diff --git a/analytics/lib/counts.py b/analytics/lib/counts.py
index 6dad7a6230..3153058e9d 100644
--- a/analytics/lib/counts.py
+++ b/analytics/lib/counts.py
@@ -36,10 +36,11 @@ logger = logging.getLogger('zulip.management')
 log_to_file(logger, settings.ANALYTICS_LOG_PATH)
 
 # You can't subtract timedelta.max from a datetime, so use this instead
-TIMEDELTA_MAX = timedelta(days=365*1000)
+TIMEDELTA_MAX = timedelta(days=365 * 1000)
 
 ## Class definitions ##
 
+
 class CountStat:
     HOUR = 'hour'
     DAY = 'day'
@@ -51,8 +52,13 @@ class CountStat:
             return timedelta(hours=1)
         return timedelta(days=1)
 
-    def __init__(self, property: str, data_collector: 'DataCollector', frequency: str,
-                 interval: Optional[timedelta]=None) -> None:
+    def __init__(
+        self,
+        property: str,
+        data_collector: 'DataCollector',
+        frequency: str,
+        interval: Optional[timedelta] = None,
+    ) -> None:
         self.property = property
         self.data_collector = data_collector
         # might have to do something different for bitfields
@@ -75,26 +81,41 @@ class CountStat:
             return fillstate.end_time
         return fillstate.end_time - self.time_increment
 
+
 class LoggingCountStat(CountStat):
     def __init__(self, property: str, output_table: Type[BaseCount], frequency: str) -> None:
         CountStat.__init__(self, property, DataCollector(output_table, None), frequency)
 
+
 class DependentCountStat(CountStat):
-    def __init__(self, property: str, data_collector: 'DataCollector', frequency: str,
-                 interval: Optional[timedelta] = None, dependencies: Sequence[str] = []) -> None:
+    def __init__(
+        self,
+        property: str,
+        data_collector: 'DataCollector',
+        frequency: str,
+        interval: Optional[timedelta] = None,
+        dependencies: Sequence[str] = [],
+    ) -> None:
         CountStat.__init__(self, property, data_collector, frequency, interval=interval)
         self.dependencies = dependencies
 
+
 class DataCollector:
-    def __init__(self, output_table: Type[BaseCount],
-                 pull_function: Optional[Callable[[str, datetime, datetime, Optional[Realm]], int]]) -> None:
+    def __init__(
+        self,
+        output_table: Type[BaseCount],
+        pull_function: Optional[Callable[[str, datetime, datetime, Optional[Realm]], int]],
+    ) -> None:
         self.output_table = output_table
         self.pull_function = pull_function
 
+
 ## CountStat-level operations ##
 
-def process_count_stat(stat: CountStat, fill_to_time: datetime,
-                       realm: Optional[Realm]=None) -> None:
+
+def process_count_stat(
+    stat: CountStat, fill_to_time: datetime, realm: Optional[Realm] = None
+) -> None:
     # TODO: The realm argument is not yet supported, in that we don't
     # have a solution for how to update FillState if it is passed.  It
     # exists solely as partial plumbing for when we do fully implement
@@ -111,9 +132,9 @@ def process_count_stat(stat: CountStat, fill_to_time: datetime,
     fill_state = FillState.objects.filter(property=stat.property).first()
     if fill_state is None:
         currently_filled = installation_epoch()
-        fill_state = FillState.objects.create(property=stat.property,
-                                              end_time=currently_filled,
-                                              state=FillState.DONE)
+        fill_state = FillState.objects.create(
+            property=stat.property, end_time=currently_filled, state=FillState.DONE
+        )
         logger.info("INITIALIZED %s %s", stat.property, currently_filled)
     elif fill_state.state == FillState.STARTED:
         logger.info("UNDO START %s %s", stat.property, fill_state.end_time)
@@ -130,8 +151,9 @@ def process_count_stat(stat: CountStat, fill_to_time: datetime,
         for dependency in stat.dependencies:
             dependency_fill_time = COUNT_STATS[dependency].last_successful_fill()
             if dependency_fill_time is None:
-                logger.warning("DependentCountStat %s run before dependency %s.",
-                               stat.property, dependency)
+                logger.warning(
+                    "DependentCountStat %s run before dependency %s.", stat.property, dependency
+                )
                 return
             fill_to_time = min(fill_to_time, dependency_fill_time)
 
@@ -144,25 +166,34 @@ def process_count_stat(stat: CountStat, fill_to_time: datetime,
         do_update_fill_state(fill_state, currently_filled, FillState.DONE)
         end = time.time()
         currently_filled = currently_filled + stat.time_increment
-        logger.info("DONE %s (%dms)", stat.property, (end-start)*1000)
+        logger.info("DONE %s (%dms)", stat.property, (end - start) * 1000)
+
 
 def do_update_fill_state(fill_state: FillState, end_time: datetime, state: int) -> None:
     fill_state.end_time = end_time
     fill_state.state = state
     fill_state.save()
 
+
 # We assume end_time is valid (e.g. is on a day or hour boundary as appropriate)
 # and is timezone aware. It is the caller's responsibility to enforce this!
-def do_fill_count_stat_at_hour(stat: CountStat, end_time: datetime, realm: Optional[Realm]=None) -> None:
+def do_fill_count_stat_at_hour(
+    stat: CountStat, end_time: datetime, realm: Optional[Realm] = None
+) -> None:
     start_time = end_time - stat.interval
     if not isinstance(stat, LoggingCountStat):
         timer = time.time()
-        assert(stat.data_collector.pull_function is not None)
+        assert stat.data_collector.pull_function is not None
         rows_added = stat.data_collector.pull_function(stat.property, start_time, end_time, realm)
-        logger.info("%s run pull_function (%dms/%sr)",
-                    stat.property, (time.time()-timer)*1000, rows_added)
+        logger.info(
+            "%s run pull_function (%dms/%sr)",
+            stat.property,
+            (time.time() - timer) * 1000,
+            rows_added,
+        )
     do_aggregate_to_summary_table(stat, end_time, realm)
 
+
 def do_delete_counts_at_hour(stat: CountStat, end_time: datetime) -> None:
     if isinstance(stat, LoggingCountStat):
         InstallationCount.objects.filter(property=stat.property, end_time=end_time).delete()
@@ -174,8 +205,10 @@ def do_delete_counts_at_hour(stat: CountStat, end_time: datetime) -> None:
         RealmCount.objects.filter(property=stat.property, end_time=end_time).delete()
         InstallationCount.objects.filter(property=stat.property, end_time=end_time).delete()
 
-def do_aggregate_to_summary_table(stat: CountStat, end_time: datetime,
-                                  realm: Optional[Realm]=None) -> None:
+
+def do_aggregate_to_summary_table(
+    stat: CountStat, end_time: datetime, realm: Optional[Realm] = None
+) -> None:
     cursor = connection.cursor()
 
     # Aggregate into RealmCount
@@ -186,7 +219,8 @@ def do_aggregate_to_summary_table(stat: CountStat, end_time: datetime,
         realm_clause = SQL("")
 
     if output_table in (UserCount, StreamCount):
-        realmcount_query = SQL("""
+        realmcount_query = SQL(
+            """
             INSERT INTO analytics_realmcount
                 (realm_id, value, property, subgroup, end_time)
             SELECT
@@ -201,19 +235,25 @@ def do_aggregate_to_summary_table(stat: CountStat, end_time: datetime,
                 {output_table}.end_time = %(end_time)s
                 {realm_clause}
             GROUP BY zerver_realm.id, {output_table}.subgroup
-        """).format(
+        """
+        ).format(
             output_table=Identifier(output_table._meta.db_table),
             realm_clause=realm_clause,
         )
         start = time.time()
-        cursor.execute(realmcount_query, {
-            'property': stat.property,
-            'end_time': end_time,
-        })
+        cursor.execute(
+            realmcount_query,
+            {
+                'property': stat.property,
+                'end_time': end_time,
+            },
+        )
         end = time.time()
         logger.info(
             "%s RealmCount aggregation (%dms/%sr)",
-            stat.property, (end - start) * 1000, cursor.rowcount,
+            stat.property,
+            (end - start) * 1000,
+            cursor.rowcount,
         )
 
     if realm is None:
@@ -222,7 +262,8 @@ def do_aggregate_to_summary_table(stat: CountStat, end_time: datetime,
         #
         # TODO: Add support for updating installation data after
         # changing an individual realm's values.
-        installationcount_query = SQL("""
+        installationcount_query = SQL(
+            """
             INSERT INTO analytics_installationcount
                 (value, property, subgroup, end_time)
             SELECT
@@ -232,26 +273,37 @@ def do_aggregate_to_summary_table(stat: CountStat, end_time: datetime,
                 property = %(property)s AND
                 end_time = %(end_time)s
             GROUP BY analytics_realmcount.subgroup
-        """)
+        """
+        )
         start = time.time()
-        cursor.execute(installationcount_query, {
-            'property': stat.property,
-            'end_time': end_time,
-        })
+        cursor.execute(
+            installationcount_query,
+            {
+                'property': stat.property,
+                'end_time': end_time,
+            },
+        )
         end = time.time()
         logger.info(
             "%s InstallationCount aggregation (%dms/%sr)",
-            stat.property, (end - start) * 1000, cursor.rowcount,
+            stat.property,
+            (end - start) * 1000,
+            cursor.rowcount,
         )
 
     cursor.close()
 
+
 ## Utility functions called from outside counts.py ##
 
 # called from zerver/lib/actions.py; should not throw any errors
-def do_increment_logging_stat(zerver_object: Union[Realm, UserProfile, Stream], stat: CountStat,
-                              subgroup: Optional[Union[str, int, bool]], event_time: datetime,
-                              increment: int=1) -> None:
+def do_increment_logging_stat(
+    zerver_object: Union[Realm, UserProfile, Stream],
+    stat: CountStat,
+    subgroup: Optional[Union[str, int, bool]],
+    event_time: datetime,
+    increment: int = 1,
+) -> None:
     if not increment:
         return
 
@@ -269,12 +321,17 @@ def do_increment_logging_stat(zerver_object: Union[Realm, UserProfile, Stream],
         end_time = ceiling_to_hour(event_time)
 
     row, created = table.objects.get_or_create(
-        property=stat.property, subgroup=subgroup, end_time=end_time,
-        defaults={'value': increment}, **id_args)
+        property=stat.property,
+        subgroup=subgroup,
+        end_time=end_time,
+        defaults={'value': increment},
+        **id_args,
+    )
     if not created:
         row.value = F('value') + increment
         row.save(update_fields=['value'])
 
+
 def do_drop_all_analytics_tables() -> None:
     UserCount.objects.all().delete()
     StreamCount.objects.all().delete()
@@ -282,6 +339,7 @@ def do_drop_all_analytics_tables() -> None:
     InstallationCount.objects.all().delete()
     FillState.objects.all().delete()
 
+
 def do_drop_single_stat(property: str) -> None:
     UserCount.objects.filter(property=property).delete()
     StreamCount.objects.filter(property=property).delete()
@@ -289,10 +347,12 @@ def do_drop_single_stat(property: str) -> None:
     InstallationCount.objects.filter(property=property).delete()
     FillState.objects.filter(property=property).delete()
 
+
 ## DataCollector-level operations ##
 
 QueryFn = Callable[[Dict[str, Composable]], Composable]
 
+
 def do_pull_by_sql_query(
     property: str,
     start_time: datetime,
@@ -311,27 +371,34 @@ def do_pull_by_sql_query(
     # group_by_clause given as a param.
     # We pass in the datetimes as params to cursor.execute so that we don't have to
     # think about how to convert python datetimes to SQL datetimes.
-    query_ = query({
-        'subgroup': subgroup,
-        'group_by_clause': group_by_clause,
-    })
+    query_ = query(
+        {
+            'subgroup': subgroup,
+            'group_by_clause': group_by_clause,
+        }
+    )
     cursor = connection.cursor()
-    cursor.execute(query_, {
-        'property': property,
-        'time_start': start_time,
-        'time_end': end_time,
-    })
+    cursor.execute(
+        query_,
+        {
+            'property': property,
+            'time_start': start_time,
+            'time_end': end_time,
+        },
+    )
     rowcount = cursor.rowcount
     cursor.close()
     return rowcount
 
+
 def sql_data_collector(
     output_table: Type[BaseCount],
     query: QueryFn,
     group_by: Optional[Tuple[models.Model, str]],
 ) -> DataCollector:
-    def pull_function(property: str, start_time: datetime, end_time: datetime,
-                      realm: Optional[Realm] = None) -> int:
+    def pull_function(
+        property: str, start_time: datetime, end_time: datetime, realm: Optional[Realm] = None
+    ) -> int:
         # The pull function type needs to accept a Realm argument
         # because the 'minutes_active::day' CountStat uses
         # DataCollector directly for do_pull_minutes_active, which
@@ -339,16 +406,23 @@ def sql_data_collector(
         # realm should have been already encoded in the `query` we're
         # passed.
         return do_pull_by_sql_query(property, start_time, end_time, query, group_by)
+
     return DataCollector(output_table, pull_function)
 
-def do_pull_minutes_active(property: str, start_time: datetime, end_time: datetime,
-                           realm: Optional[Realm] = None) -> int:
-    user_activity_intervals = UserActivityInterval.objects.filter(
-        end__gt=start_time, start__lt=end_time,
-    ).select_related(
-        'user_profile',
-    ).values_list(
-        'user_profile_id', 'user_profile__realm_id', 'start', 'end')
+
+def do_pull_minutes_active(
+    property: str, start_time: datetime, end_time: datetime, realm: Optional[Realm] = None
+) -> int:
+    user_activity_intervals = (
+        UserActivityInterval.objects.filter(
+            end__gt=start_time,
+            start__lt=end_time,
+        )
+        .select_related(
+            'user_profile',
+        )
+        .values_list('user_profile_id', 'user_profile__realm_id', 'start', 'end')
+    )
 
     seconds_active: Dict[Tuple[int, int], float] = defaultdict(float)
     for user_id, realm_id, interval_start, interval_end in user_activity_intervals:
@@ -357,18 +431,28 @@ def do_pull_minutes_active(property: str, start_time: datetime, end_time: dateti
             end = min(end_time, interval_end)
             seconds_active[(user_id, realm_id)] += (end - start).total_seconds()
 
-    rows = [UserCount(user_id=ids[0], realm_id=ids[1], property=property,
-                      end_time=end_time, value=int(seconds // 60))
-            for ids, seconds in seconds_active.items() if seconds >= 60]
+    rows = [
+        UserCount(
+            user_id=ids[0],
+            realm_id=ids[1],
+            property=property,
+            end_time=end_time,
+            value=int(seconds // 60),
+        )
+        for ids, seconds in seconds_active.items()
+        if seconds >= 60
+    ]
     UserCount.objects.bulk_create(rows)
     return len(rows)
 
+
 def count_message_by_user_query(realm: Optional[Realm]) -> QueryFn:
     if realm is None:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("zerver_userprofile.realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_usercount
         (user_id, realm_id, value, property, subgroup, end_time)
     SELECT
@@ -384,7 +468,9 @@ def count_message_by_user_query(realm: Optional[Realm]) -> QueryFn:
         {realm_clause}
         zerver_message.date_sent < %(time_end)s
     GROUP BY zerver_userprofile.id {group_by_clause}
-""").format(**kwargs, realm_clause=realm_clause)
+"""
+    ).format(**kwargs, realm_clause=realm_clause)
+
 
 # Note: ignores the group_by / group_by_clause.
 def count_message_type_by_user_query(realm: Optional[Realm]) -> QueryFn:
@@ -392,7 +478,8 @@ def count_message_type_by_user_query(realm: Optional[Realm]) -> QueryFn:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("zerver_userprofile.realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_usercount
             (realm_id, user_id, value, property, subgroup, end_time)
     SELECT realm_id, id, SUM(count) AS value, %(property)s, message_type, %(time_end)s
@@ -427,7 +514,9 @@ def count_message_type_by_user_query(realm: Optional[Realm]) -> QueryFn:
             zerver_recipient.type, zerver_stream.invite_only
     ) AS subquery
     GROUP BY realm_id, id, message_type
-""").format(**kwargs, realm_clause=realm_clause)
+"""
+    ).format(**kwargs, realm_clause=realm_clause)
+
 
 # This query joins to the UserProfile table since all current queries that
 # use this also subgroup on UserProfile.is_bot. If in the future there is a
@@ -438,7 +527,8 @@ def count_message_by_stream_query(realm: Optional[Realm]) -> QueryFn:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("zerver_stream.realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_streamcount
         (stream_id, realm_id, value, property, subgroup, end_time)
     SELECT
@@ -460,7 +550,9 @@ def count_message_by_stream_query(realm: Optional[Realm]) -> QueryFn:
         {realm_clause}
         zerver_message.date_sent < %(time_end)s
     GROUP BY zerver_stream.id {group_by_clause}
-""").format(**kwargs, realm_clause=realm_clause)
+"""
+    ).format(**kwargs, realm_clause=realm_clause)
+
 
 # Hardcodes the query needed by active_users:is_bot:day, since that is
 # currently the only stat that uses this.
@@ -469,7 +561,8 @@ def count_user_by_realm_query(realm: Optional[Realm]) -> QueryFn:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("zerver_userprofile.realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_realmcount
         (realm_id, value, property, subgroup, end_time)
     SELECT
@@ -485,7 +578,9 @@ def count_user_by_realm_query(realm: Optional[Realm]) -> QueryFn:
         {realm_clause}
         zerver_userprofile.is_active = TRUE
     GROUP BY zerver_realm.id {group_by_clause}
-""").format(**kwargs, realm_clause=realm_clause)
+"""
+    ).format(**kwargs, realm_clause=realm_clause)
+
 
 # Currently hardcodes the query needed for active_users_audit:is_bot:day.
 # Assumes that a user cannot have two RealmAuditLog entries with the same event_time and
@@ -496,7 +591,8 @@ def check_realmauditlog_by_user_query(realm: Optional[Realm]) -> QueryFn:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_usercount
         (user_id, realm_id, value, property, subgroup, end_time)
     SELECT
@@ -519,7 +615,8 @@ def check_realmauditlog_by_user_query(realm: Optional[Realm]) -> QueryFn:
         ral1.modified_user_id = zerver_userprofile.id
     WHERE
         ral1.event_type in ({user_created}, {user_activated}, {user_reactivated})
-    """).format(
+    """
+    ).format(
         **kwargs,
         user_created=Literal(RealmAuditLog.USER_CREATED),
         user_activated=Literal(RealmAuditLog.USER_ACTIVATED),
@@ -528,12 +625,14 @@ def check_realmauditlog_by_user_query(realm: Optional[Realm]) -> QueryFn:
         realm_clause=realm_clause,
     )
 
+
 def check_useractivityinterval_by_user_query(realm: Optional[Realm]) -> QueryFn:
     if realm is None:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("zerver_userprofile.realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_usercount
         (user_id, realm_id, value, property, subgroup, end_time)
     SELECT
@@ -547,14 +646,17 @@ def check_useractivityinterval_by_user_query(realm: Optional[Realm]) -> QueryFn:
         {realm_clause}
         zerver_useractivityinterval.start < %(time_end)s
     GROUP BY zerver_userprofile.id {group_by_clause}
-""").format(**kwargs, realm_clause=realm_clause)
+"""
+    ).format(**kwargs, realm_clause=realm_clause)
+
 
 def count_realm_active_humans_query(realm: Optional[Realm]) -> QueryFn:
     if realm is None:
         realm_clause = SQL("")
     else:
         realm_clause = SQL("realm_id = {} AND").format(Literal(realm.id))
-    return lambda kwargs: SQL("""
+    return lambda kwargs: SQL(
+        """
     INSERT INTO analytics_realmcount
         (realm_id, value, property, subgroup, end_time)
     SELECT
@@ -579,10 +681,13 @@ def count_realm_active_humans_query(realm: Optional[Realm]) -> QueryFn:
     ON
         usercount1.user_id = usercount2.user_id
     GROUP BY usercount1.realm_id
-""").format(**kwargs, realm_clause=realm_clause)
+"""
+    ).format(**kwargs, realm_clause=realm_clause)
+
 
 # Currently unused and untested
-count_stream_by_realm_query = lambda kwargs: SQL("""
+count_stream_by_realm_query = lambda kwargs: SQL(
+    """
     INSERT INTO analytics_realmcount
         (realm_id, value, property, subgroup, end_time)
     SELECT
@@ -596,62 +701,77 @@ count_stream_by_realm_query = lambda kwargs: SQL("""
         zerver_stream.date_created >= %(time_start)s AND
         zerver_stream.date_created < %(time_end)s
     GROUP BY zerver_realm.id {group_by_clause}
-""").format(**kwargs)
+"""
+).format(**kwargs)
 
-def get_count_stats(realm: Optional[Realm]=None) -> Dict[str, CountStat]:
+
+def get_count_stats(realm: Optional[Realm] = None) -> Dict[str, CountStat]:
     ## CountStat declarations ##
 
     count_stats_ = [
         # Messages sent stats
         # Stats that count the number of messages sent in various ways.
         # These are also the set of stats that read from the Message table.
-
-        CountStat('messages_sent:is_bot:hour',
-                  sql_data_collector(UserCount, count_message_by_user_query(
-                      realm), (UserProfile, 'is_bot')),
-                  CountStat.HOUR),
-        CountStat('messages_sent:message_type:day',
-                  sql_data_collector(
-                      UserCount, count_message_type_by_user_query(realm), None),
-                  CountStat.DAY),
-        CountStat('messages_sent:client:day',
-                  sql_data_collector(UserCount, count_message_by_user_query(realm),
-                                     (Message, 'sending_client_id')), CountStat.DAY),
-        CountStat('messages_in_stream:is_bot:day',
-                  sql_data_collector(StreamCount, count_message_by_stream_query(realm),
-                                     (UserProfile, 'is_bot')), CountStat.DAY),
-
+        CountStat(
+            'messages_sent:is_bot:hour',
+            sql_data_collector(
+                UserCount, count_message_by_user_query(realm), (UserProfile, 'is_bot')
+            ),
+            CountStat.HOUR,
+        ),
+        CountStat(
+            'messages_sent:message_type:day',
+            sql_data_collector(UserCount, count_message_type_by_user_query(realm), None),
+            CountStat.DAY,
+        ),
+        CountStat(
+            'messages_sent:client:day',
+            sql_data_collector(
+                UserCount, count_message_by_user_query(realm), (Message, 'sending_client_id')
+            ),
+            CountStat.DAY,
+        ),
+        CountStat(
+            'messages_in_stream:is_bot:day',
+            sql_data_collector(
+                StreamCount, count_message_by_stream_query(realm), (UserProfile, 'is_bot')
+            ),
+            CountStat.DAY,
+        ),
         # Number of users stats
         # Stats that count the number of active users in the UserProfile.is_active sense.
-
         # 'active_users_audit:is_bot:day' is the canonical record of which users were
         # active on which days (in the UserProfile.is_active sense).
         # Important that this stay a daily stat, so that 'realm_active_humans::day' works as expected.
-        CountStat('active_users_audit:is_bot:day',
-                  sql_data_collector(UserCount, check_realmauditlog_by_user_query(
-                      realm), (UserProfile, 'is_bot')),
-                  CountStat.DAY),
-
+        CountStat(
+            'active_users_audit:is_bot:day',
+            sql_data_collector(
+                UserCount, check_realmauditlog_by_user_query(realm), (UserProfile, 'is_bot')
+            ),
+            CountStat.DAY,
+        ),
         # Important note: LoggingCountStat objects aren't passed the
         # Realm argument, because by nature they have a logging
         # structure, not a pull-from-database structure, so there's no
         # way to compute them for a single realm after the fact (the
         # use case for passing a Realm argument).
-
         # Sanity check on 'active_users_audit:is_bot:day', and a archetype for future LoggingCountStats.
         # In RealmCount, 'active_users_audit:is_bot:day' should be the partial
         # sum sequence of 'active_users_log:is_bot:day', for any realm that
         # started after the latter stat was introduced.
-        LoggingCountStat('active_users_log:is_bot:day',
-                         RealmCount, CountStat.DAY),
+        LoggingCountStat('active_users_log:is_bot:day', RealmCount, CountStat.DAY),
         # Another sanity check on 'active_users_audit:is_bot:day'. Is only an
         # approximation, e.g. if a user is deactivated between the end of the
         # day and when this stat is run, they won't be counted. However, is the
         # simplest of the three to inspect by hand.
-        CountStat('active_users:is_bot:day',
-                  sql_data_collector(RealmCount, count_user_by_realm_query(realm), (UserProfile, 'is_bot')),
-                  CountStat.DAY, interval=TIMEDELTA_MAX),
-
+        CountStat(
+            'active_users:is_bot:day',
+            sql_data_collector(
+                RealmCount, count_user_by_realm_query(realm), (UserProfile, 'is_bot')
+            ),
+            CountStat.DAY,
+            interval=TIMEDELTA_MAX,
+        ),
         # Messages read stats.  messages_read::hour is the total
         # number of messages read, whereas
         # messages_read_interactions::hour tries to count the total
@@ -661,42 +781,45 @@ def get_count_stats(realm: Optional[Realm]=None) -> Dict[str, CountStat]:
         # operation).
         LoggingCountStat('messages_read::hour', UserCount, CountStat.HOUR),
         LoggingCountStat('messages_read_interactions::hour', UserCount, CountStat.HOUR),
-
         # User activity stats
         # Stats that measure user activity in the UserActivityInterval sense.
-
-        CountStat('1day_actives::day',
-                  sql_data_collector(
-                      UserCount, check_useractivityinterval_by_user_query(realm), None),
-                  CountStat.DAY, interval=timedelta(days=1)-UserActivityInterval.MIN_INTERVAL_LENGTH),
-        CountStat('7day_actives::day',
-                  sql_data_collector(
-                      UserCount, check_useractivityinterval_by_user_query(realm), None),
-                  CountStat.DAY, interval=timedelta(days=7)-UserActivityInterval.MIN_INTERVAL_LENGTH),
-        CountStat('15day_actives::day',
-                  sql_data_collector(
-                      UserCount, check_useractivityinterval_by_user_query(realm), None),
-                  CountStat.DAY, interval=timedelta(days=15)-UserActivityInterval.MIN_INTERVAL_LENGTH),
-        CountStat('minutes_active::day', DataCollector(
-            UserCount, do_pull_minutes_active), CountStat.DAY),
-
+        CountStat(
+            '1day_actives::day',
+            sql_data_collector(UserCount, check_useractivityinterval_by_user_query(realm), None),
+            CountStat.DAY,
+            interval=timedelta(days=1) - UserActivityInterval.MIN_INTERVAL_LENGTH,
+        ),
+        CountStat(
+            '7day_actives::day',
+            sql_data_collector(UserCount, check_useractivityinterval_by_user_query(realm), None),
+            CountStat.DAY,
+            interval=timedelta(days=7) - UserActivityInterval.MIN_INTERVAL_LENGTH,
+        ),
+        CountStat(
+            '15day_actives::day',
+            sql_data_collector(UserCount, check_useractivityinterval_by_user_query(realm), None),
+            CountStat.DAY,
+            interval=timedelta(days=15) - UserActivityInterval.MIN_INTERVAL_LENGTH,
+        ),
+        CountStat(
+            'minutes_active::day', DataCollector(UserCount, do_pull_minutes_active), CountStat.DAY
+        ),
         # Rate limiting stats
-
         # Used to limit the number of invitation emails sent by a realm
         LoggingCountStat('invites_sent::day', RealmCount, CountStat.DAY),
-
         # Dependent stats
         # Must come after their dependencies.
-
         # Canonical account of the number of active humans in a realm on each day.
-        DependentCountStat('realm_active_humans::day',
-                           sql_data_collector(
-                               RealmCount, count_realm_active_humans_query(realm), None),
-                           CountStat.DAY,
-                           dependencies=['active_users_audit:is_bot:day', '15day_actives::day']),
+        DependentCountStat(
+            'realm_active_humans::day',
+            sql_data_collector(RealmCount, count_realm_active_humans_query(realm), None),
+            CountStat.DAY,
+            dependencies=['active_users_audit:is_bot:day', '15day_actives::day'],
+        ),
     ]
 
     return OrderedDict((stat.property, stat) for stat in count_stats_)
 
+
 # To avoid refactoring for now COUNT_STATS can be used as before
 COUNT_STATS = get_count_stats()
diff --git a/analytics/lib/fixtures.py b/analytics/lib/fixtures.py
index 41f8c8dfa3..fe554be68c 100644
--- a/analytics/lib/fixtures.py
+++ b/analytics/lib/fixtures.py
@@ -5,11 +5,18 @@ from typing import List
 from analytics.lib.counts import CountStat
 
 
-def generate_time_series_data(days: int=100, business_hours_base: float=10,
-                              non_business_hours_base: float=10, growth: float=1,
-                              autocorrelation: float=0, spikiness: float=1,
-                              holiday_rate: float=0, frequency: str=CountStat.DAY,
-                              partial_sum: bool=False, random_seed: int=26) -> List[int]:
+def generate_time_series_data(
+    days: int = 100,
+    business_hours_base: float = 10,
+    non_business_hours_base: float = 10,
+    growth: float = 1,
+    autocorrelation: float = 0,
+    spikiness: float = 1,
+    holiday_rate: float = 0,
+    frequency: str = CountStat.DAY,
+    partial_sum: bool = False,
+    random_seed: int = 26,
+) -> List[int]:
     """
     Generate semi-realistic looking time series data for testing analytics graphs.
 
@@ -30,34 +37,43 @@ def generate_time_series_data(days: int=100, business_hours_base: float=10,
     random_seed -- Seed for random number generator.
     """
     if frequency == CountStat.HOUR:
-        length = days*24
+        length = days * 24
         seasonality = [non_business_hours_base] * 24 * 7
         for day in range(5):
             for hour in range(8):
-                seasonality[24*day + hour] = business_hours_base
-        holidays  = []
+                seasonality[24 * day + hour] = business_hours_base
+        holidays = []
         for i in range(days):
             holidays.extend([random() < holiday_rate] * 24)
     elif frequency == CountStat.DAY:
         length = days
-        seasonality = [8*business_hours_base + 16*non_business_hours_base] * 5 + \
-                      [24*non_business_hours_base] * 2
+        seasonality = [8 * business_hours_base + 16 * non_business_hours_base] * 5 + [
+            24 * non_business_hours_base
+        ] * 2
         holidays = [random() < holiday_rate for i in range(days)]
     else:
         raise AssertionError(f"Unknown frequency: {frequency}")
     if length < 2:
-        raise AssertionError(f"Must be generating at least 2 data points. Currently generating {length}")
-    growth_base = growth ** (1. / (length-1))
-    values_no_noise = [seasonality[i % len(seasonality)] * (growth_base**i) for i in range(length)]
+        raise AssertionError(
+            f"Must be generating at least 2 data points. Currently generating {length}"
+        )
+    growth_base = growth ** (1.0 / (length - 1))
+    values_no_noise = [
+        seasonality[i % len(seasonality)] * (growth_base ** i) for i in range(length)
+    ]
 
     seed(random_seed)
     noise_scalars = [gauss(0, 1)]
     for i in range(1, length):
-        noise_scalars.append(noise_scalars[-1]*autocorrelation + gauss(0, 1)*(1-autocorrelation))
+        noise_scalars.append(
+            noise_scalars[-1] * autocorrelation + gauss(0, 1) * (1 - autocorrelation)
+        )
 
-    values = [0 if holiday else int(v + sqrt(v)*noise_scalar*spikiness)
-              for v, noise_scalar, holiday in zip(values_no_noise, noise_scalars, holidays)]
+    values = [
+        0 if holiday else int(v + sqrt(v) * noise_scalar * spikiness)
+        for v, noise_scalar, holiday in zip(values_no_noise, noise_scalars, holidays)
+    ]
     if partial_sum:
         for i in range(1, length):
-            values[i] = values[i-1] + values[i]
+            values[i] = values[i - 1] + values[i]
     return [max(v, 0) for v in values]
diff --git a/analytics/lib/time_utils.py b/analytics/lib/time_utils.py
index b990ae252d..888baf96d5 100644
--- a/analytics/lib/time_utils.py
+++ b/analytics/lib/time_utils.py
@@ -9,8 +9,9 @@ from zerver.lib.timestamp import floor_to_day, floor_to_hour, verify_UTC
 # If min_length is greater than 0, pads the list to the left.
 # So informally, time_range(Sep 20, Sep 22, day, None) returns [Sep 20, Sep 21, Sep 22],
 # and time_range(Sep 20, Sep 22, day, 5) returns [Sep 18, Sep 19, Sep 20, Sep 21, Sep 22]
-def time_range(start: datetime, end: datetime, frequency: str,
-               min_length: Optional[int]) -> List[datetime]:
+def time_range(
+    start: datetime, end: datetime, frequency: str, min_length: Optional[int]
+) -> List[datetime]:
     verify_UTC(start)
     verify_UTC(end)
     if frequency == CountStat.HOUR:
@@ -24,7 +25,7 @@ def time_range(start: datetime, end: datetime, frequency: str,
 
     times = []
     if min_length is not None:
-        start = min(start, end - (min_length-1)*step)
+        start = min(start, end - (min_length - 1) * step)
     current = end
     while current >= start:
         times.append(current)
diff --git a/analytics/management/commands/check_analytics_state.py b/analytics/management/commands/check_analytics_state.py
index 48576cda19..d80ca29fc8 100644
--- a/analytics/management/commands/check_analytics_state.py
+++ b/analytics/management/commands/check_analytics_state.py
@@ -18,6 +18,7 @@ states = {
     3: "UNKNOWN",
 }
 
+
 class Command(BaseCommand):
     help = """Checks FillState table.
 
@@ -60,7 +61,10 @@ class Command(BaseCommand):
                 critical_threshold = timedelta(minutes=150)
 
             if floor_function(last_fill) != last_fill:
-                return {'status': 2, 'message': f'FillState not on {stat.frequency} boundary for {property}'}
+                return {
+                    'status': 2,
+                    'message': f'FillState not on {stat.frequency} boundary for {property}',
+                }
 
             time_to_last_fill = timezone_now() - last_fill
             if time_to_last_fill > critical_threshold:
diff --git a/analytics/management/commands/clear_analytics_tables.py b/analytics/management/commands/clear_analytics_tables.py
index e668d156ce..d331954682 100644
--- a/analytics/management/commands/clear_analytics_tables.py
+++ b/analytics/management/commands/clear_analytics_tables.py
@@ -10,12 +10,12 @@ class Command(BaseCommand):
     help = """Clear analytics tables."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--force',
-                            action='store_true',
-                            help="Clear analytics tables.")
+        parser.add_argument('--force', action='store_true', help="Clear analytics tables.")
 
     def handle(self, *args: Any, **options: Any) -> None:
         if options['force']:
             do_drop_all_analytics_tables()
         else:
-            raise CommandError("Would delete all data from analytics tables (!); use --force to do so.")
+            raise CommandError(
+                "Would delete all data from analytics tables (!); use --force to do so."
+            )
diff --git a/analytics/management/commands/clear_single_stat.py b/analytics/management/commands/clear_single_stat.py
index 3b440a0503..f7575ec65b 100644
--- a/analytics/management/commands/clear_single_stat.py
+++ b/analytics/management/commands/clear_single_stat.py
@@ -10,11 +10,8 @@ class Command(BaseCommand):
     help = """Clear analytics tables."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--force',
-                            action='store_true',
-                            help="Actually do it.")
-        parser.add_argument('--property',
-                            help="The property of the stat to be cleared.")
+        parser.add_argument('--force', action='store_true', help="Actually do it.")
+        parser.add_argument('--property', help="The property of the stat to be cleared.")
 
     def handle(self, *args: Any, **options: Any) -> None:
         property = options['property']
diff --git a/analytics/management/commands/populate_analytics_db.py b/analytics/management/commands/populate_analytics_db.py
index 740d0e2994..badf0cb6c5 100644
--- a/analytics/management/commands/populate_analytics_db.py
+++ b/analytics/management/commands/populate_analytics_db.py
@@ -28,16 +28,30 @@ class Command(BaseCommand):
     DAYS_OF_DATA = 100
     random_seed = 26
 
-    def generate_fixture_data(self, stat: CountStat, business_hours_base: float,
-                              non_business_hours_base: float, growth: float,
-                              autocorrelation: float, spikiness: float,
-                              holiday_rate: float=0, partial_sum: bool=False) -> List[int]:
+    def generate_fixture_data(
+        self,
+        stat: CountStat,
+        business_hours_base: float,
+        non_business_hours_base: float,
+        growth: float,
+        autocorrelation: float,
+        spikiness: float,
+        holiday_rate: float = 0,
+        partial_sum: bool = False,
+    ) -> List[int]:
         self.random_seed += 1
         return generate_time_series_data(
-            days=self.DAYS_OF_DATA, business_hours_base=business_hours_base,
-            non_business_hours_base=non_business_hours_base, growth=growth,
-            autocorrelation=autocorrelation, spikiness=spikiness, holiday_rate=holiday_rate,
-            frequency=stat.frequency, partial_sum=partial_sum, random_seed=self.random_seed)
+            days=self.DAYS_OF_DATA,
+            business_hours_base=business_hours_base,
+            non_business_hours_base=non_business_hours_base,
+            growth=growth,
+            autocorrelation=autocorrelation,
+            spikiness=spikiness,
+            holiday_rate=holiday_rate,
+            frequency=stat.frequency,
+            partial_sum=partial_sum,
+            random_seed=self.random_seed,
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         # TODO: This should arguably only delete the objects
@@ -54,23 +68,24 @@ class Command(BaseCommand):
         # memcached in order to ensure deleted objects aren't still
         # present in the memcached cache.
         from zerver.apps import flush_cache
+
         flush_cache(None)
 
         installation_time = timezone_now() - timedelta(days=self.DAYS_OF_DATA)
         last_end_time = floor_to_day(timezone_now())
         realm = Realm.objects.create(
-            string_id='analytics', name='Analytics', date_created=installation_time)
+            string_id='analytics', name='Analytics', date_created=installation_time
+        )
         with mock.patch("zerver.lib.create_user.timezone_now", return_value=installation_time):
             shylock = create_user(
                 'shylock@analytics.ds',
                 'Shylock',
                 realm,
                 full_name='Shylock',
-                role=UserProfile.ROLE_REALM_ADMINISTRATOR
+                role=UserProfile.ROLE_REALM_ADMINISTRATOR,
             )
         do_change_user_role(shylock, UserProfile.ROLE_REALM_ADMINISTRATOR, acting_user=None)
-        stream = Stream.objects.create(
-            name='all', realm=realm, date_created=installation_time)
+        stream = Stream.objects.create(name='all', realm=realm, date_created=installation_time)
         recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
         stream.recipient = recipient
         stream.save(update_fields=["recipient"])
@@ -78,17 +93,18 @@ class Command(BaseCommand):
         # Subscribe shylock to the stream to avoid invariant failures.
         # TODO: This should use subscribe_users_to_streams from populate_db.
         subs = [
-            Subscription(recipient=recipient,
-                         user_profile=shylock,
-                         color=STREAM_ASSIGNMENT_COLORS[0]),
+            Subscription(
+                recipient=recipient, user_profile=shylock, color=STREAM_ASSIGNMENT_COLORS[0]
+            ),
         ]
         Subscription.objects.bulk_create(subs)
 
-        def insert_fixture_data(stat: CountStat,
-                                fixture_data: Mapping[Optional[str], List[int]],
-                                table: Type[BaseCount]) -> None:
-            end_times = time_range(last_end_time, last_end_time, stat.frequency,
-                                   len(list(fixture_data.values())[0]))
+        def insert_fixture_data(
+            stat: CountStat, fixture_data: Mapping[Optional[str], List[int]], table: Type[BaseCount]
+        ) -> None:
+            end_times = time_range(
+                last_end_time, last_end_time, stat.frequency, len(list(fixture_data.values())[0])
+            )
             if table == InstallationCount:
                 id_args: Dict[str, Any] = {}
             if table == RealmCount:
@@ -100,94 +116,114 @@ class Command(BaseCommand):
 
             for subgroup, values in fixture_data.items():
                 table.objects.bulk_create(
-                    table(property=stat.property, subgroup=subgroup, end_time=end_time,
-                          value=value, **id_args)
-                    for end_time, value in zip(end_times, values) if value != 0)
+                    table(
+                        property=stat.property,
+                        subgroup=subgroup,
+                        end_time=end_time,
+                        value=value,
+                        **id_args,
+                    )
+                    for end_time, value in zip(end_times, values)
+                    if value != 0
+                )
 
         stat = COUNT_STATS['1day_actives::day']
         realm_data: Mapping[Optional[str], List[int]] = {
-            None: self.generate_fixture_data(stat, .08, .02, 3, .3, 6, partial_sum=True),
+            None: self.generate_fixture_data(stat, 0.08, 0.02, 3, 0.3, 6, partial_sum=True),
         }
         insert_fixture_data(stat, realm_data, RealmCount)
         installation_data: Mapping[Optional[str], List[int]] = {
-            None: self.generate_fixture_data(stat, .8, .2, 4, .3, 6, partial_sum=True),
+            None: self.generate_fixture_data(stat, 0.8, 0.2, 4, 0.3, 6, partial_sum=True),
         }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['7day_actives::day']
         realm_data = {
-            None: self.generate_fixture_data(stat, .2, .07, 3, .3, 6, partial_sum=True),
+            None: self.generate_fixture_data(stat, 0.2, 0.07, 3, 0.3, 6, partial_sum=True),
         }
         insert_fixture_data(stat, realm_data, RealmCount)
         installation_data = {
-            None: self.generate_fixture_data(stat, 2, .7, 4, .3, 6, partial_sum=True),
+            None: self.generate_fixture_data(stat, 2, 0.7, 4, 0.3, 6, partial_sum=True),
         }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['realm_active_humans::day']
         realm_data = {
-            None: self.generate_fixture_data(stat, .8, .08, 3, .5, 3, partial_sum=True),
+            None: self.generate_fixture_data(stat, 0.8, 0.08, 3, 0.5, 3, partial_sum=True),
         }
         insert_fixture_data(stat, realm_data, RealmCount)
         installation_data = {
-            None: self.generate_fixture_data(stat, 1, .3, 4, .5, 3, partial_sum=True),
+            None: self.generate_fixture_data(stat, 1, 0.3, 4, 0.5, 3, partial_sum=True),
         }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['active_users_audit:is_bot:day']
         realm_data = {
-            'false': self.generate_fixture_data(stat, 1, .2, 3.5, .8, 2, partial_sum=True),
-            'true': self.generate_fixture_data(stat, .3, .05, 3, .3, 2, partial_sum=True),
+            'false': self.generate_fixture_data(stat, 1, 0.2, 3.5, 0.8, 2, partial_sum=True),
+            'true': self.generate_fixture_data(stat, 0.3, 0.05, 3, 0.3, 2, partial_sum=True),
         }
         insert_fixture_data(stat, realm_data, RealmCount)
         installation_data = {
-            'false': self.generate_fixture_data(stat, 3, 1, 4, .8, 2, partial_sum=True),
-            'true': self.generate_fixture_data(stat, 1, .4, 4, .8, 2, partial_sum=True),
+            'false': self.generate_fixture_data(stat, 3, 1, 4, 0.8, 2, partial_sum=True),
+            'true': self.generate_fixture_data(stat, 1, 0.4, 4, 0.8, 2, partial_sum=True),
         }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['messages_sent:is_bot:hour']
         user_data: Mapping[Optional[str], List[int]] = {
-            'false': self.generate_fixture_data(stat, 2, 1, 1.5, .6, 8, holiday_rate=.1),
+            'false': self.generate_fixture_data(stat, 2, 1, 1.5, 0.6, 8, holiday_rate=0.1),
         }
         insert_fixture_data(stat, user_data, UserCount)
-        realm_data = {'false': self.generate_fixture_data(stat, 35, 15, 6, .6, 4),
-                      'true': self.generate_fixture_data(stat, 15, 15, 3, .4, 2)}
+        realm_data = {
+            'false': self.generate_fixture_data(stat, 35, 15, 6, 0.6, 4),
+            'true': self.generate_fixture_data(stat, 15, 15, 3, 0.4, 2),
+        }
         insert_fixture_data(stat, realm_data, RealmCount)
-        installation_data = {'false': self.generate_fixture_data(stat, 350, 150, 6, .6, 4),
-                             'true': self.generate_fixture_data(stat, 150, 150, 3, .4, 2)}
+        installation_data = {
+            'false': self.generate_fixture_data(stat, 350, 150, 6, 0.6, 4),
+            'true': self.generate_fixture_data(stat, 150, 150, 3, 0.4, 2),
+        }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['messages_sent:message_type:day']
         user_data = {
-            'public_stream': self.generate_fixture_data(stat, 1.5, 1, 3, .6, 8),
-            'private_message': self.generate_fixture_data(stat, .5, .3, 1, .6, 8),
-            'huddle_message': self.generate_fixture_data(stat, .2, .2, 2, .6, 8)}
+            'public_stream': self.generate_fixture_data(stat, 1.5, 1, 3, 0.6, 8),
+            'private_message': self.generate_fixture_data(stat, 0.5, 0.3, 1, 0.6, 8),
+            'huddle_message': self.generate_fixture_data(stat, 0.2, 0.2, 2, 0.6, 8),
+        }
         insert_fixture_data(stat, user_data, UserCount)
         realm_data = {
-            'public_stream': self.generate_fixture_data(stat, 30, 8, 5, .6, 4),
-            'private_stream': self.generate_fixture_data(stat, 7, 7, 5, .6, 4),
-            'private_message': self.generate_fixture_data(stat, 13, 5, 5, .6, 4),
-            'huddle_message': self.generate_fixture_data(stat, 6, 3, 3, .6, 4)}
+            'public_stream': self.generate_fixture_data(stat, 30, 8, 5, 0.6, 4),
+            'private_stream': self.generate_fixture_data(stat, 7, 7, 5, 0.6, 4),
+            'private_message': self.generate_fixture_data(stat, 13, 5, 5, 0.6, 4),
+            'huddle_message': self.generate_fixture_data(stat, 6, 3, 3, 0.6, 4),
+        }
         insert_fixture_data(stat, realm_data, RealmCount)
         installation_data = {
-            'public_stream': self.generate_fixture_data(stat, 300, 80, 5, .6, 4),
-            'private_stream': self.generate_fixture_data(stat, 70, 70, 5, .6, 4),
-            'private_message': self.generate_fixture_data(stat, 130, 50, 5, .6, 4),
-            'huddle_message': self.generate_fixture_data(stat, 60, 30, 3, .6, 4)}
+            'public_stream': self.generate_fixture_data(stat, 300, 80, 5, 0.6, 4),
+            'private_stream': self.generate_fixture_data(stat, 70, 70, 5, 0.6, 4),
+            'private_message': self.generate_fixture_data(stat, 130, 50, 5, 0.6, 4),
+            'huddle_message': self.generate_fixture_data(stat, 60, 30, 3, 0.6, 4),
+        }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         website, created = Client.objects.get_or_create(name='website')
         old_desktop, created = Client.objects.get_or_create(name='desktop app Linux 0.3.7')
@@ -201,54 +237,60 @@ class Command(BaseCommand):
 
         stat = COUNT_STATS['messages_sent:client:day']
         user_data = {
-            website.id: self.generate_fixture_data(stat, 2, 1, 1.5, .6, 8),
-            zephyr_mirror.id: self.generate_fixture_data(stat, 0, .3, 1.5, .6, 8)}
+            website.id: self.generate_fixture_data(stat, 2, 1, 1.5, 0.6, 8),
+            zephyr_mirror.id: self.generate_fixture_data(stat, 0, 0.3, 1.5, 0.6, 8),
+        }
         insert_fixture_data(stat, user_data, UserCount)
         realm_data = {
-            website.id: self.generate_fixture_data(stat, 30, 20, 5, .6, 3),
-            old_desktop.id: self.generate_fixture_data(stat, 5, 3, 8, .6, 3),
-            android.id: self.generate_fixture_data(stat, 5, 5, 2, .6, 3),
-            iOS.id: self.generate_fixture_data(stat, 5, 5, 2, .6, 3),
-            react_native.id: self.generate_fixture_data(stat, 5, 5, 10, .6, 3),
-            API.id: self.generate_fixture_data(stat, 5, 5, 5, .6, 3),
-            zephyr_mirror.id: self.generate_fixture_data(stat, 1, 1, 3, .6, 3),
+            website.id: self.generate_fixture_data(stat, 30, 20, 5, 0.6, 3),
+            old_desktop.id: self.generate_fixture_data(stat, 5, 3, 8, 0.6, 3),
+            android.id: self.generate_fixture_data(stat, 5, 5, 2, 0.6, 3),
+            iOS.id: self.generate_fixture_data(stat, 5, 5, 2, 0.6, 3),
+            react_native.id: self.generate_fixture_data(stat, 5, 5, 10, 0.6, 3),
+            API.id: self.generate_fixture_data(stat, 5, 5, 5, 0.6, 3),
+            zephyr_mirror.id: self.generate_fixture_data(stat, 1, 1, 3, 0.6, 3),
             unused.id: self.generate_fixture_data(stat, 0, 0, 0, 0, 0),
-            long_webhook.id: self.generate_fixture_data(stat, 5, 5, 2, .6, 3)}
+            long_webhook.id: self.generate_fixture_data(stat, 5, 5, 2, 0.6, 3),
+        }
         insert_fixture_data(stat, realm_data, RealmCount)
         installation_data = {
-            website.id: self.generate_fixture_data(stat, 300, 200, 5, .6, 3),
-            old_desktop.id: self.generate_fixture_data(stat, 50, 30, 8, .6, 3),
-            android.id: self.generate_fixture_data(stat, 50, 50, 2, .6, 3),
-            iOS.id: self.generate_fixture_data(stat, 50, 50, 2, .6, 3),
-            react_native.id: self.generate_fixture_data(stat, 5, 5, 10, .6, 3),
-            API.id: self.generate_fixture_data(stat, 50, 50, 5, .6, 3),
-            zephyr_mirror.id: self.generate_fixture_data(stat, 10, 10, 3, .6, 3),
+            website.id: self.generate_fixture_data(stat, 300, 200, 5, 0.6, 3),
+            old_desktop.id: self.generate_fixture_data(stat, 50, 30, 8, 0.6, 3),
+            android.id: self.generate_fixture_data(stat, 50, 50, 2, 0.6, 3),
+            iOS.id: self.generate_fixture_data(stat, 50, 50, 2, 0.6, 3),
+            react_native.id: self.generate_fixture_data(stat, 5, 5, 10, 0.6, 3),
+            API.id: self.generate_fixture_data(stat, 50, 50, 5, 0.6, 3),
+            zephyr_mirror.id: self.generate_fixture_data(stat, 10, 10, 3, 0.6, 3),
             unused.id: self.generate_fixture_data(stat, 0, 0, 0, 0, 0),
-            long_webhook.id: self.generate_fixture_data(stat, 50, 50, 2, .6, 3)}
+            long_webhook.id: self.generate_fixture_data(stat, 50, 50, 2, 0.6, 3),
+        }
         insert_fixture_data(stat, installation_data, InstallationCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['messages_in_stream:is_bot:day']
-        realm_data = {'false': self.generate_fixture_data(stat, 30, 5, 6, .6, 4),
-                      'true': self.generate_fixture_data(stat, 20, 2, 3, .2, 3)}
+        realm_data = {
+            'false': self.generate_fixture_data(stat, 30, 5, 6, 0.6, 4),
+            'true': self.generate_fixture_data(stat, 20, 2, 3, 0.2, 3),
+        }
         insert_fixture_data(stat, realm_data, RealmCount)
         stream_data: Mapping[Optional[str], List[int]] = {
-            'false': self.generate_fixture_data(stat, 10, 7, 5, .6, 4),
-            'true': self.generate_fixture_data(stat, 5, 3, 2, .4, 2),
+            'false': self.generate_fixture_data(stat, 10, 7, 5, 0.6, 4),
+            'true': self.generate_fixture_data(stat, 5, 3, 2, 0.4, 2),
         }
         insert_fixture_data(stat, stream_data, StreamCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
 
         stat = COUNT_STATS['messages_read::hour']
         user_data = {
-            None: self.generate_fixture_data(stat, 7, 3, 2, .6, 8, holiday_rate=.1),
+            None: self.generate_fixture_data(stat, 7, 3, 2, 0.6, 8, holiday_rate=0.1),
         }
         insert_fixture_data(stat, user_data, UserCount)
-        realm_data = {
-            None: self.generate_fixture_data(stat, 50, 35, 6, .6, 4)
-        }
+        realm_data = {None: self.generate_fixture_data(stat, 50, 35, 6, 0.6, 4)}
         insert_fixture_data(stat, realm_data, RealmCount)
-        FillState.objects.create(property=stat.property, end_time=last_end_time,
-                                 state=FillState.DONE)
+        FillState.objects.create(
+            property=stat.property, end_time=last_end_time, state=FillState.DONE
+        )
diff --git a/analytics/management/commands/stream_stats.py b/analytics/management/commands/stream_stats.py
index 940604c99d..3a421916e9 100644
--- a/analytics/management/commands/stream_stats.py
+++ b/analytics/management/commands/stream_stats.py
@@ -11,8 +11,9 @@ class Command(BaseCommand):
     help = "Generate statistics on the streams for a realm."
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('realms', metavar='<realm>', nargs='*',
-                            help="realm to generate statistics for")
+        parser.add_argument(
+            'realms', metavar='<realm>', nargs='*', help="realm to generate statistics for"
+        )
 
     def handle(self, *args: Any, **options: str) -> None:
         if options['realms']:
@@ -48,8 +49,12 @@ class Command(BaseCommand):
                     stream_type = 'public'
                 print(f"{stream.name:>25}", end=' ')
                 recipient = Recipient.objects.filter(type=Recipient.STREAM, type_id=stream.id)
-                print("{:10}".format(len(Subscription.objects.filter(recipient=recipient,
-                                                                     active=True))), end=' ')
+                print(
+                    "{:10}".format(
+                        len(Subscription.objects.filter(recipient=recipient, active=True))
+                    ),
+                    end=' ',
+                )
                 num_messages = len(Message.objects.filter(recipient=recipient))
                 print(f"{num_messages:12}", end=' ')
                 print(f"{stream_type:>15}")
diff --git a/analytics/management/commands/update_analytics_counts.py b/analytics/management/commands/update_analytics_counts.py
index 70b86369e0..edb49f1e99 100644
--- a/analytics/management/commands/update_analytics_counts.py
+++ b/analytics/management/commands/update_analytics_counts.py
@@ -22,25 +22,29 @@ class Command(BaseCommand):
     Run as a cron job that runs every hour."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--time', '-t',
-                            help='Update stat tables from current state to '
-                                 '--time. Defaults to the current time.',
-                            default=timezone_now().isoformat())
-        parser.add_argument('--utc',
-                            action='store_true',
-                            help="Interpret --time in UTC.")
-        parser.add_argument('--stat', '-s',
-                            help="CountStat to process. If omitted, all stats are processed.")
-        parser.add_argument('--verbose',
-                            action='store_true',
-                            help="Print timing information to stdout.")
+        parser.add_argument(
+            '--time',
+            '-t',
+            help='Update stat tables from current state to '
+            '--time. Defaults to the current time.',
+            default=timezone_now().isoformat(),
+        )
+        parser.add_argument('--utc', action='store_true', help="Interpret --time in UTC.")
+        parser.add_argument(
+            '--stat', '-s', help="CountStat to process. If omitted, all stats are processed."
+        )
+        parser.add_argument(
+            '--verbose', action='store_true', help="Print timing information to stdout."
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         try:
             os.mkdir(settings.ANALYTICS_LOCK_DIR)
         except OSError:
-            print(f"{WARNING}Analytics lock {settings.ANALYTICS_LOCK_DIR} is unavailable;"
-                  f" exiting.{ENDC}")
+            print(
+                f"{WARNING}Analytics lock {settings.ANALYTICS_LOCK_DIR} is unavailable;"
+                f" exiting.{ENDC}"
+            )
             return
 
         try:
@@ -59,7 +63,9 @@ class Command(BaseCommand):
         if options['utc']:
             fill_to_time = fill_to_time.replace(tzinfo=timezone.utc)
         if fill_to_time.tzinfo is None:
-            raise ValueError("--time must be timezone aware. Maybe you meant to use the --utc option?")
+            raise ValueError(
+                "--time must be timezone aware. Maybe you meant to use the --utc option?"
+            )
 
         fill_to_time = floor_to_hour(fill_to_time.astimezone(timezone.utc))
 
@@ -80,7 +86,9 @@ class Command(BaseCommand):
                 last = time.time()
 
         if options['verbose']:
-            print(f"Finished updating analytics counts through {fill_to_time} in {time.time() - start:.3f}s")
+            print(
+                f"Finished updating analytics counts through {fill_to_time} in {time.time() - start:.3f}s"
+            )
         logger.info("Finished updating analytics counts through %s", fill_to_time)
 
         if settings.PUSH_NOTIFICATION_BOUNCER_URL and settings.SUBMIT_USAGE_STATISTICS:
diff --git a/analytics/migrations/0001_initial.py b/analytics/migrations/0001_initial.py
index f9ace30741..c8ef31daf0 100644
--- a/analytics/migrations/0001_initial.py
+++ b/analytics/migrations/0001_initial.py
@@ -14,7 +14,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Anomaly',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
                 ('info', models.CharField(max_length=1000)),
             ],
             bases=(models.Model,),
@@ -22,68 +27,162 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='HuddleCount',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('huddle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    'huddle',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'
+                    ),
+                ),
+                (
+                    'user',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
                 ('property', models.CharField(max_length=40)),
                 ('end_time', models.DateTimeField()),
                 ('interval', models.CharField(max_length=20)),
                 ('value', models.BigIntegerField()),
-                ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)),
+                (
+                    'anomaly',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='analytics.Anomaly',
+                        null=True,
+                    ),
+                ),
             ],
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='InstallationCount',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
                 ('property', models.CharField(max_length=40)),
                 ('end_time', models.DateTimeField()),
                 ('interval', models.CharField(max_length=20)),
                 ('value', models.BigIntegerField()),
-                ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)),
+                (
+                    'anomaly',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='analytics.Anomaly',
+                        null=True,
+                    ),
+                ),
             ],
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='RealmCount',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
                 ('property', models.CharField(max_length=40)),
                 ('end_time', models.DateTimeField()),
                 ('interval', models.CharField(max_length=20)),
                 ('value', models.BigIntegerField()),
-                ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)),
-
+                (
+                    'anomaly',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='analytics.Anomaly',
+                        null=True,
+                    ),
+                ),
             ],
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='StreamCount',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
-                ('stream', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream')),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
+                (
+                    'stream',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream'
+                    ),
+                ),
                 ('property', models.CharField(max_length=40)),
                 ('end_time', models.DateTimeField()),
                 ('interval', models.CharField(max_length=20)),
                 ('value', models.BigIntegerField()),
-                ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)),
+                (
+                    'anomaly',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='analytics.Anomaly',
+                        null=True,
+                    ),
+                ),
             ],
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='UserCount',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
+                (
+                    'user',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
                 ('property', models.CharField(max_length=40)),
                 ('end_time', models.DateTimeField()),
                 ('interval', models.CharField(max_length=20)),
                 ('value', models.BigIntegerField()),
-                ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)),
+                (
+                    'anomaly',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='analytics.Anomaly',
+                        null=True,
+                    ),
+                ),
             ],
             bases=(models.Model,),
         ),
diff --git a/analytics/migrations/0003_fillstate.py b/analytics/migrations/0003_fillstate.py
index a89132aa40..41ea6ffa91 100644
--- a/analytics/migrations/0003_fillstate.py
+++ b/analytics/migrations/0003_fillstate.py
@@ -11,7 +11,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='FillState',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
                 ('property', models.CharField(unique=True, max_length=40)),
                 ('end_time', models.DateTimeField()),
                 ('state', models.PositiveSmallIntegerField()),
diff --git a/analytics/migrations/0009_remove_messages_to_stream_stat.py b/analytics/migrations/0009_remove_messages_to_stream_stat.py
index 2a0c412e11..c5fbff381a 100644
--- a/analytics/migrations/0009_remove_messages_to_stream_stat.py
+++ b/analytics/migrations/0009_remove_messages_to_stream_stat.py
@@ -3,7 +3,9 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def delete_messages_sent_to_stream_stat(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def delete_messages_sent_to_stream_stat(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     UserCount = apps.get_model('analytics', 'UserCount')
     StreamCount = apps.get_model('analytics', 'StreamCount')
     RealmCount = apps.get_model('analytics', 'RealmCount')
@@ -17,6 +19,7 @@ def delete_messages_sent_to_stream_stat(apps: StateApps, schema_editor: Database
     InstallationCount.objects.filter(property=property).delete()
     FillState.objects.filter(property=property).delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/analytics/migrations/0010_clear_messages_sent_values.py b/analytics/migrations/0010_clear_messages_sent_values.py
index b1bd03e543..fdd89a67a6 100644
--- a/analytics/migrations/0010_clear_messages_sent_values.py
+++ b/analytics/migrations/0010_clear_messages_sent_values.py
@@ -3,7 +3,9 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def clear_message_sent_by_message_type_values(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def clear_message_sent_by_message_type_values(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     UserCount = apps.get_model('analytics', 'UserCount')
     StreamCount = apps.get_model('analytics', 'StreamCount')
     RealmCount = apps.get_model('analytics', 'RealmCount')
@@ -17,6 +19,7 @@ def clear_message_sent_by_message_type_values(apps: StateApps, schema_editor: Da
     InstallationCount.objects.filter(property=property).delete()
     FillState.objects.filter(property=property).delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [('analytics', '0009_remove_messages_to_stream_stat')]
diff --git a/analytics/migrations/0011_clear_analytics_tables.py b/analytics/migrations/0011_clear_analytics_tables.py
index d7b69ce53e..80c522d2ca 100644
--- a/analytics/migrations/0011_clear_analytics_tables.py
+++ b/analytics/migrations/0011_clear_analytics_tables.py
@@ -16,6 +16,7 @@ def clear_analytics_tables(apps: StateApps, schema_editor: DatabaseSchemaEditor)
     InstallationCount.objects.all().delete()
     FillState.objects.all().delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/analytics/migrations/0012_add_on_delete.py b/analytics/migrations/0012_add_on_delete.py
index 0d0a5c22b8..bd2942bf8f 100644
--- a/analytics/migrations/0012_add_on_delete.py
+++ b/analytics/migrations/0012_add_on_delete.py
@@ -14,21 +14,29 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='installationcount',
             name='anomaly',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'
+            ),
         ),
         migrations.AlterField(
             model_name='realmcount',
             name='anomaly',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'
+            ),
         ),
         migrations.AlterField(
             model_name='streamcount',
             name='anomaly',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'
+            ),
         ),
         migrations.AlterField(
             model_name='usercount',
             name='anomaly',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='analytics.Anomaly'
+            ),
         ),
     ]
diff --git a/analytics/migrations/0015_clear_duplicate_counts.py b/analytics/migrations/0015_clear_duplicate_counts.py
index a7ecc3dd87..77038ae490 100644
--- a/analytics/migrations/0015_clear_duplicate_counts.py
+++ b/analytics/migrations/0015_clear_duplicate_counts.py
@@ -20,17 +20,23 @@ def clear_duplicate_counts(apps: StateApps, schema_editor: DatabaseSchemaEditor)
     this means deleting the extra rows, but for LoggingCountStat objects, we need to
     additionally combine the sums.
     """
-    count_tables = dict(realm=apps.get_model('analytics', 'RealmCount'),
-                        user=apps.get_model('analytics', 'UserCount'),
-                        stream=apps.get_model('analytics', 'StreamCount'),
-                        installation=apps.get_model('analytics', 'InstallationCount'))
+    count_tables = dict(
+        realm=apps.get_model('analytics', 'RealmCount'),
+        user=apps.get_model('analytics', 'UserCount'),
+        stream=apps.get_model('analytics', 'StreamCount'),
+        installation=apps.get_model('analytics', 'InstallationCount'),
+    )
 
     for name, count_table in count_tables.items():
         value = [name, 'property', 'end_time']
         if name == 'installation':
             value = ['property', 'end_time']
-        counts = count_table.objects.filter(subgroup=None).values(*value).annotate(
-            Count('id'), Sum('value')).filter(id__count__gt=1)
+        counts = (
+            count_table.objects.filter(subgroup=None)
+            .values(*value)
+            .annotate(Count('id'), Sum('value'))
+            .filter(id__count__gt=1)
+        )
 
         for count in counts:
             count.pop('id__count')
@@ -47,6 +53,7 @@ def clear_duplicate_counts(apps: StateApps, schema_editor: DatabaseSchemaEditor)
             for duplicate_count in to_cleanup:
                 duplicate_count.delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -54,6 +61,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(clear_duplicate_counts,
-                             reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(clear_duplicate_counts, reverse_code=migrations.RunPython.noop),
     ]
diff --git a/analytics/migrations/0016_unique_constraint_when_subgroup_null.py b/analytics/migrations/0016_unique_constraint_when_subgroup_null.py
index 726a3269b1..6d2aaef375 100644
--- a/analytics/migrations/0016_unique_constraint_when_subgroup_null.py
+++ b/analytics/migrations/0016_unique_constraint_when_subgroup_null.py
@@ -28,34 +28,66 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='installationcount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=False), fields=('property', 'subgroup', 'end_time'), name='unique_installation_count'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=False),
+                fields=('property', 'subgroup', 'end_time'),
+                name='unique_installation_count',
+            ),
         ),
         migrations.AddConstraint(
             model_name='installationcount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=True), fields=('property', 'end_time'), name='unique_installation_count_null_subgroup'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=True),
+                fields=('property', 'end_time'),
+                name='unique_installation_count_null_subgroup',
+            ),
         ),
         migrations.AddConstraint(
             model_name='realmcount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=False), fields=('realm', 'property', 'subgroup', 'end_time'), name='unique_realm_count'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=False),
+                fields=('realm', 'property', 'subgroup', 'end_time'),
+                name='unique_realm_count',
+            ),
         ),
         migrations.AddConstraint(
             model_name='realmcount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=True), fields=('realm', 'property', 'end_time'), name='unique_realm_count_null_subgroup'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=True),
+                fields=('realm', 'property', 'end_time'),
+                name='unique_realm_count_null_subgroup',
+            ),
         ),
         migrations.AddConstraint(
             model_name='streamcount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=False), fields=('stream', 'property', 'subgroup', 'end_time'), name='unique_stream_count'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=False),
+                fields=('stream', 'property', 'subgroup', 'end_time'),
+                name='unique_stream_count',
+            ),
         ),
         migrations.AddConstraint(
             model_name='streamcount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=True), fields=('stream', 'property', 'end_time'), name='unique_stream_count_null_subgroup'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=True),
+                fields=('stream', 'property', 'end_time'),
+                name='unique_stream_count_null_subgroup',
+            ),
         ),
         migrations.AddConstraint(
             model_name='usercount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=False), fields=('user', 'property', 'subgroup', 'end_time'), name='unique_user_count'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=False),
+                fields=('user', 'property', 'subgroup', 'end_time'),
+                name='unique_user_count',
+            ),
         ),
         migrations.AddConstraint(
             model_name='usercount',
-            constraint=models.UniqueConstraint(condition=models.Q(subgroup__isnull=True), fields=('user', 'property', 'end_time'), name='unique_user_count_null_subgroup'),
+            constraint=models.UniqueConstraint(
+                condition=models.Q(subgroup__isnull=True),
+                fields=('user', 'property', 'end_time'),
+                name='unique_user_count_null_subgroup',
+            ),
         ),
     ]
diff --git a/analytics/models.py b/analytics/models.py
index be9e87cbad..df436ffd3c 100644
--- a/analytics/models.py
+++ b/analytics/models.py
@@ -20,12 +20,16 @@ class FillState(models.Model):
     def __str__(self) -> str:
         return f"<FillState: {self.property} {self.end_time} {self.state}>"
 
+
 # The earliest/starting end_time in FillState
 # We assume there is at least one realm
 def installation_epoch() -> datetime.datetime:
-    earliest_realm_creation = Realm.objects.aggregate(models.Min('date_created'))['date_created__min']
+    earliest_realm_creation = Realm.objects.aggregate(models.Min('date_created'))[
+        'date_created__min'
+    ]
     return floor_to_day(earliest_realm_creation)
 
+
 class BaseCount(models.Model):
     # Note: When inheriting from BaseCount, you may want to rearrange
     # the order of the columns in the migration to make sure they
@@ -38,24 +42,27 @@ class BaseCount(models.Model):
     class Meta:
         abstract = True
 
-class InstallationCount(BaseCount):
 
+class InstallationCount(BaseCount):
     class Meta:
         # Handles invalid duplicate InstallationCount data
         constraints = [
             UniqueConstraint(
                 fields=["property", "subgroup", "end_time"],
                 condition=Q(subgroup__isnull=False),
-                name='unique_installation_count'),
+                name='unique_installation_count',
+            ),
             UniqueConstraint(
                 fields=["property", "end_time"],
                 condition=Q(subgroup__isnull=True),
-                name='unique_installation_count_null_subgroup'),
+                name='unique_installation_count_null_subgroup',
+            ),
         ]
 
     def __str__(self) -> str:
         return f"<InstallationCount: {self.property} {self.subgroup} {self.value}>"
 
+
 class RealmCount(BaseCount):
     realm = models.ForeignKey(Realm, on_delete=models.CASCADE)
 
@@ -65,17 +72,20 @@ class RealmCount(BaseCount):
             UniqueConstraint(
                 fields=["realm", "property", "subgroup", "end_time"],
                 condition=Q(subgroup__isnull=False),
-                name='unique_realm_count'),
+                name='unique_realm_count',
+            ),
             UniqueConstraint(
                 fields=["realm", "property", "end_time"],
                 condition=Q(subgroup__isnull=True),
-                name='unique_realm_count_null_subgroup'),
+                name='unique_realm_count_null_subgroup',
+            ),
         ]
         index_together = ["property", "end_time"]
 
     def __str__(self) -> str:
         return f"<RealmCount: {self.realm} {self.property} {self.subgroup} {self.value}>"
 
+
 class UserCount(BaseCount):
     user = models.ForeignKey(UserProfile, on_delete=models.CASCADE)
     realm = models.ForeignKey(Realm, on_delete=models.CASCADE)
@@ -86,11 +96,13 @@ class UserCount(BaseCount):
             UniqueConstraint(
                 fields=["user", "property", "subgroup", "end_time"],
                 condition=Q(subgroup__isnull=False),
-                name='unique_user_count'),
+                name='unique_user_count',
+            ),
             UniqueConstraint(
                 fields=["user", "property", "end_time"],
                 condition=Q(subgroup__isnull=True),
-                name='unique_user_count_null_subgroup'),
+                name='unique_user_count_null_subgroup',
+            ),
         ]
         # This index dramatically improves the performance of
         # aggregating from users to realms
@@ -99,6 +111,7 @@ class UserCount(BaseCount):
     def __str__(self) -> str:
         return f"<UserCount: {self.user} {self.property} {self.subgroup} {self.value}>"
 
+
 class StreamCount(BaseCount):
     stream = models.ForeignKey(Stream, on_delete=models.CASCADE)
     realm = models.ForeignKey(Realm, on_delete=models.CASCADE)
@@ -109,15 +122,19 @@ class StreamCount(BaseCount):
             UniqueConstraint(
                 fields=["stream", "property", "subgroup", "end_time"],
                 condition=Q(subgroup__isnull=False),
-                name='unique_stream_count'),
+                name='unique_stream_count',
+            ),
             UniqueConstraint(
                 fields=["stream", "property", "end_time"],
                 condition=Q(subgroup__isnull=True),
-                name='unique_stream_count_null_subgroup'),
+                name='unique_stream_count_null_subgroup',
+            ),
         ]
         # This index dramatically improves the performance of
         # aggregating from streams to realms
         index_together = ["property", "realm", "end_time"]
 
     def __str__(self) -> str:
-        return f"<StreamCount: {self.stream} {self.property} {self.subgroup} {self.value} {self.id}>"
+        return (
+            f"<StreamCount: {self.stream} {self.property} {self.subgroup} {self.value} {self.id}>"
+        )
diff --git a/analytics/tests/test_counts.py b/analytics/tests/test_counts.py
index 729a4133fb..c91e181b2f 100644
--- a/analytics/tests/test_counts.py
+++ b/analytics/tests/test_counts.py
@@ -67,7 +67,7 @@ from zerver.models import (
 
 
 class AnalyticsTestCase(ZulipTestCase):
-    MINUTE = timedelta(seconds = 60)
+    MINUTE = timedelta(seconds=60)
     HOUR = MINUTE * 60
     DAY = HOUR * 24
     TIME_ZERO = datetime(1988, 3, 14, tzinfo=timezone.utc)
@@ -76,7 +76,8 @@ class AnalyticsTestCase(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.default_realm = Realm.objects.create(
-            string_id='realmtest', name='Realm Test', date_created=self.TIME_ZERO - 2*self.DAY)
+            string_id='realmtest', name='Realm Test', date_created=self.TIME_ZERO - 2 * self.DAY
+        )
         # used to generate unique names in self.create_*
         self.name_counter = 100
         # used as defaults in self.assertCountEquals
@@ -91,7 +92,8 @@ class AnalyticsTestCase(ZulipTestCase):
             'full_name': 'full_name',
             'is_active': True,
             'is_bot': False,
-            'realm': self.default_realm}
+            'realm': self.default_realm,
+        }
         for key, value in defaults.items():
             kwargs[key] = kwargs.get(key, value)
         kwargs['delivery_email'] = kwargs['email']
@@ -107,14 +109,16 @@ class AnalyticsTestCase(ZulipTestCase):
                 active=kwargs['is_active'],
                 full_name=kwargs['full_name'],
                 role=UserProfile.ROLE_REALM_ADMINISTRATOR,
-                **pass_kwargs
+                **pass_kwargs,
             )
 
     def create_stream_with_recipient(self, **kwargs: Any) -> Tuple[Stream, Recipient]:
         self.name_counter += 1
-        defaults = {'name': f'stream name {self.name_counter}',
-                    'realm': self.default_realm,
-                    'date_created': self.TIME_LAST_HOUR}
+        defaults = {
+            'name': f'stream name {self.name_counter}',
+            'realm': self.default_realm,
+            'date_created': self.TIME_LAST_HOUR,
+        }
         for key, value in defaults.items():
             kwargs[key] = kwargs.get(key, value)
         stream = Stream.objects.create(**kwargs)
@@ -141,15 +145,23 @@ class AnalyticsTestCase(ZulipTestCase):
             DB_TOPIC_NAME: 'subject',
             'content': 'hi',
             'date_sent': self.TIME_LAST_HOUR,
-            'sending_client': get_client("website")}
+            'sending_client': get_client("website"),
+        }
         for key, value in defaults.items():
             kwargs[key] = kwargs.get(key, value)
         return Message.objects.create(**kwargs)
 
     # kwargs should only ever be a UserProfile or Stream.
-    def assertCountEquals(self, table: Type[BaseCount], value: int, property: Optional[str]=None,
-                          subgroup: Optional[str]=None, end_time: datetime=TIME_ZERO,
-                          realm: Optional[Realm]=None, **kwargs: models.Model) -> None:
+    def assertCountEquals(
+        self,
+        table: Type[BaseCount],
+        value: int,
+        property: Optional[str] = None,
+        subgroup: Optional[str] = None,
+        end_time: datetime = TIME_ZERO,
+        realm: Optional[Realm] = None,
+        **kwargs: models.Model,
+    ) -> None:
         if property is None:
             property = self.current_property
         queryset = table.objects.filter(property=property, end_time=end_time).filter(**kwargs)
@@ -161,8 +173,9 @@ class AnalyticsTestCase(ZulipTestCase):
             queryset = queryset.filter(subgroup=subgroup)
         self.assertEqual(queryset.values_list('value', flat=True)[0], value)
 
-    def assertTableState(self, table: Type[BaseCount], arg_keys: List[str],
-                         arg_values: List[List[object]]) -> None:
+    def assertTableState(
+        self, table: Type[BaseCount], arg_keys: List[str], arg_values: List[List[object]]
+    ) -> None:
         """Assert that the state of a *Count table is what it should be.
 
         Example usage:
@@ -188,7 +201,8 @@ class AnalyticsTestCase(ZulipTestCase):
             'property': self.current_property,
             'subgroup': None,
             'end_time': self.TIME_ZERO,
-            'value': 1}
+            'value': 1,
+        }
         for values in arg_values:
             kwargs: Dict[str, Any] = {}
             for i in range(len(values)):
@@ -206,19 +220,23 @@ class AnalyticsTestCase(ZulipTestCase):
             self.assertEqual(table.objects.filter(**kwargs).count(), 1)
         self.assertEqual(table.objects.count(), len(arg_values))
 
+
 class TestProcessCountStat(AnalyticsTestCase):
     def make_dummy_count_stat(self, property: str) -> CountStat:
-        query = lambda kwargs: SQL("""
+        query = lambda kwargs: SQL(
+            """
             INSERT INTO analytics_realmcount (realm_id, value, property, end_time)
             VALUES ({default_realm_id}, 1, {property}, %(time_end)s)
-        """).format(
+        """
+        ).format(
             default_realm_id=Literal(self.default_realm.id),
             property=Literal(property),
         )
         return CountStat(property, sql_data_collector(RealmCount, query, None), CountStat.HOUR)
 
-    def assertFillStateEquals(self, stat: CountStat, end_time: datetime,
-                              state: int=FillState.DONE) -> None:
+    def assertFillStateEquals(
+        self, stat: CountStat, end_time: datetime, state: int = FillState.DONE
+    ) -> None:
         fill_state = FillState.objects.filter(property=stat.property).first()
         self.assertEqual(fill_state.end_time, end_time)
         self.assertEqual(fill_state.state, state)
@@ -252,7 +270,7 @@ class TestProcessCountStat(AnalyticsTestCase):
     def test_bad_fill_to_time(self) -> None:
         stat = self.make_dummy_count_stat('test stat')
         with self.assertRaises(ValueError):
-            process_count_stat(stat, installation_epoch() + 65*self.MINUTE)
+            process_count_stat(stat, installation_epoch() + 65 * self.MINUTE)
         with self.assertRaises(TimezoneNotUTCException):
             process_count_stat(stat, installation_epoch().replace(tzinfo=None))
 
@@ -269,25 +287,30 @@ class TestProcessCountStat(AnalyticsTestCase):
         stream = self.create_stream_with_recipient()[0]
         realm = self.default_realm
         UserCount.objects.create(
-            user=user, realm=realm, property=user_stat.property, end_time=end_time, value=5)
+            user=user, realm=realm, property=user_stat.property, end_time=end_time, value=5
+        )
         StreamCount.objects.create(
-            stream=stream, realm=realm, property=stream_stat.property, end_time=end_time, value=5)
+            stream=stream, realm=realm, property=stream_stat.property, end_time=end_time, value=5
+        )
         RealmCount.objects.create(
-            realm=realm, property=realm_stat.property, end_time=end_time, value=5)
+            realm=realm, property=realm_stat.property, end_time=end_time, value=5
+        )
 
         # Normal run of process_count_stat
         for stat in [user_stat, stream_stat, realm_stat]:
             process_count_stat(stat, end_time)
         self.assertTableState(UserCount, ['property', 'value'], [[user_stat.property, 5]])
         self.assertTableState(StreamCount, ['property', 'value'], [[stream_stat.property, 5]])
-        self.assertTableState(RealmCount, ['property', 'value'],
-                              [[user_stat.property, 5],
-                               [stream_stat.property, 5],
-                               [realm_stat.property, 5]])
-        self.assertTableState(InstallationCount, ['property', 'value'],
-                              [[user_stat.property, 5],
-                               [stream_stat.property, 5],
-                               [realm_stat.property, 5]])
+        self.assertTableState(
+            RealmCount,
+            ['property', 'value'],
+            [[user_stat.property, 5], [stream_stat.property, 5], [realm_stat.property, 5]],
+        )
+        self.assertTableState(
+            InstallationCount,
+            ['property', 'value'],
+            [[user_stat.property, 5], [stream_stat.property, 5], [realm_stat.property, 5]],
+        )
 
         # Change the logged data and mark FillState as dirty
         UserCount.objects.update(value=6)
@@ -300,85 +323,117 @@ class TestProcessCountStat(AnalyticsTestCase):
             process_count_stat(stat, end_time)
         self.assertTableState(UserCount, ['property', 'value'], [[user_stat.property, 6]])
         self.assertTableState(StreamCount, ['property', 'value'], [[stream_stat.property, 6]])
-        self.assertTableState(RealmCount, ['property', 'value'],
-                              [[user_stat.property, 6],
-                               [stream_stat.property, 6],
-                               [realm_stat.property, 6]])
-        self.assertTableState(InstallationCount, ['property', 'value'],
-                              [[user_stat.property, 6],
-                               [stream_stat.property, 6],
-                               [realm_stat.property, 6]])
+        self.assertTableState(
+            RealmCount,
+            ['property', 'value'],
+            [[user_stat.property, 6], [stream_stat.property, 6], [realm_stat.property, 6]],
+        )
+        self.assertTableState(
+            InstallationCount,
+            ['property', 'value'],
+            [[user_stat.property, 6], [stream_stat.property, 6], [realm_stat.property, 6]],
+        )
 
     def test_process_dependent_stat(self) -> None:
         stat1 = self.make_dummy_count_stat('stat1')
         stat2 = self.make_dummy_count_stat('stat2')
-        query = lambda kwargs: SQL("""
+        query = lambda kwargs: SQL(
+            """
             INSERT INTO analytics_realmcount (realm_id, value, property, end_time)
             VALUES ({default_realm_id}, 1, {property}, %(time_end)s)
-        """).format(
+        """
+        ).format(
             default_realm_id=Literal(self.default_realm.id),
             property=Literal('stat3'),
         )
-        stat3 = DependentCountStat('stat3', sql_data_collector(RealmCount, query, None),
-                                   CountStat.HOUR,
-                                   dependencies=['stat1', 'stat2'])
+        stat3 = DependentCountStat(
+            'stat3',
+            sql_data_collector(RealmCount, query, None),
+            CountStat.HOUR,
+            dependencies=['stat1', 'stat2'],
+        )
 
-        query = lambda kwargs: SQL("""
+        query = lambda kwargs: SQL(
+            """
             INSERT INTO analytics_realmcount (realm_id, value, property, end_time)
             VALUES ({default_realm_id}, 1, {property}, %(time_end)s)
-        """).format(
+        """
+        ).format(
             default_realm_id=Literal(self.default_realm.id),
             property=Literal('stat4'),
         )
-        stat4 = DependentCountStat('stat4', sql_data_collector(RealmCount, query, None),
-                                   CountStat.DAY,
-                                   dependencies=['stat1', 'stat2'])
+        stat4 = DependentCountStat(
+            'stat4',
+            sql_data_collector(RealmCount, query, None),
+            CountStat.DAY,
+            dependencies=['stat1', 'stat2'],
+        )
 
         dummy_count_stats = {
             "stat1": stat1,
             "stat2": stat2,
             "stat3": stat3,
             "stat4": stat4,
-
         }
         with mock.patch("analytics.lib.counts.COUNT_STATS", dummy_count_stats):
-            hour = [installation_epoch() + i*self.HOUR for i in range(5)]
+            hour = [installation_epoch() + i * self.HOUR for i in range(5)]
 
             # test when one dependency has been run, and the other hasn't
             process_count_stat(stat1, hour[2])
             process_count_stat(stat3, hour[1])
-            self.assertTableState(InstallationCount, ['property', 'end_time'],
-                                  [['stat1', hour[1]], ['stat1', hour[2]]])
+            self.assertTableState(
+                InstallationCount,
+                ['property', 'end_time'],
+                [['stat1', hour[1]], ['stat1', hour[2]]],
+            )
             self.assertFillStateEquals(stat3, hour[0])
 
             # test that we don't fill past the fill_to_time argument, even if
             # dependencies have later last_successful_fill
             process_count_stat(stat2, hour[3])
             process_count_stat(stat3, hour[1])
-            self.assertTableState(InstallationCount, ['property', 'end_time'],
-                                  [['stat1', hour[1]], ['stat1', hour[2]],
-                                  ['stat2', hour[1]], ['stat2', hour[2]], ['stat2', hour[3]],
-                                  ['stat3', hour[1]]])
+            self.assertTableState(
+                InstallationCount,
+                ['property', 'end_time'],
+                [
+                    ['stat1', hour[1]],
+                    ['stat1', hour[2]],
+                    ['stat2', hour[1]],
+                    ['stat2', hour[2]],
+                    ['stat2', hour[3]],
+                    ['stat3', hour[1]],
+                ],
+            )
             self.assertFillStateEquals(stat3, hour[1])
 
             # test that we don't fill past the dependency last_successful_fill times,
             # even if fill_to_time is later
             process_count_stat(stat3, hour[4])
-            self.assertTableState(InstallationCount, ['property', 'end_time'],
-                                  [['stat1', hour[1]], ['stat1', hour[2]],
-                                  ['stat2', hour[1]], ['stat2', hour[2]], ['stat2', hour[3]],
-                                  ['stat3', hour[1]], ['stat3', hour[2]]])
+            self.assertTableState(
+                InstallationCount,
+                ['property', 'end_time'],
+                [
+                    ['stat1', hour[1]],
+                    ['stat1', hour[2]],
+                    ['stat2', hour[1]],
+                    ['stat2', hour[2]],
+                    ['stat2', hour[3]],
+                    ['stat3', hour[1]],
+                    ['stat3', hour[2]],
+                ],
+            )
             self.assertFillStateEquals(stat3, hour[2])
 
             # test daily dependent stat with hourly dependencies
-            hour24 = installation_epoch() + 24*self.HOUR
-            hour25 = installation_epoch() + 25*self.HOUR
+            hour24 = installation_epoch() + 24 * self.HOUR
+            hour25 = installation_epoch() + 25 * self.HOUR
             process_count_stat(stat1, hour25)
             process_count_stat(stat2, hour25)
             process_count_stat(stat4, hour25)
             self.assertEqual(InstallationCount.objects.filter(property='stat4').count(), 1)
             self.assertFillStateEquals(stat4, hour24)
 
+
 class TestCountStats(AnalyticsTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -386,15 +441,20 @@ class TestCountStats(AnalyticsTestCase):
         # more than 1 realm, and the time bounds (time_start and time_end in
         # the queries).
         self.second_realm = Realm.objects.create(
-            string_id='second-realm', name='Second Realm',
-            date_created=self.TIME_ZERO-2*self.DAY)
-        for minutes_ago in [0, 1, 61, 60*24+1]:
-            creation_time = self.TIME_ZERO - minutes_ago*self.MINUTE
-            user = self.create_user(email=f'user-{minutes_ago}@second.analytics',
-                                    realm=self.second_realm, date_joined=creation_time)
+            string_id='second-realm',
+            name='Second Realm',
+            date_created=self.TIME_ZERO - 2 * self.DAY,
+        )
+        for minutes_ago in [0, 1, 61, 60 * 24 + 1]:
+            creation_time = self.TIME_ZERO - minutes_ago * self.MINUTE
+            user = self.create_user(
+                email=f'user-{minutes_ago}@second.analytics',
+                realm=self.second_realm,
+                date_joined=creation_time,
+            )
             recipient = self.create_stream_with_recipient(
-                name=f'stream {minutes_ago}', realm=self.second_realm,
-                date_created=creation_time)[1]
+                name=f'stream {minutes_ago}', realm=self.second_realm, date_created=creation_time
+            )[1]
             self.create_message(user, recipient, date_sent=creation_time)
         self.hourly_user = get_user('user-1@second.analytics', self.second_realm)
         self.daily_user = get_user('user-61@second.analytics', self.second_realm)
@@ -402,8 +462,10 @@ class TestCountStats(AnalyticsTestCase):
         # This realm should not show up in the *Count tables for any of the
         # messages_* CountStats
         self.no_message_realm = Realm.objects.create(
-            string_id='no-message-realm', name='No Message Realm',
-            date_created=self.TIME_ZERO-2*self.DAY)
+            string_id='no-message-realm',
+            name='No Message Realm',
+            date_created=self.TIME_ZERO - 2 * self.DAY,
+        )
         self.create_user(realm=self.no_message_realm)
         self.create_stream_with_recipient(realm=self.no_message_realm)
         # This huddle should not show up anywhere
@@ -415,7 +477,7 @@ class TestCountStats(AnalyticsTestCase):
 
         # To be included
         self.create_user(is_bot=True)
-        self.create_user(is_bot=True, date_joined=self.TIME_ZERO-25*self.HOUR)
+        self.create_user(is_bot=True, date_joined=self.TIME_ZERO - 25 * self.HOUR)
         self.create_user(is_bot=False)
 
         # To be excluded
@@ -423,13 +485,17 @@ class TestCountStats(AnalyticsTestCase):
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
 
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[2, 'true'], [1, 'false'],
-                               [3, 'false', self.second_realm],
-                               [1, 'false', self.no_message_realm]])
-        self.assertTableState(InstallationCount,
-                              ['value', 'subgroup'],
-                              [[2, 'true'], [5, 'false']])
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [
+                [2, 'true'],
+                [1, 'false'],
+                [3, 'false', self.second_realm],
+                [1, 'false', self.no_message_realm],
+            ],
+        )
+        self.assertTableState(InstallationCount, ['value', 'subgroup'], [[2, 'true'], [5, 'false']])
         self.assertTableState(UserCount, [], [])
         self.assertTableState(StreamCount, [], [])
 
@@ -441,16 +507,18 @@ class TestCountStats(AnalyticsTestCase):
         self.current_property = stat.property
 
         # To be included
-        self.create_user(is_bot=True, date_joined=self.TIME_ZERO-25*self.HOUR)
+        self.create_user(is_bot=True, date_joined=self.TIME_ZERO - 25 * self.HOUR)
         self.create_user(is_bot=False)
 
         # To be excluded
-        self.create_user(email='test@second.analytics',
-                         realm=self.second_realm, date_joined=self.TIME_ZERO-2*self.DAY)
+        self.create_user(
+            email='test@second.analytics',
+            realm=self.second_realm,
+            date_joined=self.TIME_ZERO - 2 * self.DAY,
+        )
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO, self.default_realm)
-        self.assertTableState(RealmCount, ['value', 'subgroup'],
-                              [[1, 'true'], [1, 'false']])
+        self.assertTableState(RealmCount, ['value', 'subgroup'], [[1, 'true'], [1, 'false']])
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [])
         self.assertTableState(UserCount, [], [])
@@ -463,8 +531,7 @@ class TestCountStats(AnalyticsTestCase):
         bot = self.create_user(is_bot=True)
         human1 = self.create_user()
         human2 = self.create_user()
-        recipient_human1 = Recipient.objects.get(type_id=human1.id,
-                                                 type=Recipient.PERSONAL)
+        recipient_human1 = Recipient.objects.get(type_id=human1.id, type=Recipient.PERSONAL)
 
         recipient_stream = self.create_stream_with_recipient()[1]
         recipient_huddle = self.create_huddle_with_recipient()[1]
@@ -477,11 +544,21 @@ class TestCountStats(AnalyticsTestCase):
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
 
-        self.assertTableState(UserCount, ['value', 'subgroup', 'user'],
-                              [[1, 'false', human1], [1, 'false', human2], [3, 'true', bot],
-                               [1, 'false', self.hourly_user]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[2, 'false'], [3, 'true'], [1, 'false', self.second_realm]])
+        self.assertTableState(
+            UserCount,
+            ['value', 'subgroup', 'user'],
+            [
+                [1, 'false', human1],
+                [1, 'false', human2],
+                [3, 'true', bot],
+                [1, 'false', self.hourly_user],
+            ],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [[2, 'false'], [3, 'true'], [1, 'false', self.second_realm]],
+        )
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [[3, 'false'], [3, 'true']])
         self.assertTableState(StreamCount, [], [])
 
@@ -495,8 +572,7 @@ class TestCountStats(AnalyticsTestCase):
         bot = self.create_user(is_bot=True)
         human1 = self.create_user()
         human2 = self.create_user()
-        recipient_human1 = Recipient.objects.get(type_id=human1.id,
-                                                 type=Recipient.PERSONAL)
+        recipient_human1 = Recipient.objects.get(type_id=human1.id, type=Recipient.PERSONAL)
 
         recipient_stream = self.create_stream_with_recipient()[1]
         recipient_huddle = self.create_huddle_with_recipient()[1]
@@ -515,12 +591,16 @@ class TestCountStats(AnalyticsTestCase):
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO, self.default_realm)
 
-        self.assertTableState(UserCount, ['value', 'subgroup', 'user'],
-                              [[1, 'false', human1], [1, 'false', human2],
-                               [3, 'true', bot]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[2, 'false', self.default_realm],
-                               [3, 'true', self.default_realm]])
+        self.assertTableState(
+            UserCount,
+            ['value', 'subgroup', 'user'],
+            [[1, 'false', human1], [1, 'false', human2], [3, 'true', bot]],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [[2, 'false', self.default_realm], [3, 'true', self.default_realm]],
+        )
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [])
         self.assertTableState(StreamCount, [], [])
@@ -567,24 +647,44 @@ class TestCountStats(AnalyticsTestCase):
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
 
-        self.assertTableState(UserCount, ['value', 'subgroup', 'user'],
-                              [[1, 'private_stream', user1],
-                               [2, 'private_stream', user2],
-                               [2, 'public_stream', user1],
-                               [1, 'public_stream', user2],
-                               [1, 'private_message', user1],
-                               [1, 'private_message', user2],
-                               [1, 'private_message', user3],
-                               [1, 'huddle_message', user1],
-                               [1, 'huddle_message', user2],
-                               [1, 'public_stream', self.hourly_user],
-                               [1, 'public_stream', self.daily_user]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[3, 'private_stream'], [3, 'public_stream'], [3, 'private_message'],
-                               [2, 'huddle_message'], [2, 'public_stream', self.second_realm]])
-        self.assertTableState(InstallationCount, ['value', 'subgroup'],
-                              [[3, 'private_stream'], [5, 'public_stream'], [3, 'private_message'],
-                               [2, 'huddle_message']])
+        self.assertTableState(
+            UserCount,
+            ['value', 'subgroup', 'user'],
+            [
+                [1, 'private_stream', user1],
+                [2, 'private_stream', user2],
+                [2, 'public_stream', user1],
+                [1, 'public_stream', user2],
+                [1, 'private_message', user1],
+                [1, 'private_message', user2],
+                [1, 'private_message', user3],
+                [1, 'huddle_message', user1],
+                [1, 'huddle_message', user2],
+                [1, 'public_stream', self.hourly_user],
+                [1, 'public_stream', self.daily_user],
+            ],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [
+                [3, 'private_stream'],
+                [3, 'public_stream'],
+                [3, 'private_message'],
+                [2, 'huddle_message'],
+                [2, 'public_stream', self.second_realm],
+            ],
+        )
+        self.assertTableState(
+            InstallationCount,
+            ['value', 'subgroup'],
+            [
+                [3, 'private_stream'],
+                [5, 'public_stream'],
+                [3, 'private_message'],
+                [2, 'huddle_message'],
+            ],
+        )
         self.assertTableState(StreamCount, [], [])
 
     def test_messages_sent_by_message_type_realm_constraint(self) -> None:
@@ -614,12 +714,26 @@ class TestCountStats(AnalyticsTestCase):
         self.create_message(self.hourly_user, stream_recipient)
         self.create_message(self.hourly_user, huddle_recipient)
 
-        self.assertTableState(UserCount, ['value', 'subgroup', 'user'],
-                              [[1, 'private_message', user], [1, 'private_stream', user],
-                               [1, 'huddle_message', user], [1, 'public_stream', user]])
-        self.assertTableState(RealmCount, ['value', 'subgroup'],
-                              [[1, 'private_message'], [1, 'private_stream'],
-                               [1, 'public_stream'], [1, 'huddle_message']])
+        self.assertTableState(
+            UserCount,
+            ['value', 'subgroup', 'user'],
+            [
+                [1, 'private_message', user],
+                [1, 'private_stream', user],
+                [1, 'huddle_message', user],
+                [1, 'public_stream', user],
+            ],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup'],
+            [
+                [1, 'private_message'],
+                [1, 'private_stream'],
+                [1, 'public_stream'],
+                [1, 'huddle_message'],
+            ],
+        )
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [])
         self.assertTableState(StreamCount, [], [])
@@ -666,16 +780,25 @@ class TestCountStats(AnalyticsTestCase):
 
         client2_id = str(client2.id)
         website_client_id = str(get_client('website').id)  # default for self.create_message
-        self.assertTableState(UserCount, ['value', 'subgroup', 'user'],
-                              [[2, website_client_id, user1],
-                               [1, client2_id, user1], [2, client2_id, user2],
-                               [1, website_client_id, self.hourly_user],
-                               [1, website_client_id, self.daily_user]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[2, website_client_id], [3, client2_id],
-                               [2, website_client_id, self.second_realm]])
-        self.assertTableState(InstallationCount, ['value', 'subgroup'],
-                              [[4, website_client_id], [3, client2_id]])
+        self.assertTableState(
+            UserCount,
+            ['value', 'subgroup', 'user'],
+            [
+                [2, website_client_id, user1],
+                [1, client2_id, user1],
+                [2, client2_id, user2],
+                [1, website_client_id, self.hourly_user],
+                [1, website_client_id, self.daily_user],
+            ],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [[2, website_client_id], [3, client2_id], [2, website_client_id, self.second_realm]],
+        )
+        self.assertTableState(
+            InstallationCount, ['value', 'subgroup'], [[4, website_client_id], [3, client2_id]]
+        )
         self.assertTableState(StreamCount, [], [])
 
     def test_messages_sent_by_client_realm_constraint(self) -> None:
@@ -705,11 +828,14 @@ class TestCountStats(AnalyticsTestCase):
 
         client2_id = str(client2.id)
         website_client_id = str(get_client('website').id)  # default for self.create_message
-        self.assertTableState(UserCount, ['value', 'subgroup', 'user'],
-                              [[1, client2_id, user1], [1, client2_id, user2],
-                               [1, website_client_id, user2]])
-        self.assertTableState(RealmCount, ['value', 'subgroup'],
-                              [[1, website_client_id], [2, client2_id]])
+        self.assertTableState(
+            UserCount,
+            ['value', 'subgroup', 'user'],
+            [[1, client2_id, user1], [1, client2_id, user2], [1, website_client_id, user2]],
+        )
+        self.assertTableState(
+            RealmCount, ['value', 'subgroup'], [[1, website_client_id], [2, client2_id]]
+        )
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [])
         self.assertTableState(StreamCount, [], [])
@@ -741,13 +867,23 @@ class TestCountStats(AnalyticsTestCase):
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
 
-        self.assertTableState(StreamCount, ['value', 'subgroup', 'stream'],
-                              [[2, 'false', stream1], [1, 'false', stream2], [2, 'true', stream2],
-                               # "hourly" and "daily" stream, from TestCountStats.setUp
-                               [1, 'false', Stream.objects.get(name='stream 1')],
-                               [1, 'false', Stream.objects.get(name='stream 61')]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[3, 'false'], [2, 'true'], [2, 'false', self.second_realm]])
+        self.assertTableState(
+            StreamCount,
+            ['value', 'subgroup', 'stream'],
+            [
+                [2, 'false', stream1],
+                [1, 'false', stream2],
+                [2, 'true', stream2],
+                # "hourly" and "daily" stream, from TestCountStats.setUp
+                [1, 'false', Stream.objects.get(name='stream 1')],
+                [1, 'false', Stream.objects.get(name='stream 61')],
+            ],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [[3, 'false'], [2, 'true'], [2, 'false', self.second_realm]],
+        )
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [[5, 'false'], [2, 'true']])
         self.assertTableState(UserCount, [], [])
 
@@ -775,26 +911,30 @@ class TestCountStats(AnalyticsTestCase):
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO, self.default_realm)
 
-        self.assertTableState(StreamCount, ['value', 'subgroup', 'stream'],
-                              [[1, 'false', stream1],
-                               [1, 'true', stream1]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[1, 'false'], [1, 'true']])
+        self.assertTableState(
+            StreamCount,
+            ['value', 'subgroup', 'stream'],
+            [[1, 'false', stream1], [1, 'true', stream1]],
+        )
+        self.assertTableState(
+            RealmCount, ['value', 'subgroup', 'realm'], [[1, 'false'], [1, 'true']]
+        )
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [])
         self.assertTableState(UserCount, [], [])
 
-    def create_interval(self, user: UserProfile, start_offset: timedelta,
-                        end_offset: timedelta) -> None:
+    def create_interval(
+        self, user: UserProfile, start_offset: timedelta, end_offset: timedelta
+    ) -> None:
         UserActivityInterval.objects.create(
-            user_profile=user, start=self.TIME_ZERO-start_offset,
-            end=self.TIME_ZERO-end_offset)
+            user_profile=user, start=self.TIME_ZERO - start_offset, end=self.TIME_ZERO - end_offset
+        )
 
     def test_1day_actives(self) -> None:
         stat = COUNT_STATS['1day_actives::day']
         self.current_property = stat.property
 
-        _1day = 1*self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
+        _1day = 1 * self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
 
         # Outside time range, should not appear. Also tests upper boundary.
         user1 = self.create_user()
@@ -807,29 +947,33 @@ class TestCountStats(AnalyticsTestCase):
 
         # Multiple intervals, including one outside boundary
         user3 = self.create_user()
-        self.create_interval(user3, 2*self.DAY, 1*self.DAY)
-        self.create_interval(user3, 20*self.HOUR, 19*self.HOUR)
-        self.create_interval(user3, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user3, 2 * self.DAY, 1 * self.DAY)
+        self.create_interval(user3, 20 * self.HOUR, 19 * self.HOUR)
+        self.create_interval(user3, 20 * self.MINUTE, 19 * self.MINUTE)
 
         # Intervals crossing boundary
         user4 = self.create_user()
-        self.create_interval(user4, 1.5*self.DAY, 0.5*self.DAY)
+        self.create_interval(user4, 1.5 * self.DAY, 0.5 * self.DAY)
         user5 = self.create_user()
         self.create_interval(user5, self.MINUTE, -self.MINUTE)
 
         # Interval subsuming time range
         user6 = self.create_user()
-        self.create_interval(user6, 2*self.DAY, -2*self.DAY)
+        self.create_interval(user6, 2 * self.DAY, -2 * self.DAY)
 
         # Second realm
         user7 = self.create_user(realm=self.second_realm)
-        self.create_interval(user7, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user7, 20 * self.MINUTE, 19 * self.MINUTE)
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['value', 'user'],
-                              [[1, user2], [1, user3], [1, user4], [1, user5], [1, user6], [1, user7]])
-        self.assertTableState(RealmCount, ['value', 'realm'],
-                              [[5, self.default_realm], [1, self.second_realm]])
+        self.assertTableState(
+            UserCount,
+            ['value', 'user'],
+            [[1, user2], [1, user3], [1, user4], [1, user5], [1, user6], [1, user7]],
+        )
+        self.assertTableState(
+            RealmCount, ['value', 'realm'], [[5, self.default_realm], [1, self.second_realm]]
+        )
         self.assertTableState(InstallationCount, ['value'], [[6]])
         self.assertTableState(StreamCount, [], [])
 
@@ -840,23 +984,21 @@ class TestCountStats(AnalyticsTestCase):
         stat = COUNT_STATS['1day_actives::day']
         self.current_property = stat.property
 
-        _1day = 1*self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
+        _1day = 1 * self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
         user1 = self.create_user()
         user2 = self.create_user()
 
         # To be included
-        self.create_interval(user1, 20*self.HOUR, 19*self.HOUR)
+        self.create_interval(user1, 20 * self.HOUR, 19 * self.HOUR)
         self.create_interval(user2, _1day + self.DAY, _1day)
 
         # To be excluded
         user3 = self.create_user(realm=self.second_realm)
-        self.create_interval(user3, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user3, 20 * self.MINUTE, 19 * self.MINUTE)
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO, self.default_realm)
-        self.assertTableState(UserCount, ['value', 'user'],
-                              [[1, user2], [1, user2]])
-        self.assertTableState(RealmCount, ['value', 'realm'],
-                              [[2, self.default_realm]])
+        self.assertTableState(UserCount, ['value', 'user'], [[1, user2], [1, user2]])
+        self.assertTableState(RealmCount, ['value', 'realm'], [[2, self.default_realm]])
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value'], [])
         self.assertTableState(StreamCount, [], [])
@@ -865,7 +1007,7 @@ class TestCountStats(AnalyticsTestCase):
         stat = COUNT_STATS['15day_actives::day']
         self.current_property = stat.property
 
-        _15day = 15*self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
+        _15day = 15 * self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
 
         # Outside time range, should not appear. Also tests upper boundary.
         user1 = self.create_user()
@@ -878,29 +1020,33 @@ class TestCountStats(AnalyticsTestCase):
 
         # Multiple intervals, including one outside boundary
         user3 = self.create_user()
-        self.create_interval(user3, 20*self.DAY, 19*self.DAY)
-        self.create_interval(user3, 20*self.HOUR, 19*self.HOUR)
-        self.create_interval(user3, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user3, 20 * self.DAY, 19 * self.DAY)
+        self.create_interval(user3, 20 * self.HOUR, 19 * self.HOUR)
+        self.create_interval(user3, 20 * self.MINUTE, 19 * self.MINUTE)
 
         # Intervals crossing boundary
         user4 = self.create_user()
-        self.create_interval(user4, 20*self.DAY, 10*self.DAY)
+        self.create_interval(user4, 20 * self.DAY, 10 * self.DAY)
         user5 = self.create_user()
         self.create_interval(user5, self.MINUTE, -self.MINUTE)
 
         # Interval subsuming time range
         user6 = self.create_user()
-        self.create_interval(user6, 20*self.DAY, -2*self.DAY)
+        self.create_interval(user6, 20 * self.DAY, -2 * self.DAY)
 
         # Second realm
         user7 = self.create_user(realm=self.second_realm)
-        self.create_interval(user7, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user7, 20 * self.MINUTE, 19 * self.MINUTE)
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['value', 'user'],
-                              [[1, user2], [1, user3], [1, user4], [1, user5], [1, user6], [1, user7]])
-        self.assertTableState(RealmCount, ['value', 'realm'],
-                              [[5, self.default_realm], [1, self.second_realm]])
+        self.assertTableState(
+            UserCount,
+            ['value', 'user'],
+            [[1, user2], [1, user3], [1, user4], [1, user5], [1, user6], [1, user7]],
+        )
+        self.assertTableState(
+            RealmCount, ['value', 'realm'], [[5, self.default_realm], [1, self.second_realm]]
+        )
         self.assertTableState(InstallationCount, ['value'], [[6]])
         self.assertTableState(StreamCount, [], [])
 
@@ -911,7 +1057,7 @@ class TestCountStats(AnalyticsTestCase):
         stat = COUNT_STATS['15day_actives::day']
         self.current_property = stat.property
 
-        _15day = 15*self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
+        _15day = 15 * self.DAY - UserActivityInterval.MIN_INTERVAL_LENGTH
 
         user1 = self.create_user()
         user2 = self.create_user()
@@ -919,17 +1065,15 @@ class TestCountStats(AnalyticsTestCase):
 
         # To be included
         self.create_interval(user1, _15day + self.DAY, _15day)
-        self.create_interval(user2, 20*self.HOUR, 19*self.HOUR)
+        self.create_interval(user2, 20 * self.HOUR, 19 * self.HOUR)
 
         # To be excluded
-        self.create_interval(user3, 20*self.HOUR, 19*self.HOUR)
+        self.create_interval(user3, 20 * self.HOUR, 19 * self.HOUR)
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO, self.default_realm)
 
-        self.assertTableState(UserCount, ['value', 'user'],
-                              [[1, user1], [1, user2]])
-        self.assertTableState(RealmCount, ['value', 'realm'],
-                              [[2, self.default_realm]])
+        self.assertTableState(UserCount, ['value', 'user'], [[1, user1], [1, user2]])
+        self.assertTableState(RealmCount, ['value', 'realm'], [[2, self.default_realm]])
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value'], [])
         self.assertTableState(StreamCount, [], [])
@@ -941,23 +1085,23 @@ class TestCountStats(AnalyticsTestCase):
         # Outside time range, should not appear. Also testing for intervals
         # starting and ending on boundary
         user1 = self.create_user()
-        self.create_interval(user1, 25*self.HOUR, self.DAY)
+        self.create_interval(user1, 25 * self.HOUR, self.DAY)
         self.create_interval(user1, timedelta(0), -self.HOUR)
 
         # Multiple intervals, including one outside boundary
         user2 = self.create_user()
-        self.create_interval(user2, 20*self.DAY, 19*self.DAY)
-        self.create_interval(user2, 20*self.HOUR, 19*self.HOUR)
-        self.create_interval(user2, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user2, 20 * self.DAY, 19 * self.DAY)
+        self.create_interval(user2, 20 * self.HOUR, 19 * self.HOUR)
+        self.create_interval(user2, 20 * self.MINUTE, 19 * self.MINUTE)
 
         # Intervals crossing boundary
         user3 = self.create_user()
-        self.create_interval(user3, 25*self.HOUR, 22*self.HOUR)
+        self.create_interval(user3, 25 * self.HOUR, 22 * self.HOUR)
         self.create_interval(user3, self.MINUTE, -self.MINUTE)
 
         # Interval subsuming time range
         user4 = self.create_user()
-        self.create_interval(user4, 2*self.DAY, -2*self.DAY)
+        self.create_interval(user4, 2 * self.DAY, -2 * self.DAY)
 
         # Less than 60 seconds, should not appear
         user5 = self.create_user()
@@ -966,14 +1110,18 @@ class TestCountStats(AnalyticsTestCase):
 
         # Second realm
         user6 = self.create_user(realm=self.second_realm)
-        self.create_interval(user6, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user6, 20 * self.MINUTE, 19 * self.MINUTE)
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['value', 'user'],
-                              [[61, user2], [121, user3], [24*60, user4], [1, user6]])
-        self.assertTableState(RealmCount, ['value', 'realm'],
-                              [[61 + 121 + 24*60, self.default_realm], [1, self.second_realm]])
-        self.assertTableState(InstallationCount, ['value'], [[61 + 121 + 24*60 + 1]])
+        self.assertTableState(
+            UserCount, ['value', 'user'], [[61, user2], [121, user3], [24 * 60, user4], [1, user6]]
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'realm'],
+            [[61 + 121 + 24 * 60, self.default_realm], [1, self.second_realm]],
+        )
+        self.assertTableState(InstallationCount, ['value'], [[61 + 121 + 24 * 60 + 1]])
         self.assertTableState(StreamCount, [], [])
 
     def test_minutes_active_realm_constraint(self) -> None:
@@ -990,17 +1138,15 @@ class TestCountStats(AnalyticsTestCase):
         user3 = self.create_user(realm=self.second_realm)
 
         # To be included
-        self.create_interval(user1, 20*self.HOUR, 19*self.HOUR)
-        self.create_interval(user2, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user1, 20 * self.HOUR, 19 * self.HOUR)
+        self.create_interval(user2, 20 * self.MINUTE, 19 * self.MINUTE)
 
         # To be excluded
-        self.create_interval(user3, 20*self.MINUTE, 19*self.MINUTE)
+        self.create_interval(user3, 20 * self.MINUTE, 19 * self.MINUTE)
 
         do_fill_count_stat_at_hour(stat, self.TIME_ZERO, self.default_realm)
-        self.assertTableState(UserCount, ['value', 'user'],
-                              [[60, user1], [1, user2]])
-        self.assertTableState(RealmCount, ['value', 'realm'],
-                              [[60 + 1, self.default_realm]])
+        self.assertTableState(UserCount, ['value', 'user'], [[60, user1], [1, user2]])
+        self.assertTableState(RealmCount, ['value', 'realm'], [[60 + 1, self.default_realm]])
         # No aggregation to InstallationCount with realm constraint
         self.assertTableState(InstallationCount, ['value'], [])
         self.assertTableState(StreamCount, [], [])
@@ -1012,18 +1158,24 @@ class TestCountStats(AnalyticsTestCase):
         one_hour_before = datetime(2016, 3, 14, 18, tzinfo=timezone.utc)
         one_day_before = datetime(2016, 3, 13, 19, tzinfo=timezone.utc)
 
-        fillstate = FillState.objects.create(property=COUNT_STATS["messages_sent:is_bot:hour"].property,
-                                             end_time=a_time, state=FillState.DONE)
+        fillstate = FillState.objects.create(
+            property=COUNT_STATS["messages_sent:is_bot:hour"].property,
+            end_time=a_time,
+            state=FillState.DONE,
+        )
         self.assertEqual(COUNT_STATS["messages_sent:is_bot:hour"].last_successful_fill(), a_time)
 
         fillstate.state = FillState.STARTED
         fillstate.save(update_fields=["state"])
-        self.assertEqual(COUNT_STATS["messages_sent:is_bot:hour"].last_successful_fill(), one_hour_before)
+        self.assertEqual(
+            COUNT_STATS["messages_sent:is_bot:hour"].last_successful_fill(), one_hour_before
+        )
 
         fillstate.property = COUNT_STATS["7day_actives::day"].property
         fillstate.save(update_fields=["property"])
         self.assertEqual(COUNT_STATS["7day_actives::day"].last_successful_fill(), one_day_before)
 
+
 class TestDoAggregateToSummaryTable(AnalyticsTestCase):
     # do_aggregate_to_summary_table is mostly tested by the end to end
     # nature of the tests in TestCountStats. But want to highlight one
@@ -1036,6 +1188,7 @@ class TestDoAggregateToSummaryTable(AnalyticsTestCase):
         self.assertFalse(RealmCount.objects.exists())
         self.assertFalse(InstallationCount.objects.exists())
 
+
 class TestDoIncrementLoggingStat(AnalyticsTestCase):
     def test_table_and_id_args(self) -> None:
         # For realms, streams, and users, tests that the new rows are going to
@@ -1063,7 +1216,7 @@ class TestDoIncrementLoggingStat(AnalyticsTestCase):
         self.assertTableState(StreamCount, ['stream'], [[stream1], [stream2]])
 
     def test_frequency(self) -> None:
-        times = [self.TIME_ZERO - self.MINUTE*i for i in [0, 1, 61, 24*60+1]]
+        times = [self.TIME_ZERO - self.MINUTE * i for i in [0, 1, 61, 24 * 60 + 1]]
 
         stat = LoggingCountStat('day test', RealmCount, CountStat.DAY)
         for time_ in times:
@@ -1072,12 +1225,17 @@ class TestDoIncrementLoggingStat(AnalyticsTestCase):
         for time_ in times:
             do_increment_logging_stat(self.default_realm, stat, None, time_)
 
-        self.assertTableState(RealmCount, ['value', 'property', 'end_time'],
-                              [[3, 'day test', self.TIME_ZERO],
-                               [1, 'day test', self.TIME_ZERO - self.DAY],
-                               [2, 'hour test', self.TIME_ZERO],
-                               [1, 'hour test', self.TIME_LAST_HOUR],
-                               [1, 'hour test', self.TIME_ZERO - self.DAY]])
+        self.assertTableState(
+            RealmCount,
+            ['value', 'property', 'end_time'],
+            [
+                [3, 'day test', self.TIME_ZERO],
+                [1, 'day test', self.TIME_ZERO - self.DAY],
+                [2, 'hour test', self.TIME_ZERO],
+                [1, 'hour test', self.TIME_LAST_HOUR],
+                [1, 'hour test', self.TIME_ZERO - self.DAY],
+            ],
+        )
 
     def test_get_or_create(self) -> None:
         stat = LoggingCountStat('test', RealmCount, CountStat.HOUR)
@@ -1088,14 +1246,26 @@ class TestDoIncrementLoggingStat(AnalyticsTestCase):
         do_increment_logging_stat(self.default_realm, stat, 'subgroup2', self.TIME_ZERO)
         do_increment_logging_stat(self.default_realm, stat, 'subgroup1', self.TIME_LAST_HOUR)
         self.current_property = 'test'
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'end_time'],
-                              [[1, 'subgroup1', self.TIME_ZERO], [1, 'subgroup2', self.TIME_ZERO],
-                               [1, 'subgroup1', self.TIME_LAST_HOUR]])
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'end_time'],
+            [
+                [1, 'subgroup1', self.TIME_ZERO],
+                [1, 'subgroup2', self.TIME_ZERO],
+                [1, 'subgroup1', self.TIME_LAST_HOUR],
+            ],
+        )
         # This should trigger the get part of get_or_create
         do_increment_logging_stat(self.default_realm, stat, 'subgroup1', self.TIME_ZERO)
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'end_time'],
-                              [[2, 'subgroup1', self.TIME_ZERO], [1, 'subgroup2', self.TIME_ZERO],
-                               [1, 'subgroup1', self.TIME_LAST_HOUR]])
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'end_time'],
+            [
+                [2, 'subgroup1', self.TIME_ZERO],
+                [1, 'subgroup2', self.TIME_ZERO],
+                [1, 'subgroup1', self.TIME_LAST_HOUR],
+            ],
+        )
 
     def test_increment(self) -> None:
         stat = LoggingCountStat('test', RealmCount, CountStat.DAY)
@@ -1107,6 +1277,7 @@ class TestDoIncrementLoggingStat(AnalyticsTestCase):
         do_increment_logging_stat(self.default_realm, stat, None, self.TIME_ZERO)
         self.assertTableState(RealmCount, ['value'], [[3]])
 
+
 class TestLoggingCountStats(AnalyticsTestCase):
     def test_aggregation(self) -> None:
         stat = LoggingCountStat('realm test', RealmCount, CountStat.DAY)
@@ -1123,37 +1294,67 @@ class TestLoggingCountStats(AnalyticsTestCase):
         do_increment_logging_stat(stream, stat, None, self.TIME_ZERO)
         process_count_stat(stat, self.TIME_ZERO)
 
-        self.assertTableState(InstallationCount, ['property', 'value'],
-                              [['realm test', 1], ['user test', 1], ['stream test', 1]])
-        self.assertTableState(RealmCount, ['property', 'value'],
-                              [['realm test', 1], ['user test', 1], ['stream test', 1]])
+        self.assertTableState(
+            InstallationCount,
+            ['property', 'value'],
+            [['realm test', 1], ['user test', 1], ['stream test', 1]],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['property', 'value'],
+            [['realm test', 1], ['user test', 1], ['stream test', 1]],
+        )
         self.assertTableState(UserCount, ['property', 'value'], [['user test', 1]])
         self.assertTableState(StreamCount, ['property', 'value'], [['stream test', 1]])
 
     def test_active_users_log_by_is_bot(self) -> None:
         property = 'active_users_log:is_bot:day'
         user = do_create_user('email', 'password', self.default_realm, 'full_name')
-        self.assertEqual(1, RealmCount.objects.filter(property=property, subgroup=False)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            1,
+            RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
         do_deactivate_user(user)
-        self.assertEqual(0, RealmCount.objects.filter(property=property, subgroup=False)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            0,
+            RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
         do_activate_user(user)
-        self.assertEqual(1, RealmCount.objects.filter(property=property, subgroup=False)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            1,
+            RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
         do_deactivate_user(user)
-        self.assertEqual(0, RealmCount.objects.filter(property=property, subgroup=False)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            0,
+            RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
         do_reactivate_user(user)
-        self.assertEqual(1, RealmCount.objects.filter(property=property, subgroup=False)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            1,
+            RealmCount.objects.filter(property=property, subgroup=False).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
 
     def test_invites_sent(self) -> None:
         property = 'invites_sent::day'
 
         def assertInviteCountEquals(count: int) -> None:
-            self.assertEqual(count, RealmCount.objects.filter(property=property, subgroup=None)
-                             .aggregate(Sum('value'))['value__sum'])
+            self.assertEqual(
+                count,
+                RealmCount.objects.filter(property=property, subgroup=None).aggregate(Sum('value'))[
+                    'value__sum'
+                ],
+            )
 
         user = self.create_user(email='first@domain.tld')
         stream, _ = self.create_stream_with_recipient()
@@ -1200,25 +1401,50 @@ class TestLoggingCountStats(AnalyticsTestCase):
         self.send_personal_message(user1, user2)
         client = get_client("website")
         do_mark_all_as_read(user2, client)
-        self.assertEqual(1, UserCount.objects.filter(property=read_count_property)
-                         .aggregate(Sum('value'))['value__sum'])
-        self.assertEqual(1, UserCount.objects.filter(property=interactions_property)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            1,
+            UserCount.objects.filter(property=read_count_property).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
+        self.assertEqual(
+            1,
+            UserCount.objects.filter(property=interactions_property).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
 
         self.send_stream_message(user1, stream.name)
         self.send_stream_message(user1, stream.name)
         do_mark_stream_messages_as_read(user2, stream.recipient_id)
-        self.assertEqual(3, UserCount.objects.filter(property=read_count_property)
-                         .aggregate(Sum('value'))['value__sum'])
-        self.assertEqual(2, UserCount.objects.filter(property=interactions_property)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            3,
+            UserCount.objects.filter(property=read_count_property).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
+        self.assertEqual(
+            2,
+            UserCount.objects.filter(property=interactions_property).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
 
         message = self.send_stream_message(user2, stream.name)
         do_update_message_flags(user1, client, 'add', 'read', [message])
-        self.assertEqual(4, UserCount.objects.filter(property=read_count_property)
-                         .aggregate(Sum('value'))['value__sum'])
-        self.assertEqual(3, UserCount.objects.filter(property=interactions_property)
-                         .aggregate(Sum('value'))['value__sum'])
+        self.assertEqual(
+            4,
+            UserCount.objects.filter(property=read_count_property).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
+        self.assertEqual(
+            3,
+            UserCount.objects.filter(property=interactions_property).aggregate(Sum('value'))[
+                'value__sum'
+            ],
+        )
+
 
 class TestDeleteStats(AnalyticsTestCase):
     def test_do_drop_all_analytics_tables(self) -> None:
@@ -1251,7 +1477,9 @@ class TestDeleteStats(AnalyticsTestCase):
             StreamCount.objects.create(stream=stream, realm=stream.realm, **count_args)
             RealmCount.objects.create(realm=user.realm, **count_args)
             InstallationCount.objects.create(**count_args)
-        FillState.objects.create(property='to_delete', end_time=self.TIME_ZERO, state=FillState.DONE)
+        FillState.objects.create(
+            property='to_delete', end_time=self.TIME_ZERO, state=FillState.DONE
+        )
         FillState.objects.create(property='to_save', end_time=self.TIME_ZERO, state=FillState.DONE)
 
         analytics = apps.get_app_config('analytics')
@@ -1263,6 +1491,7 @@ class TestDeleteStats(AnalyticsTestCase):
             self.assertFalse(table.objects.filter(property='to_delete').exists())
             self.assertTrue(table.objects.filter(property='to_save').exists())
 
+
 class TestActiveUsersAudit(AnalyticsTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -1270,14 +1499,18 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         self.stat = COUNT_STATS['active_users_audit:is_bot:day']
         self.current_property = self.stat.property
 
-    def add_event(self, event_type: int, days_offset: float,
-                  user: Optional[UserProfile]=None) -> None:
-        hours_offset = int(24*days_offset)
+    def add_event(
+        self, event_type: int, days_offset: float, user: Optional[UserProfile] = None
+    ) -> None:
+        hours_offset = int(24 * days_offset)
         if user is None:
             user = self.user
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=event_type,
-            event_time=self.TIME_ZERO - hours_offset*self.HOUR)
+            realm=user.realm,
+            modified_user=user,
+            event_type=event_type,
+            event_time=self.TIME_ZERO - hours_offset * self.HOUR,
+        )
 
     def test_user_deactivated_in_future(self) -> None:
         self.add_event(RealmAuditLog.USER_CREATED, 1)
@@ -1293,13 +1526,13 @@ class TestActiveUsersAudit(AnalyticsTestCase):
 
     def test_user_active_then_deactivated_same_day(self) -> None:
         self.add_event(RealmAuditLog.USER_CREATED, 1)
-        self.add_event(RealmAuditLog.USER_DEACTIVATED, .5)
+        self.add_event(RealmAuditLog.USER_DEACTIVATED, 0.5)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
         self.assertTableState(UserCount, [], [])
 
     def test_user_unactive_then_activated_same_day(self) -> None:
         self.add_event(RealmAuditLog.USER_DEACTIVATED, 1)
-        self.add_event(RealmAuditLog.USER_REACTIVATED, .5)
+        self.add_event(RealmAuditLog.USER_REACTIVATED, 0.5)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
         self.assertTableState(UserCount, ['subgroup'], [['false']])
 
@@ -1309,8 +1542,9 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         self.add_event(RealmAuditLog.USER_CREATED, 2)
         self.add_event(RealmAuditLog.USER_DEACTIVATED, 1)
         process_count_stat(self.stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['subgroup', 'end_time'],
-                              [['false', self.TIME_ZERO - self.DAY]])
+        self.assertTableState(
+            UserCount, ['subgroup', 'end_time'], [['false', self.TIME_ZERO - self.DAY]]
+        )
 
     def test_user_deactivated_then_reactivated_with_day_gap(self) -> None:
         self.add_event(RealmAuditLog.USER_DEACTIVATED, 2)
@@ -1324,9 +1558,12 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         self.add_event(RealmAuditLog.USER_ACTIVATED, 2)
         self.add_event(RealmAuditLog.USER_REACTIVATED, 1)
         for i in range(4):
-            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO - i*self.DAY)
-        self.assertTableState(UserCount, ['subgroup', 'end_time'],
-                              [['false', self.TIME_ZERO - i*self.DAY] for i in [3, 1, 0]])
+            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO - i * self.DAY)
+        self.assertTableState(
+            UserCount,
+            ['subgroup', 'end_time'],
+            [['false', self.TIME_ZERO - i * self.DAY] for i in [3, 1, 0]],
+        )
 
     # Also tests that aggregation to RealmCount and InstallationCount is
     # being done, and that we're storing the user correctly in UserCount
@@ -1339,11 +1576,20 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         for user in [user1, user2, user3, user4]:
             self.add_event(RealmAuditLog.USER_CREATED, 1, user=user)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['subgroup', 'user'],
-                              [['false', user1], ['false', user2], ['false', user3], ['true', user4]])
-        self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[2, 'false', self.default_realm], [1, 'false', second_realm],
-                               [1, 'true', second_realm]])
+        self.assertTableState(
+            UserCount,
+            ['subgroup', 'user'],
+            [['false', user1], ['false', user2], ['false', user3], ['true', user4]],
+        )
+        self.assertTableState(
+            RealmCount,
+            ['value', 'subgroup', 'realm'],
+            [
+                [2, 'false', self.default_realm],
+                [1, 'false', second_realm],
+                [1, 'true', second_realm],
+            ],
+        )
         self.assertTableState(InstallationCount, ['value', 'subgroup'], [[3, 'false'], [1, 'true']])
         self.assertTableState(StreamCount, [], [])
 
@@ -1357,8 +1603,11 @@ class TestActiveUsersAudit(AnalyticsTestCase):
     def test_update_from_two_days_ago(self) -> None:
         self.add_event(RealmAuditLog.USER_CREATED, 2)
         process_count_stat(self.stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['subgroup', 'end_time'],
-                              [['false', self.TIME_ZERO], ['false', self.TIME_ZERO-self.DAY]])
+        self.assertTableState(
+            UserCount,
+            ['subgroup', 'end_time'],
+            [['false', self.TIME_ZERO], ['false', self.TIME_ZERO - self.DAY]],
+        )
 
     # User with no relevant activity could happen e.g. for a system bot that
     # doesn't go through do_create_user. Mainly just want to make sure that
@@ -1372,7 +1621,7 @@ class TestActiveUsersAudit(AnalyticsTestCase):
 
     def test_max_audit_entry_is_unrelated(self) -> None:
         self.add_event(RealmAuditLog.USER_CREATED, 1)
-        self.add_event(RealmAuditLog.USER_SOFT_ACTIVATED, .5)
+        self.add_event(RealmAuditLog.USER_SOFT_ACTIVATED, 0.5)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
         self.assertTableState(UserCount, ['subgroup'], [['false']])
 
@@ -1387,13 +1636,12 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         user1 = self.create_user()
         user2 = self.create_user()
         user3 = self.create_user()
-        self.add_event(RealmAuditLog.USER_CREATED, .5, user=user1)
-        self.add_event(RealmAuditLog.USER_CREATED, .5, user=user2)
+        self.add_event(RealmAuditLog.USER_CREATED, 0.5, user=user1)
+        self.add_event(RealmAuditLog.USER_CREATED, 0.5, user=user2)
         self.add_event(RealmAuditLog.USER_CREATED, 1, user=user3)
-        self.add_event(RealmAuditLog.USER_DEACTIVATED, .5, user=user3)
+        self.add_event(RealmAuditLog.USER_DEACTIVATED, 0.5, user=user3)
         do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO)
-        self.assertTableState(UserCount, ['user', 'subgroup'],
-                              [[user1, 'false'], [user2, 'false']])
+        self.assertTableState(UserCount, ['user', 'subgroup'], [[user1, 'false'], [user2, 'false']])
 
     def test_end_to_end_with_actions_dot_py(self) -> None:
         user1 = do_create_user('email1', 'password', self.default_realm, 'full_name')
@@ -1406,30 +1654,42 @@ class TestActiveUsersAudit(AnalyticsTestCase):
         end_time = floor_to_day(timezone_now()) + self.DAY
         do_fill_count_stat_at_hour(self.stat, end_time)
         for user in [user1, user3, user4]:
-            self.assertTrue(UserCount.objects.filter(
-                user=user, property=self.current_property, subgroup='false',
-                end_time=end_time, value=1).exists())
+            self.assertTrue(
+                UserCount.objects.filter(
+                    user=user,
+                    property=self.current_property,
+                    subgroup='false',
+                    end_time=end_time,
+                    value=1,
+                ).exists()
+            )
         self.assertFalse(UserCount.objects.filter(user=user2, end_time=end_time).exists())
 
+
 class TestRealmActiveHumans(AnalyticsTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.stat = COUNT_STATS['realm_active_humans::day']
         self.current_property = self.stat.property
 
-    def mark_audit_active(self, user: UserProfile, end_time: Optional[datetime]=None) -> None:
+    def mark_audit_active(self, user: UserProfile, end_time: Optional[datetime] = None) -> None:
         if end_time is None:
             end_time = self.TIME_ZERO
         UserCount.objects.create(
-            user=user, realm=user.realm, property='active_users_audit:is_bot:day',
-            subgroup=orjson.dumps(user.is_bot).decode(), end_time=end_time, value=1)
+            user=user,
+            realm=user.realm,
+            property='active_users_audit:is_bot:day',
+            subgroup=orjson.dumps(user.is_bot).decode(),
+            end_time=end_time,
+            value=1,
+        )
 
-    def mark_15day_active(self, user: UserProfile, end_time: Optional[datetime]=None) -> None:
+    def mark_15day_active(self, user: UserProfile, end_time: Optional[datetime] = None) -> None:
         if end_time is None:
             end_time = self.TIME_ZERO
         UserCount.objects.create(
-            user=user, realm=user.realm, property='15day_actives::day',
-            end_time=end_time, value=1)
+            user=user, realm=user.realm, property='15day_actives::day', end_time=end_time, value=1
+        )
 
     def test_basic_boolean_logic(self) -> None:
         user = self.create_user()
@@ -1439,7 +1699,7 @@ class TestRealmActiveHumans(AnalyticsTestCase):
         self.mark_15day_active(user, end_time=self.TIME_ZERO + self.DAY)
 
         for i in [-1, 0, 1]:
-            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO + i*self.DAY)
+            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO + i * self.DAY)
         self.assertTableState(RealmCount, ['value', 'end_time'], [[1, self.TIME_ZERO + self.DAY]])
 
     def test_bots_not_counted(self) -> None:
@@ -1465,12 +1725,17 @@ class TestRealmActiveHumans(AnalyticsTestCase):
             self.mark_15day_active(user, end_time=self.TIME_ZERO - self.DAY)
 
         for i in [-1, 0, 1]:
-            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO + i*self.DAY)
-        self.assertTableState(RealmCount, ['value', 'realm', 'end_time'],
-                              [[2, self.default_realm, self.TIME_ZERO],
-                               [3, second_realm, self.TIME_ZERO],
-                               [1, self.default_realm, self.TIME_ZERO - self.DAY],
-                               [2, second_realm, self.TIME_ZERO - self.DAY]])
+            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO + i * self.DAY)
+        self.assertTableState(
+            RealmCount,
+            ['value', 'realm', 'end_time'],
+            [
+                [2, self.default_realm, self.TIME_ZERO],
+                [3, second_realm, self.TIME_ZERO],
+                [1, self.default_realm, self.TIME_ZERO - self.DAY],
+                [2, second_realm, self.TIME_ZERO - self.DAY],
+            ],
+        )
 
         # Check that adding spurious entries doesn't make a difference
         self.mark_audit_active(user1, end_time=self.TIME_ZERO + self.DAY)
@@ -1483,12 +1748,17 @@ class TestRealmActiveHumans(AnalyticsTestCase):
         RealmCount.objects.all().delete()
         InstallationCount.objects.all().delete()
         for i in [-1, 0, 1]:
-            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO + i*self.DAY)
-        self.assertTableState(RealmCount, ['value', 'realm', 'end_time'],
-                              [[2, self.default_realm, self.TIME_ZERO],
-                               [3, second_realm, self.TIME_ZERO],
-                               [1, self.default_realm, self.TIME_ZERO - self.DAY],
-                               [2, second_realm, self.TIME_ZERO - self.DAY]])
+            do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO + i * self.DAY)
+        self.assertTableState(
+            RealmCount,
+            ['value', 'realm', 'end_time'],
+            [
+                [2, self.default_realm, self.TIME_ZERO],
+                [3, second_realm, self.TIME_ZERO],
+                [1, self.default_realm, self.TIME_ZERO - self.DAY],
+                [2, second_realm, self.TIME_ZERO - self.DAY],
+            ],
+        )
 
     def test_end_to_end(self) -> None:
         user1 = do_create_user('email1', 'password', self.default_realm, 'full_name')
@@ -1498,10 +1768,17 @@ class TestRealmActiveHumans(AnalyticsTestCase):
         update_user_activity_interval(user1, time_zero)
         update_user_activity_interval(user2, time_zero)
         do_deactivate_user(user2)
-        for property in ['active_users_audit:is_bot:day', '15day_actives::day',
-                         'realm_active_humans::day']:
+        for property in [
+            'active_users_audit:is_bot:day',
+            '15day_actives::day',
+            'realm_active_humans::day',
+        ]:
             FillState.objects.create(property=property, state=FillState.DONE, end_time=time_zero)
-            process_count_stat(COUNT_STATS[property], time_zero+self.DAY)
-        self.assertEqual(RealmCount.objects.filter(
-            property='realm_active_humans::day', end_time=time_zero+self.DAY, value=1).count(), 1)
+            process_count_stat(COUNT_STATS[property], time_zero + self.DAY)
+        self.assertEqual(
+            RealmCount.objects.filter(
+                property='realm_active_humans::day', end_time=time_zero + self.DAY, value=1
+            ).count(),
+            1,
+        )
         self.assertEqual(RealmCount.objects.filter(property='realm_active_humans::day').count(), 1)
diff --git a/analytics/tests/test_fixtures.py b/analytics/tests/test_fixtures.py
index a5e7f47125..cc9da62750 100644
--- a/analytics/tests/test_fixtures.py
+++ b/analytics/tests/test_fixtures.py
@@ -9,22 +9,32 @@ class TestFixtures(ZulipTestCase):
         # test basic business_hour / non_business_hour calculation
         # test we get an array of the right length with frequency=CountStat.DAY
         data = generate_time_series_data(
-            days=7, business_hours_base=20, non_business_hours_base=15, spikiness=0)
+            days=7, business_hours_base=20, non_business_hours_base=15, spikiness=0
+        )
         self.assertEqual(data, [400, 400, 400, 400, 400, 360, 360])
 
         data = generate_time_series_data(
-            days=1, business_hours_base=2000, non_business_hours_base=1500,
-            growth=2, spikiness=0, frequency=CountStat.HOUR)
+            days=1,
+            business_hours_base=2000,
+            non_business_hours_base=1500,
+            growth=2,
+            spikiness=0,
+            frequency=CountStat.HOUR,
+        )
         # test we get an array of the right length with frequency=CountStat.HOUR
         self.assertEqual(len(data), 24)
         # test that growth doesn't affect the first data point
         self.assertEqual(data[0], 2000)
         # test that the last data point is growth times what it otherwise would be
-        self.assertEqual(data[-1], 1500*2)
+        self.assertEqual(data[-1], 1500 * 2)
 
         # test autocorrelation == 1, since that's the easiest value to test
         data = generate_time_series_data(
-            days=1, business_hours_base=2000, non_business_hours_base=2000,
-            autocorrelation=1, frequency=CountStat.HOUR)
+            days=1,
+            business_hours_base=2000,
+            non_business_hours_base=2000,
+            autocorrelation=1,
+            frequency=CountStat.HOUR,
+        )
         self.assertEqual(data[0], data[1])
         self.assertEqual(data[0], data[-1])
diff --git a/analytics/tests/test_views.py b/analytics/tests/test_views.py
index 378a4c014f..10efb2891a 100644
--- a/analytics/tests/test_views.py
+++ b/analytics/tests/test_views.py
@@ -81,22 +81,26 @@ class TestStatsEndpoint(ZulipTestCase):
         self.assertEqual(result.status_code, 200)
         self.assert_in_response("Zulip analytics for", result)
 
+
 class TestGetChartData(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.realm = get_realm('zulip')
         self.user = self.example_user('hamlet')
         self.login_user(self.user)
-        self.end_times_hour = [ceiling_to_hour(self.realm.date_created) + timedelta(hours=i)
-                               for i in range(4)]
-        self.end_times_day = [ceiling_to_day(self.realm.date_created) + timedelta(days=i)
-                              for i in range(4)]
+        self.end_times_hour = [
+            ceiling_to_hour(self.realm.date_created) + timedelta(hours=i) for i in range(4)
+        ]
+        self.end_times_day = [
+            ceiling_to_day(self.realm.date_created) + timedelta(days=i) for i in range(4)
+        ]
 
     def data(self, i: int) -> List[int]:
         return [0, 0, i, 0]
 
-    def insert_data(self, stat: CountStat, realm_subgroups: List[Optional[str]],
-                    user_subgroups: List[str]) -> None:
+    def insert_data(
+        self, stat: CountStat, realm_subgroups: List[Optional[str]], user_subgroups: List[str]
+    ) -> None:
         if stat.frequency == CountStat.HOUR:
             insert_time = self.end_times_hour[2]
             fill_time = self.end_times_hour[-1]
@@ -105,13 +109,26 @@ class TestGetChartData(ZulipTestCase):
             fill_time = self.end_times_day[-1]
 
         RealmCount.objects.bulk_create(
-            RealmCount(property=stat.property, subgroup=subgroup, end_time=insert_time,
-                       value=100+i, realm=self.realm)
-            for i, subgroup in enumerate(realm_subgroups))
+            RealmCount(
+                property=stat.property,
+                subgroup=subgroup,
+                end_time=insert_time,
+                value=100 + i,
+                realm=self.realm,
+            )
+            for i, subgroup in enumerate(realm_subgroups)
+        )
         UserCount.objects.bulk_create(
-            UserCount(property=stat.property, subgroup=subgroup, end_time=insert_time,
-                      value=200+i, realm=self.realm, user=self.user)
-            for i, subgroup in enumerate(user_subgroups))
+            UserCount(
+                property=stat.property,
+                subgroup=subgroup,
+                end_time=insert_time,
+                value=200 + i,
+                realm=self.realm,
+                user=self.user,
+            )
+            for i, subgroup in enumerate(user_subgroups)
+        )
         FillState.objects.create(property=stat.property, end_time=fill_time, state=FillState.DONE)
 
     def test_number_of_humans(self) -> None:
@@ -121,55 +138,83 @@ class TestGetChartData(ZulipTestCase):
         self.insert_data(stat, [None], [])
         stat = COUNT_STATS['active_users_audit:is_bot:day']
         self.insert_data(stat, ['false'], [])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'number_of_humans'})
+        result = self.client_get('/json/analytics/chart_data', {'chart_name': 'number_of_humans'})
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data, {
-            'msg': '',
-            'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
-            'frequency': CountStat.DAY,
-            'everyone': {'_1day': self.data(100), '_15day': self.data(100), 'all_time': self.data(100)},
-            'display_order': None,
-            'result': 'success',
-        })
+        self.assertEqual(
+            data,
+            {
+                'msg': '',
+                'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
+                'frequency': CountStat.DAY,
+                'everyone': {
+                    '_1day': self.data(100),
+                    '_15day': self.data(100),
+                    'all_time': self.data(100),
+                },
+                'display_order': None,
+                'result': 'success',
+            },
+        )
 
     def test_messages_sent_over_time(self) -> None:
         stat = COUNT_STATS['messages_sent:is_bot:hour']
         self.insert_data(stat, ['true', 'false'], ['false'])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data, {
-            'msg': '',
-            'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_hour],
-            'frequency': CountStat.HOUR,
-            'everyone': {'bot': self.data(100), 'human': self.data(101)},
-            'user': {'bot': self.data(0), 'human': self.data(200)},
-            'display_order': None,
-            'result': 'success',
-        })
+        self.assertEqual(
+            data,
+            {
+                'msg': '',
+                'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_hour],
+                'frequency': CountStat.HOUR,
+                'everyone': {'bot': self.data(100), 'human': self.data(101)},
+                'user': {'bot': self.data(0), 'human': self.data(200)},
+                'display_order': None,
+                'result': 'success',
+            },
+        )
 
     def test_messages_sent_by_message_type(self) -> None:
         stat = COUNT_STATS['messages_sent:message_type:day']
-        self.insert_data(stat, ['public_stream', 'private_message'],
-                         ['public_stream', 'private_stream'])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_by_message_type'})
+        self.insert_data(
+            stat, ['public_stream', 'private_message'], ['public_stream', 'private_stream']
+        )
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_by_message_type'}
+        )
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data, {
-            'msg': '',
-            'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
-            'frequency': CountStat.DAY,
-            'everyone': {'Public streams': self.data(100), 'Private streams': self.data(0),
-                         'Private messages': self.data(101), 'Group private messages': self.data(0)},
-            'user': {'Public streams': self.data(200), 'Private streams': self.data(201),
-                     'Private messages': self.data(0), 'Group private messages': self.data(0)},
-            'display_order': ['Private messages', 'Public streams', 'Private streams', 'Group private messages'],
-            'result': 'success',
-        })
+        self.assertEqual(
+            data,
+            {
+                'msg': '',
+                'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
+                'frequency': CountStat.DAY,
+                'everyone': {
+                    'Public streams': self.data(100),
+                    'Private streams': self.data(0),
+                    'Private messages': self.data(101),
+                    'Group private messages': self.data(0),
+                },
+                'user': {
+                    'Public streams': self.data(200),
+                    'Private streams': self.data(201),
+                    'Private messages': self.data(0),
+                    'Group private messages': self.data(0),
+                },
+                'display_order': [
+                    'Private messages',
+                    'Public streams',
+                    'Private streams',
+                    'Group private messages',
+                ],
+                'result': 'success',
+            },
+        )
 
     def test_messages_sent_by_client(self) -> None:
         stat = COUNT_STATS['messages_sent:client:day']
@@ -177,80 +222,112 @@ class TestGetChartData(ZulipTestCase):
         client2 = Client.objects.create(name='client 2')
         client3 = Client.objects.create(name='client 3')
         client4 = Client.objects.create(name='client 4')
-        self.insert_data(stat, [client4.id, client3.id, client2.id],
-                         [client3.id, client1.id])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_by_client'})
+        self.insert_data(stat, [client4.id, client3.id, client2.id], [client3.id, client1.id])
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_by_client'}
+        )
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data, {
-            'msg': '',
-            'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
-            'frequency': CountStat.DAY,
-            'everyone': {'client 4': self.data(100), 'client 3': self.data(101),
-                         'client 2': self.data(102)},
-            'user': {'client 3': self.data(200), 'client 1': self.data(201)},
-            'display_order': ['client 1', 'client 2', 'client 3', 'client 4'],
-            'result': 'success',
-        })
+        self.assertEqual(
+            data,
+            {
+                'msg': '',
+                'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_day],
+                'frequency': CountStat.DAY,
+                'everyone': {
+                    'client 4': self.data(100),
+                    'client 3': self.data(101),
+                    'client 2': self.data(102),
+                },
+                'user': {'client 3': self.data(200), 'client 1': self.data(201)},
+                'display_order': ['client 1', 'client 2', 'client 3', 'client 4'],
+                'result': 'success',
+            },
+        )
 
     def test_messages_read_over_time(self) -> None:
         stat = COUNT_STATS['messages_read::hour']
         self.insert_data(stat, [None], [])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_read_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_read_over_time'}
+        )
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data, {
-            'msg': '',
-            'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_hour],
-            'frequency': CountStat.HOUR,
-            'everyone': {'read': self.data(100)},
-            'user': {'read': self.data(0)},
-            'display_order': None,
-            'result': 'success',
-        })
+        self.assertEqual(
+            data,
+            {
+                'msg': '',
+                'end_times': [datetime_to_timestamp(dt) for dt in self.end_times_hour],
+                'frequency': CountStat.HOUR,
+                'everyone': {'read': self.data(100)},
+                'user': {'read': self.data(0)},
+                'display_order': None,
+                'result': 'success',
+            },
+        )
 
     def test_include_empty_subgroups(self) -> None:
         FillState.objects.create(
-            property='realm_active_humans::day', end_time=self.end_times_day[0],
-            state=FillState.DONE)
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'number_of_humans'})
+            property='realm_active_humans::day',
+            end_time=self.end_times_day[0],
+            state=FillState.DONE,
+        )
+        result = self.client_get('/json/analytics/chart_data', {'chart_name': 'number_of_humans'})
         self.assert_json_success(result)
         data = result.json()
         self.assertEqual(data['everyone'], {"_1day": [0], "_15day": [0], "all_time": [0]})
         self.assertFalse('user' in data)
 
         FillState.objects.create(
-            property='messages_sent:is_bot:hour', end_time=self.end_times_hour[0],
-            state=FillState.DONE)
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_over_time'})
+            property='messages_sent:is_bot:hour',
+            end_time=self.end_times_hour[0],
+            state=FillState.DONE,
+        )
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
         data = result.json()
         self.assertEqual(data['everyone'], {'human': [0], 'bot': [0]})
         self.assertEqual(data['user'], {'human': [0], 'bot': [0]})
 
         FillState.objects.create(
-            property='messages_sent:message_type:day', end_time=self.end_times_day[0],
-            state=FillState.DONE)
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_by_message_type'})
+            property='messages_sent:message_type:day',
+            end_time=self.end_times_day[0],
+            state=FillState.DONE,
+        )
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_by_message_type'}
+        )
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data['everyone'], {
-            'Public streams': [0], 'Private streams': [0],
-            'Private messages': [0], 'Group private messages': [0]})
-        self.assertEqual(data['user'], {
-            'Public streams': [0], 'Private streams': [0],
-            'Private messages': [0], 'Group private messages': [0]})
+        self.assertEqual(
+            data['everyone'],
+            {
+                'Public streams': [0],
+                'Private streams': [0],
+                'Private messages': [0],
+                'Group private messages': [0],
+            },
+        )
+        self.assertEqual(
+            data['user'],
+            {
+                'Public streams': [0],
+                'Private streams': [0],
+                'Private messages': [0],
+                'Group private messages': [0],
+            },
+        )
 
         FillState.objects.create(
-            property='messages_sent:client:day', end_time=self.end_times_day[0],
-            state=FillState.DONE)
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_by_client'})
+            property='messages_sent:client:day',
+            end_time=self.end_times_day[0],
+            state=FillState.DONE,
+        )
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_by_client'}
+        )
         self.assert_json_success(result)
         data = result.json()
         self.assertEqual(data['everyone'], {})
@@ -266,20 +343,30 @@ class TestGetChartData(ZulipTestCase):
         end_time_timestamps = [datetime_to_timestamp(dt) for dt in self.end_times_day]
 
         # valid start and end
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'number_of_humans',
-                                  'start': end_time_timestamps[1],
-                                  'end': end_time_timestamps[2]})
+        result = self.client_get(
+            '/json/analytics/chart_data',
+            {
+                'chart_name': 'number_of_humans',
+                'start': end_time_timestamps[1],
+                'end': end_time_timestamps[2],
+            },
+        )
         self.assert_json_success(result)
         data = result.json()
         self.assertEqual(data['end_times'], end_time_timestamps[1:3])
-        self.assertEqual(data['everyone'], {'_1day': [0, 100], '_15day': [0, 100], 'all_time': [0, 100]})
+        self.assertEqual(
+            data['everyone'], {'_1day': [0, 100], '_15day': [0, 100], 'all_time': [0, 100]}
+        )
 
         # start later then end
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'number_of_humans',
-                                  'start': end_time_timestamps[2],
-                                  'end': end_time_timestamps[1]})
+        result = self.client_get(
+            '/json/analytics/chart_data',
+            {
+                'chart_name': 'number_of_humans',
+                'start': end_time_timestamps[2],
+                'end': end_time_timestamps[1],
+            },
+        )
         self.assert_json_error_contains(result, 'Start time is later than')
 
     def test_min_length(self) -> None:
@@ -290,26 +377,39 @@ class TestGetChartData(ZulipTestCase):
         stat = COUNT_STATS['active_users_audit:is_bot:day']
         self.insert_data(stat, ['false'], [])
         # test min_length is too short to change anything
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'number_of_humans',
-                                  'min_length': 2})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'number_of_humans', 'min_length': 2}
+        )
         self.assert_json_success(result)
         data = result.json()
-        self.assertEqual(data['end_times'], [datetime_to_timestamp(dt) for dt in self.end_times_day])
-        self.assertEqual(data['everyone'], {'_1day': self.data(100), '_15day': self.data(100), 'all_time': self.data(100)})
+        self.assertEqual(
+            data['end_times'], [datetime_to_timestamp(dt) for dt in self.end_times_day]
+        )
+        self.assertEqual(
+            data['everyone'],
+            {'_1day': self.data(100), '_15day': self.data(100), 'all_time': self.data(100)},
+        )
         # test min_length larger than filled data
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'number_of_humans',
-                                  'min_length': 5})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'number_of_humans', 'min_length': 5}
+        )
         self.assert_json_success(result)
         data = result.json()
-        end_times = [ceiling_to_day(self.realm.date_created) + timedelta(days=i) for i in range(-1, 4)]
+        end_times = [
+            ceiling_to_day(self.realm.date_created) + timedelta(days=i) for i in range(-1, 4)
+        ]
         self.assertEqual(data['end_times'], [datetime_to_timestamp(dt) for dt in end_times])
-        self.assertEqual(data['everyone'], {'_1day': [0, *self.data(100)], '_15day': [0, *self.data(100)], 'all_time': [0, *self.data(100)]})
+        self.assertEqual(
+            data['everyone'],
+            {
+                '_1day': [0, *self.data(100)],
+                '_15day': [0, *self.data(100)],
+                'all_time': [0, *self.data(100)],
+            },
+        )
 
     def test_non_existent_chart(self) -> None:
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'does_not_exist'})
+        result = self.client_get('/json/analytics/chart_data', {'chart_name': 'does_not_exist'})
         self.assert_json_error_contains(result, 'Unknown chart name')
 
     def test_analytics_not_running(self) -> None:
@@ -320,49 +420,72 @@ class TestGetChartData(ZulipTestCase):
         realm.date_created = timezone_now() - timedelta(days=3)
         realm.save(update_fields=["date_created"])
         with self.assertLogs(level="WARNING") as m:
-            result = self.client_get('/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'})
-            self.assertEqual(m.output, [f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: 0001-01-01 00:00:00+00:00 (last successful analytics update). Is the analytics cron job running?"])
+            result = self.client_get(
+                '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+            )
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: 0001-01-01 00:00:00+00:00 (last successful analytics update). Is the analytics cron job running?"
+                ],
+            )
 
         self.assert_json_error_contains(result, 'No analytics data available')
 
         realm.date_created = timezone_now() - timedelta(days=1, hours=2)
         realm.save(update_fields=["date_created"])
         with self.assertLogs(level="WARNING") as m:
-            result = self.client_get('/json/analytics/chart_data',
-                                     {'chart_name': 'messages_sent_over_time'})
-            self.assertEqual(m.output, [f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: 0001-01-01 00:00:00+00:00 (last successful analytics update). Is the analytics cron job running?"])
+            result = self.client_get(
+                '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+            )
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: 0001-01-01 00:00:00+00:00 (last successful analytics update). Is the analytics cron job running?"
+                ],
+            )
 
         self.assert_json_error_contains(result, 'No analytics data available')
 
         realm.date_created = timezone_now() - timedelta(days=1, minutes=10)
         realm.save(update_fields=["date_created"])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
 
         realm.date_created = timezone_now() - timedelta(hours=10)
         realm.save(update_fields=["date_created"])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
 
         end_time = timezone_now() - timedelta(days=5)
-        fill_state = FillState.objects.create(property='messages_sent:is_bot:hour', end_time=end_time,
-                                              state=FillState.DONE)
+        fill_state = FillState.objects.create(
+            property='messages_sent:is_bot:hour', end_time=end_time, state=FillState.DONE
+        )
 
         realm.date_created = timezone_now() - timedelta(days=3)
         realm.save(update_fields=["date_created"])
         with self.assertLogs(level="WARNING") as m:
-            result = self.client_get('/json/analytics/chart_data',
-                                     {'chart_name': 'messages_sent_over_time'})
-            self.assertEqual(m.output, [f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: {end_time} (last successful analytics update). Is the analytics cron job running?"])
+            result = self.client_get(
+                '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+            )
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: {end_time} (last successful analytics update). Is the analytics cron job running?"
+                ],
+            )
 
         self.assert_json_error_contains(result, 'No analytics data available')
 
         realm.date_created = timezone_now() - timedelta(days=1, minutes=10)
         realm.save(update_fields=["date_created"])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
 
         end_time = timezone_now() - timedelta(days=2)
@@ -371,30 +494,40 @@ class TestGetChartData(ZulipTestCase):
 
         realm.date_created = timezone_now() - timedelta(days=3)
         realm.save(update_fields=["date_created"])
-        result = self.client_get('/json/analytics/chart_data',
-                                 {'chart_name': 'messages_sent_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
 
         realm.date_created = timezone_now() - timedelta(days=1, hours=2)
         realm.save(update_fields=["date_created"])
         with self.assertLogs(level="WARNING") as m:
-            result = self.client_get('/json/analytics/chart_data',
-                                     {'chart_name': 'messages_sent_over_time'})
-            self.assertEqual(m.output, [f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: {end_time} (last successful analytics update). Is the analytics cron job running?"])
+            result = self.client_get(
+                '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+            )
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:User from realm zulip attempted to access /stats, but the computed start time: {realm.date_created} (creation of realm or installation) is later than the computed end time: {end_time} (last successful analytics update). Is the analytics cron job running?"
+                ],
+            )
 
         self.assert_json_error_contains(result, 'No analytics data available')
 
         realm.date_created = timezone_now() - timedelta(days=1, minutes=10)
         realm.save(update_fields=["date_created"])
-        result = self.client_get('/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'})
+        result = self.client_get(
+            '/json/analytics/chart_data', {'chart_name': 'messages_sent_over_time'}
+        )
         self.assert_json_success(result)
 
     def test_get_chart_data_for_realm(self) -> None:
         user = self.example_user('hamlet')
         self.login_user(user)
 
-        result = self.client_get('/json/analytics/chart_data/realm/zulip',
-                                 {'chart_name': 'number_of_humans'})
+        result = self.client_get(
+            '/json/analytics/chart_data/realm/zulip', {'chart_name': 'number_of_humans'}
+        )
         self.assert_json_error(result, "Must be an server administrator", 400)
 
         user = self.example_user('hamlet')
@@ -403,20 +536,24 @@ class TestGetChartData(ZulipTestCase):
         stat = COUNT_STATS['realm_active_humans::day']
         self.insert_data(stat, [None], [])
 
-        result = self.client_get('/json/analytics/chart_data/realm/not_existing_realm',
-                                 {'chart_name': 'number_of_humans'})
+        result = self.client_get(
+            '/json/analytics/chart_data/realm/not_existing_realm',
+            {'chart_name': 'number_of_humans'},
+        )
         self.assert_json_error(result, 'Invalid organization', 400)
 
-        result = self.client_get('/json/analytics/chart_data/realm/zulip',
-                                 {'chart_name': 'number_of_humans'})
+        result = self.client_get(
+            '/json/analytics/chart_data/realm/zulip', {'chart_name': 'number_of_humans'}
+        )
         self.assert_json_success(result)
 
     def test_get_chart_data_for_installation(self) -> None:
         user = self.example_user('hamlet')
         self.login_user(user)
 
-        result = self.client_get('/json/analytics/chart_data/installation',
-                                 {'chart_name': 'number_of_humans'})
+        result = self.client_get(
+            '/json/analytics/chart_data/installation', {'chart_name': 'number_of_humans'}
+        )
         self.assert_json_error(result, "Must be an server administrator", 400)
 
         user = self.example_user('hamlet')
@@ -425,91 +562,139 @@ class TestGetChartData(ZulipTestCase):
         stat = COUNT_STATS['realm_active_humans::day']
         self.insert_data(stat, [None], [])
 
-        result = self.client_get('/json/analytics/chart_data/installation',
-                                 {'chart_name': 'number_of_humans'})
+        result = self.client_get(
+            '/json/analytics/chart_data/installation', {'chart_name': 'number_of_humans'}
+        )
         self.assert_json_success(result)
 
+
 class TestSupportEndpoint(ZulipTestCase):
     def test_search(self) -> None:
         reset_emails_in_zulip_realm()
 
         def check_hamlet_user_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">user</span>\n', '<h3>King Hamlet</h3>',
-                                             '<b>Email</b>: hamlet@zulip.com', '<b>Is active</b>: True<br>',
-                                             '<b>Admins</b>: desdemona@zulip.com, iago@zulip.com\n',
-                                             'class="copy-button" data-copytext="desdemona@zulip.com, iago@zulip.com"',
-                                             ], result)
+            self.assert_in_success_response(
+                [
+                    '<span class="label">user</span>\n',
+                    '<h3>King Hamlet</h3>',
+                    '<b>Email</b>: hamlet@zulip.com',
+                    '<b>Is active</b>: True<br>',
+                    '<b>Admins</b>: desdemona@zulip.com, iago@zulip.com\n',
+                    'class="copy-button" data-copytext="desdemona@zulip.com, iago@zulip.com"',
+                ],
+                result,
+            )
 
         def check_othello_user_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">user</span>\n', '<h3>Othello, the Moor of Venice</h3>',
-                                             '<b>Email</b>: othello@zulip.com', '<b>Is active</b>: True<br>'
-                                             ], result)
+            self.assert_in_success_response(
+                [
+                    '<span class="label">user</span>\n',
+                    '<h3>Othello, the Moor of Venice</h3>',
+                    '<b>Email</b>: othello@zulip.com',
+                    '<b>Is active</b>: True<br>',
+                ],
+                result,
+            )
 
         def check_zulip_realm_query_result(result: HttpResponse) -> None:
             zulip_realm = get_realm("zulip")
-            self.assert_in_success_response([f'<input type="hidden" name="realm_id" value="{zulip_realm.id}"',
-                                             'Zulip Dev</h3>',
-                                             '<option value="1" selected>Self hosted</option>',
-                                             '<option value="2" >Limited</option>',
-                                             'input type="number" name="discount" value="None"',
-                                             '<option value="active" selected>Active</option>',
-                                             '<option value="deactivated" >Deactivated</option>',
-                                             'scrub-realm-button">',
-                                             'data-string-id="zulip"'], result)
+            self.assert_in_success_response(
+                [
+                    f'<input type="hidden" name="realm_id" value="{zulip_realm.id}"',
+                    'Zulip Dev</h3>',
+                    '<option value="1" selected>Self hosted</option>',
+                    '<option value="2" >Limited</option>',
+                    'input type="number" name="discount" value="None"',
+                    '<option value="active" selected>Active</option>',
+                    '<option value="deactivated" >Deactivated</option>',
+                    'scrub-realm-button">',
+                    'data-string-id="zulip"',
+                ],
+                result,
+            )
 
         def check_lear_realm_query_result(result: HttpResponse) -> None:
             lear_realm = get_realm("lear")
-            self.assert_in_success_response([f'<input type="hidden" name="realm_id" value="{lear_realm.id}"',
-                                             'Lear &amp; Co.</h3>',
-                                             '<option value="1" selected>Self hosted</option>',
-                                             '<option value="2" >Limited</option>',
-                                             'input type="number" name="discount" value="None"',
-                                             '<option value="active" selected>Active</option>',
-                                             '<option value="deactivated" >Deactivated</option>',
-                                             'scrub-realm-button">',
-                                             'data-string-id="lear"',
-                                             '<b>Name</b>: Zulip Standard',
-                                             '<b>Status</b>: Active',
-                                             '<b>Billing schedule</b>: Annual',
-                                             '<b>Licenses</b>: 2/10 (Manual)',
-                                             '<b>Price per license</b>: $80.0',
-                                             '<b>Next invoice date</b>: 02 January 2017',
-                                             '<option value="send_invoice" selected>',
-                                             '<option value="charge_automatically" >'
-                                             ], result)
+            self.assert_in_success_response(
+                [
+                    f'<input type="hidden" name="realm_id" value="{lear_realm.id}"',
+                    'Lear &amp; Co.</h3>',
+                    '<option value="1" selected>Self hosted</option>',
+                    '<option value="2" >Limited</option>',
+                    'input type="number" name="discount" value="None"',
+                    '<option value="active" selected>Active</option>',
+                    '<option value="deactivated" >Deactivated</option>',
+                    'scrub-realm-button">',
+                    'data-string-id="lear"',
+                    '<b>Name</b>: Zulip Standard',
+                    '<b>Status</b>: Active',
+                    '<b>Billing schedule</b>: Annual',
+                    '<b>Licenses</b>: 2/10 (Manual)',
+                    '<b>Price per license</b>: $80.0',
+                    '<b>Next invoice date</b>: 02 January 2017',
+                    '<option value="send_invoice" selected>',
+                    '<option value="charge_automatically" >',
+                ],
+                result,
+            )
 
-        def check_preregistration_user_query_result(result: HttpResponse, email: str, invite: bool=False) -> None:
-            self.assert_in_success_response(['<span class="label">preregistration user</span>\n',
-                                             f'<b>Email</b>: {email}',
-                                             ], result)
+        def check_preregistration_user_query_result(
+            result: HttpResponse, email: str, invite: bool = False
+        ) -> None:
+            self.assert_in_success_response(
+                [
+                    '<span class="label">preregistration user</span>\n',
+                    f'<b>Email</b>: {email}',
+                ],
+                result,
+            )
             if invite:
                 self.assert_in_success_response(['<span class="label">invite</span>'], result)
-                self.assert_in_success_response(['<b>Expires in</b>: 1\xa0week, 3',
-                                                 '<b>Status</b>: Link has never been clicked'], result)
+                self.assert_in_success_response(
+                    [
+                        '<b>Expires in</b>: 1\xa0week, 3',
+                        '<b>Status</b>: Link has never been clicked',
+                    ],
+                    result,
+                )
                 self.assert_in_success_response([], result)
             else:
                 self.assert_not_in_success_response(['<span class="label">invite</span>'], result)
-                self.assert_in_success_response(['<b>Expires in</b>: 1\xa0day',
-                                                 '<b>Status</b>: Link has never been clicked'], result)
+                self.assert_in_success_response(
+                    ['<b>Expires in</b>: 1\xa0day', '<b>Status</b>: Link has never been clicked'],
+                    result,
+                )
 
         def check_realm_creation_query_result(result: HttpResponse, email: str) -> None:
-            self.assert_in_success_response(['<span class="label">preregistration user</span>\n',
-                                             '<span class="label">realm creation</span>\n',
-                                             '<b>Link</b>: http://testserver/accounts/do_confirm/',
-                                             '<b>Expires in</b>: 1\xa0day<br>\n',
-                                             ], result)
+            self.assert_in_success_response(
+                [
+                    '<span class="label">preregistration user</span>\n',
+                    '<span class="label">realm creation</span>\n',
+                    '<b>Link</b>: http://testserver/accounts/do_confirm/',
+                    '<b>Expires in</b>: 1\xa0day<br>\n',
+                ],
+                result,
+            )
 
         def check_multiuse_invite_link_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">multiuse invite</span>\n',
-                                             '<b>Link</b>: http://zulip.testserver/join/',
-                                             '<b>Expires in</b>: 1\xa0week, 3',
-                                             ], result)
+            self.assert_in_success_response(
+                [
+                    '<span class="label">multiuse invite</span>\n',
+                    '<b>Link</b>: http://zulip.testserver/join/',
+                    '<b>Expires in</b>: 1\xa0week, 3',
+                ],
+                result,
+            )
 
         def check_realm_reactivation_link_query_result(result: HttpResponse) -> None:
-            self.assert_in_success_response(['<span class="label">realm reactivation</span>\n',
-                                             '<b>Link</b>: http://zulip.testserver/reactivate/',
-                                             '<b>Expires in</b>: 1\xa0day',
-                                             ], result)
+            self.assert_in_success_response(
+                [
+                    '<span class="label">realm reactivation</span>\n',
+                    '<b>Link</b>: http://zulip.testserver/reactivate/',
+                    '<b>Expires in</b>: 1\xa0day',
+                ],
+                result,
+            )
 
         self.login('cordelia')
 
@@ -521,14 +706,26 @@ class TestSupportEndpoint(ZulipTestCase):
 
         customer = Customer.objects.create(realm=get_realm("lear"), stripe_customer_id='cus_123')
         now = datetime(2016, 1, 2, tzinfo=timezone.utc)
-        plan = CustomerPlan.objects.create(customer=customer, billing_cycle_anchor=now,
-                                           billing_schedule=CustomerPlan.ANNUAL, tier=CustomerPlan.STANDARD,
-                                           price_per_license=8000, next_invoice_date=add_months(now, 12))
-        LicenseLedger.objects.create(licenses=10, licenses_at_next_renewal=10, event_time=timezone_now(),
-                                     is_renewal=True, plan=plan)
+        plan = CustomerPlan.objects.create(
+            customer=customer,
+            billing_cycle_anchor=now,
+            billing_schedule=CustomerPlan.ANNUAL,
+            tier=CustomerPlan.STANDARD,
+            price_per_license=8000,
+            next_invoice_date=add_months(now, 12),
+        )
+        LicenseLedger.objects.create(
+            licenses=10,
+            licenses_at_next_renewal=10,
+            event_time=timezone_now(),
+            is_renewal=True,
+            plan=plan,
+        )
 
         result = self.client_get("/activity/support")
-        self.assert_in_success_response(['<input type="text" name="q" class="input-xxlarge search-query"'], result)
+        self.assert_in_success_response(
+            ['<input type="text" name="q" class="input-xxlarge search-query"'], result
+        )
 
         result = self.client_get("/activity/support", {"q": "hamlet@zulip.com"})
         check_hamlet_user_query_result(result)
@@ -571,9 +768,14 @@ class TestSupportEndpoint(ZulipTestCase):
 
         stream_ids = [self.get_stream_id("Denmark")]
         invitee_emails = [self.nonreg_email("test1")]
-        self.client_post("/json/invites", {"invitee_emails": invitee_emails,
-                                           "stream_ids": orjson.dumps(stream_ids).decode(),
-                                           "invite_as": PreregistrationUser.INVITE_AS['MEMBER']})
+        self.client_post(
+            "/json/invites",
+            {
+                "invitee_emails": invitee_emails,
+                "stream_ids": orjson.dumps(stream_ids).decode(),
+                "invite_as": PreregistrationUser.INVITE_AS['MEMBER'],
+            },
+        )
         result = self.client_get("/activity/support", {"q": self.nonreg_email("test1")})
         check_preregistration_user_query_result(result, self.nonreg_email("test1"), invite=True)
         check_zulip_realm_query_result(result)
@@ -599,28 +801,41 @@ class TestSupportEndpoint(ZulipTestCase):
         cordelia = self.example_user('cordelia')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{cordelia.realm_id}", "plan_type": "2"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{cordelia.realm_id}", "plan_type": "2"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
         iago = self.example_user("iago")
         self.login_user(iago)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{iago.realm_id}", "billing_method": "charge_automatically"})
+        result = self.client_post(
+            "/activity/support",
+            {"realm_id": f"{iago.realm_id}", "billing_method": "charge_automatically"},
+        )
         m.assert_called_once_with(get_realm("zulip"), charge_automatically=True)
-        self.assert_in_success_response(["Billing method of zulip updated to charge automatically"], result)
+        self.assert_in_success_response(
+            ["Billing method of zulip updated to charge automatically"], result
+        )
 
         m.reset_mock()
 
-        result = self.client_post("/activity/support", {"realm_id": f"{iago.realm_id}", "billing_method": "send_invoice"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{iago.realm_id}", "billing_method": "send_invoice"}
+        )
         m.assert_called_once_with(get_realm("zulip"), charge_automatically=False)
-        self.assert_in_success_response(["Billing method of zulip updated to pay by invoice"], result)
+        self.assert_in_success_response(
+            ["Billing method of zulip updated to pay by invoice"], result
+        )
 
     def test_change_plan_type(self) -> None:
         cordelia = self.example_user('cordelia')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{cordelia.realm_id}", "plan_type": "2"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{cordelia.realm_id}", "plan_type": "2"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
@@ -628,23 +843,31 @@ class TestSupportEndpoint(ZulipTestCase):
         self.login_user(iago)
 
         with mock.patch("analytics.views.do_change_plan_type") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{iago.realm_id}", "plan_type": "2"})
+            result = self.client_post(
+                "/activity/support", {"realm_id": f"{iago.realm_id}", "plan_type": "2"}
+            )
             m.assert_called_once_with(get_realm("zulip"), 2)
-            self.assert_in_success_response(["Plan type of zulip changed from self hosted to limited"], result)
+            self.assert_in_success_response(
+                ["Plan type of zulip changed from self hosted to limited"], result
+            )
 
     def test_attach_discount(self) -> None:
         cordelia = self.example_user('cordelia')
         lear_realm = get_realm('lear')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "discount": "25"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "discount": "25"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
         self.login('iago')
 
         with mock.patch("analytics.views.attach_discount_to_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "discount": "25"})
+            result = self.client_post(
+                "/activity/support", {"realm_id": f"{lear_realm.id}", "discount": "25"}
+            )
             m.assert_called_once_with(get_realm("lear"), 25)
             self.assert_in_success_response(["Discount of lear changed to 25% from 0%"], result)
 
@@ -655,26 +878,29 @@ class TestSupportEndpoint(ZulipTestCase):
         cordelia = self.example_user('cordelia')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}",
-                                                        "sponsorship_pending": "true"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "sponsorship_pending": "true"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
         iago = self.example_user("iago")
         self.login_user(iago)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}",
-                                                        "sponsorship_pending": "true"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "sponsorship_pending": "true"}
+        )
         self.assert_in_success_response(["lear marked as pending sponsorship."], result)
         customer = get_customer_by_realm(lear_realm)
-        assert(customer is not None)
+        assert customer is not None
         self.assertTrue(customer.sponsorship_pending)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}",
-                                                        "sponsorship_pending": "false"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "sponsorship_pending": "false"}
+        )
         self.assert_in_success_response(["lear is no longer pending sponsorship."], result)
         customer = get_customer_by_realm(lear_realm)
-        assert(customer is not None)
+        assert customer is not None
         self.assertFalse(customer.sponsorship_pending)
 
     def test_approve_sponsorship(self) -> None:
@@ -687,24 +913,30 @@ class TestSupportEndpoint(ZulipTestCase):
         cordelia = self.example_user('cordelia')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}",
-                                                        "approve_sponsorship": "approve_sponsorship"})
+        result = self.client_post(
+            "/activity/support",
+            {"realm_id": f"{lear_realm.id}", "approve_sponsorship": "approve_sponsorship"},
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
         iago = self.example_user("iago")
         self.login_user(iago)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}",
-                                                        "approve_sponsorship": "approve_sponsorship"})
+        result = self.client_post(
+            "/activity/support",
+            {"realm_id": f"{lear_realm.id}", "approve_sponsorship": "approve_sponsorship"},
+        )
         self.assert_in_success_response(["Sponsorship approved for lear"], result)
         lear_realm.refresh_from_db()
         self.assertEqual(lear_realm.plan_type, Realm.STANDARD_FREE)
         customer = get_customer_by_realm(lear_realm)
-        assert(customer is not None)
+        assert customer is not None
         self.assertFalse(customer.sponsorship_pending)
         messages = UserMessage.objects.filter(user_profile=king_user)
-        self.assertIn("request for sponsored hosting has been approved", messages[0].message.content)
+        self.assertIn(
+            "request for sponsored hosting has been approved", messages[0].message.content
+        )
         self.assertEqual(len(messages), 1)
 
     def test_activate_or_deactivate_realm(self) -> None:
@@ -712,34 +944,45 @@ class TestSupportEndpoint(ZulipTestCase):
         lear_realm = get_realm('lear')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "status": "deactivated"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "status": "deactivated"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
         self.login('iago')
 
         with mock.patch("analytics.views.do_deactivate_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "status": "deactivated"})
+            result = self.client_post(
+                "/activity/support", {"realm_id": f"{lear_realm.id}", "status": "deactivated"}
+            )
             m.assert_called_once_with(lear_realm, self.example_user("iago"))
             self.assert_in_success_response(["lear deactivated"], result)
 
         with mock.patch("analytics.views.do_send_realm_reactivation_email") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "status": "active"})
+            result = self.client_post(
+                "/activity/support", {"realm_id": f"{lear_realm.id}", "status": "active"}
+            )
             m.assert_called_once_with(lear_realm)
-            self.assert_in_success_response(["Realm reactivation email sent to admins of lear"], result)
+            self.assert_in_success_response(
+                ["Realm reactivation email sent to admins of lear"], result
+            )
 
     def test_change_subdomain(self) -> None:
         cordelia = self.example_user('cordelia')
         lear_realm = get_realm('lear')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}",
-                                                        "new_subdomain": "new_name"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "new_name"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
         self.login('iago')
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "new-name"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "new-name"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/activity/support?q=new-name")
         realm_id = lear_realm.id
@@ -748,19 +991,33 @@ class TestSupportEndpoint(ZulipTestCase):
         self.assertTrue(Realm.objects.filter(string_id='lear').exists())
         self.assertTrue(Realm.objects.filter(string_id='lear')[0].deactivated)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "new-name"})
-        self.assert_in_success_response(["Subdomain unavailable. Please choose a different one."], result)
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "new-name"}
+        )
+        self.assert_in_success_response(
+            ["Subdomain unavailable. Please choose a different one."], result
+        )
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "zulip"})
-        self.assert_in_success_response(["Subdomain unavailable. Please choose a different one."], result)
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "zulip"}
+        )
+        self.assert_in_success_response(
+            ["Subdomain unavailable. Please choose a different one."], result
+        )
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "lear"})
-        self.assert_in_success_response(["Subdomain unavailable. Please choose a different one."], result)
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "new_subdomain": "lear"}
+        )
+        self.assert_in_success_response(
+            ["Subdomain unavailable. Please choose a different one."], result
+        )
 
     def test_downgrade_realm(self) -> None:
         cordelia = self.example_user('cordelia')
         self.login_user(cordelia)
-        result = self.client_post("/activity/support", {"realm_id": f"{cordelia.realm_id}", "plan_type": "2"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{cordelia.realm_id}", "plan_type": "2"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
@@ -768,38 +1025,63 @@ class TestSupportEndpoint(ZulipTestCase):
         self.login_user(iago)
 
         with mock.patch("analytics.views.downgrade_at_the_end_of_billing_cycle") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{iago.realm_id}",
-                                      "downgrade_method": "downgrade_at_billing_cycle_end"})
+            result = self.client_post(
+                "/activity/support",
+                {
+                    "realm_id": f"{iago.realm_id}",
+                    "downgrade_method": "downgrade_at_billing_cycle_end",
+                },
+            )
             m.assert_called_once_with(get_realm("zulip"))
-            self.assert_in_success_response(["zulip marked for downgrade at the end of billing cycle"], result)
+            self.assert_in_success_response(
+                ["zulip marked for downgrade at the end of billing cycle"], result
+            )
 
         with mock.patch("analytics.views.downgrade_now_without_creating_additional_invoices") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{iago.realm_id}",
-                                      "downgrade_method": "downgrade_now_without_additional_licenses"})
+            result = self.client_post(
+                "/activity/support",
+                {
+                    "realm_id": f"{iago.realm_id}",
+                    "downgrade_method": "downgrade_now_without_additional_licenses",
+                },
+            )
             m.assert_called_once_with(get_realm("zulip"))
-            self.assert_in_success_response(["zulip downgraded without creating additional invoices"], result)
+            self.assert_in_success_response(
+                ["zulip downgraded without creating additional invoices"], result
+            )
 
         with mock.patch("analytics.views.downgrade_now_without_creating_additional_invoices") as m1:
             with mock.patch("analytics.views.void_all_open_invoices", return_value=1) as m2:
-                result = self.client_post("/activity/support", {"realm_id": f"{iago.realm_id}",
-                                          "downgrade_method": "downgrade_now_void_open_invoices"})
+                result = self.client_post(
+                    "/activity/support",
+                    {
+                        "realm_id": f"{iago.realm_id}",
+                        "downgrade_method": "downgrade_now_void_open_invoices",
+                    },
+                )
                 m1.assert_called_once_with(get_realm("zulip"))
                 m2.assert_called_once_with(get_realm("zulip"))
-                self.assert_in_success_response(["zulip downgraded and voided 1 open invoices"], result)
+                self.assert_in_success_response(
+                    ["zulip downgraded and voided 1 open invoices"], result
+                )
 
     def test_scrub_realm(self) -> None:
         cordelia = self.example_user('cordelia')
         lear_realm = get_realm('lear')
         self.login_user(cordelia)
 
-        result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "discount": "25"})
+        result = self.client_post(
+            "/activity/support", {"realm_id": f"{lear_realm.id}", "discount": "25"}
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], "/login/")
 
         self.login('iago')
 
         with mock.patch("analytics.views.do_scrub_realm") as m:
-            result = self.client_post("/activity/support", {"realm_id": f"{lear_realm.id}", "scrub_realm": "scrub_realm"})
+            result = self.client_post(
+                "/activity/support", {"realm_id": f"{lear_realm.id}", "scrub_realm": "scrub_realm"}
+            )
             m.assert_called_once_with(lear_realm, acting_user=self.example_user("iago"))
             self.assert_in_success_response(["lear scrubbed"], result)
 
@@ -808,6 +1090,7 @@ class TestSupportEndpoint(ZulipTestCase):
             self.assert_json_error(result, "Invalid parameters")
             m.assert_not_called()
 
+
 class TestGetChartDataHelpers(ZulipTestCase):
     def test_sort_by_totals(self) -> None:
         empty: List[int] = []
@@ -815,10 +1098,13 @@ class TestGetChartDataHelpers(ZulipTestCase):
         self.assertEqual(sort_by_totals(value_arrays), ['a', 'b', 'c', 'd'])
 
     def test_sort_client_labels(self) -> None:
-        data = {'everyone': {'a': [16], 'c': [15], 'b': [14], 'e': [13], 'd': [12], 'h': [11]},
-                'user': {'a': [6], 'b': [5], 'd': [4], 'e': [3], 'f': [2], 'g': [1]}}
+        data = {
+            'everyone': {'a': [16], 'c': [15], 'b': [14], 'e': [13], 'd': [12], 'h': [11]},
+            'user': {'a': [6], 'b': [5], 'd': [4], 'e': [3], 'f': [2], 'g': [1]},
+        }
         self.assertEqual(sort_client_labels(data), ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'])
 
+
 class TestTimeRange(ZulipTestCase):
     def test_time_range(self) -> None:
         HOUR = timedelta(hours=1)
@@ -835,38 +1121,53 @@ class TestTimeRange(ZulipTestCase):
         self.assertEqual(time_range(floor_hour, floor_hour, CountStat.HOUR, 0), [floor_hour])
         self.assertEqual(time_range(floor_day, floor_day, CountStat.DAY, 0), [floor_day])
         # test start and end on different boundaries
-        self.assertEqual(time_range(floor_hour, floor_hour+HOUR, CountStat.HOUR, None),
-                         [floor_hour, floor_hour+HOUR])
-        self.assertEqual(time_range(floor_day, floor_day+DAY, CountStat.DAY, None),
-                         [floor_day, floor_day+DAY])
+        self.assertEqual(
+            time_range(floor_hour, floor_hour + HOUR, CountStat.HOUR, None),
+            [floor_hour, floor_hour + HOUR],
+        )
+        self.assertEqual(
+            time_range(floor_day, floor_day + DAY, CountStat.DAY, None),
+            [floor_day, floor_day + DAY],
+        )
         # test min_length
-        self.assertEqual(time_range(floor_hour, floor_hour+HOUR, CountStat.HOUR, 4),
-                         [floor_hour-2*HOUR, floor_hour-HOUR, floor_hour, floor_hour+HOUR])
-        self.assertEqual(time_range(floor_day, floor_day+DAY, CountStat.DAY, 4),
-                         [floor_day-2*DAY, floor_day-DAY, floor_day, floor_day+DAY])
+        self.assertEqual(
+            time_range(floor_hour, floor_hour + HOUR, CountStat.HOUR, 4),
+            [floor_hour - 2 * HOUR, floor_hour - HOUR, floor_hour, floor_hour + HOUR],
+        )
+        self.assertEqual(
+            time_range(floor_day, floor_day + DAY, CountStat.DAY, 4),
+            [floor_day - 2 * DAY, floor_day - DAY, floor_day, floor_day + DAY],
+        )
+
 
 class TestMapArrays(ZulipTestCase):
     def test_map_arrays(self) -> None:
-        a = {'desktop app 1.0': [1, 2, 3],
-             'desktop app 2.0': [10, 12, 13],
-             'desktop app 3.0': [21, 22, 23],
-             'website': [1, 2, 3],
-             'ZulipiOS': [1, 2, 3],
-             'ZulipElectron': [2, 5, 7],
-             'ZulipMobile': [1, 5, 7],
-             'ZulipPython': [1, 2, 3],
-             'API: Python': [1, 2, 3],
-             'SomethingRandom': [4, 5, 6],
-             'ZulipGitHubWebhook': [7, 7, 9],
-             'ZulipAndroid': [64, 63, 65]}
+        a = {
+            'desktop app 1.0': [1, 2, 3],
+            'desktop app 2.0': [10, 12, 13],
+            'desktop app 3.0': [21, 22, 23],
+            'website': [1, 2, 3],
+            'ZulipiOS': [1, 2, 3],
+            'ZulipElectron': [2, 5, 7],
+            'ZulipMobile': [1, 5, 7],
+            'ZulipPython': [1, 2, 3],
+            'API: Python': [1, 2, 3],
+            'SomethingRandom': [4, 5, 6],
+            'ZulipGitHubWebhook': [7, 7, 9],
+            'ZulipAndroid': [64, 63, 65],
+        }
         result = rewrite_client_arrays(a)
-        self.assertEqual(result,
-                         {'Old desktop app': [32, 36, 39],
-                          'Old iOS app': [1, 2, 3],
-                          'Desktop app': [2, 5, 7],
-                          'Mobile app': [1, 5, 7],
-                          'Website': [1, 2, 3],
-                          'Python API': [2, 4, 6],
-                          'SomethingRandom': [4, 5, 6],
-                          'GitHub webhook': [7, 7, 9],
-                          'Old Android app': [64, 63, 65]})
+        self.assertEqual(
+            result,
+            {
+                'Old desktop app': [32, 36, 39],
+                'Old iOS app': [1, 2, 3],
+                'Desktop app': [2, 5, 7],
+                'Mobile app': [1, 5, 7],
+                'Website': [1, 2, 3],
+                'Python API': [2, 4, 6],
+                'SomethingRandom': [4, 5, 6],
+                'GitHub webhook': [7, 7, 9],
+                'Old Android app': [64, 63, 65],
+            },
+        )
diff --git a/analytics/urls.py b/analytics/urls.py
index 8f36e94310..74247c246e 100644
--- a/analytics/urls.py
+++ b/analytics/urls.py
@@ -22,21 +22,17 @@ from zerver.lib.rest import rest_path
 i18n_urlpatterns = [
     # Server admin (user_profile.is_staff) visible stats pages
     path('activity', get_activity),
-    path('activity/support', support,
-         name='support'),
+    path('activity/support', support, name='support'),
     path('realm_activity/<realm_str>/', get_realm_activity),
     path('user_activity/<email>/', get_user_activity),
-
     path('stats/realm/<realm_str>/', stats_for_realm),
     path('stats/installation', stats_for_installation),
-    path('stats/remote/<int:remote_server_id>/installation',
-         stats_for_remote_installation),
-    path('stats/remote/<int:remote_server_id>/realm/<int:remote_realm_id>/',
-         stats_for_remote_realm),
-
+    path('stats/remote/<int:remote_server_id>/installation', stats_for_remote_installation),
+    path(
+        'stats/remote/<int:remote_server_id>/realm/<int:remote_realm_id>/', stats_for_remote_realm
+    ),
     # User-visible stats page
-    path('stats', stats,
-         name='stats'),
+    path('stats', stats, name='stats'),
 ]
 
 # These endpoints are a part of the API (V1), which uses:
@@ -49,16 +45,17 @@ i18n_urlpatterns = [
 # All of these paths are accessed by either a /json or /api prefix
 v1_api_and_json_patterns = [
     # get data for the graphs at /stats
-    rest_path('analytics/chart_data',
-              GET=get_chart_data),
-    rest_path('analytics/chart_data/realm/<realm_str>',
-              GET=get_chart_data_for_realm),
-    rest_path('analytics/chart_data/installation',
-              GET=get_chart_data_for_installation),
-    rest_path('analytics/chart_data/remote/<int:remote_server_id>/installation',
-              GET=get_chart_data_for_remote_installation),
-    rest_path('analytics/chart_data/remote/<int:remote_server_id>/realm/<int:remote_realm_id>',
-              GET=get_chart_data_for_remote_realm),
+    rest_path('analytics/chart_data', GET=get_chart_data),
+    rest_path('analytics/chart_data/realm/<realm_str>', GET=get_chart_data_for_realm),
+    rest_path('analytics/chart_data/installation', GET=get_chart_data_for_installation),
+    rest_path(
+        'analytics/chart_data/remote/<int:remote_server_id>/installation',
+        GET=get_chart_data_for_remote_installation,
+    ),
+    rest_path(
+        'analytics/chart_data/remote/<int:remote_server_id>/realm/<int:remote_realm_id>',
+        GET=get_chart_data_for_remote_realm,
+    ),
 ]
 
 i18n_urlpatterns += [
diff --git a/analytics/views.py b/analytics/views.py
index 650849e138..e712a6db1d 100644
--- a/analytics/views.py
+++ b/analytics/views.py
@@ -94,12 +94,19 @@ if settings.ZILENCER_ENABLED:
 
 MAX_TIME_FOR_FULL_ANALYTICS_GENERATION = timedelta(days=1, minutes=30)
 
+
 def is_analytics_ready(realm: Realm) -> bool:
     return (timezone_now() - realm.date_created) > MAX_TIME_FOR_FULL_ANALYTICS_GENERATION
 
-def render_stats(request: HttpRequest, data_url_suffix: str, target_name: str,
-                 for_installation: bool=False, remote: bool=False,
-                 analytics_ready: bool=True) -> HttpRequest:
+
+def render_stats(
+    request: HttpRequest,
+    data_url_suffix: str,
+    target_name: str,
+    for_installation: bool = False,
+    remote: bool = False,
+    analytics_ready: bool = True,
+) -> HttpRequest:
     page_params = dict(
         data_url_suffix=data_url_suffix,
         for_installation=for_installation,
@@ -110,16 +117,19 @@ def render_stats(request: HttpRequest, data_url_suffix: str, target_name: str,
     request_language = get_and_set_request_language(
         request,
         request.user.default_language,
-        translation.get_language_from_path(request.path_info)
+        translation.get_language_from_path(request.path_info),
     )
 
     page_params["translation_data"] = get_language_translation_data(request_language)
 
-    return render(request,
-                  'analytics/stats.html',
-                  context=dict(target_name=target_name,
-                               page_params=page_params,
-                               analytics_ready=analytics_ready))
+    return render(
+        request,
+        'analytics/stats.html',
+        context=dict(
+            target_name=target_name, page_params=page_params, analytics_ready=analytics_ready
+        ),
+    )
+
 
 @zulip_login_required
 def stats(request: HttpRequest) -> HttpResponse:
@@ -128,8 +138,10 @@ def stats(request: HttpRequest) -> HttpResponse:
         # TODO: Make @zulip_login_required pass the UserProfile so we
         # can use @require_member_or_admin
         raise JsonableError(_("Not allowed for guest users"))
-    return render_stats(request, '', realm.name or realm.string_id,
-                        analytics_ready=is_analytics_ready(realm))
+    return render_stats(
+        request, '', realm.name or realm.string_id, analytics_ready=is_analytics_ready(realm)
+    )
+
 
 @require_server_admin
 @has_request_variables
@@ -139,22 +151,33 @@ def stats_for_realm(request: HttpRequest, realm_str: str) -> HttpResponse:
     except Realm.DoesNotExist:
         return HttpResponseNotFound(f"Realm {realm_str} does not exist")
 
-    return render_stats(request, f'/realm/{realm_str}', realm.name or realm.string_id,
-                        analytics_ready=is_analytics_ready(realm))
+    return render_stats(
+        request,
+        f'/realm/{realm_str}',
+        realm.name or realm.string_id,
+        analytics_ready=is_analytics_ready(realm),
+    )
+
 
 @require_server_admin
 @has_request_variables
-def stats_for_remote_realm(request: HttpRequest, remote_server_id: int,
-                           remote_realm_id: int) -> HttpResponse:
+def stats_for_remote_realm(
+    request: HttpRequest, remote_server_id: int, remote_realm_id: int
+) -> HttpResponse:
     assert settings.ZILENCER_ENABLED
     server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return render_stats(request, f'/remote/{server.id}/realm/{remote_realm_id}',
-                        f"Realm {remote_realm_id} on server {server.hostname}")
+    return render_stats(
+        request,
+        f'/remote/{server.id}/realm/{remote_realm_id}',
+        f"Realm {remote_realm_id} on server {server.hostname}",
+    )
+
 
 @require_server_admin_api
 @has_request_variables
-def get_chart_data_for_realm(request: HttpRequest, user_profile: UserProfile,
-                             realm_str: str, **kwargs: Any) -> HttpResponse:
+def get_chart_data_for_realm(
+    request: HttpRequest, user_profile: UserProfile, realm_str: str, **kwargs: Any
+) -> HttpResponse:
     try:
         realm = get_realm(realm_str)
     except Realm.DoesNotExist:
@@ -162,55 +185,92 @@ def get_chart_data_for_realm(request: HttpRequest, user_profile: UserProfile,
 
     return get_chart_data(request=request, user_profile=user_profile, realm=realm, **kwargs)
 
+
 @require_server_admin_api
 @has_request_variables
 def get_chart_data_for_remote_realm(
-        request: HttpRequest, user_profile: UserProfile, remote_server_id: int,
-        remote_realm_id: int, **kwargs: Any) -> HttpResponse:
+    request: HttpRequest,
+    user_profile: UserProfile,
+    remote_server_id: int,
+    remote_realm_id: int,
+    **kwargs: Any,
+) -> HttpResponse:
     assert settings.ZILENCER_ENABLED
     server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return get_chart_data(request=request, user_profile=user_profile, server=server,
-                          remote=True, remote_realm_id=int(remote_realm_id), **kwargs)
+    return get_chart_data(
+        request=request,
+        user_profile=user_profile,
+        server=server,
+        remote=True,
+        remote_realm_id=int(remote_realm_id),
+        **kwargs,
+    )
+
 
 @require_server_admin
 def stats_for_installation(request: HttpRequest) -> HttpResponse:
     return render_stats(request, '/installation', 'installation', True)
 
+
 @require_server_admin
 def stats_for_remote_installation(request: HttpRequest, remote_server_id: int) -> HttpResponse:
     assert settings.ZILENCER_ENABLED
     server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return render_stats(request, f'/remote/{server.id}/installation',
-                        f'remote installation {server.hostname}', True, True)
+    return render_stats(
+        request,
+        f'/remote/{server.id}/installation',
+        f'remote installation {server.hostname}',
+        True,
+        True,
+    )
+
 
 @require_server_admin_api
 @has_request_variables
-def get_chart_data_for_installation(request: HttpRequest, user_profile: UserProfile,
-                                    chart_name: str=REQ(), **kwargs: Any) -> HttpResponse:
-    return get_chart_data(request=request, user_profile=user_profile, for_installation=True, **kwargs)
+def get_chart_data_for_installation(
+    request: HttpRequest, user_profile: UserProfile, chart_name: str = REQ(), **kwargs: Any
+) -> HttpResponse:
+    return get_chart_data(
+        request=request, user_profile=user_profile, for_installation=True, **kwargs
+    )
+
 
 @require_server_admin_api
 @has_request_variables
 def get_chart_data_for_remote_installation(
-        request: HttpRequest,
-        user_profile: UserProfile,
-        remote_server_id: int,
-        chart_name: str=REQ(),
-        **kwargs: Any) -> HttpResponse:
+    request: HttpRequest,
+    user_profile: UserProfile,
+    remote_server_id: int,
+    chart_name: str = REQ(),
+    **kwargs: Any,
+) -> HttpResponse:
     assert settings.ZILENCER_ENABLED
     server = RemoteZulipServer.objects.get(id=remote_server_id)
-    return get_chart_data(request=request, user_profile=user_profile, for_installation=True,
-                          remote=True, server=server, **kwargs)
+    return get_chart_data(
+        request=request,
+        user_profile=user_profile,
+        for_installation=True,
+        remote=True,
+        server=server,
+        **kwargs,
+    )
+
 
 @require_non_guest_user
 @has_request_variables
-def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name: str=REQ(),
-                   min_length: Optional[int]=REQ(converter=to_non_negative_int, default=None),
-                   start: Optional[datetime]=REQ(converter=to_utc_datetime, default=None),
-                   end: Optional[datetime]=REQ(converter=to_utc_datetime, default=None),
-                   realm: Optional[Realm]=None, for_installation: bool=False,
-                   remote: bool=False, remote_realm_id: Optional[int]=None,
-                   server: Optional["RemoteZulipServer"]=None) -> HttpResponse:
+def get_chart_data(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    chart_name: str = REQ(),
+    min_length: Optional[int] = REQ(converter=to_non_negative_int, default=None),
+    start: Optional[datetime] = REQ(converter=to_utc_datetime, default=None),
+    end: Optional[datetime] = REQ(converter=to_utc_datetime, default=None),
+    realm: Optional[Realm] = None,
+    for_installation: bool = False,
+    remote: bool = False,
+    remote_realm_id: Optional[int] = None,
+    server: Optional["RemoteZulipServer"] = None,
+) -> HttpResponse:
     if for_installation:
         if remote:
             assert settings.ZILENCER_ENABLED
@@ -231,12 +291,14 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
         stats = [
             COUNT_STATS['1day_actives::day'],
             COUNT_STATS['realm_active_humans::day'],
-            COUNT_STATS['active_users_audit:is_bot:day']]
+            COUNT_STATS['active_users_audit:is_bot:day'],
+        ]
         tables = [aggregate_table]
         subgroup_to_label: Dict[CountStat, Dict[Optional[str], str]] = {
             stats[0]: {None: '_1day'},
             stats[1]: {None: '_15day'},
-            stats[2]: {'false': 'all_time'}}
+            stats[2]: {'false': 'all_time'},
+        }
         labels_sort_function = None
         include_empty_subgroups = True
     elif chart_name == 'messages_sent_over_time':
@@ -248,18 +310,23 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
     elif chart_name == 'messages_sent_by_message_type':
         stats = [COUNT_STATS['messages_sent:message_type:day']]
         tables = [aggregate_table, UserCount]
-        subgroup_to_label = {stats[0]: {'public_stream': _('Public streams'),
-                                        'private_stream': _('Private streams'),
-                                        'private_message': _('Private messages'),
-                                        'huddle_message': _('Group private messages')}}
+        subgroup_to_label = {
+            stats[0]: {
+                'public_stream': _('Public streams'),
+                'private_stream': _('Private streams'),
+                'private_message': _('Private messages'),
+                'huddle_message': _('Group private messages'),
+            }
+        }
         labels_sort_function = lambda data: sort_by_totals(data['everyone'])
         include_empty_subgroups = True
     elif chart_name == 'messages_sent_by_client':
         stats = [COUNT_STATS['messages_sent:client:day']]
         tables = [aggregate_table, UserCount]
         # Note that the labels are further re-written by client_label_map
-        subgroup_to_label = {stats[0]:
-                             {str(id): name for id, name in Client.objects.values_list('id', 'name')}}
+        subgroup_to_label = {
+            stats[0]: {str(id): name for id, name in Client.objects.values_list('id', 'name')}
+        }
         labels_sort_function = sort_client_labels
         include_empty_subgroups = False
     elif chart_name == 'messages_read_over_time':
@@ -278,9 +345,12 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
     if end is not None:
         end = convert_to_UTC(end)
     if start is not None and end is not None and start > end:
-        raise JsonableError(_("Start time is later than end time. Start: {start}, End: {end}").format(
-            start=start, end=end,
-        ))
+        raise JsonableError(
+            _("Start time is later than end time. Start: {start}, End: {end}").format(
+                start=start,
+                end=end,
+            )
+        )
 
     if realm is None:
         # Note that this value is invalid for Remote tables; be
@@ -293,7 +363,9 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
         # table.
         assert server is not None
         if not aggregate_table.objects.filter(server=server).exists():
-            raise JsonableError(_("No analytics data available. Please contact your server administrator."))
+            raise JsonableError(
+                _("No analytics data available. Please contact your server administrator.")
+            )
         if start is None:
             start = aggregate_table.objects.filter(server=server).first().end_time
         if end is None:
@@ -307,15 +379,24 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
             else:
                 start = realm.date_created
         if end is None:
-            end = max(stat.last_successful_fill() or
-                      datetime.min.replace(tzinfo=timezone.utc) for stat in stats)
+            end = max(
+                stat.last_successful_fill() or datetime.min.replace(tzinfo=timezone.utc)
+                for stat in stats
+            )
 
         if start > end and (timezone_now() - start > MAX_TIME_FOR_FULL_ANALYTICS_GENERATION):
-            logging.warning("User from realm %s attempted to access /stats, but the computed "
-                            "start time: %s (creation of realm or installation) is later than the computed "
-                            "end time: %s (last successful analytics update). Is the "
-                            "analytics cron job running?", realm.string_id, start, end)
-            raise JsonableError(_("No analytics data available. Please contact your server administrator."))
+            logging.warning(
+                "User from realm %s attempted to access /stats, but the computed "
+                "start time: %s (creation of realm or installation) is later than the computed "
+                "end time: %s (last successful analytics update). Is the "
+                "analytics cron job running?",
+                realm.string_id,
+                start,
+                end,
+            )
+            raise JsonableError(
+                _("No analytics data available. Please contact your server administrator.")
+            )
 
     assert len({stat.frequency for stat in stats}) == 1
     end_times = time_range(start, end, stats[0].frequency, min_length)
@@ -350,8 +431,16 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
     for table in tables:
         data[aggregation_level[table]] = {}
         for stat in stats:
-            data[aggregation_level[table]].update(get_time_series_by_subgroup(
-                stat, table, id_value[table], end_times, subgroup_to_label[stat], include_empty_subgroups))
+            data[aggregation_level[table]].update(
+                get_time_series_by_subgroup(
+                    stat,
+                    table,
+                    id_value[table],
+                    end_times,
+                    subgroup_to_label[stat],
+                    include_empty_subgroups,
+                )
+            )
 
     if labels_sort_function is not None:
         data['display_order'] = labels_sort_function(data)
@@ -359,11 +448,13 @@ def get_chart_data(request: HttpRequest, user_profile: UserProfile, chart_name:
         data['display_order'] = None
     return json_success(data=data)
 
+
 def sort_by_totals(value_arrays: Dict[str, List[int]]) -> List[str]:
     totals = [(sum(values), label) for label, values in value_arrays.items()]
     totals.sort(reverse=True)
     return [label for total, label in totals]
 
+
 # For any given user, we want to show a fixed set of clients in the chart,
 # regardless of the time aggregation or whether we're looking at realm or
 # user data. This fixed set ideally includes the clients most important in
@@ -377,9 +468,9 @@ def sort_client_labels(data: Dict[str, Dict[str, List[int]]]) -> List[str]:
     for i, label in enumerate(realm_order):
         label_sort_values[label] = i
     for i, label in enumerate(user_order):
-        label_sort_values[label] = min(i-.1, label_sort_values.get(label, i))
-    return [label for label, sort_value in sorted(label_sort_values.items(),
-                                                  key=lambda x: x[1])]
+        label_sort_values[label] = min(i - 0.1, label_sort_values.get(label, i))
+    return [label for label, sort_value in sorted(label_sort_values.items(), key=lambda x: x[1])]
+
 
 def table_filtered_to_id(table: Type[BaseCount], key_id: int) -> QuerySet:
     if table == RealmCount:
@@ -397,6 +488,7 @@ def table_filtered_to_id(table: Type[BaseCount], key_id: int) -> QuerySet:
     else:
         raise AssertionError(f"Unknown table: {table}")
 
+
 def client_label_map(name: str) -> str:
     if name == "website":
         return "Website"
@@ -413,9 +505,10 @@ def client_label_map(name: str) -> str:
     if name in ["ZulipPython", "API: Python"]:
         return "Python API"
     if name.startswith("Zulip") and name.endswith("Webhook"):
-        return name[len("Zulip"):-len("Webhook")] + " webhook"
+        return name[len("Zulip") : -len("Webhook")] + " webhook"
     return name
 
+
 def rewrite_client_arrays(value_arrays: Dict[str, List[int]]) -> Dict[str, List[int]]:
     mapped_arrays: Dict[str, List[int]] = {}
     for label, array in value_arrays.items():
@@ -427,14 +520,20 @@ def rewrite_client_arrays(value_arrays: Dict[str, List[int]]) -> Dict[str, List[
             mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(0, len(array))]
     return mapped_arrays
 
-def get_time_series_by_subgroup(stat: CountStat,
-                                table: Type[BaseCount],
-                                key_id: int,
-                                end_times: List[datetime],
-                                subgroup_to_label: Dict[Optional[str], str],
-                                include_empty_subgroups: bool) -> Dict[str, List[int]]:
-    queryset = table_filtered_to_id(table, key_id).filter(property=stat.property) \
-                                                  .values_list('subgroup', 'end_time', 'value')
+
+def get_time_series_by_subgroup(
+    stat: CountStat,
+    table: Type[BaseCount],
+    key_id: int,
+    end_times: List[datetime],
+    subgroup_to_label: Dict[Optional[str], str],
+    include_empty_subgroups: bool,
+) -> Dict[str, List[int]]:
+    queryset = (
+        table_filtered_to_id(table, key_id)
+        .filter(property=stat.property)
+        .values_list('subgroup', 'end_time', 'value')
+    )
     value_dicts: Dict[Optional[str], Dict[datetime, int]] = defaultdict(lambda: defaultdict(int))
     for subgroup, end_time, value in queryset:
         value_dicts[subgroup][end_time] = value
@@ -453,11 +552,16 @@ def get_time_series_by_subgroup(stat: CountStat,
 
 eastern_tz = pytz.timezone('US/Eastern')
 
-def make_table(title: str, cols: Sequence[str], rows: Sequence[Any], has_row_class: bool = False) -> str:
+
+def make_table(
+    title: str, cols: Sequence[str], rows: Sequence[Any], has_row_class: bool = False
+) -> str:
 
     if not has_row_class:
+
         def fix_row(row: Any) -> Dict[str, Any]:
             return dict(cells=row, row_class=None)
+
         rows = list(map(fix_row, rows))
 
     data = dict(title=title, cols=cols, rows=rows)
@@ -469,17 +573,16 @@ def make_table(title: str, cols: Sequence[str], rows: Sequence[Any], has_row_cla
 
     return content
 
+
 def dictfetchall(cursor: connection.cursor) -> List[Dict[str, Any]]:
     "Returns all rows from a cursor as a dict"
     desc = cursor.description
-    return [
-        dict(zip((col[0] for col in desc), row))
-        for row in cursor.fetchall()
-    ]
+    return [dict(zip((col[0] for col in desc), row)) for row in cursor.fetchall()]
 
 
 def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
-    query = SQL('''
+    query = SQL(
+        '''
         select
             r.string_id,
             (now()::date - date_sent::date) age,
@@ -500,7 +603,8 @@ def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
         order by
             r.string_id,
             age
-    ''')
+    '''
+    )
     cursor = connection.cursor()
     cursor.execute(query)
     rows = dictfetchall(cursor)
@@ -516,7 +620,7 @@ def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
         min_cnt = min(raw_cnts[1:])
         max_cnt = max(raw_cnts[1:])
 
-        def format_count(cnt: int, style: Optional[str]=None) -> str:
+        def format_count(cnt: int, style: Optional[str] = None) -> str:
             if style is not None:
                 good_bad = style
             elif cnt == min_cnt:
@@ -528,19 +632,21 @@ def get_realm_day_counts() -> Dict[str, Dict[str, str]]:
 
             return f'<td class="number {good_bad}">{cnt}</td>'
 
-        cnts = (format_count(raw_cnts[0], 'neutral')
-                + ''.join(map(format_count, raw_cnts[1:])))
+        cnts = format_count(raw_cnts[0], 'neutral') + ''.join(map(format_count, raw_cnts[1:]))
         result[string_id] = dict(cnts=cnts)
 
     return result
 
+
 def get_plan_name(plan_type: int) -> str:
     return ['', 'self hosted', 'limited', 'standard', 'open source'][plan_type]
 
+
 def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
     now = timezone_now()
 
-    query = SQL('''
+    query = SQL(
+        '''
         SELECT
             realm.string_id,
             realm.date_created,
@@ -609,15 +715,23 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
         ORDER BY
             dau_count DESC,
             string_id ASC
-    ''')
+    '''
+    )
 
     cursor = connection.cursor()
-    cursor.execute(query, {
-        'realm_active_humans_end_time': COUNT_STATS['realm_active_humans::day'].last_successful_fill(),
-        'seven_day_actives_end_time':  COUNT_STATS['7day_actives::day'].last_successful_fill(),
-        'one_day_actives_end_time': COUNT_STATS['1day_actives::day'].last_successful_fill(),
-        'active_users_audit_end_time': COUNT_STATS['active_users_audit:is_bot:day'].last_successful_fill(),
-    })
+    cursor.execute(
+        query,
+        {
+            'realm_active_humans_end_time': COUNT_STATS[
+                'realm_active_humans::day'
+            ].last_successful_fill(),
+            'seven_day_actives_end_time': COUNT_STATS['7day_actives::day'].last_successful_fill(),
+            'one_day_actives_end_time': COUNT_STATS['1day_actives::day'].last_successful_fill(),
+            'active_users_audit_end_time': COUNT_STATS[
+                'active_users_audit:is_bot:day'
+            ].last_successful_fill(),
+        },
+    )
     rows = dictfetchall(cursor)
     cursor.close()
 
@@ -632,8 +746,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
     for row in rows:
         row['date_created_day'] = row['date_created'].strftime('%Y-%m-%d')
         row['plan_type_string'] = get_plan_name(row['plan_type'])
-        row['age_days'] = int((now - row['date_created']).total_seconds()
-                              / 86400)
+        row['age_days'] = int((now - row['date_created']).total_seconds() / 86400)
         row['is_new'] = row['age_days'] < 12 * 7
         row['realm_admin_email'] = ', '.join(realm_admins[row['string_id']])
 
@@ -649,6 +762,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
     total_amount = 0
     if settings.BILLING_ENABLED:
         from corporate.lib.stripe import estimate_annual_recurring_revenue_by_realm
+
         estimated_arrs = estimate_annual_recurring_revenue_by_realm()
         for row in rows:
             if row['string_id'] in estimated_arrs:
@@ -694,7 +808,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
         string_id='Total',
         plan_type_string="",
         amount=total_amount,
-        stats_link = '',
+        stats_link='',
         date_created_day='',
         realm_admin_email='',
         dau_count=total_dau_count,
@@ -708,8 +822,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
 
     content = loader.render_to_string(
         'analytics/realm_summary_table.html',
-        dict(rows=rows, num_active_sites=num_active_sites,
-             utctime=now.strftime('%Y-%m-%d %H:%MZ')),
+        dict(rows=rows, num_active_sites=num_active_sites, utctime=now.strftime('%Y-%m-%d %H:%MZ')),
     )
     return content
 
@@ -721,20 +834,25 @@ def user_activity_intervals() -> Tuple[mark_safe, Dict[str, float]]:
     output = "Per-user online duration for the last 24 hours:\n"
     total_duration = timedelta(0)
 
-    all_intervals = UserActivityInterval.objects.filter(
-        end__gte=day_start,
-        start__lte=day_end,
-    ).select_related(
-        'user_profile',
-        'user_profile__realm',
-    ).only(
-        'start',
-        'end',
-        'user_profile__delivery_email',
-        'user_profile__realm__string_id',
-    ).order_by(
-        'user_profile__realm__string_id',
-        'user_profile__delivery_email',
+    all_intervals = (
+        UserActivityInterval.objects.filter(
+            end__gte=day_start,
+            start__lte=day_end,
+        )
+        .select_related(
+            'user_profile',
+            'user_profile__realm',
+        )
+        .only(
+            'start',
+            'end',
+            'user_profile__delivery_email',
+            'user_profile__realm__string_id',
+        )
+        .order_by(
+            'user_profile__realm__string_id',
+            'user_profile__delivery_email',
+        )
     )
 
     by_string_id = lambda row: row.user_profile.realm.string_id
@@ -764,6 +882,7 @@ def user_activity_intervals() -> Tuple[mark_safe, Dict[str, float]]:
     content = mark_safe('<pre>' + output + '</pre>')
     return content, realm_minutes
 
+
 def sent_messages_report(realm: str) -> str:
     title = 'Recently sent messages for ' + realm
 
@@ -773,7 +892,8 @@ def sent_messages_report(realm: str) -> str:
         'Bots',
     ]
 
-    query = SQL('''
+    query = SQL(
+        '''
         select
             series.day::date,
             humans.cnt,
@@ -823,7 +943,8 @@ def sent_messages_report(realm: str) -> str:
                 date_sent::date
         ) bots on
             series.day = bots.date_sent
-    ''')
+    '''
+    )
     cursor = connection.cursor()
     cursor.execute(query, [realm, realm])
     rows = cursor.fetchall()
@@ -831,17 +952,20 @@ def sent_messages_report(realm: str) -> str:
 
     return make_table(title, cols, rows)
 
+
 def ad_hoc_queries() -> List[Dict[str, str]]:
-    def get_page(query: Composable, cols: Sequence[str], title: str,
-                 totals_columns: Sequence[int]=[]) -> Dict[str, str]:
+    def get_page(
+        query: Composable, cols: Sequence[str], title: str, totals_columns: Sequence[int] = []
+    ) -> Dict[str, str]:
         cursor = connection.cursor()
         cursor.execute(query)
         rows = cursor.fetchall()
         rows = list(map(list, rows))
         cursor.close()
 
-        def fix_rows(i: int,
-                     fixup_func: Union[Callable[[Realm], mark_safe], Callable[[datetime], str]]) -> None:
+        def fix_rows(
+            i: int, fixup_func: Union[Callable[[Realm], mark_safe], Callable[[datetime], str]]
+        ) -> None:
             for row in rows:
                 row[i] = fixup_func(row[i])
 
@@ -878,7 +1002,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
     for mobile_type in ['Android', 'ZulipiOS']:
         title = f'{mobile_type} usage'
 
-        query = SQL('''
+        query = SQL(
+            '''
             select
                 realm.string_id,
                 up.id user_id,
@@ -894,7 +1019,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
             group by string_id, up.id, client.name
             having max(last_visit) > now() - interval '2 week'
             order by string_id, up.id, client.name
-        ''').format(
+        '''
+        ).format(
             mobile_type=Literal(mobile_type),
         )
 
@@ -912,7 +1038,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
 
     title = 'Desktop users'
 
-    query = SQL('''
+    query = SQL(
+        '''
         select
             realm.string_id,
             client.name,
@@ -927,7 +1054,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
         group by string_id, client.name
         having max(last_visit) > now() - interval '2 week'
         order by string_id, client.name
-    ''')
+    '''
+    )
 
     cols = [
         'Realm',
@@ -942,7 +1070,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
 
     title = 'Integrations by realm'
 
-    query = SQL('''
+    query = SQL(
+        '''
         select
             realm.string_id,
             case
@@ -965,7 +1094,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
         group by string_id, client_name
         having max(last_visit) > now() - interval '2 week'
         order by string_id, client_name
-    ''')
+    '''
+    )
 
     cols = [
         'Realm',
@@ -980,7 +1110,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
 
     title = 'Integrations by client'
 
-    query = SQL('''
+    query = SQL(
+        '''
         select
             case
                 when query like '%%external%%' then split_part(query, '/', 5)
@@ -1003,7 +1134,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
         group by client_name, string_id
         having max(last_visit) > now() - interval '2 week'
         order by client_name, string_id
-    ''')
+    '''
+    )
 
     cols = [
         'Client',
@@ -1016,7 +1148,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
 
     title = 'Remote Zulip servers'
 
-    query = SQL('''
+    query = SQL(
+        '''
         with icount as (
             select
                 server_id,
@@ -1043,7 +1176,8 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
         left join icount on icount.server_id = rserver.id
         left join remote_push_devices on remote_push_devices.server_id = rserver.id
         order by max_value DESC NULLS LAST, push_user_count DESC NULLS LAST
-    ''')
+    '''
+    )
 
     cols = [
         'ID',
@@ -1054,11 +1188,11 @@ def ad_hoc_queries() -> List[Dict[str, str]]:
         'Last update time',
     ]
 
-    pages.append(get_page(query, cols, title,
-                          totals_columns=[3, 4]))
+    pages.append(get_page(query, cols, title, totals_columns=[3, 4]))
 
     return pages
 
+
 @require_server_admin
 @has_request_variables
 def get_activity(request: HttpRequest) -> HttpResponse:
@@ -1079,11 +1213,14 @@ def get_activity(request: HttpRequest) -> HttpResponse:
         context=dict(data=data, title=title, is_home=True),
     )
 
-def get_confirmations(types: List[int], object_ids: List[int],
-                      hostname: Optional[str]=None) -> List[Dict[str, Any]]:
+
+def get_confirmations(
+    types: List[int], object_ids: List[int], hostname: Optional[str] = None
+) -> List[Dict[str, Any]]:
     lowest_datetime = timezone_now() - timedelta(days=30)
-    confirmations = Confirmation.objects.filter(type__in=types, object_id__in=object_ids,
-                                                date_sent__gte=lowest_datetime)
+    confirmations = Confirmation.objects.filter(
+        type__in=types, object_id__in=object_ids, date_sent__gte=lowest_datetime
+    )
     confirmation_dicts = []
     for confirmation in confirmations:
         realm = confirmation.realm
@@ -1107,11 +1244,18 @@ def get_confirmations(types: List[int], object_ids: List[int],
             expires_in = "Expired"
 
         url = confirmation_url(confirmation.confirmation_key, realm, type)
-        confirmation_dicts.append({"object": confirmation.content_object,
-                                   "url": url, "type": type, "link_status": link_status,
-                                   "expires_in": expires_in})
+        confirmation_dicts.append(
+            {
+                "object": confirmation.content_object,
+                "url": url,
+                "type": type,
+                "link_status": link_status,
+                "expires_in": expires_in,
+            }
+        )
     return confirmation_dicts
 
+
 @require_server_admin
 def support(request: HttpRequest) -> HttpResponse:
     context: Dict[str, Any] = {}
@@ -1142,7 +1286,9 @@ def support(request: HttpRequest) -> HttpResponse:
             new_discount = Decimal(request.POST.get("discount"))
             current_discount = get_discount_for_realm(realm) or 0
             attach_discount_to_realm(realm, new_discount)
-            context["success_message"] = f"Discount of {realm.string_id} changed to {new_discount}% from {current_discount}%."
+            context[
+                "success_message"
+            ] = f"Discount of {realm.string_id} changed to {new_discount}% from {current_discount}%."
         elif request.POST.get("new_subdomain", None) is not None:
             new_subdomain = request.POST.get("new_subdomain")
             old_subdomain = realm.string_id
@@ -1152,13 +1298,19 @@ def support(request: HttpRequest) -> HttpResponse:
                 context["error_message"] = error.message
             else:
                 do_change_realm_subdomain(realm, new_subdomain)
-                request.session["success_message"] = f"Subdomain changed from {old_subdomain} to {new_subdomain}"
-                return HttpResponseRedirect(reverse('support') + '?' + urlencode({'q': new_subdomain}))
+                request.session[
+                    "success_message"
+                ] = f"Subdomain changed from {old_subdomain} to {new_subdomain}"
+                return HttpResponseRedirect(
+                    reverse('support') + '?' + urlencode({'q': new_subdomain})
+                )
         elif request.POST.get("status", None) is not None:
             status = request.POST.get("status")
             if status == "active":
                 do_send_realm_reactivation_email(realm)
-                context["success_message"] = f"Realm reactivation email sent to admins of {realm.string_id}."
+                context[
+                    "success_message"
+                ] = f"Realm reactivation email sent to admins of {realm.string_id}."
             elif status == "deactivated":
                 do_deactivate_realm(realm, request.user)
                 context["success_message"] = f"{realm.string_id} deactivated."
@@ -1166,10 +1318,14 @@ def support(request: HttpRequest) -> HttpResponse:
             billing_method = request.POST.get("billing_method")
             if billing_method == "send_invoice":
                 update_billing_method_of_current_plan(realm, charge_automatically=False)
-                context["success_message"] = f"Billing method of {realm.string_id} updated to pay by invoice."
+                context[
+                    "success_message"
+                ] = f"Billing method of {realm.string_id} updated to pay by invoice."
             elif billing_method == "charge_automatically":
                 update_billing_method_of_current_plan(realm, charge_automatically=True)
-                context["success_message"] = f"Billing method of {realm.string_id} updated to charge automatically."
+                context[
+                    "success_message"
+                ] = f"Billing method of {realm.string_id} updated to charge automatically."
         elif request.POST.get("sponsorship_pending", None) is not None:
             sponsorship_pending = request.POST.get("sponsorship_pending")
             if sponsorship_pending == "true":
@@ -1186,14 +1342,20 @@ def support(request: HttpRequest) -> HttpResponse:
             downgrade_method = request.POST.get('downgrade_method')
             if downgrade_method == "downgrade_at_billing_cycle_end":
                 downgrade_at_the_end_of_billing_cycle(realm)
-                context["success_message"] = f"{realm.string_id} marked for downgrade at the end of billing cycle"
+                context[
+                    "success_message"
+                ] = f"{realm.string_id} marked for downgrade at the end of billing cycle"
             elif downgrade_method == "downgrade_now_without_additional_licenses":
                 downgrade_now_without_creating_additional_invoices(realm)
-                context["success_message"] = f"{realm.string_id} downgraded without creating additional invoices"
+                context[
+                    "success_message"
+                ] = f"{realm.string_id} downgraded without creating additional invoices"
             elif downgrade_method == "downgrade_now_void_open_invoices":
                 downgrade_now_without_creating_additional_invoices(realm)
                 voided_invoices_count = void_all_open_invoices(realm)
-                context["success_message"] = f"{realm.string_id} downgraded and voided {voided_invoices_count} open invoices"
+                context[
+                    "success_message"
+                ] = f"{realm.string_id} downgraded and voided {voided_invoices_count} open invoices"
         elif request.POST.get("scrub_realm", None) is not None:
             if request.POST.get("scrub_realm") == "scrub_realm":
                 do_scrub_realm(realm, acting_user=request.user)
@@ -1227,7 +1389,9 @@ def support(request: HttpRequest) -> HttpResponse:
 
             current_plan = get_current_plan_by_realm(realm)
             if current_plan is not None:
-                new_plan, last_ledger_entry = make_end_of_cycle_updates_if_needed(current_plan, timezone_now())
+                new_plan, last_ledger_entry = make_end_of_cycle_updates_if_needed(
+                    current_plan, timezone_now()
+                )
                 if last_ledger_entry is not None:
                     if new_plan is not None:
                         realm.current_plan = new_plan
@@ -1245,20 +1409,27 @@ def support(request: HttpRequest) -> HttpResponse:
         confirmations: List[Dict[str, Any]] = []
 
         preregistration_users = PreregistrationUser.objects.filter(email__in=key_words)
-        confirmations += get_confirmations([Confirmation.USER_REGISTRATION, Confirmation.INVITATION,
-                                            Confirmation.REALM_CREATION], preregistration_users,
-                                           hostname=request.get_host())
+        confirmations += get_confirmations(
+            [Confirmation.USER_REGISTRATION, Confirmation.INVITATION, Confirmation.REALM_CREATION],
+            preregistration_users,
+            hostname=request.get_host(),
+        )
 
         multiuse_invites = MultiuseInvite.objects.filter(realm__in=realms)
         confirmations += get_confirmations([Confirmation.MULTIUSE_INVITE], multiuse_invites)
 
-        confirmations += get_confirmations([Confirmation.REALM_REACTIVATION], [realm.id for realm in realms])
+        confirmations += get_confirmations(
+            [Confirmation.REALM_REACTIVATION], [realm.id for realm in realms]
+        )
 
         context["confirmations"] = confirmations
 
     def realm_admin_emails(realm: Realm) -> str:
-        return ", ".join(realm.get_human_admin_users().order_by('delivery_email').values_list(
-            "delivery_email", flat=True))
+        return ", ".join(
+            realm.get_human_admin_users()
+            .order_by('delivery_email')
+            .values_list("delivery_email", flat=True)
+        )
 
     context["realm_admin_emails"] = realm_admin_emails
     context["get_discount_for_realm"] = get_discount_for_realm
@@ -1266,6 +1437,7 @@ def support(request: HttpRequest) -> HttpResponse:
     context["Confirmation"] = Confirmation
     return render(request, 'analytics/support.html', context=context)
 
+
 def get_user_activity_records_for_realm(realm: str, is_bot: bool) -> QuerySet:
     fields = [
         'user_profile__full_name',
@@ -1285,6 +1457,7 @@ def get_user_activity_records_for_realm(realm: str, is_bot: bool) -> QuerySet:
     records = records.select_related('user_profile', 'client').only(*fields)
     return records
 
+
 def get_user_activity_records_for_email(email: str) -> List[QuerySet]:
     fields = [
         'user_profile__full_name',
@@ -1301,6 +1474,7 @@ def get_user_activity_records_for_email(email: str) -> List[QuerySet]:
     records = records.select_related('user_profile', 'client').only(*fields)
     return records
 
+
 def raw_user_activity_table(records: List[QuerySet]) -> str:
     cols = [
         'query',
@@ -1321,6 +1495,7 @@ def raw_user_activity_table(records: List[QuerySet]) -> str:
     title = 'Raw data'
     return make_table(title, cols, rows)
 
+
 def get_user_activity_summary(records: List[QuerySet]) -> Dict[str, Dict[str, Any]]:
     #: `Any` used above should be `Union(int, datetime)`.
     #: However current version of `Union` does not work inside other function.
@@ -1363,39 +1538,49 @@ def get_user_activity_summary(records: List[QuerySet]) -> Dict[str, Dict[str, An
             update('website', record)
         if ('send_message' in query) or re.search('/api/.*/external/.*', query):
             update('send', record)
-        if query in ['/json/update_pointer', '/json/users/me/pointer', '/api/v1/update_pointer',
-                     'update_pointer_backend']:
+        if query in [
+            '/json/update_pointer',
+            '/json/users/me/pointer',
+            '/api/v1/update_pointer',
+            'update_pointer_backend',
+        ]:
             update('pointer', record)
         update(client, record)
 
     return summary
 
+
 def format_date_for_activity_reports(date: Optional[datetime]) -> str:
     if date:
         return date.astimezone(eastern_tz).strftime('%Y-%m-%d %H:%M')
     else:
         return ''
 
+
 def user_activity_link(email: str) -> mark_safe:
     url = reverse(get_user_activity, kwargs=dict(email=email))
     email_link = f'<a href="{url}">{email}</a>'
     return mark_safe(email_link)
 
+
 def realm_activity_link(realm_str: str) -> mark_safe:
     url = reverse(get_realm_activity, kwargs=dict(realm_str=realm_str))
     realm_link = f'<a href="{url}">{realm_str}</a>'
     return mark_safe(realm_link)
 
+
 def realm_stats_link(realm_str: str) -> mark_safe:
     url = reverse(stats_for_realm, kwargs=dict(realm_str=realm_str))
     stats_link = f'<a href="{url}"><i class="fa fa-pie-chart"></i>{realm_str}</a>'
     return mark_safe(stats_link)
 
+
 def remote_installation_stats_link(server_id: int, hostname: str) -> mark_safe:
     url = reverse(stats_for_remote_installation, kwargs=dict(remote_server_id=server_id))
     stats_link = f'<a href="{url}"><i class="fa fa-pie-chart"></i>{hostname}</a>'
     return mark_safe(stats_link)
 
+
 def realm_client_table(user_summaries: Dict[str, Dict[str, Dict[str, Any]]]) -> str:
     exclude_keys = [
         'internal',
@@ -1440,6 +1625,7 @@ def realm_client_table(user_summaries: Dict[str, Dict[str, Dict[str, Any]]]) ->
 
     return make_table(title, cols, rows)
 
+
 def user_activity_summary_table(user_summary: Dict[str, Dict[str, Any]]) -> str:
     rows = []
     for k, v in user_summary.items():
@@ -1466,8 +1652,10 @@ def user_activity_summary_table(user_summary: Dict[str, Dict[str, Any]]) -> str:
     title = 'User activity'
     return make_table(title, cols, rows)
 
-def realm_user_summary_table(all_records: List[QuerySet],
-                             admin_emails: Set[str]) -> Tuple[Dict[str, Dict[str, Any]], str]:
+
+def realm_user_summary_table(
+    all_records: List[QuerySet], admin_emails: Set[str]
+) -> Tuple[Dict[str, Dict[str, Any]], str]:
     user_records = {}
 
     def by_email(record: QuerySet) -> str:
@@ -1532,6 +1720,7 @@ def realm_user_summary_table(all_records: List[QuerySet],
     content = make_table(title, cols, rows, has_row_class=True)
     return user_records, content
 
+
 @require_server_admin
 def get_realm_activity(request: HttpRequest, realm_str: str) -> HttpResponse:
     data: List[Tuple[str, str]] = []
@@ -1567,6 +1756,7 @@ def get_realm_activity(request: HttpRequest, realm_str: str) -> HttpResponse:
         context=dict(data=data, realm_link=None, title=title),
     )
 
+
 @require_server_admin
 def get_user_activity(request: HttpRequest, email: str) -> HttpResponse:
     records = get_user_activity_records_for_email(email)
diff --git a/confirmation/migrations/0001_initial.py b/confirmation/migrations/0001_initial.py
index 75b8fb2f97..537206a77d 100644
--- a/confirmation/migrations/0001_initial.py
+++ b/confirmation/migrations/0001_initial.py
@@ -12,11 +12,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Confirmation',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
                 ('object_id', models.PositiveIntegerField()),
                 ('date_sent', models.DateTimeField(verbose_name='sent')),
-                ('confirmation_key', models.CharField(max_length=40, verbose_name='activation key')),
-                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+                (
+                    'confirmation_key',
+                    models.CharField(max_length=40, verbose_name='activation key'),
+                ),
+                (
+                    'content_type',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'
+                    ),
+                ),
             ],
             options={
                 'verbose_name': 'confirmation email',
diff --git a/confirmation/migrations/0002_realmcreationkey.py b/confirmation/migrations/0002_realmcreationkey.py
index fac60f8186..18ed852e33 100644
--- a/confirmation/migrations/0002_realmcreationkey.py
+++ b/confirmation/migrations/0002_realmcreationkey.py
@@ -12,9 +12,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RealmCreationKey',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
                 ('creation_key', models.CharField(max_length=40, verbose_name='activation key')),
-                ('date_created', models.DateTimeField(default=django.utils.timezone.now, verbose_name='created')),
+                (
+                    'date_created',
+                    models.DateTimeField(default=django.utils.timezone.now, verbose_name='created'),
+                ),
             ],
         ),
     ]
diff --git a/confirmation/migrations/0003_emailchangeconfirmation.py b/confirmation/migrations/0003_emailchangeconfirmation.py
index cc04f0de83..fd91d4c32f 100644
--- a/confirmation/migrations/0003_emailchangeconfirmation.py
+++ b/confirmation/migrations/0003_emailchangeconfirmation.py
@@ -11,8 +11,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.CreateModel(
             name='EmailChangeConfirmation',
-            fields=[
-            ],
+            fields=[],
             options={
                 'proxy': True,
             },
diff --git a/confirmation/migrations/0005_confirmation_realm.py b/confirmation/migrations/0005_confirmation_realm.py
index 75179cb797..3f8f75e2f3 100644
--- a/confirmation/migrations/0005_confirmation_realm.py
+++ b/confirmation/migrations/0005_confirmation_realm.py
@@ -14,6 +14,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='confirmation',
             name='realm',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+            ),
         ),
     ]
diff --git a/confirmation/models.py b/confirmation/models.py
index e0ce38434f..7338eeb5d1 100644
--- a/confirmation/models.py
+++ b/confirmation/models.py
@@ -29,27 +29,35 @@ class ConfirmationKeyException(Exception):
         super().__init__()
         self.error_type = error_type
 
-def render_confirmation_key_error(request: HttpRequest, exception: ConfirmationKeyException) -> HttpResponse:
+
+def render_confirmation_key_error(
+    request: HttpRequest, exception: ConfirmationKeyException
+) -> HttpResponse:
     if exception.error_type == ConfirmationKeyException.WRONG_LENGTH:
         return render(request, 'confirmation/link_malformed.html')
     if exception.error_type == ConfirmationKeyException.EXPIRED:
         return render(request, 'confirmation/link_expired.html')
     return render(request, 'confirmation/link_does_not_exist.html')
 
+
 def generate_key() -> str:
     # 24 characters * 5 bits of entropy/character = 120 bits of entropy
     return b32encode(secrets.token_bytes(15)).decode().lower()
 
+
 ConfirmationObjT = Union[MultiuseInvite, PreregistrationUser, EmailChangeStatus]
-def get_object_from_key(confirmation_key: str,
-                        confirmation_type: int,
-                        activate_object: bool=True) -> ConfirmationObjT:
+
+
+def get_object_from_key(
+    confirmation_key: str, confirmation_type: int, activate_object: bool = True
+) -> ConfirmationObjT:
     # Confirmation keys used to be 40 characters
     if len(confirmation_key) not in (24, 40):
         raise ConfirmationKeyException(ConfirmationKeyException.WRONG_LENGTH)
     try:
-        confirmation = Confirmation.objects.get(confirmation_key=confirmation_key,
-                                                type=confirmation_type)
+        confirmation = Confirmation.objects.get(
+            confirmation_key=confirmation_key, type=confirmation_type
+        )
     except Confirmation.DoesNotExist:
         raise ConfirmationKeyException(ConfirmationKeyException.DOES_NOT_EXIST)
 
@@ -63,9 +71,10 @@ def get_object_from_key(confirmation_key: str,
         obj.save(update_fields=['status'])
     return obj
 
-def create_confirmation_link(obj: ContentType,
-                             confirmation_type: int,
-                             url_args: Mapping[str, str] = {}) -> str:
+
+def create_confirmation_link(
+    obj: ContentType, confirmation_type: int, url_args: Mapping[str, str] = {}
+) -> str:
     key = generate_key()
     realm = None
     if hasattr(obj, 'realm'):
@@ -73,13 +82,22 @@ def create_confirmation_link(obj: ContentType,
     elif isinstance(obj, Realm):
         realm = obj
 
-    Confirmation.objects.create(content_object=obj, date_sent=timezone_now(), confirmation_key=key,
-                                realm=realm, type=confirmation_type)
+    Confirmation.objects.create(
+        content_object=obj,
+        date_sent=timezone_now(),
+        confirmation_key=key,
+        realm=realm,
+        type=confirmation_type,
+    )
     return confirmation_url(key, realm, confirmation_type, url_args)
 
-def confirmation_url(confirmation_key: str, realm: Optional[Realm],
-                     confirmation_type: int,
-                     url_args: Mapping[str, str] = {}) -> str:
+
+def confirmation_url(
+    confirmation_key: str,
+    realm: Optional[Realm],
+    confirmation_type: int,
+    url_args: Mapping[str, str] = {},
+) -> str:
     url_args = dict(url_args)
     url_args['confirmation_key'] = confirmation_key
     return urljoin(
@@ -87,6 +105,7 @@ def confirmation_url(confirmation_key: str, realm: Optional[Realm],
         reverse(_properties[confirmation_type].url_name, kwargs=url_args),
     )
 
+
 class Confirmation(models.Model):
     content_type = models.ForeignKey(ContentType, on_delete=CASCADE)
     object_id: int = models.PositiveIntegerField(db_index=True)
@@ -112,36 +131,44 @@ class Confirmation(models.Model):
     class Meta:
         unique_together = ("type", "confirmation_key")
 
+
 class ConfirmationType:
-    def __init__(self, url_name: str,
-                 validity_in_days: int=settings.CONFIRMATION_LINK_DEFAULT_VALIDITY_DAYS) -> None:
+    def __init__(
+        self,
+        url_name: str,
+        validity_in_days: int = settings.CONFIRMATION_LINK_DEFAULT_VALIDITY_DAYS,
+    ) -> None:
         self.url_name = url_name
         self.validity_in_days = validity_in_days
 
+
 _properties = {
     Confirmation.USER_REGISTRATION: ConfirmationType('check_prereg_key_and_redirect'),
-    Confirmation.INVITATION: ConfirmationType('check_prereg_key_and_redirect',
-                                              validity_in_days=settings.INVITATION_LINK_VALIDITY_DAYS),
+    Confirmation.INVITATION: ConfirmationType(
+        'check_prereg_key_and_redirect', validity_in_days=settings.INVITATION_LINK_VALIDITY_DAYS
+    ),
     Confirmation.EMAIL_CHANGE: ConfirmationType('confirm_email_change'),
     Confirmation.UNSUBSCRIBE: ConfirmationType(
         'unsubscribe',
         validity_in_days=1000000,  # should never expire
     ),
     Confirmation.MULTIUSE_INVITE: ConfirmationType(
-        'join',
-        validity_in_days=settings.INVITATION_LINK_VALIDITY_DAYS),
+        'join', validity_in_days=settings.INVITATION_LINK_VALIDITY_DAYS
+    ),
     Confirmation.REALM_CREATION: ConfirmationType('check_prereg_key_and_redirect'),
     Confirmation.REALM_REACTIVATION: ConfirmationType('realm_reactivation'),
 }
 
+
 def one_click_unsubscribe_link(user_profile: UserProfile, email_type: str) -> str:
     """
     Generate a unique link that a logged-out user can visit to unsubscribe from
     Zulip e-mails without having to first log in.
     """
-    return create_confirmation_link(user_profile,
-                                    Confirmation.UNSUBSCRIBE,
-                                    url_args = {'email_type': email_type})
+    return create_confirmation_link(
+        user_profile, Confirmation.UNSUBSCRIBE, url_args={'email_type': email_type}
+    )
+
 
 # Functions related to links generated by the generate_realm_creation_link.py
 # management command.
@@ -151,6 +178,7 @@ def one_click_unsubscribe_link(user_profile: UserProfile, email_type: str) -> st
 # Arguably RealmCreationKey should just be another ConfirmationObjT and we should
 # add another Confirmation.type for this; it's this way for historical reasons.
 
+
 def validate_key(creation_key: Optional[str]) -> Optional['RealmCreationKey']:
     """Get the record for this key, raising InvalidCreationKey if non-None but invalid."""
     if creation_key is None:
@@ -164,16 +192,18 @@ def validate_key(creation_key: Optional[str]) -> Optional['RealmCreationKey']:
         raise RealmCreationKey.Invalid()
     return key_record
 
-def generate_realm_creation_url(by_admin: bool=False) -> str:
+
+def generate_realm_creation_url(by_admin: bool = False) -> str:
     key = generate_key()
-    RealmCreationKey.objects.create(creation_key=key,
-                                    date_created=timezone_now(),
-                                    presume_email_valid=by_admin)
+    RealmCreationKey.objects.create(
+        creation_key=key, date_created=timezone_now(), presume_email_valid=by_admin
+    )
     return urljoin(
         settings.ROOT_DOMAIN_URI,
         reverse('create_realm', kwargs={'creation_key': key}),
     )
 
+
 class RealmCreationKey(models.Model):
     creation_key = models.CharField('activation key', db_index=True, max_length=40)
     date_created = models.DateTimeField('created', default=timezone_now)
diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py
index 4151abb6aa..c478b29050 100644
--- a/corporate/lib/stripe.py
+++ b/corporate/lib/stripe.py
@@ -33,10 +33,10 @@ from zproject.config import get_secret
 STRIPE_PUBLISHABLE_KEY = get_secret('stripe_publishable_key')
 stripe.api_key = get_secret('stripe_secret_key')
 
-BILLING_LOG_PATH = os.path.join('/var/log/zulip'
-                                if not settings.DEVELOPMENT
-                                else settings.DEVELOPMENT_LOG_DIRECTORY,
-                                'billing.log')
+BILLING_LOG_PATH = os.path.join(
+    '/var/log/zulip' if not settings.DEVELOPMENT else settings.DEVELOPMENT_LOG_DIRECTORY,
+    'billing.log',
+)
 billing_logger = logging.getLogger('corporate.stripe')
 log_to_file(billing_logger, BILLING_LOG_PATH)
 log_to_file(logging.getLogger('stripe'), BILLING_LOG_PATH)
@@ -47,32 +47,52 @@ MIN_INVOICED_LICENSES = 30
 MAX_INVOICED_LICENSES = 1000
 DEFAULT_INVOICE_DAYS_UNTIL_DUE = 30
 
+
 def get_latest_seat_count(realm: Realm) -> int:
-    non_guests = UserProfile.objects.filter(
-        realm=realm, is_active=True, is_bot=False).exclude(role=UserProfile.ROLE_GUEST).count()
+    non_guests = (
+        UserProfile.objects.filter(realm=realm, is_active=True, is_bot=False)
+        .exclude(role=UserProfile.ROLE_GUEST)
+        .count()
+    )
     guests = UserProfile.objects.filter(
-        realm=realm, is_active=True, is_bot=False, role=UserProfile.ROLE_GUEST).count()
+        realm=realm, is_active=True, is_bot=False, role=UserProfile.ROLE_GUEST
+    ).count()
     return max(non_guests, math.ceil(guests / 5))
 
+
 def sign_string(string: str) -> Tuple[str, str]:
     salt = secrets.token_hex(32)
     signer = Signer(salt=salt)
     return signer.sign(string), salt
 
+
 def unsign_string(signed_string: str, salt: str) -> str:
     signer = Signer(salt=salt)
     return signer.unsign(signed_string)
 
+
 # Be extremely careful changing this function. Historical billing periods
 # are not stored anywhere, and are just computed on the fly using this
 # function. Any change you make here should return the same value (or be
 # within a few seconds) for basically any value from when the billing system
 # went online to within a year from now.
 def add_months(dt: datetime, months: int) -> datetime:
-    assert(months >= 0)
+    assert months >= 0
     # It's fine that the max day in Feb is 28 for leap years.
-    MAX_DAY_FOR_MONTH = {1: 31, 2: 28, 3: 31, 4: 30, 5: 31, 6: 30,
-                         7: 31, 8: 31, 9: 30, 10: 31, 11: 30, 12: 31}
+    MAX_DAY_FOR_MONTH = {
+        1: 31,
+        2: 28,
+        3: 31,
+        4: 30,
+        5: 31,
+        6: 30,
+        7: 31,
+        8: 31,
+        9: 30,
+        10: 31,
+        11: 30,
+        12: 31,
+    }
     year = dt.year
     month = dt.month + months
     while month > 12:
@@ -82,18 +102,22 @@ def add_months(dt: datetime, months: int) -> datetime:
     # datetimes don't support leap seconds, so don't need to worry about those
     return dt.replace(year=year, month=month, day=day)
 
+
 def next_month(billing_cycle_anchor: datetime, dt: datetime) -> datetime:
-    estimated_months = round((dt - billing_cycle_anchor).days * 12. / 365)
+    estimated_months = round((dt - billing_cycle_anchor).days * 12.0 / 365)
     for months in range(max(estimated_months - 1, 0), estimated_months + 2):
         proposed_next_month = add_months(billing_cycle_anchor, months)
         if 20 < (proposed_next_month - dt).days < 40:
             return proposed_next_month
-    raise AssertionError('Something wrong in next_month calculation with '
-                         f'billing_cycle_anchor: {billing_cycle_anchor}, dt: {dt}')
+    raise AssertionError(
+        'Something wrong in next_month calculation with '
+        f'billing_cycle_anchor: {billing_cycle_anchor}, dt: {dt}'
+    )
+
 
 def start_of_next_billing_cycle(plan: CustomerPlan, event_time: datetime) -> datetime:
     if plan.status == CustomerPlan.FREE_TRIAL:
-        assert(plan.next_invoice_date is not None)  # for mypy
+        assert plan.next_invoice_date is not None  # for mypy
         return plan.next_invoice_date
 
     months_per_period = {
@@ -107,10 +131,11 @@ def start_of_next_billing_cycle(plan: CustomerPlan, event_time: datetime) -> dat
         periods += 1
     return dt
 
+
 def next_invoice_date(plan: CustomerPlan) -> Optional[datetime]:
     if plan.status == CustomerPlan.ENDED:
         return None
-    assert(plan.next_invoice_date is not None)  # for mypy
+    assert plan.next_invoice_date is not None  # for mypy
     months_per_period = {
         CustomerPlan.ANNUAL: 12,
         CustomerPlan.MONTHLY: 1,
@@ -124,6 +149,7 @@ def next_invoice_date(plan: CustomerPlan) -> Optional[datetime]:
         periods += 1
     return dt
 
+
 def renewal_amount(plan: CustomerPlan, event_time: datetime) -> int:  # nocoverage: TODO
     if plan.fixed_price is not None:
         return plan.fixed_price
@@ -134,14 +160,16 @@ def renewal_amount(plan: CustomerPlan, event_time: datetime) -> int:  # nocovera
         return 0
     if new_plan is not None:
         plan = new_plan
-    assert(plan.price_per_license is not None)  # for mypy
+    assert plan.price_per_license is not None  # for mypy
     return plan.price_per_license * last_ledger_entry.licenses_at_next_renewal
 
+
 def get_idempotency_key(ledger_entry: LicenseLedger) -> Optional[str]:
     if settings.TEST_SUITE:
         return None
     return f'ledger_entry:{ledger_entry.id}'  # nocoverage
 
+
 class BillingError(Exception):
     # error messages
     CONTACT_SUPPORT = ugettext_lazy("Something went wrong. Please contact {email}.")
@@ -154,24 +182,31 @@ class BillingError(Exception):
             message = BillingError.CONTACT_SUPPORT.format(email=settings.ZULIP_ADMINISTRATOR)
         self.message = message
 
+
 class StripeCardError(BillingError):
     pass
 
+
 class StripeConnectionError(BillingError):
     pass
 
+
 class InvalidBillingSchedule(Exception):
     def __init__(self, billing_schedule: int) -> None:
         self.message = f"Unknown billing_schedule: {billing_schedule}"
         super().__init__(self.message)
 
+
 def catch_stripe_errors(func: CallableT) -> CallableT:
     @wraps(func)
     def wrapped(*args: object, **kwargs: object) -> object:
         if settings.DEVELOPMENT and not settings.TEST_SUITE:  # nocoverage
             if STRIPE_PUBLISHABLE_KEY is None:
-                raise BillingError('missing stripe config', "Missing Stripe config. "
-                                   "See https://zulip.readthedocs.io/en/latest/subsystems/billing.html.")
+                raise BillingError(
+                    'missing stripe config',
+                    "Missing Stripe config. "
+                    "See https://zulip.readthedocs.io/en/latest/subsystems/billing.html.",
+                )
         try:
             return func(*args, **kwargs)
         # See https://stripe.com/docs/api/python#error_handling, though
@@ -182,27 +217,39 @@ def catch_stripe_errors(func: CallableT) -> CallableT:
             if isinstance(e, stripe.error.CardError):
                 billing_logger.info(
                     "Stripe card error: %s %s %s %s",
-                    e.http_status, err.get('type'), err.get('code'), err.get('param'),
+                    e.http_status,
+                    err.get('type'),
+                    err.get('code'),
+                    err.get('param'),
                 )
                 # TODO: Look into i18n for this
                 raise StripeCardError('card error', err.get('message'))
             billing_logger.error(
                 "Stripe error: %s %s %s %s",
-                e.http_status, err.get('type'), err.get('code'), err.get('param'),
+                e.http_status,
+                err.get('type'),
+                err.get('code'),
+                err.get('param'),
             )
-            if isinstance(e, (stripe.error.RateLimitError, stripe.error.APIConnectionError)):  # nocoverage TODO
+            if isinstance(
+                e, (stripe.error.RateLimitError, stripe.error.APIConnectionError)
+            ):  # nocoverage TODO
                 raise StripeConnectionError(
                     'stripe connection error',
-                    _("Something went wrong. Please wait a few seconds and try again."))
+                    _("Something went wrong. Please wait a few seconds and try again."),
+                )
             raise BillingError('other stripe error')
+
     return cast(CallableT, wrapped)
 
+
 @catch_stripe_errors
 def stripe_get_customer(stripe_customer_id: str) -> stripe.Customer:
     return stripe.Customer.retrieve(stripe_customer_id, expand=["default_source"])
 
+
 @catch_stripe_errors
-def do_create_stripe_customer(user: UserProfile, stripe_token: Optional[str]=None) -> Customer:
+def do_create_stripe_customer(user: UserProfile, stripe_token: Optional[str] = None) -> Customer:
     realm = user.realm
     # We could do a better job of handling race conditions here, but if two
     # people from a realm try to upgrade at exactly the same time, the main
@@ -212,38 +259,52 @@ def do_create_stripe_customer(user: UserProfile, stripe_token: Optional[str]=Non
         description=f"{realm.string_id} ({realm.name})",
         email=user.delivery_email,
         metadata={'realm_id': realm.id, 'realm_str': realm.string_id},
-        source=stripe_token)
+        source=stripe_token,
+    )
     event_time = timestamp_to_datetime(stripe_customer.created)
     with transaction.atomic():
         RealmAuditLog.objects.create(
-            realm=user.realm, acting_user=user, event_type=RealmAuditLog.STRIPE_CUSTOMER_CREATED,
-            event_time=event_time)
+            realm=user.realm,
+            acting_user=user,
+            event_type=RealmAuditLog.STRIPE_CUSTOMER_CREATED,
+            event_time=event_time,
+        )
         if stripe_token is not None:
             RealmAuditLog.objects.create(
-                realm=user.realm, acting_user=user, event_type=RealmAuditLog.STRIPE_CARD_CHANGED,
-                event_time=event_time)
-        customer, created = Customer.objects.update_or_create(realm=realm, defaults={
-            'stripe_customer_id': stripe_customer.id})
+                realm=user.realm,
+                acting_user=user,
+                event_type=RealmAuditLog.STRIPE_CARD_CHANGED,
+                event_time=event_time,
+            )
+        customer, created = Customer.objects.update_or_create(
+            realm=realm, defaults={'stripe_customer_id': stripe_customer.id}
+        )
         user.is_billing_admin = True
         user.save(update_fields=["is_billing_admin"])
     return customer
 
+
 @catch_stripe_errors
-def do_replace_payment_source(user: UserProfile, stripe_token: str,
-                              pay_invoices: bool=False) -> stripe.Customer:
+def do_replace_payment_source(
+    user: UserProfile, stripe_token: str, pay_invoices: bool = False
+) -> stripe.Customer:
     customer = get_customer_by_realm(user.realm)
-    assert(customer is not None)  # for mypy
+    assert customer is not None  # for mypy
 
     stripe_customer = stripe_get_customer(customer.stripe_customer_id)
     stripe_customer.source = stripe_token
     # Deletes existing card: https://stripe.com/docs/api#update_customer-source
     updated_stripe_customer = stripe.Customer.save(stripe_customer)
     RealmAuditLog.objects.create(
-        realm=user.realm, acting_user=user, event_type=RealmAuditLog.STRIPE_CARD_CHANGED,
-        event_time=timezone_now())
+        realm=user.realm,
+        acting_user=user,
+        event_type=RealmAuditLog.STRIPE_CARD_CHANGED,
+        event_time=timezone_now(),
+    )
     if pay_invoices:
         for stripe_invoice in stripe.Invoice.list(
-                billing='charge_automatically', customer=stripe_customer.id, status='open'):
+            billing='charge_automatically', customer=stripe_customer.id, status='open'
+        ):
             # The user will get either a receipt or a "failed payment" email, but the in-app
             # messaging could be clearer here (e.g. it could explicitly tell the user that there
             # were payment(s) and that they succeeded or failed).
@@ -251,31 +312,40 @@ def do_replace_payment_source(user: UserProfile, stripe_token: str,
             stripe.Invoice.pay(stripe_invoice)
     return updated_stripe_customer
 
+
 # event_time should roughly be timezone_now(). Not designed to handle
 # event_times in the past or future
 @transaction.atomic
-def make_end_of_cycle_updates_if_needed(plan: CustomerPlan,
-                                        event_time: datetime) -> Tuple[Optional[CustomerPlan], Optional[LicenseLedger]]:
+def make_end_of_cycle_updates_if_needed(
+    plan: CustomerPlan, event_time: datetime
+) -> Tuple[Optional[CustomerPlan], Optional[LicenseLedger]]:
     last_ledger_entry = LicenseLedger.objects.filter(plan=plan).order_by('-id').first()
-    last_renewal = LicenseLedger.objects.filter(plan=plan, is_renewal=True) \
-                                        .order_by('-id').first().event_time
+    last_renewal = (
+        LicenseLedger.objects.filter(plan=plan, is_renewal=True).order_by('-id').first().event_time
+    )
     next_billing_cycle = start_of_next_billing_cycle(plan, last_renewal)
     if next_billing_cycle <= event_time:
         if plan.status == CustomerPlan.ACTIVE:
             return None, LicenseLedger.objects.create(
-                plan=plan, is_renewal=True, event_time=next_billing_cycle,
+                plan=plan,
+                is_renewal=True,
+                event_time=next_billing_cycle,
                 licenses=last_ledger_entry.licenses_at_next_renewal,
-                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal)
+                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal,
+            )
         if plan.status == CustomerPlan.FREE_TRIAL:
             plan.invoiced_through = last_ledger_entry
-            assert(plan.next_invoice_date is not None)
+            assert plan.next_invoice_date is not None
             plan.billing_cycle_anchor = plan.next_invoice_date.replace(microsecond=0)
             plan.status = CustomerPlan.ACTIVE
             plan.save(update_fields=["invoiced_through", "billing_cycle_anchor", "status"])
             return None, LicenseLedger.objects.create(
-                plan=plan, is_renewal=True, event_time=next_billing_cycle,
+                plan=plan,
+                is_renewal=True,
+                event_time=next_billing_cycle,
                 licenses=last_ledger_entry.licenses_at_next_renewal,
-                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal)
+                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal,
+            )
 
         if plan.status == CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE:
             if plan.fixed_price is not None:  # nocoverage
@@ -286,31 +356,44 @@ def make_end_of_cycle_updates_if_needed(plan: CustomerPlan,
 
             discount = plan.customer.default_discount or plan.discount
             _, _, _, price_per_license = compute_plan_parameters(
-                automanage_licenses=plan.automanage_licenses, billing_schedule=CustomerPlan.ANNUAL,
-                discount=plan.discount
+                automanage_licenses=plan.automanage_licenses,
+                billing_schedule=CustomerPlan.ANNUAL,
+                discount=plan.discount,
             )
 
             new_plan = CustomerPlan.objects.create(
-                customer=plan.customer, billing_schedule=CustomerPlan.ANNUAL, automanage_licenses=plan.automanage_licenses,
-                charge_automatically=plan.charge_automatically, price_per_license=price_per_license,
-                discount=discount, billing_cycle_anchor=next_billing_cycle,
-                tier=plan.tier, status=CustomerPlan.ACTIVE, next_invoice_date=next_billing_cycle,
-                invoiced_through=None, invoicing_status=CustomerPlan.INITIAL_INVOICE_TO_BE_SENT,
+                customer=plan.customer,
+                billing_schedule=CustomerPlan.ANNUAL,
+                automanage_licenses=plan.automanage_licenses,
+                charge_automatically=plan.charge_automatically,
+                price_per_license=price_per_license,
+                discount=discount,
+                billing_cycle_anchor=next_billing_cycle,
+                tier=plan.tier,
+                status=CustomerPlan.ACTIVE,
+                next_invoice_date=next_billing_cycle,
+                invoiced_through=None,
+                invoicing_status=CustomerPlan.INITIAL_INVOICE_TO_BE_SENT,
             )
 
             new_plan_ledger_entry = LicenseLedger.objects.create(
-                plan=new_plan, is_renewal=True, event_time=next_billing_cycle,
+                plan=new_plan,
+                is_renewal=True,
+                event_time=next_billing_cycle,
                 licenses=last_ledger_entry.licenses_at_next_renewal,
-                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal
+                licenses_at_next_renewal=last_ledger_entry.licenses_at_next_renewal,
             )
 
             RealmAuditLog.objects.create(
-                realm=new_plan.customer.realm, event_time=event_time,
+                realm=new_plan.customer.realm,
+                event_time=event_time,
                 event_type=RealmAuditLog.CUSTOMER_SWITCHED_FROM_MONTHLY_TO_ANNUAL_PLAN,
-                extra_data=orjson.dumps({
-                    "monthly_plan_id": plan.id,
-                    "annual_plan_id": new_plan.id,
-                }).decode()
+                extra_data=orjson.dumps(
+                    {
+                        "monthly_plan_id": plan.id,
+                        "annual_plan_id": new_plan.id,
+                    }
+                ).decode(),
             )
             return new_plan, new_plan_ledger_entry
 
@@ -319,9 +402,12 @@ def make_end_of_cycle_updates_if_needed(plan: CustomerPlan,
         return None, None
     return None, last_ledger_entry
 
+
 # Returns Customer instead of stripe_customer so that we don't make a Stripe
 # API call if there's nothing to update
-def update_or_create_stripe_customer(user: UserProfile, stripe_token: Optional[str]=None) -> Customer:
+def update_or_create_stripe_customer(
+    user: UserProfile, stripe_token: Optional[str] = None
+) -> Customer:
     realm = user.realm
     customer = get_customer_by_realm(realm)
     if customer is None or customer.stripe_customer_id is None:
@@ -330,13 +416,19 @@ def update_or_create_stripe_customer(user: UserProfile, stripe_token: Optional[s
         do_replace_payment_source(user, stripe_token)
     return customer
 
-def calculate_discounted_price_per_license(original_price_per_license: int, discount: Decimal) -> int:
-    # There are no fractional cents in Stripe, so round down to nearest integer.
-    return int(float(original_price_per_license * (1 - discount / 100)) + .00001)
 
-def get_price_per_license(tier: int, billing_schedule: int, discount: Optional[Decimal]=None) -> int:
+def calculate_discounted_price_per_license(
+    original_price_per_license: int, discount: Decimal
+) -> int:
+    # There are no fractional cents in Stripe, so round down to nearest integer.
+    return int(float(original_price_per_license * (1 - discount / 100)) + 0.00001)
+
+
+def get_price_per_license(
+    tier: int, billing_schedule: int, discount: Optional[Decimal] = None
+) -> int:
     # TODO use variables to account for Zulip Plus
-    assert(tier == CustomerPlan.STANDARD)
+    assert tier == CustomerPlan.STANDARD
 
     price_per_license: Optional[int] = None
     if billing_schedule == CustomerPlan.ANNUAL:
@@ -349,10 +441,13 @@ def get_price_per_license(tier: int, billing_schedule: int, discount: Optional[D
         price_per_license = calculate_discounted_price_per_license(price_per_license, discount)
     return price_per_license
 
+
 def compute_plan_parameters(
-        automanage_licenses: bool, billing_schedule: int,
-        discount: Optional[Decimal],
-        free_trial: bool=False) -> Tuple[datetime, datetime, datetime, int]:
+    automanage_licenses: bool,
+    billing_schedule: int,
+    discount: Optional[Decimal],
+    free_trial: bool = False,
+) -> Tuple[datetime, datetime, datetime, int]:
     # Everything in Stripe is stored as timestamps with 1 second resolution,
     # so standardize on 1 second resolution.
     # TODO talk about leapseconds?
@@ -374,15 +469,22 @@ def compute_plan_parameters(
         next_invoice_date = period_end
     return billing_cycle_anchor, next_invoice_date, period_end, price_per_license
 
+
 def decimal_to_float(obj: object) -> object:
     if isinstance(obj, Decimal):
         return float(obj)
     raise TypeError  # nocoverage
 
+
 # Only used for cloud signups
 @catch_stripe_errors
-def process_initial_upgrade(user: UserProfile, licenses: int, automanage_licenses: bool,
-                            billing_schedule: int, stripe_token: Optional[str]) -> None:
+def process_initial_upgrade(
+    user: UserProfile,
+    licenses: int,
+    automanage_licenses: bool,
+    billing_schedule: int,
+    stripe_token: Optional[str],
+) -> None:
     realm = user.realm
     customer = update_or_create_stripe_customer(user, stripe_token=stripe_token)
     charge_automatically = stripe_token is not None
@@ -393,12 +495,21 @@ def process_initial_upgrade(user: UserProfile, licenses: int, automanage_license
         # at exactly the same time. Doesn't fully resolve the race condition, but having
         # a check here reduces the likelihood.
         billing_logger.warning(
-            "Customer %s trying to upgrade, but has an active subscription", customer,
+            "Customer %s trying to upgrade, but has an active subscription",
+            customer,
+        )
+        raise BillingError(
+            'subscribing with existing subscription', str(BillingError.TRY_RELOADING)
         )
-        raise BillingError('subscribing with existing subscription', str(BillingError.TRY_RELOADING))
 
-    billing_cycle_anchor, next_invoice_date, period_end, price_per_license = compute_plan_parameters(
-        automanage_licenses, billing_schedule, customer.default_discount, free_trial)
+    (
+        billing_cycle_anchor,
+        next_invoice_date,
+        period_end,
+        price_per_license,
+    ) = compute_plan_parameters(
+        automanage_licenses, billing_schedule, customer.default_discount, free_trial
+    )
     # The main design constraint in this function is that if you upgrade with a credit card, and the
     # charge fails, everything should be rolled back as if nothing had happened. This is because we
     # expect frequent card failures on initial signup.
@@ -412,7 +523,8 @@ def process_initial_upgrade(user: UserProfile, licenses: int, automanage_license
                 customer=customer.stripe_customer_id,
                 description=f"Upgrade to Zulip Standard, ${price_per_license/100} x {licenses}",
                 receipt_email=user.delivery_email,
-                statement_descriptor='Zulip Standard')
+                statement_descriptor='Zulip Standard',
+            )
             # Not setting a period start and end, but maybe we should? Unclear what will make things
             # most similar to the renewal case from an accounting perspective.
             assert isinstance(stripe_charge.source, stripe.Card)
@@ -422,7 +534,8 @@ def process_initial_upgrade(user: UserProfile, licenses: int, automanage_license
                 currency='usd',
                 customer=customer.stripe_customer_id,
                 description=description,
-                discountable=False)
+                discountable=False,
+            )
 
     # TODO: The correctness of this relies on user creation, deactivation, etc being
     # in a transaction.atomic() with the relevant RealmAuditLog entries
@@ -437,25 +550,29 @@ def process_initial_upgrade(user: UserProfile, licenses: int, automanage_license
             'discount': customer.default_discount,
             'billing_cycle_anchor': billing_cycle_anchor,
             'billing_schedule': billing_schedule,
-            'tier': CustomerPlan.STANDARD}
+            'tier': CustomerPlan.STANDARD,
+        }
         if free_trial:
             plan_params['status'] = CustomerPlan.FREE_TRIAL
         plan = CustomerPlan.objects.create(
-            customer=customer,
-            next_invoice_date=next_invoice_date,
-            **plan_params)
+            customer=customer, next_invoice_date=next_invoice_date, **plan_params
+        )
         ledger_entry = LicenseLedger.objects.create(
             plan=plan,
             is_renewal=True,
             event_time=billing_cycle_anchor,
             licenses=billed_licenses,
-            licenses_at_next_renewal=billed_licenses)
+            licenses_at_next_renewal=billed_licenses,
+        )
         plan.invoiced_through = ledger_entry
         plan.save(update_fields=['invoiced_through'])
         RealmAuditLog.objects.create(
-            realm=realm, acting_user=user, event_time=billing_cycle_anchor,
+            realm=realm,
+            acting_user=user,
+            event_time=billing_cycle_anchor,
             event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED,
-            extra_data=orjson.dumps(plan_params, default=decimal_to_float).decode())
+            extra_data=orjson.dumps(plan_params, default=decimal_to_float).decode(),
+        )
 
     if not free_trial:
         stripe.InvoiceItem.create(
@@ -463,10 +580,13 @@ def process_initial_upgrade(user: UserProfile, licenses: int, automanage_license
             customer=customer.stripe_customer_id,
             description='Zulip Standard',
             discountable=False,
-            period = {'start': datetime_to_timestamp(billing_cycle_anchor),
-                      'end': datetime_to_timestamp(period_end)},
+            period={
+                'start': datetime_to_timestamp(billing_cycle_anchor),
+                'end': datetime_to_timestamp(period_end),
+            },
             quantity=billed_licenses,
-            unit_amount=price_per_license)
+            unit_amount=price_per_license,
+        )
 
         if charge_automatically:
             billing_method = 'charge_automatically'
@@ -480,14 +600,18 @@ def process_initial_upgrade(user: UserProfile, licenses: int, automanage_license
             billing=billing_method,
             customer=customer.stripe_customer_id,
             days_until_due=days_until_due,
-            statement_descriptor='Zulip Standard')
+            statement_descriptor='Zulip Standard',
+        )
         stripe.Invoice.finalize_invoice(stripe_invoice)
 
     from zerver.lib.actions import do_change_plan_type
+
     do_change_plan_type(realm, Realm.STANDARD)
 
-def update_license_ledger_for_automanaged_plan(realm: Realm, plan: CustomerPlan,
-                                               event_time: datetime) -> None:
+
+def update_license_ledger_for_automanaged_plan(
+    realm: Realm, plan: CustomerPlan, event_time: datetime
+) -> None:
     new_plan, last_ledger_entry = make_end_of_cycle_updates_if_needed(plan, event_time)
     if last_ledger_entry is None:
         return
@@ -497,8 +621,12 @@ def update_license_ledger_for_automanaged_plan(realm: Realm, plan: CustomerPlan,
     licenses = max(licenses_at_next_renewal, last_ledger_entry.licenses)
 
     LicenseLedger.objects.create(
-        plan=plan, event_time=event_time, licenses=licenses,
-        licenses_at_next_renewal=licenses_at_next_renewal)
+        plan=plan,
+        event_time=event_time,
+        licenses=licenses,
+        licenses_at_next_renewal=licenses_at_next_renewal,
+    )
+
 
 def update_license_ledger_if_needed(realm: Realm, event_time: datetime) -> None:
     plan = get_current_plan_by_realm(realm)
@@ -508,6 +636,7 @@ def update_license_ledger_if_needed(realm: Realm, event_time: datetime) -> None:
         return
     update_license_ledger_for_automanaged_plan(realm, plan, event_time)
 
+
 def invoice_plan(plan: CustomerPlan, event_time: datetime) -> None:
     if plan.invoicing_status == CustomerPlan.STARTED:
         raise NotImplementedError('Plan with invoicing_status==STARTED needs manual resolution.')
@@ -517,33 +646,46 @@ def invoice_plan(plan: CustomerPlan, event_time: datetime) -> None:
         invoiced_through_id = -1
         licenses_base = None
     else:
-        assert(plan.invoiced_through is not None)
+        assert plan.invoiced_through is not None
         licenses_base = plan.invoiced_through.licenses
         invoiced_through_id = plan.invoiced_through.id
 
     invoice_item_created = False
-    for ledger_entry in LicenseLedger.objects.filter(plan=plan, id__gt=invoiced_through_id,
-                                                     event_time__lte=event_time).order_by('id'):
+    for ledger_entry in LicenseLedger.objects.filter(
+        plan=plan, id__gt=invoiced_through_id, event_time__lte=event_time
+    ).order_by('id'):
         price_args: Dict[str, int] = {}
         if ledger_entry.is_renewal:
             if plan.fixed_price is not None:
                 price_args = {'amount': plan.fixed_price}
             else:
-                assert(plan.price_per_license is not None)  # needed for mypy
-                price_args = {'unit_amount': plan.price_per_license,
-                              'quantity': ledger_entry.licenses}
+                assert plan.price_per_license is not None  # needed for mypy
+                price_args = {
+                    'unit_amount': plan.price_per_license,
+                    'quantity': ledger_entry.licenses,
+                }
             description = "Zulip Standard - renewal"
         elif licenses_base is not None and ledger_entry.licenses != licenses_base:
-            assert(plan.price_per_license)
-            last_renewal = LicenseLedger.objects.filter(
-                plan=plan, is_renewal=True, event_time__lte=ledger_entry.event_time) \
-                .order_by('-id').first().event_time
+            assert plan.price_per_license
+            last_renewal = (
+                LicenseLedger.objects.filter(
+                    plan=plan, is_renewal=True, event_time__lte=ledger_entry.event_time
+                )
+                .order_by('-id')
+                .first()
+                .event_time
+            )
             period_end = start_of_next_billing_cycle(plan, ledger_entry.event_time)
-            proration_fraction = (period_end - ledger_entry.event_time) / (period_end - last_renewal)
-            price_args = {'unit_amount': int(plan.price_per_license * proration_fraction + .5),
-                          'quantity': ledger_entry.licenses - licenses_base}
+            proration_fraction = (period_end - ledger_entry.event_time) / (
+                period_end - last_renewal
+            )
+            price_args = {
+                'unit_amount': int(plan.price_per_license * proration_fraction + 0.5),
+                'quantity': ledger_entry.licenses - licenses_base,
+            }
             description = "Additional license ({} - {})".format(
-                ledger_entry.event_time.strftime('%b %-d, %Y'), period_end.strftime('%b %-d, %Y'))
+                ledger_entry.event_time.strftime('%b %-d, %Y'), period_end.strftime('%b %-d, %Y')
+            )
 
         if price_args:
             plan.invoiced_through = ledger_entry
@@ -554,11 +696,15 @@ def invoice_plan(plan: CustomerPlan, event_time: datetime) -> None:
                 customer=plan.customer.stripe_customer_id,
                 description=description,
                 discountable=False,
-                period = {'start': datetime_to_timestamp(ledger_entry.event_time),
-                          'end': datetime_to_timestamp(
-                              start_of_next_billing_cycle(plan, ledger_entry.event_time))},
+                period={
+                    'start': datetime_to_timestamp(ledger_entry.event_time),
+                    'end': datetime_to_timestamp(
+                        start_of_next_billing_cycle(plan, ledger_entry.event_time)
+                    ),
+                },
                 idempotency_key=get_idempotency_key(ledger_entry),
-                **price_args)
+                **price_args,
+            )
             invoice_item_created = True
         plan.invoiced_through = ledger_entry
         plan.invoicing_status = CustomerPlan.DONE
@@ -577,16 +723,19 @@ def invoice_plan(plan: CustomerPlan, event_time: datetime) -> None:
             billing=billing_method,
             customer=plan.customer.stripe_customer_id,
             days_until_due=days_until_due,
-            statement_descriptor='Zulip Standard')
+            statement_descriptor='Zulip Standard',
+        )
         stripe.Invoice.finalize_invoice(stripe_invoice)
 
     plan.next_invoice_date = next_invoice_date(plan)
     plan.save(update_fields=['next_invoice_date'])
 
-def invoice_plans_as_needed(event_time: datetime=timezone_now()) -> None:
+
+def invoice_plans_as_needed(event_time: datetime = timezone_now()) -> None:
     for plan in CustomerPlan.objects.filter(next_invoice_date__lte=event_time):
         invoice_plan(plan, event_time)
 
+
 def attach_discount_to_realm(realm: Realm, discount: Decimal) -> None:
     Customer.objects.update_or_create(realm=realm, defaults={'default_discount': discount})
     plan = get_current_plan_by_realm(realm)
@@ -595,13 +744,16 @@ def attach_discount_to_realm(realm: Realm, discount: Decimal) -> None:
         plan.discount = discount
         plan.save(update_fields=["price_per_license", "discount"])
 
+
 def update_sponsorship_status(realm: Realm, sponsorship_pending: bool) -> None:
     customer, _ = Customer.objects.get_or_create(realm=realm)
     customer.sponsorship_pending = sponsorship_pending
     customer.save(update_fields=["sponsorship_pending"])
 
+
 def approve_sponsorship(realm: Realm) -> None:
     from zerver.lib.actions import do_change_plan_type, internal_send_private_message
+
     do_change_plan_type(realm, Realm.STANDARD_FREE)
     customer = get_customer_by_realm(realm)
     if customer is not None and customer.sponsorship_pending:
@@ -615,8 +767,12 @@ def approve_sponsorship(realm: Realm) -> None:
             emoji = ":tada:"
             message = _(
                 f"Your organization's request for sponsored hosting has been approved! {emoji}.\n"
-                f"You have been upgraded to {plan_name}, free of charge.")
-            internal_send_private_message(billing_admin.realm, notification_bot, billing_admin, message)
+                f"You have been upgraded to {plan_name}, free of charge."
+            )
+            internal_send_private_message(
+                billing_admin.realm, notification_bot, billing_admin, message
+            )
+
 
 def get_discount_for_realm(realm: Realm) -> Optional[Decimal]:
     customer = get_customer_by_realm(realm)
@@ -624,24 +780,31 @@ def get_discount_for_realm(realm: Realm) -> Optional[Decimal]:
         return customer.default_discount
     return None
 
+
 def do_change_plan_status(plan: CustomerPlan, status: int) -> None:
     plan.status = status
     plan.save(update_fields=['status'])
     billing_logger.info(
         'Change plan status: Customer.id: %s, CustomerPlan.id: %s, status: %s',
-        plan.customer.id, plan.id, status,
+        plan.customer.id,
+        plan.id,
+        status,
     )
 
+
 def process_downgrade(plan: CustomerPlan) -> None:
     from zerver.lib.actions import do_change_plan_type
+
     do_change_plan_type(plan.customer.realm, Realm.LIMITED)
     plan.status = CustomerPlan.ENDED
     plan.save(update_fields=['status'])
 
+
 def estimate_annual_recurring_revenue_by_realm() -> Dict[str, int]:  # nocoverage
     annual_revenue = {}
-    for plan in CustomerPlan.objects.filter(
-            status=CustomerPlan.ACTIVE).select_related('customer__realm'):
+    for plan in CustomerPlan.objects.filter(status=CustomerPlan.ACTIVE).select_related(
+        'customer__realm'
+    ):
         # TODO: figure out what to do for plans that don't automatically
         # renew, but which probably will renew
         renewal_cents = renewal_amount(plan, timezone_now())
@@ -651,6 +814,7 @@ def estimate_annual_recurring_revenue_by_realm() -> Dict[str, int]:  # nocoverag
         annual_revenue[plan.customer.realm.string_id] = int(renewal_cents / 100)
     return annual_revenue
 
+
 # During realm deactivation we instantly downgrade the plan to Limited.
 # Extra users added in the final month are not charged. Also used
 # for the cancellation of Free Trial.
@@ -664,11 +828,13 @@ def downgrade_now_without_creating_additional_invoices(realm: Realm) -> None:
     plan.next_invoice_date = next_invoice_date(plan)
     plan.save(update_fields=["invoiced_through", "next_invoice_date"])
 
+
 def downgrade_at_the_end_of_billing_cycle(realm: Realm) -> None:
     plan = get_current_plan_by_realm(realm)
-    assert(plan is not None)
+    assert plan is not None
     do_change_plan_status(plan, CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE)
 
+
 def void_all_open_invoices(realm: Realm) -> int:
     customer = get_customer_by_realm(realm)
     if customer is None:
@@ -677,12 +843,11 @@ def void_all_open_invoices(realm: Realm) -> int:
     voided_invoices_count = 0
     for invoice in invoices:
         if invoice.status == "open":
-            stripe.Invoice.void_invoice(
-                invoice.id
-            )
+            stripe.Invoice.void_invoice(invoice.id)
             voided_invoices_count += 1
     return voided_invoices_count
 
+
 def update_billing_method_of_current_plan(realm: Realm, charge_automatically: bool) -> None:
     plan = get_current_plan_by_realm(realm)
     if plan is not None:
diff --git a/corporate/migrations/0001_initial.py b/corporate/migrations/0001_initial.py
index 968b3f230a..c3da640784 100644
--- a/corporate/migrations/0001_initial.py
+++ b/corporate/migrations/0001_initial.py
@@ -16,17 +16,37 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='BillingProcessor',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('state', models.CharField(max_length=20)),
                 ('last_modified', models.DateTimeField(auto_now=True)),
-                ('log_row', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.RealmAuditLog')),
-                ('realm', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'log_row',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.RealmAuditLog'
+                    ),
+                ),
+                (
+                    'realm',
+                    models.OneToOneField(
+                        null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='Coupon',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('percent_off', models.SmallIntegerField(unique=True)),
                 ('stripe_coupon_id', models.CharField(max_length=255, unique=True)),
             ],
@@ -34,16 +54,31 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Customer',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('stripe_customer_id', models.CharField(max_length=255, unique=True)),
                 ('has_billing_relationship', models.BooleanField(default=False)),
-                ('realm', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='Plan',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('nickname', models.CharField(max_length=40, unique=True)),
                 ('stripe_plan_id', models.CharField(max_length=255, unique=True)),
             ],
diff --git a/corporate/migrations/0003_customerplan.py b/corporate/migrations/0003_customerplan.py
index 50457b446d..cf9701cb1c 100644
--- a/corporate/migrations/0003_customerplan.py
+++ b/corporate/migrations/0003_customerplan.py
@@ -14,7 +14,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='CustomerPlan',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('licenses', models.IntegerField()),
                 ('automanage_licenses', models.BooleanField(default=False)),
                 ('charge_automatically', models.BooleanField(default=False)),
@@ -27,7 +32,12 @@ class Migration(migrations.Migration):
                 ('next_billing_date', models.DateTimeField(db_index=True)),
                 ('tier', models.SmallIntegerField()),
                 ('status', models.SmallIntegerField(default=1)),
-                ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='corporate.Customer')),
+                (
+                    'customer',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='corporate.Customer'
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/corporate/migrations/0004_licenseledger.py b/corporate/migrations/0004_licenseledger.py
index ed7d01f7eb..13b6e39593 100644
--- a/corporate/migrations/0004_licenseledger.py
+++ b/corporate/migrations/0004_licenseledger.py
@@ -14,12 +14,22 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LicenseLedger',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('is_renewal', models.BooleanField(default=False)),
                 ('event_time', models.DateTimeField()),
                 ('licenses', models.IntegerField()),
                 ('licenses_at_next_renewal', models.IntegerField(null=True)),
-                ('plan', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='corporate.CustomerPlan')),
+                (
+                    'plan',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='corporate.CustomerPlan'
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/corporate/migrations/0005_customerplan_invoicing.py b/corporate/migrations/0005_customerplan_invoicing.py
index 09fbee94cb..f5dd5f5423 100644
--- a/corporate/migrations/0005_customerplan_invoicing.py
+++ b/corporate/migrations/0005_customerplan_invoicing.py
@@ -23,7 +23,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='customerplan',
             name='invoiced_through',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='corporate.LicenseLedger'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='+',
+                to='corporate.LicenseLedger',
+            ),
         ),
         migrations.AddField(
             model_name='customerplan',
diff --git a/corporate/models.py b/corporate/models.py
index 0cf0c74056..6e5be5e2d9 100644
--- a/corporate/models.py
+++ b/corporate/models.py
@@ -13,14 +13,18 @@ class Customer(models.Model):
     stripe_customer_id: str = models.CharField(max_length=255, null=True, unique=True)
     sponsorship_pending: bool = models.BooleanField(default=False)
     # A percentage, like 85.
-    default_discount: Optional[Decimal] = models.DecimalField(decimal_places=4, max_digits=7, null=True)
+    default_discount: Optional[Decimal] = models.DecimalField(
+        decimal_places=4, max_digits=7, null=True
+    )
 
     def __str__(self) -> str:
         return f"<Customer {self.realm} {self.stripe_customer_id}>"
 
+
 def get_customer_by_realm(realm: Realm) -> Optional[Customer]:
     return Customer.objects.filter(realm=realm).first()
 
+
 class CustomerPlan(models.Model):
     customer: Customer = models.ForeignKey(Customer, on_delete=CASCADE)
     automanage_licenses: bool = models.BooleanField(default=False)
@@ -42,7 +46,8 @@ class CustomerPlan(models.Model):
 
     next_invoice_date: Optional[datetime.datetime] = models.DateTimeField(db_index=True, null=True)
     invoiced_through: Optional["LicenseLedger"] = models.ForeignKey(
-        'LicenseLedger', null=True, on_delete=CASCADE, related_name='+')
+        'LicenseLedger', null=True, on_delete=CASCADE, related_name='+'
+    )
     DONE = 1
     STARTED = 2
     INITIAL_INVOICE_TO_BE_SENT = 3
@@ -80,12 +85,15 @@ class CustomerPlan(models.Model):
             self.DOWNGRADE_AT_END_OF_CYCLE: "Scheduled for downgrade at end of cycle",
             self.FREE_TRIAL: "Free trial",
             self.ENDED: "Ended",
-            self.NEVER_STARTED: "Never started"
+            self.NEVER_STARTED: "Never started",
         }[self.status]
 
+
 def get_current_plan_by_customer(customer: Customer) -> Optional[CustomerPlan]:
     return CustomerPlan.objects.filter(
-        customer=customer, status__lt=CustomerPlan.LIVE_STATUS_THRESHOLD).first()
+        customer=customer, status__lt=CustomerPlan.LIVE_STATUS_THRESHOLD
+    ).first()
+
 
 def get_current_plan_by_realm(realm: Realm) -> Optional[CustomerPlan]:
     customer = get_customer_by_realm(realm)
@@ -93,6 +101,7 @@ def get_current_plan_by_realm(realm: Realm) -> Optional[CustomerPlan]:
         return None
     return get_current_plan_by_customer(customer)
 
+
 class LicenseLedger(models.Model):
     plan: CustomerPlan = models.ForeignKey(CustomerPlan, on_delete=CASCADE)
     # Also True for the initial upgrade.
diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py
index 6a3210e90e..4d90af35f3 100644
--- a/corporate/tests/test_stripe.py
+++ b/corporate/tests/test_stripe.py
@@ -72,7 +72,7 @@ STRIPE_FIXTURES_DIR = "corporate/tests/stripe_fixtures"
 
 # TODO: check that this creates a token similar to what is created by our
 # actual Stripe Checkout flows
-def stripe_create_token(card_number: str="4242424242424242") -> stripe.Token:
+def stripe_create_token(card_number: str = "4242424242424242") -> stripe.Token:
     return stripe.Token.create(
         card={
             "number": card_number,
@@ -84,29 +84,41 @@ def stripe_create_token(card_number: str="4242424242424242") -> stripe.Token:
             "address_city": "Pacific",
             "address_zip": "33333",
             "address_country": "United States",
-        })
+        }
+    )
 
-def stripe_fixture_path(decorated_function_name: str, mocked_function_name: str, call_count: int) -> str:
+
+def stripe_fixture_path(
+    decorated_function_name: str, mocked_function_name: str, call_count: int
+) -> str:
     # Make the eventual filename a bit shorter, and also we conventionally
     # use test_* for the python test files
     if decorated_function_name[:5] == 'test_':
         decorated_function_name = decorated_function_name[5:]
     return f"{STRIPE_FIXTURES_DIR}/{decorated_function_name}--{mocked_function_name[7:]}.{call_count}.json"
 
+
 def fixture_files_for_function(decorated_function: CallableT) -> List[str]:  # nocoverage
     decorated_function_name = decorated_function.__name__
     if decorated_function_name[:5] == 'test_':
         decorated_function_name = decorated_function_name[5:]
-    return sorted(f'{STRIPE_FIXTURES_DIR}/{f}' for f in os.listdir(STRIPE_FIXTURES_DIR)
-                  if f.startswith(decorated_function_name + '--'))
+    return sorted(
+        f'{STRIPE_FIXTURES_DIR}/{f}'
+        for f in os.listdir(STRIPE_FIXTURES_DIR)
+        if f.startswith(decorated_function_name + '--')
+    )
 
-def generate_and_save_stripe_fixture(decorated_function_name: str, mocked_function_name: str,
-                                     mocked_function: CallableT) -> Callable[[Any, Any], Any]:  # nocoverage
+
+def generate_and_save_stripe_fixture(
+    decorated_function_name: str, mocked_function_name: str, mocked_function: CallableT
+) -> Callable[[Any, Any], Any]:  # nocoverage
     def _generate_and_save_stripe_fixture(*args: Any, **kwargs: Any) -> Any:
         # Note that mock is not the same as mocked_function, even though their
         # definitions look the same
         mock = operator.attrgetter(mocked_function_name)(sys.modules[__name__])
-        fixture_path = stripe_fixture_path(decorated_function_name, mocked_function_name, mock.call_count)
+        fixture_path = stripe_fixture_path(
+            decorated_function_name, mocked_function_name, mock.call_count
+        )
         try:
             with responses.RequestsMock() as request_mock:
                 request_mock.add_passthru("https://api.stripe.com")
@@ -116,7 +128,9 @@ def generate_and_save_stripe_fixture(decorated_function_name: str, mocked_functi
             with open(fixture_path, 'w') as f:
                 error_dict = e.__dict__
                 error_dict["headers"] = dict(error_dict["headers"])
-                f.write(json.dumps(error_dict, indent=2, separators=(',', ': '), sort_keys=True) + "\n")
+                f.write(
+                    json.dumps(error_dict, indent=2, separators=(',', ': '), sort_keys=True) + "\n"
+                )
             raise e
         with open(fixture_path, 'w') as f:
             if stripe_object is not None:
@@ -124,49 +138,77 @@ def generate_and_save_stripe_fixture(decorated_function_name: str, mocked_functi
             else:
                 f.write("{}\n")
         return stripe_object
+
     return _generate_and_save_stripe_fixture
 
-def read_stripe_fixture(decorated_function_name: str,
-                        mocked_function_name: str) -> Callable[[Any, Any], Any]:
+
+def read_stripe_fixture(
+    decorated_function_name: str, mocked_function_name: str
+) -> Callable[[Any, Any], Any]:
     def _read_stripe_fixture(*args: Any, **kwargs: Any) -> Any:
         mock = operator.attrgetter(mocked_function_name)(sys.modules[__name__])
-        fixture_path = stripe_fixture_path(decorated_function_name, mocked_function_name, mock.call_count)
+        fixture_path = stripe_fixture_path(
+            decorated_function_name, mocked_function_name, mock.call_count
+        )
         with open(fixture_path, "rb") as f:
             fixture = orjson.loads(f.read())
         # Check for StripeError fixtures
         if "json_body" in fixture:
             requestor = stripe.api_requestor.APIRequestor()
             # This function will raise the relevant StripeError according to the fixture
-            requestor.interpret_response(fixture["http_body"], fixture["http_status"], fixture["headers"])
+            requestor.interpret_response(
+                fixture["http_body"], fixture["http_status"], fixture["headers"]
+            )
         return stripe.util.convert_to_stripe_object(fixture)
+
     return _read_stripe_fixture
 
+
 def delete_fixture_data(decorated_function: CallableT) -> None:  # nocoverage
     for fixture_file in fixture_files_for_function(decorated_function):
         os.remove(fixture_file)
 
-def normalize_fixture_data(decorated_function: CallableT,
-                           tested_timestamp_fields: Sequence[str] = []) -> None:  # nocoverage
+
+def normalize_fixture_data(
+    decorated_function: CallableT, tested_timestamp_fields: Sequence[str] = []
+) -> None:  # nocoverage
     # stripe ids are all of the form cus_D7OT2jf5YAtZQ2
     id_lengths = [
-        ('cus', 14), ('sub', 14), ('si', 14), ('sli', 14), ('req', 14), ('tok', 24), ('card', 24),
-        ('txn', 24), ('ch', 24), ('in', 24), ('ii', 24), ('test', 12), ('src_client_secret', 24),
-        ('src', 24), ('invst', 26), ('acct', 16), ('rcpt', 31)]
+        ('cus', 14),
+        ('sub', 14),
+        ('si', 14),
+        ('sli', 14),
+        ('req', 14),
+        ('tok', 24),
+        ('card', 24),
+        ('txn', 24),
+        ('ch', 24),
+        ('in', 24),
+        ('ii', 24),
+        ('test', 12),
+        ('src_client_secret', 24),
+        ('src', 24),
+        ('invst', 26),
+        ('acct', 16),
+        ('rcpt', 31),
+    ]
     # We'll replace cus_D7OT2jf5YAtZQ2 with something like cus_NORMALIZED0001
     pattern_translations = {
         f"{prefix}_[A-Za-z0-9]{{{length}}}": f"{prefix}_NORMALIZED%0{length - 10}d"
         for prefix, length in id_lengths
     }
     # We'll replace "invoice_prefix": "A35BC4Q" with something like "invoice_prefix": "NORMA01"
-    pattern_translations.update({
-        '"invoice_prefix": "([A-Za-z0-9]{7,8})"': 'NORMA%02d',
-        '"fingerprint": "([A-Za-z0-9]{16})"': 'NORMALIZED%06d',
-        '"number": "([A-Za-z0-9]{7,8}-[A-Za-z0-9]{4})"': 'NORMALI-%04d',
-        '"address": "([A-Za-z0-9]{9}-test_[A-Za-z0-9]{12})"': '000000000-test_NORMALIZED%02d',
-        # Don't use (..) notation, since the matched strings may be small integers that will also match
-        # elsewhere in the file
-        '"realm_id": "[0-9]+"': '"realm_id": "%d"',
-    })
+    pattern_translations.update(
+        {
+            '"invoice_prefix": "([A-Za-z0-9]{7,8})"': 'NORMA%02d',
+            '"fingerprint": "([A-Za-z0-9]{16})"': 'NORMALIZED%06d',
+            '"number": "([A-Za-z0-9]{7,8}-[A-Za-z0-9]{4})"': 'NORMALI-%04d',
+            '"address": "([A-Za-z0-9]{9}-test_[A-Za-z0-9]{12})"': '000000000-test_NORMALIZED%02d',
+            # Don't use (..) notation, since the matched strings may be small integers that will also match
+            # elsewhere in the file
+            '"realm_id": "[0-9]+"': '"realm_id": "%d"',
+        }
+    )
     # Normalizing across all timestamps still causes a lot of variance run to run, which is
     # why we're doing something a bit more complicated
     for i, timestamp_field in enumerate(tested_timestamp_fields):
@@ -184,12 +226,17 @@ def normalize_fixture_data(decorated_function: CallableT,
         for pattern, translation in pattern_translations.items():
             for match in re.findall(pattern, file_content):
                 if match not in normalized_values[pattern]:
-                    normalized_values[pattern][match] = translation % (len(normalized_values[pattern]) + 1,)
+                    normalized_values[pattern][match] = translation % (
+                        len(normalized_values[pattern]) + 1,
+                    )
                 file_content = file_content.replace(match, normalized_values[pattern][match])
         file_content = re.sub(r'(?<="risk_score": )(\d+)', '0', file_content)
         file_content = re.sub(r'(?<="times_redeemed": )(\d+)', '0', file_content)
-        file_content = re.sub(r'(?<="idempotency-key": )"([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f-]*)"',
-                              '"00000000-0000-0000-0000-000000000000"', file_content)
+        file_content = re.sub(
+            r'(?<="idempotency-key": )"([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f-]*)"',
+            '"00000000-0000-0000-0000-000000000000"',
+            file_content,
+        )
         # Dates
         file_content = re.sub(r'(?<="Date": )"(.* GMT)"', '"NORMALIZED DATETIME"', file_content)
         file_content = re.sub(r'[0-3]\d [A-Z][a-z]{2} 20[1-2]\d', 'NORMALIZED DATE', file_content)
@@ -201,20 +248,38 @@ def normalize_fixture_data(decorated_function: CallableT,
         with open(fixture_file, "w") as f:
             f.write(file_content)
 
-MOCKED_STRIPE_FUNCTION_NAMES = [f"stripe.{name}" for name in [
-    "Charge.create", "Charge.list",
-    "Coupon.create",
-    "Customer.create", "Customer.retrieve", "Customer.save",
-    "Invoice.create", "Invoice.finalize_invoice", "Invoice.list", "Invoice.pay", "Invoice.upcoming", "Invoice.void_invoice",
-    "InvoiceItem.create", "InvoiceItem.list",
-    "Plan.create",
-    "Product.create",
-    "Subscription.create", "Subscription.delete", "Subscription.retrieve", "Subscription.save",
-    "Token.create",
-]]
 
-def mock_stripe(tested_timestamp_fields: Sequence[str]=[],
-                generate: Optional[bool]=None) -> Callable[[CallableT], CallableT]:
+MOCKED_STRIPE_FUNCTION_NAMES = [
+    f"stripe.{name}"
+    for name in [
+        "Charge.create",
+        "Charge.list",
+        "Coupon.create",
+        "Customer.create",
+        "Customer.retrieve",
+        "Customer.save",
+        "Invoice.create",
+        "Invoice.finalize_invoice",
+        "Invoice.list",
+        "Invoice.pay",
+        "Invoice.upcoming",
+        "Invoice.void_invoice",
+        "InvoiceItem.create",
+        "InvoiceItem.list",
+        "Plan.create",
+        "Product.create",
+        "Subscription.create",
+        "Subscription.delete",
+        "Subscription.retrieve",
+        "Subscription.save",
+        "Token.create",
+    ]
+]
+
+
+def mock_stripe(
+    tested_timestamp_fields: Sequence[str] = [], generate: Optional[bool] = None
+) -> Callable[[CallableT], CallableT]:
     def _mock_stripe(decorated_function: CallableT) -> CallableT:
         generate_fixture = generate
         if generate_fixture is None:
@@ -223,10 +288,13 @@ def mock_stripe(tested_timestamp_fields: Sequence[str]=[],
             mocked_function = operator.attrgetter(mocked_function_name)(sys.modules[__name__])
             if generate_fixture:
                 side_effect = generate_and_save_stripe_fixture(
-                    decorated_function.__name__, mocked_function_name, mocked_function)  # nocoverage
+                    decorated_function.__name__, mocked_function_name, mocked_function
+                )  # nocoverage
             else:
                 side_effect = read_stripe_fixture(decorated_function.__name__, mocked_function_name)
-            decorated_function = cast(CallableT, patch(mocked_function_name, side_effect=side_effect)(decorated_function))
+            decorated_function = cast(
+                CallableT, patch(mocked_function_name, side_effect=side_effect)(decorated_function)
+            )
 
         @wraps(decorated_function)
         def wrapped(*args: object, **kwargs: object) -> object:
@@ -237,15 +305,19 @@ def mock_stripe(tested_timestamp_fields: Sequence[str]=[],
                 return val
             else:
                 return decorated_function(*args, **kwargs)
+
         return cast(CallableT, wrapped)
+
     return _mock_stripe
 
+
 # A Kandra is a fictional character that can become anything. Used as a
 # wildcard when testing for equality.
 class Kandra:  # nocoverage: TODO
     def __eq__(self, other: Any) -> bool:
         return True
 
+
 class StripeTestCase(ZulipTestCase):
     def setUp(self, *mocks: Mock) -> None:
         super().setUp()
@@ -268,7 +340,9 @@ class StripeTestCase(ZulipTestCase):
         ]
 
         # Deactivate all users in our realm that aren't in our whitelist.
-        UserProfile.objects.filter(realm_id=realm.id).exclude(email__in=active_emails).update(is_active=False)
+        UserProfile.objects.filter(realm_id=realm.id).exclude(email__in=active_emails).update(
+            is_active=False
+        )
 
         # sanity check our 8 expected users are active
         self.assertEqual(
@@ -296,16 +370,23 @@ class StripeTestCase(ZulipTestCase):
         self.next_year = datetime(2013, 1, 2, 3, 4, 5, tzinfo=timezone.utc)
 
     def get_signed_seat_count_from_response(self, response: HttpResponse) -> Optional[str]:
-        match = re.search(r'name=\"signed_seat_count\" value=\"(.+)\"', response.content.decode("utf-8"))
+        match = re.search(
+            r'name=\"signed_seat_count\" value=\"(.+)\"', response.content.decode("utf-8")
+        )
         return match.group(1) if match else None
 
     def get_salt_from_response(self, response: HttpResponse) -> Optional[str]:
         match = re.search(r'name=\"salt\" value=\"(\w+)\"', response.content.decode("utf-8"))
         return match.group(1) if match else None
 
-    def upgrade(self, invoice: bool=False, talk_to_stripe: bool=True,
-                realm: Optional[Realm]=None, del_args: Sequence[str]=[],
-                **kwargs: Any) -> HttpResponse:
+    def upgrade(
+        self,
+        invoice: bool = False,
+        talk_to_stripe: bool = True,
+        realm: Optional[Realm] = None,
+        del_args: Sequence[str] = [],
+        **kwargs: Any,
+    ) -> HttpResponse:
         host_args = {}
         if realm is not None:  # nocoverage: TODO
             host_args['HTTP_HOST'] = realm.host
@@ -313,7 +394,8 @@ class StripeTestCase(ZulipTestCase):
         params: Dict[str, Any] = {
             'schedule': 'annual',
             'signed_seat_count': self.get_signed_seat_count_from_response(response),
-            'salt': self.get_salt_from_response(response)}
+            'salt': self.get_salt_from_response(response),
+        }
         if invoice:  # send_invoice
             params.update(
                 billing_modality='send_invoice',
@@ -343,7 +425,7 @@ class StripeTestCase(ZulipTestCase):
     # Upgrade without talking to Stripe
     def local_upgrade(self, *args: Any) -> None:
         class StripeMock(Mock):
-            def __init__(self, depth: int=1):
+            def __init__(self, depth: int = 1):
                 super().__init__(spec=stripe.Card)
                 self.id = 'id'
                 self.created = '1000'
@@ -358,30 +440,37 @@ class StripeTestCase(ZulipTestCase):
             upgrade_func = patch(mocked_function_name, return_value=StripeMock())(upgrade_func)
         upgrade_func(*args)
 
+
 class StripeTest(StripeTestCase):
     def test_catch_stripe_errors(self) -> None:
         @catch_stripe_errors
         def raise_invalid_request_error() -> None:
-            raise stripe.error.InvalidRequestError(
-                "message", "param", "code", json_body={})
+            raise stripe.error.InvalidRequestError("message", "param", "code", json_body={})
+
         with self.assertLogs('corporate.stripe', "ERROR") as error_log:
             with self.assertRaises(BillingError) as context:
                 raise_invalid_request_error()
             self.assertEqual('other stripe error', context.exception.description)
-            self.assertEqual(error_log.output, ['ERROR:corporate.stripe:Stripe error: None None None None'])
+            self.assertEqual(
+                error_log.output, ['ERROR:corporate.stripe:Stripe error: None None None None']
+            )
 
         @catch_stripe_errors
         def raise_card_error() -> None:
             error_message = "The card number is not a valid credit card number."
             json_body = {"error": {"message": error_message}}
-            raise stripe.error.CardError(error_message, "number", "invalid_number",
-                                         json_body=json_body)
+            raise stripe.error.CardError(
+                error_message, "number", "invalid_number", json_body=json_body
+            )
+
         with self.assertLogs('corporate.stripe', "INFO") as info_log:
             with self.assertRaises(StripeCardError) as context:
                 raise_card_error()
             self.assertIn('not a valid credit card', context.exception.message)
             self.assertEqual('card error', context.exception.description)
-            self.assertEqual(info_log.output, ['INFO:corporate.stripe:Stripe card error: None None None None'])
+            self.assertEqual(
+                info_log.output, ['INFO:corporate.stripe:Stripe card error: None None None None']
+            )
 
     def test_billing_not_enabled(self) -> None:
         iago = self.example_user('iago')
@@ -404,7 +493,9 @@ class StripeTest(StripeTestCase):
             self.upgrade()
 
         # Check that we correctly created a Customer object in Stripe
-        stripe_customer = stripe_get_customer(Customer.objects.get(realm=user.realm).stripe_customer_id)
+        stripe_customer = stripe_get_customer(
+            Customer.objects.get(realm=user.realm).stripe_customer_id
+        )
         self.assertEqual(stripe_customer.default_source.id[:5], 'card_')
         self.assertEqual(stripe_customer.description, "zulip (Zulip Dev)")
         self.assertEqual(stripe_customer.discount, None)
@@ -420,8 +511,9 @@ class StripeTest(StripeTestCase):
         [charge] = stripe.Charge.list(customer=stripe_customer.id)
         self.assertEqual(charge.amount, 8000 * self.seat_count)
         # TODO: fix Decimal
-        self.assertEqual(charge.description,
-                         f"Upgrade to Zulip Standard, $80.0 x {self.seat_count}")
+        self.assertEqual(
+            charge.description, f"Upgrade to Zulip Standard, $80.0 x {self.seat_count}"
+        )
         self.assertEqual(charge.receipt_email, user.email)
         self.assertEqual(charge.statement_descriptor, "Zulip Standard")
         # Check Invoices in Stripe
@@ -429,53 +521,95 @@ class StripeTest(StripeTestCase):
         self.assertIsNotNone(invoice.status_transitions.finalized_at)
         invoice_params = {
             # auto_advance is False because the invoice has been paid
-            'amount_due': 0, 'amount_paid': 0, 'auto_advance': False, 'billing': 'charge_automatically',
-            'charge': None, 'status': 'paid', 'total': 0}
+            'amount_due': 0,
+            'amount_paid': 0,
+            'auto_advance': False,
+            'billing': 'charge_automatically',
+            'charge': None,
+            'status': 'paid',
+            'total': 0,
+        }
         for key, value in invoice_params.items():
             self.assertEqual(invoice.get(key), value)
         # Check Line Items on Stripe Invoice
         [item0, item1] = invoice.lines
         line_item_params = {
-            'amount': 8000 * self.seat_count, 'description': 'Zulip Standard', 'discountable': False,
+            'amount': 8000 * self.seat_count,
+            'description': 'Zulip Standard',
+            'discountable': False,
             'period': {
                 'end': datetime_to_timestamp(self.next_year),
-                'start': datetime_to_timestamp(self.now)},
+                'start': datetime_to_timestamp(self.now),
+            },
             # There's no unit_amount on Line Items, probably because it doesn't show up on the
             # user-facing invoice. We could pull the Invoice Item instead and test unit_amount there,
             # but testing the amount and quantity seems sufficient.
-            'plan': None, 'proration': False, 'quantity': self.seat_count}
+            'plan': None,
+            'proration': False,
+            'quantity': self.seat_count,
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item0.get(key), value)
         line_item_params = {
-            'amount': -8000 * self.seat_count, 'description': 'Payment (Card ending in 4242)',
-            'discountable': False, 'plan': None, 'proration': False, 'quantity': 1}
+            'amount': -8000 * self.seat_count,
+            'description': 'Payment (Card ending in 4242)',
+            'discountable': False,
+            'plan': None,
+            'proration': False,
+            'quantity': 1,
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item1.get(key), value)
 
         # Check that we correctly populated Customer, CustomerPlan, and LicenseLedger in Zulip
         customer = Customer.objects.get(stripe_customer_id=stripe_customer.id, realm=user.realm)
         plan = CustomerPlan.objects.get(
-            customer=customer, automanage_licenses=True,
-            price_per_license=8000, fixed_price=None, discount=None, billing_cycle_anchor=self.now,
-            billing_schedule=CustomerPlan.ANNUAL, invoiced_through=LicenseLedger.objects.first(),
-            next_invoice_date=self.next_month, tier=CustomerPlan.STANDARD,
-            status=CustomerPlan.ACTIVE)
+            customer=customer,
+            automanage_licenses=True,
+            price_per_license=8000,
+            fixed_price=None,
+            discount=None,
+            billing_cycle_anchor=self.now,
+            billing_schedule=CustomerPlan.ANNUAL,
+            invoiced_through=LicenseLedger.objects.first(),
+            next_invoice_date=self.next_month,
+            tier=CustomerPlan.STANDARD,
+            status=CustomerPlan.ACTIVE,
+        )
         LicenseLedger.objects.get(
-            plan=plan, is_renewal=True, event_time=self.now, licenses=self.seat_count,
-            licenses_at_next_renewal=self.seat_count)
+            plan=plan,
+            is_renewal=True,
+            event_time=self.now,
+            licenses=self.seat_count,
+            licenses_at_next_renewal=self.seat_count,
+        )
         # Check RealmAuditLog
-        audit_log_entries = list(RealmAuditLog.objects.filter(acting_user=user)
-                                 .values_list('event_type', 'event_time').order_by('id'))
-        self.assertEqual(audit_log_entries, [
-            (RealmAuditLog.STRIPE_CUSTOMER_CREATED, timestamp_to_datetime(stripe_customer.created)),
-            (RealmAuditLog.STRIPE_CARD_CHANGED, timestamp_to_datetime(stripe_customer.created)),
-            (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
-            # TODO: Check for REALM_PLAN_TYPE_CHANGED
-            # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
-        ])
-        self.assertEqual(orjson.loads(RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED).values_list(
-                'extra_data', flat=True).first())['automanage_licenses'], True)
+        audit_log_entries = list(
+            RealmAuditLog.objects.filter(acting_user=user)
+            .values_list('event_type', 'event_time')
+            .order_by('id')
+        )
+        self.assertEqual(
+            audit_log_entries,
+            [
+                (
+                    RealmAuditLog.STRIPE_CUSTOMER_CREATED,
+                    timestamp_to_datetime(stripe_customer.created),
+                ),
+                (RealmAuditLog.STRIPE_CARD_CHANGED, timestamp_to_datetime(stripe_customer.created)),
+                (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
+                # TODO: Check for REALM_PLAN_TYPE_CHANGED
+                # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
+            ],
+        )
+        self.assertEqual(
+            orjson.loads(
+                RealmAuditLog.objects.filter(event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED)
+                .values_list('extra_data', flat=True)
+                .first()
+            )['automanage_licenses'],
+            True,
+        )
         # Check that we correctly updated Realm
         realm = get_realm("zulip")
         self.assertEqual(realm.plan_type, Realm.STANDARD)
@@ -490,12 +624,17 @@ class StripeTest(StripeTestCase):
             response = self.client_get("/billing/")
         self.assert_not_in_success_response(['Pay annually'], response)
         for substring in [
-                'Zulip Standard', str(self.seat_count),
-                'You are using', f'{self.seat_count} of {self.seat_count} licenses',
-                'Licenses are automatically managed by Zulip; when you add',
-                'Your plan will renew on', 'January 2, 2013', f'${80 * self.seat_count}.00',
-                'Visa ending in 4242',
-                'Update card']:
+            'Zulip Standard',
+            str(self.seat_count),
+            'You are using',
+            f'{self.seat_count} of {self.seat_count} licenses',
+            'Licenses are automatically managed by Zulip; when you add',
+            'Your plan will renew on',
+            'January 2, 2013',
+            f'${80 * self.seat_count}.00',
+            'Visa ending in 4242',
+            'Update card',
+        ]:
             self.assert_in_response(substring, response)
 
     @mock_stripe(tested_timestamp_fields=["created"])
@@ -506,7 +645,9 @@ class StripeTest(StripeTestCase):
         with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
             self.upgrade(invoice=True)
         # Check that we correctly created a Customer in Stripe
-        stripe_customer = stripe_get_customer(Customer.objects.get(realm=user.realm).stripe_customer_id)
+        stripe_customer = stripe_get_customer(
+            Customer.objects.get(realm=user.realm).stripe_customer_id
+        )
         # It can take a second for Stripe to attach the source to the customer, and in
         # particular it may not be attached at the time stripe_get_customer is called above,
         # causing test flakes.
@@ -521,44 +662,83 @@ class StripeTest(StripeTestCase):
         self.assertIsNotNone(invoice.due_date)
         self.assertIsNotNone(invoice.status_transitions.finalized_at)
         invoice_params = {
-            'amount_due': 8000 * 123, 'amount_paid': 0, 'attempt_count': 0,
-            'auto_advance': True, 'billing': 'send_invoice', 'statement_descriptor': 'Zulip Standard',
-            'status': 'open', 'total': 8000 * 123}
+            'amount_due': 8000 * 123,
+            'amount_paid': 0,
+            'attempt_count': 0,
+            'auto_advance': True,
+            'billing': 'send_invoice',
+            'statement_descriptor': 'Zulip Standard',
+            'status': 'open',
+            'total': 8000 * 123,
+        }
         for key, value in invoice_params.items():
             self.assertEqual(invoice.get(key), value)
         # Check Line Items on Stripe Invoice
         [item] = invoice.lines
         line_item_params = {
-            'amount': 8000 * 123, 'description': 'Zulip Standard', 'discountable': False,
+            'amount': 8000 * 123,
+            'description': 'Zulip Standard',
+            'discountable': False,
             'period': {
                 'end': datetime_to_timestamp(self.next_year),
-                'start': datetime_to_timestamp(self.now)},
-            'plan': None, 'proration': False, 'quantity': 123}
+                'start': datetime_to_timestamp(self.now),
+            },
+            'plan': None,
+            'proration': False,
+            'quantity': 123,
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item.get(key), value)
 
         # Check that we correctly populated Customer, CustomerPlan and LicenseLedger in Zulip
         customer = Customer.objects.get(stripe_customer_id=stripe_customer.id, realm=user.realm)
         plan = CustomerPlan.objects.get(
-            customer=customer, automanage_licenses=False, charge_automatically=False,
-            price_per_license=8000, fixed_price=None, discount=None, billing_cycle_anchor=self.now,
-            billing_schedule=CustomerPlan.ANNUAL, invoiced_through=LicenseLedger.objects.first(),
-            next_invoice_date=self.next_year, tier=CustomerPlan.STANDARD,
-            status=CustomerPlan.ACTIVE)
+            customer=customer,
+            automanage_licenses=False,
+            charge_automatically=False,
+            price_per_license=8000,
+            fixed_price=None,
+            discount=None,
+            billing_cycle_anchor=self.now,
+            billing_schedule=CustomerPlan.ANNUAL,
+            invoiced_through=LicenseLedger.objects.first(),
+            next_invoice_date=self.next_year,
+            tier=CustomerPlan.STANDARD,
+            status=CustomerPlan.ACTIVE,
+        )
         LicenseLedger.objects.get(
-            plan=plan, is_renewal=True, event_time=self.now, licenses=123, licenses_at_next_renewal=123)
+            plan=plan,
+            is_renewal=True,
+            event_time=self.now,
+            licenses=123,
+            licenses_at_next_renewal=123,
+        )
         # Check RealmAuditLog
-        audit_log_entries = list(RealmAuditLog.objects.filter(acting_user=user)
-                                 .values_list('event_type', 'event_time').order_by('id'))
-        self.assertEqual(audit_log_entries, [
-            (RealmAuditLog.STRIPE_CUSTOMER_CREATED, timestamp_to_datetime(stripe_customer.created)),
-            (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
-            # TODO: Check for REALM_PLAN_TYPE_CHANGED
-            # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
-        ])
-        self.assertEqual(orjson.loads(RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED).values_list(
-                'extra_data', flat=True).first())['automanage_licenses'], False)
+        audit_log_entries = list(
+            RealmAuditLog.objects.filter(acting_user=user)
+            .values_list('event_type', 'event_time')
+            .order_by('id')
+        )
+        self.assertEqual(
+            audit_log_entries,
+            [
+                (
+                    RealmAuditLog.STRIPE_CUSTOMER_CREATED,
+                    timestamp_to_datetime(stripe_customer.created),
+                ),
+                (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
+                # TODO: Check for REALM_PLAN_TYPE_CHANGED
+                # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
+            ],
+        )
+        self.assertEqual(
+            orjson.loads(
+                RealmAuditLog.objects.filter(event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED)
+                .values_list('extra_data', flat=True)
+                .first()
+            )['automanage_licenses'],
+            False,
+        )
         # Check that we correctly updated Realm
         realm = get_realm("zulip")
         self.assertEqual(realm.plan_type, Realm.STANDARD)
@@ -573,11 +753,16 @@ class StripeTest(StripeTestCase):
             response = self.client_get("/billing/")
         self.assert_not_in_success_response(['Pay annually', 'Update card'], response)
         for substring in [
-                'Zulip Standard', str(123),
-                'You are using', f'{self.seat_count} of {123} licenses',
-                'Licenses are manually managed. You will not be able to add ',
-                'Your plan will renew on', 'January 2, 2013', '$9,840.00',  # 9840 = 80 * 123
-                'Billed by invoice']:
+            'Zulip Standard',
+            str(123),
+            'You are using',
+            f'{self.seat_count} of {123} licenses',
+            'Licenses are manually managed. You will not be able to add ',
+            'Your plan will renew on',
+            'January 2, 2013',
+            '$9,840.00',  # 9840 = 80 * 123
+            'Billed by invoice',
+        ]:
             self.assert_in_response(substring, response)
 
     @mock_stripe(tested_timestamp_fields=["created"])
@@ -596,7 +781,9 @@ class StripeTest(StripeTestCase):
             with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
                 self.upgrade()
 
-            stripe_customer = stripe_get_customer(Customer.objects.get(realm=user.realm).stripe_customer_id)
+            stripe_customer = stripe_get_customer(
+                Customer.objects.get(realm=user.realm).stripe_customer_id
+            )
             self.assertEqual(stripe_customer.default_source.id[:5], 'card_')
             self.assertEqual(stripe_customer.description, "zulip (Zulip Dev)")
             self.assertEqual(stripe_customer.discount, None)
@@ -614,26 +801,54 @@ class StripeTest(StripeTestCase):
 
             customer = Customer.objects.get(stripe_customer_id=stripe_customer.id, realm=user.realm)
             plan = CustomerPlan.objects.get(
-                customer=customer, automanage_licenses=True,
-                price_per_license=8000, fixed_price=None, discount=None, billing_cycle_anchor=self.now,
-                billing_schedule=CustomerPlan.ANNUAL, invoiced_through=LicenseLedger.objects.first(),
-                next_invoice_date=free_trial_end_date, tier=CustomerPlan.STANDARD,
-                status=CustomerPlan.FREE_TRIAL)
+                customer=customer,
+                automanage_licenses=True,
+                price_per_license=8000,
+                fixed_price=None,
+                discount=None,
+                billing_cycle_anchor=self.now,
+                billing_schedule=CustomerPlan.ANNUAL,
+                invoiced_through=LicenseLedger.objects.first(),
+                next_invoice_date=free_trial_end_date,
+                tier=CustomerPlan.STANDARD,
+                status=CustomerPlan.FREE_TRIAL,
+            )
             LicenseLedger.objects.get(
-                plan=plan, is_renewal=True, event_time=self.now, licenses=self.seat_count,
-                licenses_at_next_renewal=self.seat_count)
-            audit_log_entries = list(RealmAuditLog.objects.filter(acting_user=user)
-                                     .values_list('event_type', 'event_time').order_by('id'))
-            self.assertEqual(audit_log_entries, [
-                (RealmAuditLog.STRIPE_CUSTOMER_CREATED, timestamp_to_datetime(stripe_customer.created)),
-                (RealmAuditLog.STRIPE_CARD_CHANGED, timestamp_to_datetime(stripe_customer.created)),
-                (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
-                # TODO: Check for REALM_PLAN_TYPE_CHANGED
-                # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
-            ])
-            self.assertEqual(orjson.loads(RealmAuditLog.objects.filter(
-                event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED).values_list(
-                    'extra_data', flat=True).first())['automanage_licenses'], True)
+                plan=plan,
+                is_renewal=True,
+                event_time=self.now,
+                licenses=self.seat_count,
+                licenses_at_next_renewal=self.seat_count,
+            )
+            audit_log_entries = list(
+                RealmAuditLog.objects.filter(acting_user=user)
+                .values_list('event_type', 'event_time')
+                .order_by('id')
+            )
+            self.assertEqual(
+                audit_log_entries,
+                [
+                    (
+                        RealmAuditLog.STRIPE_CUSTOMER_CREATED,
+                        timestamp_to_datetime(stripe_customer.created),
+                    ),
+                    (
+                        RealmAuditLog.STRIPE_CARD_CHANGED,
+                        timestamp_to_datetime(stripe_customer.created),
+                    ),
+                    (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
+                    # TODO: Check for REALM_PLAN_TYPE_CHANGED
+                    # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
+                ],
+            )
+            self.assertEqual(
+                orjson.loads(
+                    RealmAuditLog.objects.filter(event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED)
+                    .values_list('extra_data', flat=True)
+                    .first()
+                )['automanage_licenses'],
+                True,
+            )
 
             realm = get_realm("zulip")
             self.assertEqual(realm.plan_type, Realm.STANDARD)
@@ -643,11 +858,17 @@ class StripeTest(StripeTestCase):
                 response = self.client_get("/billing/")
             self.assert_not_in_success_response(['Pay annually'], response)
             for substring in [
-                    'Zulip Standard', 'Free Trial', str(self.seat_count),
-                    'You are using', f'{self.seat_count} of {self.seat_count} licenses',
-                    'Your plan will be upgraded to', 'March 2, 2012', f'${80 * self.seat_count}.00',
-                    'Visa ending in 4242',
-                    'Update card']:
+                'Zulip Standard',
+                'Free Trial',
+                str(self.seat_count),
+                'You are using',
+                f'{self.seat_count} of {self.seat_count} licenses',
+                'Your plan will be upgraded to',
+                'March 2, 2012',
+                f'${80 * self.seat_count}.00',
+                'Visa ending in 4242',
+                'Update card',
+            ]:
                 self.assert_in_response(substring, response)
             self.assert_not_in_success_response(["Go to your Zulip organization"], response)
 
@@ -658,14 +879,18 @@ class StripeTest(StripeTestCase):
             with patch('corporate.lib.stripe.get_latest_seat_count', return_value=12):
                 update_license_ledger_if_needed(realm, self.now)
             self.assertEqual(
-                LicenseLedger.objects.order_by('-id').values_list('licenses', 'licenses_at_next_renewal').first(),
+                LicenseLedger.objects.order_by('-id')
+                .values_list('licenses', 'licenses_at_next_renewal')
+                .first(),
                 (12, 12),
             )
 
             with patch('corporate.lib.stripe.get_latest_seat_count', return_value=15):
                 update_license_ledger_if_needed(realm, self.next_month)
             self.assertEqual(
-                LicenseLedger.objects.order_by('-id').values_list('licenses', 'licenses_at_next_renewal').first(),
+                LicenseLedger.objects.order_by('-id')
+                .values_list('licenses', 'licenses_at_next_renewal')
+                .first(),
                 (15, 15),
             )
 
@@ -683,17 +908,28 @@ class StripeTest(StripeTestCase):
             self.assertEqual(realm.plan_type, Realm.STANDARD)
             [invoice] = stripe.Invoice.list(customer=stripe_customer.id)
             invoice_params = {
-                "amount_due": 15 * 80 * 100, "amount_paid": 0, "amount_remaining": 15 * 80 * 100,
-                "auto_advance": True, "billing": "charge_automatically", "collection_method": "charge_automatically",
-                "customer_email": self.example_email("hamlet"), "discount": None, "paid": False, "status": "open",
+                "amount_due": 15 * 80 * 100,
+                "amount_paid": 0,
+                "amount_remaining": 15 * 80 * 100,
+                "auto_advance": True,
+                "billing": "charge_automatically",
+                "collection_method": "charge_automatically",
+                "customer_email": self.example_email("hamlet"),
+                "discount": None,
+                "paid": False,
+                "status": "open",
                 "total": 15 * 80 * 100,
             }
             for key, value in invoice_params.items():
                 self.assertEqual(invoice.get(key), value)
             [invoice_item] = invoice.get("lines")
             invoice_item_params = {
-                "amount": 15 * 80 * 100, "description": "Zulip Standard - renewal",
-                "plan": None, "quantity": 15, "subscription": None, "discountable": False,
+                "amount": 15 * 80 * 100,
+                "description": "Zulip Standard - renewal",
+                "plan": None,
+                "quantity": 15,
+                "subscription": None,
+                "discountable": False,
                 "period": {
                     "start": datetime_to_timestamp(free_trial_end_date),
                     "end": datetime_to_timestamp(add_months(free_trial_end_date, 12)),
@@ -708,19 +944,26 @@ class StripeTest(StripeTestCase):
             with patch('corporate.lib.stripe.get_latest_seat_count', return_value=19):
                 update_license_ledger_if_needed(realm, add_months(free_trial_end_date, 10))
             self.assertEqual(
-                LicenseLedger.objects.order_by('-id').values_list('licenses', 'licenses_at_next_renewal').first(),
+                LicenseLedger.objects.order_by('-id')
+                .values_list('licenses', 'licenses_at_next_renewal')
+                .first(),
                 (19, 19),
             )
             invoice_plans_as_needed(add_months(free_trial_end_date, 10))
             [invoice0, invoice1] = stripe.Invoice.list(customer=stripe_customer.id)
             invoice_params = {
-                "amount_due": 5172, "auto_advance": True,  "billing": "charge_automatically",
-                "collection_method": "charge_automatically", "customer_email": "hamlet@zulip.com",
+                "amount_due": 5172,
+                "auto_advance": True,
+                "billing": "charge_automatically",
+                "collection_method": "charge_automatically",
+                "customer_email": "hamlet@zulip.com",
             }
             [invoice_item] = invoice0.get("lines")
             invoice_item_params = {
-                "amount": 5172, "description": "Additional license (Jan 2, 2013 - Mar 2, 2013)",
-                "discountable": False, "quantity": 4,
+                "amount": 5172,
+                "description": "Additional license (Jan 2, 2013 - Mar 2, 2013)",
+                "discountable": False,
+                "quantity": 4,
                 "period": {
                     "start": datetime_to_timestamp(add_months(free_trial_end_date, 10)),
                     "end": datetime_to_timestamp(add_months(free_trial_end_date, 12)),
@@ -746,7 +989,9 @@ class StripeTest(StripeTestCase):
             with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
                 self.upgrade(invoice=True)
 
-            stripe_customer = stripe_get_customer(Customer.objects.get(realm=user.realm).stripe_customer_id)
+            stripe_customer = stripe_get_customer(
+                Customer.objects.get(realm=user.realm).stripe_customer_id
+            )
             self.assertEqual(stripe_customer.discount, None)
             self.assertEqual(stripe_customer.email, user.email)
             metadata_dict = dict(stripe_customer.metadata)
@@ -760,26 +1005,51 @@ class StripeTest(StripeTestCase):
 
             customer = Customer.objects.get(stripe_customer_id=stripe_customer.id, realm=user.realm)
             plan = CustomerPlan.objects.get(
-                customer=customer, automanage_licenses=False,
-                price_per_license=8000, fixed_price=None, discount=None, billing_cycle_anchor=self.now,
-                billing_schedule=CustomerPlan.ANNUAL, invoiced_through=LicenseLedger.objects.first(),
-                next_invoice_date=free_trial_end_date, tier=CustomerPlan.STANDARD,
-                status=CustomerPlan.FREE_TRIAL)
+                customer=customer,
+                automanage_licenses=False,
+                price_per_license=8000,
+                fixed_price=None,
+                discount=None,
+                billing_cycle_anchor=self.now,
+                billing_schedule=CustomerPlan.ANNUAL,
+                invoiced_through=LicenseLedger.objects.first(),
+                next_invoice_date=free_trial_end_date,
+                tier=CustomerPlan.STANDARD,
+                status=CustomerPlan.FREE_TRIAL,
+            )
 
             LicenseLedger.objects.get(
-                plan=plan, is_renewal=True, event_time=self.now, licenses=123,
-                licenses_at_next_renewal=123)
-            audit_log_entries = list(RealmAuditLog.objects.filter(acting_user=user)
-                                     .values_list('event_type', 'event_time').order_by('id'))
-            self.assertEqual(audit_log_entries, [
-                (RealmAuditLog.STRIPE_CUSTOMER_CREATED, timestamp_to_datetime(stripe_customer.created)),
-                (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
-                # TODO: Check for REALM_PLAN_TYPE_CHANGED
-                # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
-            ])
-            self.assertEqual(orjson.loads(RealmAuditLog.objects.filter(
-                event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED).values_list(
-                    'extra_data', flat=True).first())['automanage_licenses'], False)
+                plan=plan,
+                is_renewal=True,
+                event_time=self.now,
+                licenses=123,
+                licenses_at_next_renewal=123,
+            )
+            audit_log_entries = list(
+                RealmAuditLog.objects.filter(acting_user=user)
+                .values_list('event_type', 'event_time')
+                .order_by('id')
+            )
+            self.assertEqual(
+                audit_log_entries,
+                [
+                    (
+                        RealmAuditLog.STRIPE_CUSTOMER_CREATED,
+                        timestamp_to_datetime(stripe_customer.created),
+                    ),
+                    (RealmAuditLog.CUSTOMER_PLAN_CREATED, self.now),
+                    # TODO: Check for REALM_PLAN_TYPE_CHANGED
+                    # (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra()),
+                ],
+            )
+            self.assertEqual(
+                orjson.loads(
+                    RealmAuditLog.objects.filter(event_type=RealmAuditLog.CUSTOMER_PLAN_CREATED)
+                    .values_list('extra_data', flat=True)
+                    .first()
+                )['automanage_licenses'],
+                False,
+            )
 
             realm = get_realm("zulip")
             self.assertEqual(realm.plan_type, Realm.STANDARD)
@@ -789,10 +1059,15 @@ class StripeTest(StripeTestCase):
                 response = self.client_get("/billing/")
             self.assert_not_in_success_response(['Pay annually'], response)
             for substring in [
-                    'Zulip Standard', 'Free Trial', str(self.seat_count),
-                    'You are using', f'{self.seat_count} of {123} licenses',
-                    'Your plan will be upgraded to', 'March 2, 2012',
-                    f'{80 * 123:,.2f}', 'Billed by invoice',
+                'Zulip Standard',
+                'Free Trial',
+                str(self.seat_count),
+                'You are using',
+                f'{self.seat_count} of {123} licenses',
+                'Your plan will be upgraded to',
+                'March 2, 2012',
+                f'{80 * 123:,.2f}',
+                'Billed by invoice',
             ]:
                 self.assert_in_response(substring, response)
 
@@ -812,17 +1087,28 @@ class StripeTest(StripeTestCase):
             self.assertEqual(realm.plan_type, Realm.STANDARD)
             [invoice] = stripe.Invoice.list(customer=stripe_customer.id)
             invoice_params = {
-                "amount_due": 123 * 80 * 100, "amount_paid": 0, "amount_remaining": 123 * 80 * 100,
-                "auto_advance": True, "billing": "send_invoice", "collection_method": "send_invoice",
-                "customer_email": self.example_email("hamlet"), "discount": None, "paid": False, "status": "open",
+                "amount_due": 123 * 80 * 100,
+                "amount_paid": 0,
+                "amount_remaining": 123 * 80 * 100,
+                "auto_advance": True,
+                "billing": "send_invoice",
+                "collection_method": "send_invoice",
+                "customer_email": self.example_email("hamlet"),
+                "discount": None,
+                "paid": False,
+                "status": "open",
                 "total": 123 * 80 * 100,
             }
             for key, value in invoice_params.items():
                 self.assertEqual(invoice.get(key), value)
             [invoice_item] = invoice.get("lines")
             invoice_item_params = {
-                "amount": 123 * 80 * 100, "description": "Zulip Standard - renewal",
-                "plan": None, "quantity": 123, "subscription": None, "discountable": False,
+                "amount": 123 * 80 * 100,
+                "description": "Zulip Standard - renewal",
+                "plan": None,
+                "quantity": 123,
+                "subscription": None,
+                "discountable": False,
                 "period": {
                     "start": datetime_to_timestamp(free_trial_end_date),
                     "end": datetime_to_timestamp(add_months(free_trial_end_date, 12)),
@@ -869,7 +1155,9 @@ class StripeTest(StripeTestCase):
         # Check that member who is not a billing admin does not have access
         self.login_user(self.example_user('cordelia'))
         response = self.client_get("/billing/")
-        self.assert_in_success_response(["You must be an organization owner or a billing administrator"], response)
+        self.assert_in_success_response(
+            ["You must be an organization owner or a billing administrator"], response
+        )
 
     @mock_stripe(tested_timestamp_fields=["created"])
     def test_upgrade_by_card_with_outdated_seat_count(self, *mocks: Mock) -> None:
@@ -885,8 +1173,10 @@ class StripeTest(StripeTestCase):
         self.assertEqual(8000 * self.seat_count, charge.amount)
         # Check that the invoice has a credit for the old amount and a charge for the new one
         [stripe_invoice] = stripe.Invoice.list(customer=stripe_customer_id)
-        self.assertEqual([8000 * new_seat_count, -8000 * self.seat_count],
-                         [item.amount for item in stripe_invoice.lines])
+        self.assertEqual(
+            [8000 * new_seat_count, -8000 * self.seat_count],
+            [item.amount for item in stripe_invoice.lines],
+        )
         # Check LicenseLedger has the new amount
         self.assertEqual(LicenseLedger.objects.first().licenses, new_seat_count)
         self.assertEqual(LicenseLedger.objects.first().licenses_at_next_renewal, new_seat_count)
@@ -899,7 +1189,10 @@ class StripeTest(StripeTestCase):
         # a Customer object succeeds, but attempts to charge the customer fail.
         with self.assertLogs('corporate.stripe', 'INFO') as m:
             self.upgrade(stripe_token=stripe_create_token('4000000000000341').id)
-            self.assertEqual(m.output, ['INFO:corporate.stripe:Stripe card error: 402 card_error card_declined None'])
+            self.assertEqual(
+                m.output,
+                ['INFO:corporate.stripe:Stripe card error: 402 card_error card_declined None'],
+            )
         # Check that we created a Customer object but no CustomerPlan
         stripe_customer_id = Customer.objects.get(realm=get_realm('zulip')).stripe_customer_id
         self.assertFalse(CustomerPlan.objects.exists())
@@ -911,10 +1204,15 @@ class StripeTest(StripeTestCase):
         self.assertFalse(stripe.Invoice.list(customer=stripe_customer_id))
         self.assertFalse(stripe.InvoiceItem.list(customer=stripe_customer_id))
         # Check that we correctly populated RealmAuditLog
-        audit_log_entries = list(RealmAuditLog.objects.filter(acting_user=user)
-                                 .values_list('event_type', flat=True).order_by('id'))
-        self.assertEqual(audit_log_entries, [RealmAuditLog.STRIPE_CUSTOMER_CREATED,
-                                             RealmAuditLog.STRIPE_CARD_CHANGED])
+        audit_log_entries = list(
+            RealmAuditLog.objects.filter(acting_user=user)
+            .values_list('event_type', flat=True)
+            .order_by('id')
+        )
+        self.assertEqual(
+            audit_log_entries,
+            [RealmAuditLog.STRIPE_CUSTOMER_CREATED, RealmAuditLog.STRIPE_CARD_CHANGED],
+        )
         # Check that we did not update Realm
         realm = get_realm("zulip")
         self.assertNotEqual(realm.plan_type, Realm.STANDARD)
@@ -940,16 +1238,23 @@ class StripeTest(StripeTestCase):
         [charge0, charge1] = stripe.Charge.list(customer=stripe_customer_id)
         self.assertEqual(8000 * 23, charge0.amount)
         [stripe_invoice] = stripe.Invoice.list(customer=stripe_customer_id)
-        self.assertEqual([8000 * 23, -8000 * 23],
-                         [item.amount for item in stripe_invoice.lines])
+        self.assertEqual([8000 * 23, -8000 * 23], [item.amount for item in stripe_invoice.lines])
         # Check that we correctly populated RealmAuditLog
-        audit_log_entries = list(RealmAuditLog.objects.filter(acting_user=user)
-                                 .values_list('event_type', flat=True).order_by('id'))
+        audit_log_entries = list(
+            RealmAuditLog.objects.filter(acting_user=user)
+            .values_list('event_type', flat=True)
+            .order_by('id')
+        )
         # TODO: Test for REALM_PLAN_TYPE_CHANGED as the last entry
-        self.assertEqual(audit_log_entries, [RealmAuditLog.STRIPE_CUSTOMER_CREATED,
-                                             RealmAuditLog.STRIPE_CARD_CHANGED,
-                                             RealmAuditLog.STRIPE_CARD_CHANGED,
-                                             RealmAuditLog.CUSTOMER_PLAN_CREATED])
+        self.assertEqual(
+            audit_log_entries,
+            [
+                RealmAuditLog.STRIPE_CUSTOMER_CREATED,
+                RealmAuditLog.STRIPE_CARD_CHANGED,
+                RealmAuditLog.STRIPE_CARD_CHANGED,
+                RealmAuditLog.CUSTOMER_PLAN_CREATED,
+            ],
+        )
         # Check that we correctly updated Realm
         realm = get_realm("zulip")
         self.assertEqual(realm.plan_type, Realm.STANDARD)
@@ -973,13 +1278,17 @@ class StripeTest(StripeTestCase):
             with self.assertRaises(BillingError) as context:
                 self.local_upgrade(self.seat_count, True, CustomerPlan.ANNUAL, 'token')
         self.assertEqual('subscribing with existing subscription', context.exception.description)
-        self.assertRegexpMatches(m.output[0], r'WARNING:corporate.stripe:Customer <Customer <Realm: zulip \d*> id> trying to upgrade, but has an active subscription')
+        self.assertRegexpMatches(
+            m.output[0],
+            r'WARNING:corporate.stripe:Customer <Customer <Realm: zulip \d*> id> trying to upgrade, but has an active subscription',
+        )
         self.assertEqual(len(m.output), 1)
 
     def test_check_upgrade_parameters(self) -> None:
         # Tests all the error paths except 'not enough licenses'
-        def check_error(error_description: str, upgrade_params: Mapping[str, Any],
-                        del_args: Sequence[str] = []) -> None:
+        def check_error(
+            error_description: str, upgrade_params: Mapping[str, Any], del_args: Sequence[str] = []
+        ) -> None:
             response = self.upgrade(talk_to_stripe=False, del_args=del_args, **upgrade_params)
             self.assert_json_error_contains(response, "Something went wrong. Please contact")
             self.assertEqual(orjson.loads(response.content)['error_description'], error_description)
@@ -992,39 +1301,54 @@ class StripeTest(StripeTestCase):
         check_error('autopay with no card', {}, del_args=['stripe_token'])
 
     def test_upgrade_license_counts(self) -> None:
-        def check_min_licenses_error(invoice: bool, licenses: Optional[int], min_licenses_in_response: int,
-                                     upgrade_params: Dict[str, Any]={}) -> None:
+        def check_min_licenses_error(
+            invoice: bool,
+            licenses: Optional[int],
+            min_licenses_in_response: int,
+            upgrade_params: Dict[str, Any] = {},
+        ) -> None:
             if licenses is None:
                 del_args = ['licenses']
             else:
                 del_args = []
                 upgrade_params['licenses'] = licenses
-            response = self.upgrade(invoice=invoice, talk_to_stripe=False,
-                                    del_args=del_args, **upgrade_params)
+            response = self.upgrade(
+                invoice=invoice, talk_to_stripe=False, del_args=del_args, **upgrade_params
+            )
             self.assert_json_error_contains(response, f"at least {min_licenses_in_response} users")
-            self.assertEqual(orjson.loads(response.content)['error_description'], 'not enough licenses')
+            self.assertEqual(
+                orjson.loads(response.content)['error_description'], 'not enough licenses'
+            )
 
         def check_max_licenses_error(licenses: int) -> None:
-            response = self.upgrade(invoice=True, talk_to_stripe=False,
-                                    licenses=licenses)
-            self.assert_json_error_contains(response, f"with more than {MAX_INVOICED_LICENSES} licenses")
-            self.assertEqual(orjson.loads(response.content)['error_description'], 'too many licenses')
+            response = self.upgrade(invoice=True, talk_to_stripe=False, licenses=licenses)
+            self.assert_json_error_contains(
+                response, f"with more than {MAX_INVOICED_LICENSES} licenses"
+            )
+            self.assertEqual(
+                orjson.loads(response.content)['error_description'], 'too many licenses'
+            )
 
-        def check_success(invoice: bool, licenses: Optional[int], upgrade_params: Dict[str, Any]={}) -> None:
+        def check_success(
+            invoice: bool, licenses: Optional[int], upgrade_params: Dict[str, Any] = {}
+        ) -> None:
             if licenses is None:
                 del_args = ['licenses']
             else:
                 del_args = []
                 upgrade_params['licenses'] = licenses
             with patch('corporate.views.process_initial_upgrade'):
-                response = self.upgrade(invoice=invoice, talk_to_stripe=False,
-                                        del_args=del_args, **upgrade_params)
+                response = self.upgrade(
+                    invoice=invoice, talk_to_stripe=False, del_args=del_args, **upgrade_params
+                )
             self.assert_json_success(response)
 
         hamlet = self.example_user('hamlet')
         self.login_user(hamlet)
         # Autopay with licenses < seat count
-        check_min_licenses_error(False, self.seat_count - 1, self.seat_count, {'license_management': 'manual'})
+        check_min_licenses_error(
+            False, self.seat_count - 1, self.seat_count, {'license_management': 'manual'}
+        )
         # Autopay with not setting licenses
         check_min_licenses_error(False, None, self.seat_count, {'license_management': 'manual'})
         # Invoice with licenses < MIN_INVOICED_LICENSES
@@ -1036,7 +1360,9 @@ class StripeTest(StripeTestCase):
         check_min_licenses_error(True, None, MIN_INVOICED_LICENSES)
         # Invoice exceeding max licenses
         check_max_licenses_error(MAX_INVOICED_LICENSES + 1)
-        with patch("corporate.lib.stripe.get_latest_seat_count", return_value=MAX_INVOICED_LICENSES + 5):
+        with patch(
+            "corporate.lib.stripe.get_latest_seat_count", return_value=MAX_INVOICED_LICENSES + 5
+        ):
             check_max_licenses_error(MAX_INVOICED_LICENSES + 5)
 
         # Autopay with automatic license_management
@@ -1055,13 +1381,18 @@ class StripeTest(StripeTestCase):
     def test_upgrade_with_uncaught_exception(self) -> None:
         hamlet = self.example_user('hamlet')
         self.login_user(hamlet)
-        with patch("corporate.views.process_initial_upgrade", side_effect=Exception), \
-             self.assertLogs('corporate.stripe', "WARNING") as m:
+        with patch(
+            "corporate.views.process_initial_upgrade", side_effect=Exception
+        ), self.assertLogs('corporate.stripe', "WARNING") as m:
             response = self.upgrade(talk_to_stripe=False)
             self.assertIn('ERROR:corporate.stripe:Uncaught exception in billing', m.output[0])
             self.assertIn(m.records[0].stack_info, m.output[0])
-        self.assert_json_error_contains(response, "Something went wrong. Please contact desdemona+admin@zulip.com.")
-        self.assertEqual(orjson.loads(response.content)['error_description'], 'uncaught exception during upgrade')
+        self.assert_json_error_contains(
+            response, "Something went wrong. Please contact desdemona+admin@zulip.com."
+        )
+        self.assertEqual(
+            orjson.loads(response.content)['error_description'], 'uncaught exception during upgrade'
+        )
 
     def test_request_sponsorship(self) -> None:
         user = self.example_user("hamlet")
@@ -1072,15 +1403,18 @@ class StripeTest(StripeTestCase):
         data = {
             "organization-type": orjson.dumps("Open-source").decode(),
             "website": orjson.dumps("https://infinispan.org/").decode(),
-            "description": orjson.dumps("Infinispan is a distributed in-memory key/value data store with optional schema.").decode(),
+            "description": orjson.dumps(
+                "Infinispan is a distributed in-memory key/value data store with optional schema."
+            ).decode(),
         }
         response = self.client_post("/json/billing/sponsorship", data)
         self.assert_json_success(response)
 
         customer = get_customer_by_realm(user.realm)
-        assert(customer is not None)
+        assert customer is not None
         self.assertEqual(customer.sponsorship_pending, True)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 1)
 
         for message in outbox:
@@ -1090,7 +1424,9 @@ class StripeTest(StripeTestCase):
             self.assertEqual(message.reply_to, ['hamlet@zulip.com'])
             self.assertIn('Zulip sponsorship <noreply-', message.from_email)
             self.assertIn("Requested by: King Hamlet (Member)", message.body)
-            self.assertIn("Support URL: http://zulip.testserver/activity/support?q=zulip", message.body)
+            self.assertIn(
+                "Support URL: http://zulip.testserver/activity/support?q=zulip", message.body
+            )
             self.assertIn("Website: https://infinispan.org", message.body)
             self.assertIn("Organization type: Open-source", message.body)
             self.assertIn("Description:\nInfinispan is a distributed in-memory", message.body)
@@ -1100,17 +1436,24 @@ class StripeTest(StripeTestCase):
         self.assertEqual(response.url, "/billing/")
 
         response = self.client_get("/billing/")
-        self.assert_in_success_response(["Your organization has requested sponsored or discounted hosting."], response)
+        self.assert_in_success_response(
+            ["Your organization has requested sponsored or discounted hosting."], response
+        )
 
         self.login_user(self.example_user("othello"))
         response = self.client_get("/billing/")
-        self.assert_in_success_response(["You must be an organization owner or a billing administrator to view this page."], response)
+        self.assert_in_success_response(
+            ["You must be an organization owner or a billing administrator to view this page."],
+            response,
+        )
 
         user.realm.plan_type = Realm.STANDARD_FREE
         user.realm.save()
         self.login_user(self.example_user("hamlet"))
         response = self.client_get("/billing/")
-        self.assert_in_success_response(["Your organization is fully sponsored and is on the <b>Zulip Standard</b>"], response)
+        self.assert_in_success_response(
+            ["Your organization is fully sponsored and is on the <b>Zulip Standard</b>"], response
+        )
 
     def test_redirect_for_billing_home(self) -> None:
         user = self.example_user("iago")
@@ -1150,8 +1493,12 @@ class StripeTest(StripeTestCase):
         response = self.client_get("/upgrade/")
         self.assertEqual(response.status_code, 200)
 
-        CustomerPlan.objects.create(customer=customer, billing_cycle_anchor=timezone_now(),
-                                    billing_schedule=CustomerPlan.ANNUAL, tier=CustomerPlan.STANDARD)
+        CustomerPlan.objects.create(
+            customer=customer,
+            billing_cycle_anchor=timezone_now(),
+            billing_schedule=CustomerPlan.ANNUAL,
+            tier=CustomerPlan.STANDARD,
+        )
         response = self.client_get("/upgrade/")
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.url, "/billing/")
@@ -1168,10 +1515,12 @@ class StripeTest(StripeTestCase):
     def test_get_latest_seat_count(self) -> None:
         realm = get_realm("zulip")
         initial_count = get_latest_seat_count(realm)
-        user1 = UserProfile.objects.create(realm=realm, email='user1@zulip.com',
-                                           delivery_email='user1@zulip.com')
-        user2 = UserProfile.objects.create(realm=realm, email='user2@zulip.com',
-                                           delivery_email='user2@zulip.com')
+        user1 = UserProfile.objects.create(
+            realm=realm, email='user1@zulip.com', delivery_email='user1@zulip.com'
+        )
+        user2 = UserProfile.objects.create(
+            realm=realm, email='user2@zulip.com', delivery_email='user2@zulip.com'
+        )
         self.assertEqual(get_latest_seat_count(realm), initial_count + 2)
 
         # Test that bots aren't counted
@@ -1185,22 +1534,33 @@ class StripeTest(StripeTestCase):
 
         # Test guests
         # Adding a guest to a realm with a lot of members shouldn't change anything
-        UserProfile.objects.create(realm=realm, email='user3@zulip.com', delivery_email='user3@zulip.com',
-                                   role=UserProfile.ROLE_GUEST)
+        UserProfile.objects.create(
+            realm=realm,
+            email='user3@zulip.com',
+            delivery_email='user3@zulip.com',
+            role=UserProfile.ROLE_GUEST,
+        )
         self.assertEqual(get_latest_seat_count(realm), initial_count)
         # Test 1 member and 5 guests
         realm = Realm.objects.create(string_id='second', name='second')
-        UserProfile.objects.create(realm=realm, email='member@second.com',
-                                   delivery_email='member@second.com')
+        UserProfile.objects.create(
+            realm=realm, email='member@second.com', delivery_email='member@second.com'
+        )
         for i in range(5):
-            UserProfile.objects.create(realm=realm, email=f'guest{i}@second.com',
-                                       delivery_email=f'guest{i}@second.com',
-                                       role=UserProfile.ROLE_GUEST)
+            UserProfile.objects.create(
+                realm=realm,
+                email=f'guest{i}@second.com',
+                delivery_email=f'guest{i}@second.com',
+                role=UserProfile.ROLE_GUEST,
+            )
         self.assertEqual(get_latest_seat_count(realm), 1)
         # Test 1 member and 6 guests
-        UserProfile.objects.create(realm=realm, email='guest5@second.com',
-                                   delivery_email='guest5@second.com',
-                                   role=UserProfile.ROLE_GUEST)
+        UserProfile.objects.create(
+            realm=realm,
+            email='guest5@second.com',
+            delivery_email='guest5@second.com',
+            role=UserProfile.ROLE_GUEST,
+        )
         self.assertEqual(get_latest_seat_count(realm), 2)
 
     def test_sign_string(self) -> None:
@@ -1247,8 +1607,10 @@ class StripeTest(StripeTestCase):
         [charge] = stripe.Charge.list(customer=customer.stripe_customer_id)
         self.assertEqual(1200 * self.seat_count, charge.amount)
         [invoice] = stripe.Invoice.list(customer=customer.stripe_customer_id)
-        self.assertEqual([1200 * self.seat_count, -1200 * self.seat_count],
-                         [item.amount for item in invoice.lines])
+        self.assertEqual(
+            [1200 * self.seat_count, -1200 * self.seat_count],
+            [item.amount for item in invoice.lines],
+        )
         # Check CustomerPlan reflects the discount
         plan = CustomerPlan.objects.get(price_per_license=1200, discount=Decimal(85))
 
@@ -1257,12 +1619,16 @@ class StripeTest(StripeTestCase):
         plan.save(update_fields=['status'])
         attach_discount_to_realm(user.realm, Decimal(25))
         with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
-            process_initial_upgrade(user, self.seat_count, True, CustomerPlan.ANNUAL, stripe_create_token().id)
+            process_initial_upgrade(
+                user, self.seat_count, True, CustomerPlan.ANNUAL, stripe_create_token().id
+            )
         [charge, _] = stripe.Charge.list(customer=customer.stripe_customer_id)
         self.assertEqual(6000 * self.seat_count, charge.amount)
         [invoice, _] = stripe.Invoice.list(customer=customer.stripe_customer_id)
-        self.assertEqual([6000 * self.seat_count, -6000 * self.seat_count],
-                         [item.amount for item in invoice.lines])
+        self.assertEqual(
+            [6000 * self.seat_count, -6000 * self.seat_count],
+            [item.amount for item in invoice.lines],
+        )
         plan = CustomerPlan.objects.get(price_per_license=6000, discount=Decimal(25))
 
         attach_discount_to_realm(user.realm, Decimal(50))
@@ -1273,8 +1639,7 @@ class StripeTest(StripeTestCase):
         self.assertEqual(customer.default_discount, 50)
         invoice_plans_as_needed(self.next_year + timedelta(days=10))
         [invoice, _, _] = stripe.Invoice.list(customer=customer.stripe_customer_id)
-        self.assertEqual([4000 * self.seat_count],
-                         [item.amount for item in invoice.lines])
+        self.assertEqual([4000 * self.seat_count], [item.amount for item in invoice.lines])
 
     def test_get_discount_for_realm(self) -> None:
         user = self.example_user('hamlet')
@@ -1297,37 +1662,54 @@ class StripeTest(StripeTestCase):
 
         # Replace with an invalid card
         stripe_token = stripe_create_token(card_number='4000000000009987').id
-        with patch("stripe.Invoice.list") as mock_invoice_list, self.assertLogs('corporate.stripe', 'INFO') as m:
-            response = self.client_post("/json/billing/sources/change",
-                                        {'stripe_token': orjson.dumps(stripe_token).decode()})
-            self.assertEqual(m.output, ['INFO:corporate.stripe:Stripe card error: 402 card_error card_declined '])
+        with patch("stripe.Invoice.list") as mock_invoice_list, self.assertLogs(
+            'corporate.stripe', 'INFO'
+        ) as m:
+            response = self.client_post(
+                "/json/billing/sources/change",
+                {'stripe_token': orjson.dumps(stripe_token).decode()},
+            )
+            self.assertEqual(
+                m.output, ['INFO:corporate.stripe:Stripe card error: 402 card_error card_declined ']
+            )
         mock_invoice_list.assert_not_called()
         self.assertEqual(orjson.loads(response.content)['error_description'], 'card error')
         self.assert_json_error_contains(response, 'Your card was declined')
         for stripe_source in stripe_get_customer(stripe_customer_id).sources:
             assert isinstance(stripe_source, stripe.Card)
             self.assertEqual(stripe_source.last4, '4242')
-        self.assertFalse(RealmAuditLog.objects.filter(event_type=RealmAuditLog.STRIPE_CARD_CHANGED).exists())
+        self.assertFalse(
+            RealmAuditLog.objects.filter(event_type=RealmAuditLog.STRIPE_CARD_CHANGED).exists()
+        )
 
         # Replace with a card that's valid, but charging the card fails
         stripe_token = stripe_create_token(card_number='4000000000000341').id
         with self.assertLogs('corporate.stripe', 'INFO') as m:
-            response = self.client_post("/json/billing/sources/change",
-                                        {'stripe_token': orjson.dumps(stripe_token).decode()})
-            self.assertEqual(m.output, ['INFO:corporate.stripe:Stripe card error: 402 card_error card_declined None'])
+            response = self.client_post(
+                "/json/billing/sources/change",
+                {'stripe_token': orjson.dumps(stripe_token).decode()},
+            )
+            self.assertEqual(
+                m.output,
+                ['INFO:corporate.stripe:Stripe card error: 402 card_error card_declined None'],
+            )
         self.assertEqual(orjson.loads(response.content)['error_description'], 'card error')
         self.assert_json_error_contains(response, 'Your card was declined')
         for stripe_source in stripe_get_customer(stripe_customer_id).sources:
             assert isinstance(stripe_source, stripe.Card)
             self.assertEqual(stripe_source.last4, '0341')
-        self.assertEqual(len(list(stripe.Invoice.list(customer=stripe_customer_id, status='open'))), 1)
-        self.assertEqual(1, RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.STRIPE_CARD_CHANGED).count())
+        self.assertEqual(
+            len(list(stripe.Invoice.list(customer=stripe_customer_id, status='open'))), 1
+        )
+        self.assertEqual(
+            1, RealmAuditLog.objects.filter(event_type=RealmAuditLog.STRIPE_CARD_CHANGED).count()
+        )
 
         # Replace with a valid card
         stripe_token = stripe_create_token(card_number='5555555555554444').id
-        response = self.client_post("/json/billing/sources/change",
-                                    {'stripe_token': orjson.dumps(stripe_token).decode()})
+        response = self.client_post(
+            "/json/billing/sources/change", {'stripe_token': orjson.dumps(stripe_token).decode()}
+        )
         self.assert_json_success(response)
         number_of_sources = 0
         for stripe_source in stripe_get_customer(stripe_customer_id).sources:
@@ -1339,8 +1721,9 @@ class StripeTest(StripeTestCase):
         # Ideally we'd also test that we don't pay invoices with billing=='send_invoice'
         for stripe_invoice in stripe.Invoice.list(customer=stripe_customer_id):
             self.assertEqual(stripe_invoice.status, 'paid')
-        self.assertEqual(2, RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.STRIPE_CARD_CHANGED).count())
+        self.assertEqual(
+            2, RealmAuditLog.objects.filter(event_type=RealmAuditLog.STRIPE_CARD_CHANGED).count()
+        )
 
     def test_downgrade(self) -> None:
         user = self.example_user("hamlet")
@@ -1348,20 +1731,29 @@ class StripeTest(StripeTestCase):
         with patch("corporate.lib.stripe.timezone_now", return_value=self.now):
             self.local_upgrade(self.seat_count, True, CustomerPlan.ANNUAL, 'token')
         with self.assertLogs('corporate.stripe', 'INFO') as m:
-            response = self.client_post("/json/billing/plan/change",
-                                        {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE})
-            self.assertRegexpMatches(m.output[0], r"INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: \d*")
+            response = self.client_post(
+                "/json/billing/plan/change", {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE}
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r"INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: \d*",
+            )
         self.assert_json_success(response)
 
         # Verify that we still write LicenseLedger rows during the remaining
         # part of the cycle
         with patch("corporate.lib.stripe.get_latest_seat_count", return_value=20):
             update_license_ledger_if_needed(user.realm, self.now)
-        self.assertEqual(LicenseLedger.objects.order_by('-id').values_list(
-            'licenses', 'licenses_at_next_renewal').first(), (20, 20))
+        self.assertEqual(
+            LicenseLedger.objects.order_by('-id')
+            .values_list('licenses', 'licenses_at_next_renewal')
+            .first(),
+            (20, 20),
+        )
 
         # Verify that we invoice them for the additional users
         from stripe import Invoice
+
         Invoice.create = lambda **args: None  # type: ignore[assignment] # cleaner than mocking
         Invoice.finalize_invoice = lambda *args: None  # type: ignore[assignment] # cleaner than mocking
         with patch("stripe.InvoiceItem.create") as mocked:
@@ -1374,14 +1766,22 @@ class StripeTest(StripeTestCase):
             update_license_ledger_if_needed(user.realm, self.next_year)
         self.assertEqual(get_realm('zulip').plan_type, Realm.LIMITED)
         self.assertEqual(CustomerPlan.objects.first().status, CustomerPlan.ENDED)
-        self.assertEqual(LicenseLedger.objects.order_by('-id').values_list(
-            'licenses', 'licenses_at_next_renewal').first(), (20, 20))
+        self.assertEqual(
+            LicenseLedger.objects.order_by('-id')
+            .values_list('licenses', 'licenses_at_next_renewal')
+            .first(),
+            (20, 20),
+        )
 
         # Verify that we don't write LicenseLedger rows once we've downgraded
         with patch("corporate.lib.stripe.get_latest_seat_count", return_value=40):
             update_license_ledger_if_needed(user.realm, self.next_year)
-        self.assertEqual(LicenseLedger.objects.order_by('-id').values_list(
-            'licenses', 'licenses_at_next_renewal').first(), (20, 20))
+        self.assertEqual(
+            LicenseLedger.objects.order_by('-id')
+            .values_list('licenses', 'licenses_at_next_renewal')
+            .first(),
+            (20, 20),
+        )
 
         # Verify that we call invoice_plan once more after cycle end but
         # don't invoice them for users added after the cycle end
@@ -1401,46 +1801,59 @@ class StripeTest(StripeTestCase):
         mocked.assert_not_called()
 
     @mock_stripe()
-    def test_switch_from_monthly_plan_to_annual_plan_for_automatic_license_management(self, *mocks: Mock) -> None:
+    def test_switch_from_monthly_plan_to_annual_plan_for_automatic_license_management(
+        self, *mocks: Mock
+    ) -> None:
         user = self.example_user("hamlet")
 
         self.login_user(user)
         with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
             self.upgrade(schedule='monthly')
         monthly_plan = get_current_plan_by_realm(user.realm)
-        assert(monthly_plan is not None)
+        assert monthly_plan is not None
         self.assertEqual(monthly_plan.automanage_licenses, True)
         self.assertEqual(monthly_plan.billing_schedule, CustomerPlan.MONTHLY)
 
         with self.assertLogs('corporate.stripe', "INFO") as m:
-            response = self.client_post("/json/billing/plan/change",
-                                        {'status': CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE})
-            self.assertRegexpMatches(m.output[0], r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 4')
+            response = self.client_post(
+                "/json/billing/plan/change",
+                {'status': CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE},
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 4',
+            )
         self.assert_json_success(response)
         monthly_plan.refresh_from_db()
         self.assertEqual(monthly_plan.status, CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE)
         with patch('corporate.views.timezone_now', return_value=self.now):
             response = self.client_get("/billing/")
-        self.assert_in_success_response(["be switched from monthly to annual billing on <strong>February 2, 2012"], response)
+        self.assert_in_success_response(
+            ["be switched from monthly to annual billing on <strong>February 2, 2012"], response
+        )
 
         with patch("corporate.lib.stripe.get_latest_seat_count", return_value=20):
             update_license_ledger_if_needed(user.realm, self.now)
         self.assertEqual(LicenseLedger.objects.filter(plan=monthly_plan).count(), 2)
-        self.assertEqual(LicenseLedger.objects.order_by('-id').values_list(
-            'licenses', 'licenses_at_next_renewal').first(), (20, 20))
+        self.assertEqual(
+            LicenseLedger.objects.order_by('-id')
+            .values_list('licenses', 'licenses_at_next_renewal')
+            .first(),
+            (20, 20),
+        )
 
         with patch('corporate.lib.stripe.timezone_now', return_value=self.next_month):
             with patch("corporate.lib.stripe.get_latest_seat_count", return_value=25):
                 update_license_ledger_if_needed(user.realm, self.next_month)
         self.assertEqual(LicenseLedger.objects.filter(plan=monthly_plan).count(), 2)
         customer = get_customer_by_realm(user.realm)
-        assert(customer is not None)
+        assert customer is not None
         self.assertEqual(CustomerPlan.objects.filter(customer=customer).count(), 2)
         monthly_plan.refresh_from_db()
         self.assertEqual(monthly_plan.status, CustomerPlan.ENDED)
         self.assertEqual(monthly_plan.next_invoice_date, self.next_month)
         annual_plan = get_current_plan_by_realm(user.realm)
-        assert(annual_plan is not None)
+        assert annual_plan is not None
         self.assertEqual(annual_plan.status, CustomerPlan.ACTIVE)
         self.assertEqual(annual_plan.billing_schedule, CustomerPlan.ANNUAL)
         self.assertEqual(annual_plan.invoicing_status, CustomerPlan.INITIAL_INVOICE_TO_BE_SENT)
@@ -1450,10 +1863,16 @@ class StripeTest(StripeTestCase):
         annual_ledger_entries = LicenseLedger.objects.filter(plan=annual_plan).order_by('id')
         self.assertEqual(len(annual_ledger_entries), 2)
         self.assertEqual(annual_ledger_entries[0].is_renewal, True)
-        self.assertEqual(annual_ledger_entries.values_list('licenses', 'licenses_at_next_renewal')[0], (20, 20))
+        self.assertEqual(
+            annual_ledger_entries.values_list('licenses', 'licenses_at_next_renewal')[0], (20, 20)
+        )
         self.assertEqual(annual_ledger_entries[1].is_renewal, False)
-        self.assertEqual(annual_ledger_entries.values_list('licenses', 'licenses_at_next_renewal')[1], (25, 25))
-        audit_log = RealmAuditLog.objects.get(event_type=RealmAuditLog.CUSTOMER_SWITCHED_FROM_MONTHLY_TO_ANNUAL_PLAN)
+        self.assertEqual(
+            annual_ledger_entries.values_list('licenses', 'licenses_at_next_renewal')[1], (25, 25)
+        )
+        audit_log = RealmAuditLog.objects.get(
+            event_type=RealmAuditLog.CUSTOMER_SWITCHED_FROM_MONTHLY_TO_ANNUAL_PLAN
+        )
         self.assertEqual(audit_log.realm, user.realm)
         self.assertEqual(orjson.loads(audit_log.extra_data)["monthly_plan_id"], monthly_plan.id)
         self.assertEqual(orjson.loads(audit_log.extra_data)["annual_plan_id"], annual_plan.id)
@@ -1476,21 +1895,28 @@ class StripeTest(StripeTestCase):
         annual_plan_invoice_item_params = {
             "amount": 5 * 80 * 100,
             "description": "Additional license (Feb 2, 2012 - Feb 2, 2013)",
-            "plan": None, "quantity": 5, "subscription": None, "discountable": False,
+            "plan": None,
+            "quantity": 5,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(self.next_month),
-                "end": datetime_to_timestamp(add_months(self.next_month, 12))
+                "end": datetime_to_timestamp(add_months(self.next_month, 12)),
             },
         }
         for key, value in annual_plan_invoice_item_params.items():
             self.assertEqual(invoice_item0[key], value)
 
         annual_plan_invoice_item_params = {
-            "amount": 20 * 80 * 100, "description": "Zulip Standard - renewal",
-            "plan": None, "quantity": 20, "subscription": None, "discountable": False,
+            "amount": 20 * 80 * 100,
+            "description": "Zulip Standard - renewal",
+            "plan": None,
+            "quantity": 20,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(self.next_month),
-                "end": datetime_to_timestamp(add_months(self.next_month, 12))
+                "end": datetime_to_timestamp(add_months(self.next_month, 12)),
             },
         }
         for key, value in annual_plan_invoice_item_params.items():
@@ -1500,10 +1926,13 @@ class StripeTest(StripeTestCase):
         monthly_plan_invoice_item_params = {
             "amount": 14 * 8 * 100,
             "description": "Additional license (Jan 2, 2012 - Feb 2, 2012)",
-            "plan": None, "quantity": 14, "subscription": None, "discountable": False,
+            "plan": None,
+            "quantity": 14,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(self.now),
-                "end": datetime_to_timestamp(self.next_month)
+                "end": datetime_to_timestamp(self.next_month),
             },
         }
         for key, value in monthly_plan_invoice_item_params.items():
@@ -1513,39 +1942,51 @@ class StripeTest(StripeTestCase):
             update_license_ledger_if_needed(user.realm, add_months(self.next_month, 1))
         invoice_plans_as_needed(add_months(self.next_month, 1))
 
-        [invoice0, invoice1, invoice2, invoice3] = stripe.Invoice.list(customer=customer.stripe_customer_id)
+        [invoice0, invoice1, invoice2, invoice3] = stripe.Invoice.list(
+            customer=customer.stripe_customer_id
+        )
 
         [monthly_plan_invoice_item] = invoice0.get("lines")
         monthly_plan_invoice_item_params = {
             "amount": 5 * 7366,
             "description": "Additional license (Mar 2, 2012 - Feb 2, 2013)",
-            "plan": None, "quantity": 5, "subscription": None, "discountable": False,
+            "plan": None,
+            "quantity": 5,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(add_months(self.next_month, 1)),
-                "end": datetime_to_timestamp(add_months(self.next_month, 12))
+                "end": datetime_to_timestamp(add_months(self.next_month, 12)),
             },
         }
         for key, value in monthly_plan_invoice_item_params.items():
             self.assertEqual(monthly_plan_invoice_item[key], value)
         invoice_plans_as_needed(add_months(self.now, 13))
 
-        [invoice0, invoice1, invoice2, invoice3, invoice4] = stripe.Invoice.list(customer=customer.stripe_customer_id)
+        [invoice0, invoice1, invoice2, invoice3, invoice4] = stripe.Invoice.list(
+            customer=customer.stripe_customer_id
+        )
 
         [invoice_item] = invoice0.get("lines")
         annual_plan_invoice_item_params = {
             "amount": 30 * 80 * 100,
             "description": "Zulip Standard - renewal",
-            "plan": None, "quantity": 30, "subscription": None, "discountable": False,
+            "plan": None,
+            "quantity": 30,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(add_months(self.next_month, 12)),
-                "end": datetime_to_timestamp(add_months(self.next_month, 24))
+                "end": datetime_to_timestamp(add_months(self.next_month, 24)),
             },
         }
         for key, value in annual_plan_invoice_item_params.items():
             self.assertEqual(invoice_item[key], value)
 
     @mock_stripe()
-    def test_switch_from_monthly_plan_to_annual_plan_for_manual_license_management(self, *mocks: Mock) -> None:
+    def test_switch_from_monthly_plan_to_annual_plan_for_manual_license_management(
+        self, *mocks: Mock
+    ) -> None:
         user = self.example_user("hamlet")
         num_licenses = 35
 
@@ -1553,31 +1994,38 @@ class StripeTest(StripeTestCase):
         with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
             self.upgrade(schedule='monthly', license_management='manual', licenses=num_licenses)
         monthly_plan = get_current_plan_by_realm(user.realm)
-        assert(monthly_plan is not None)
+        assert monthly_plan is not None
         self.assertEqual(monthly_plan.automanage_licenses, False)
         self.assertEqual(monthly_plan.billing_schedule, CustomerPlan.MONTHLY)
         with self.assertLogs('corporate.stripe', "INFO") as m:
-            response = self.client_post("/json/billing/plan/change",
-                                        {'status': CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE})
-            self.assertRegexpMatches(m.output[0], r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 4')
+            response = self.client_post(
+                "/json/billing/plan/change",
+                {'status': CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE},
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 4',
+            )
         self.assert_json_success(response)
         monthly_plan.refresh_from_db()
         self.assertEqual(monthly_plan.status, CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE)
         with patch('corporate.views.timezone_now', return_value=self.now):
             response = self.client_get("/billing/")
-        self.assert_in_success_response(["be switched from monthly to annual billing on <strong>February 2, 2012"], response)
+        self.assert_in_success_response(
+            ["be switched from monthly to annual billing on <strong>February 2, 2012"], response
+        )
 
         invoice_plans_as_needed(self.next_month)
 
         self.assertEqual(LicenseLedger.objects.filter(plan=monthly_plan).count(), 1)
         customer = get_customer_by_realm(user.realm)
-        assert(customer is not None)
+        assert customer is not None
         self.assertEqual(CustomerPlan.objects.filter(customer=customer).count(), 2)
         monthly_plan.refresh_from_db()
         self.assertEqual(monthly_plan.status, CustomerPlan.ENDED)
         self.assertEqual(monthly_plan.next_invoice_date, None)
         annual_plan = get_current_plan_by_realm(user.realm)
-        assert(annual_plan is not None)
+        assert annual_plan is not None
         self.assertEqual(annual_plan.status, CustomerPlan.ACTIVE)
         self.assertEqual(annual_plan.billing_schedule, CustomerPlan.ANNUAL)
         self.assertEqual(annual_plan.invoicing_status, CustomerPlan.INITIAL_INVOICE_TO_BE_SENT)
@@ -1586,7 +2034,10 @@ class StripeTest(StripeTestCase):
         annual_ledger_entries = LicenseLedger.objects.filter(plan=annual_plan).order_by('id')
         self.assertEqual(len(annual_ledger_entries), 1)
         self.assertEqual(annual_ledger_entries[0].is_renewal, True)
-        self.assertEqual(annual_ledger_entries.values_list('licenses', 'licenses_at_next_renewal')[0], (num_licenses, num_licenses))
+        self.assertEqual(
+            annual_ledger_entries.values_list('licenses', 'licenses_at_next_renewal')[0],
+            (num_licenses, num_licenses),
+        )
         self.assertEqual(annual_plan.invoiced_through, None)
 
         # First call of invoice_plans_as_needed creates the new plan. Second call
@@ -1602,11 +2053,15 @@ class StripeTest(StripeTestCase):
 
         [invoice_item] = invoice0.get("lines")
         annual_plan_invoice_item_params = {
-            "amount": num_licenses * 80 * 100, "description": "Zulip Standard - renewal",
-            "plan": None, "quantity": num_licenses, "subscription": None, "discountable": False,
+            "amount": num_licenses * 80 * 100,
+            "description": "Zulip Standard - renewal",
+            "plan": None,
+            "quantity": num_licenses,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(self.next_month),
-                "end": datetime_to_timestamp(add_months(self.next_month, 12))
+                "end": datetime_to_timestamp(add_months(self.next_month, 12)),
             },
         }
         for key, value in annual_plan_invoice_item_params.items():
@@ -1624,10 +2079,13 @@ class StripeTest(StripeTestCase):
         annual_plan_invoice_item_params = {
             "amount": num_licenses * 80 * 100,
             "description": "Zulip Standard - renewal",
-            "plan": None, "quantity": num_licenses, "subscription": None, "discountable": False,
+            "plan": None,
+            "quantity": num_licenses,
+            "subscription": None,
+            "discountable": False,
             "period": {
                 "start": datetime_to_timestamp(add_months(self.next_month, 12)),
-                "end": datetime_to_timestamp(add_months(self.next_month, 24))
+                "end": datetime_to_timestamp(add_months(self.next_month, 24)),
             },
         }
         for key, value in annual_plan_invoice_item_params.items():
@@ -1639,15 +2097,25 @@ class StripeTest(StripeTestCase):
         with patch("corporate.lib.stripe.timezone_now", return_value=self.now):
             self.local_upgrade(self.seat_count, True, CustomerPlan.ANNUAL, 'token')
         with self.assertLogs('corporate.stripe', 'INFO') as m:
-            response = self.client_post("/json/billing/plan/change",
-                                        {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE})
-            self.assertRegexpMatches(m.output[0], r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 2')
+            response = self.client_post(
+                "/json/billing/plan/change", {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE}
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 2',
+            )
         self.assert_json_success(response)
-        self.assertEqual(CustomerPlan.objects.first().status, CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE)
+        self.assertEqual(
+            CustomerPlan.objects.first().status, CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE
+        )
         with self.assertLogs('corporate.stripe', "INFO") as m:
-            response = self.client_post("/json/billing/plan/change",
-                                        {'status': CustomerPlan.ACTIVE})
-            self.assertRegexpMatches(m.output[0], r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 1')
+            response = self.client_post(
+                "/json/billing/plan/change", {'status': CustomerPlan.ACTIVE}
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 1',
+            )
         self.assert_json_success(response)
         self.assertEqual(CustomerPlan.objects.first().status, CustomerPlan.ACTIVE)
 
@@ -1665,9 +2133,13 @@ class StripeTest(StripeTestCase):
         with patch("corporate.lib.stripe.timezone_now", return_value=self.now):
             self.local_upgrade(self.seat_count, True, CustomerPlan.ANNUAL, 'token')
         with self.assertLogs('corporate.stripe', "INFO") as m:
-            self.client_post("/json/billing/plan/change",
-                             {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE})
-            self.assertRegexpMatches(m.output[0], r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 2')
+            self.client_post(
+                "/json/billing/plan/change", {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE}
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 2',
+            )
 
         plan = CustomerPlan.objects.first()
         self.assertIsNotNone(plan.next_invoice_date)
@@ -1709,7 +2181,9 @@ class StripeTest(StripeTestCase):
 
             self.login_user(user)
             response = self.client_get("/billing/")
-            self.assert_in_success_response(["Your organization is on the <b>Zulip Free</b>"], response)
+            self.assert_in_success_response(
+                ["Your organization is on the <b>Zulip Free</b>"], response
+            )
 
             # The extra users added in the final month are not charged
             with patch("corporate.lib.stripe.invoice_plan") as mocked:
@@ -1729,14 +2203,23 @@ class StripeTest(StripeTestCase):
 
         self.login_user(user)
         with self.assertLogs('corporate.stripe', 'INFO') as m:
-            self.client_post("/json/billing/plan/change",
-                             {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE})
-            self.assertRegexpMatches(m.output[0], r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 2')
+            self.client_post(
+                "/json/billing/plan/change", {'status': CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE}
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'INFO:corporate.stripe:Change plan status: Customer.id: \d*, CustomerPlan.id: \d*, status: 2',
+            )
 
-        with self.assertRaises(BillingError) as context, self.assertLogs('corporate.stripe', 'WARNING') as m:
+        with self.assertRaises(BillingError) as context, self.assertLogs(
+            'corporate.stripe', 'WARNING'
+        ) as m:
             with patch("corporate.lib.stripe.timezone_now", return_value=self.now):
                 self.local_upgrade(self.seat_count, True, CustomerPlan.ANNUAL, 'token')
-        self.assertRegexpMatches(m.output[0], r'WARNING:corporate.stripe:Customer <Customer <Realm: zulip \d*> id> trying to upgrade, but has an active subscription')
+        self.assertRegexpMatches(
+            m.output[0],
+            r'WARNING:corporate.stripe:Customer <Customer <Realm: zulip \d*> id> trying to upgrade, but has an active subscription',
+        )
         self.assertEqual(context.exception.description, "subscribing with existing subscription")
 
         invoice_plans_as_needed(self.next_year)
@@ -1845,14 +2328,14 @@ class StripeTest(StripeTestCase):
             description="Zulip standard upgrade",
             discountable=False,
             unit_amount=800,
-            quantity=8
+            quantity=8,
         )
         stripe_invoice = stripe.Invoice.create(
             auto_advance=True,
             billing="send_invoice",
             customer=customer.stripe_customer_id,
             days_until_due=30,
-            statement_descriptor='Zulip Standard'
+            statement_descriptor='Zulip Standard',
         )
         stripe.Invoice.finalize_invoice(stripe_invoice)
 
@@ -1865,10 +2348,13 @@ class StripeTest(StripeTestCase):
     def test_update_billing_method_of_current_plan(self) -> None:
         realm = get_realm("zulip")
         customer = Customer.objects.create(realm=realm, stripe_customer_id='cus_12345')
-        plan = CustomerPlan.objects.create(customer=customer, status=CustomerPlan.ACTIVE,
-                                           billing_cycle_anchor=timezone_now(),
-                                           billing_schedule=CustomerPlan.ANNUAL,
-                                           tier=CustomerPlan.STANDARD)
+        plan = CustomerPlan.objects.create(
+            customer=customer,
+            status=CustomerPlan.ACTIVE,
+            billing_cycle_anchor=timezone_now(),
+            billing_schedule=CustomerPlan.ANNUAL,
+            tier=CustomerPlan.STANDARD,
+        )
         self.assertEqual(plan.charge_automatically, False)
 
         update_billing_method_of_current_plan(realm, True)
@@ -1879,6 +2365,7 @@ class StripeTest(StripeTestCase):
         plan.refresh_from_db()
         self.assertEqual(plan.charge_automatically, False)
 
+
 class RequiresBillingAccessTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -1894,50 +2381,77 @@ class RequiresBillingAccessTest(ZulipTestCase):
         # Billing admins have access
         self.login_user(self.example_user('hamlet'))
         with patch("corporate.views.do_replace_payment_source") as mocked1:
-            response = self.client_post("/json/billing/sources/change",
-                                        {'stripe_token': orjson.dumps('token').decode()})
+            response = self.client_post(
+                "/json/billing/sources/change", {'stripe_token': orjson.dumps('token').decode()}
+            )
         self.assert_json_success(response)
         mocked1.assert_called_once()
 
         # Realm owners have access, even if they are not billing admins
         self.login_user(self.example_user('desdemona'))
         with patch("corporate.views.do_replace_payment_source") as mocked2:
-            response = self.client_post("/json/billing/sources/change",
-                                        {'stripe_token': orjson.dumps('token').decode()})
+            response = self.client_post(
+                "/json/billing/sources/change", {'stripe_token': orjson.dumps('token').decode()}
+            )
         self.assert_json_success(response)
         mocked2.assert_called_once()
 
     def test_who_cant_access_json_endpoints(self) -> None:
-        def verify_user_cant_access_endpoint(username: str, endpoint: str, request_data: Dict[str, str], error_message: str) -> None:
+        def verify_user_cant_access_endpoint(
+            username: str, endpoint: str, request_data: Dict[str, str], error_message: str
+        ) -> None:
             self.login_user(self.example_user(username))
             response = self.client_post(endpoint, request_data)
             self.assert_json_error_contains(response, error_message)
 
-        verify_user_cant_access_endpoint("polonius", "/json/billing/upgrade",
-                                         {'billing_modality': orjson.dumps("charge_automatically").decode(), 'schedule': orjson.dumps("annual").decode(),
-                                          'signed_seat_count': orjson.dumps('signed count').decode(), 'salt': orjson.dumps('salt').decode()},
-                                         "Must be an organization member")
+        verify_user_cant_access_endpoint(
+            "polonius",
+            "/json/billing/upgrade",
+            {
+                'billing_modality': orjson.dumps("charge_automatically").decode(),
+                'schedule': orjson.dumps("annual").decode(),
+                'signed_seat_count': orjson.dumps('signed count').decode(),
+                'salt': orjson.dumps('salt').decode(),
+            },
+            "Must be an organization member",
+        )
 
-        verify_user_cant_access_endpoint("polonius", "/json/billing/sponsorship",
-                                         {'organization-type': orjson.dumps("event").decode(), 'description': orjson.dumps("event description").decode(),
-                                          'website': orjson.dumps("example.com").decode()},
-                                         "Must be an organization member")
+        verify_user_cant_access_endpoint(
+            "polonius",
+            "/json/billing/sponsorship",
+            {
+                'organization-type': orjson.dumps("event").decode(),
+                'description': orjson.dumps("event description").decode(),
+                'website': orjson.dumps("example.com").decode(),
+            },
+            "Must be an organization member",
+        )
 
         for username in ["cordelia", "iago"]:
             self.login_user(self.example_user(username))
-            verify_user_cant_access_endpoint(username, "/json/billing/sources/change", {'stripe_token': orjson.dumps('token').decode()},
-                                             "Must be a billing administrator or an organization owner")
+            verify_user_cant_access_endpoint(
+                username,
+                "/json/billing/sources/change",
+                {'stripe_token': orjson.dumps('token').decode()},
+                "Must be a billing administrator or an organization owner",
+            )
 
-            verify_user_cant_access_endpoint(username, "/json/billing/plan/change",  {'status': orjson.dumps(1).decode()},
-                                             "Must be a billing administrator or an organization owner")
+            verify_user_cant_access_endpoint(
+                username,
+                "/json/billing/plan/change",
+                {'status': orjson.dumps(1).decode()},
+                "Must be a billing administrator or an organization owner",
+            )
 
         # Make sure that we are testing all the JSON endpoints
         # Quite a hack, but probably fine for now
         string_with_all_endpoints = str(get_resolver('corporate.urls').reverse_dict)
-        json_endpoints = {word.strip("\"'()[],$") for word in string_with_all_endpoints.split()
-                          if 'json/' in word}
+        json_endpoints = {
+            word.strip("\"'()[],$") for word in string_with_all_endpoints.split() if 'json/' in word
+        }
         self.assertEqual(len(json_endpoints), 4)
 
+
 class BillingHelpersTest(ZulipTestCase):
     def test_next_month(self) -> None:
         anchor = datetime(2019, 12, 31, 1, 2, 3, tzinfo=timezone.utc)
@@ -1957,7 +2471,8 @@ class BillingHelpersTest(ZulipTestCase):
             datetime(2020, 11, 30, 1, 2, 3, tzinfo=timezone.utc),
             datetime(2020, 12, 31, 1, 2, 3, tzinfo=timezone.utc),
             datetime(2021, 1, 31, 1, 2, 3, tzinfo=timezone.utc),
-            datetime(2021, 2, 28, 1, 2, 3, tzinfo=timezone.utc)]
+            datetime(2021, 2, 28, 1, 2, 3, tzinfo=timezone.utc),
+        ]
         with self.assertRaises(AssertionError):
             add_months(anchor, -1)
         # Explicitly test add_months for each value of MAX_DAY_FOR_MONTH and
@@ -1968,7 +2483,7 @@ class BillingHelpersTest(ZulipTestCase):
         for last, next_ in zip(period_boundaries[:-1], period_boundaries[1:]):
             self.assertEqual(next_month(anchor, last), next_)
         # Test next_month for large values
-        period_boundaries = [dt.replace(year=dt.year+100) for dt in period_boundaries]
+        period_boundaries = [dt.replace(year=dt.year + 100) for dt in period_boundaries]
         for last, next_ in zip(period_boundaries[:-1], period_boundaries[1:]):
             self.assertEqual(next_month(anchor, last), next_)
 
@@ -1979,14 +2494,14 @@ class BillingHelpersTest(ZulipTestCase):
         year_later = datetime(2020, 12, 31, 1, 2, 3, tzinfo=timezone.utc)
         test_cases = [
             # test all possibilities, since there aren't that many
-            ((True,  CustomerPlan.ANNUAL,  None),  (anchor, month_later, year_later, 8000)),
-            ((True,  CustomerPlan.ANNUAL,  85),    (anchor, month_later, year_later, 1200)),
-            ((True,  CustomerPlan.MONTHLY, None),  (anchor, month_later, month_later, 800)),
-            ((True,  CustomerPlan.MONTHLY, 85),    (anchor, month_later, month_later, 120)),
-            ((False, CustomerPlan.ANNUAL,  None),  (anchor, year_later,  year_later, 8000)),
-            ((False, CustomerPlan.ANNUAL,  85),    (anchor, year_later,  year_later, 1200)),
-            ((False, CustomerPlan.MONTHLY, None),  (anchor, month_later, month_later, 800)),
-            ((False, CustomerPlan.MONTHLY, 85),    (anchor, month_later, month_later, 120)),
+            ((True, CustomerPlan.ANNUAL, None), (anchor, month_later, year_later, 8000)),
+            ((True, CustomerPlan.ANNUAL, 85), (anchor, month_later, year_later, 1200)),
+            ((True, CustomerPlan.MONTHLY, None), (anchor, month_later, month_later, 800)),
+            ((True, CustomerPlan.MONTHLY, 85), (anchor, month_later, month_later, 120)),
+            ((False, CustomerPlan.ANNUAL, None), (anchor, year_later, year_later, 8000)),
+            ((False, CustomerPlan.ANNUAL, 85), (anchor, year_later, year_later, 1200)),
+            ((False, CustomerPlan.MONTHLY, None), (anchor, month_later, month_later, 800)),
+            ((False, CustomerPlan.MONTHLY, 85), (anchor, month_later, month_later, 120)),
             # test exact math of Decimals; 800 * (1 - 87.25) = 101.9999999..
             ((False, CustomerPlan.MONTHLY, 87.25), (anchor, month_later, month_later, 102)),
             # test dropping of fractional cents; without the int it's 102.8
@@ -2002,15 +2517,13 @@ class BillingHelpersTest(ZulipTestCase):
                 self.assertEqual(output_, output)
 
     def test_get_price_per_license(self) -> None:
+        self.assertEqual(get_price_per_license(CustomerPlan.STANDARD, CustomerPlan.ANNUAL), 8000)
+        self.assertEqual(get_price_per_license(CustomerPlan.STANDARD, CustomerPlan.MONTHLY), 800)
         self.assertEqual(
-            get_price_per_license(CustomerPlan.STANDARD, CustomerPlan.ANNUAL), 8000
-        )
-        self.assertEqual(
-            get_price_per_license(CustomerPlan.STANDARD, CustomerPlan.MONTHLY), 800
-        )
-        self.assertEqual(
-            get_price_per_license(CustomerPlan.STANDARD, CustomerPlan.MONTHLY, discount=Decimal(50)),
-            400
+            get_price_per_license(
+                CustomerPlan.STANDARD, CustomerPlan.MONTHLY, discount=Decimal(50)
+            ),
+            400,
         )
 
         with self.assertRaises(AssertionError):
@@ -2022,14 +2535,18 @@ class BillingHelpersTest(ZulipTestCase):
     def test_update_or_create_stripe_customer_logic(self) -> None:
         user = self.example_user('hamlet')
         # No existing Customer object
-        with patch('corporate.lib.stripe.do_create_stripe_customer', return_value='returned') as mocked1:
+        with patch(
+            'corporate.lib.stripe.do_create_stripe_customer', return_value='returned'
+        ) as mocked1:
             returned = update_or_create_stripe_customer(user, stripe_token='token')
         mocked1.assert_called_once()
         self.assertEqual(returned, 'returned')
 
         customer = Customer.objects.create(realm=get_realm('zulip'))
         # Customer exists but stripe_customer_id is None
-        with patch('corporate.lib.stripe.do_create_stripe_customer', return_value='returned') as mocked2:
+        with patch(
+            'corporate.lib.stripe.do_create_stripe_customer', return_value='returned'
+        ) as mocked2:
             returned = update_or_create_stripe_customer(user, stripe_token='token')
         mocked2.assert_called_once()
         self.assertEqual(returned, 'returned')
@@ -2038,7 +2555,9 @@ class BillingHelpersTest(ZulipTestCase):
         customer.save()
         # Customer exists, replace payment source
         with patch('corporate.lib.stripe.do_replace_payment_source') as mocked3:
-            returned_customer = update_or_create_stripe_customer(self.example_user('hamlet'), 'token')
+            returned_customer = update_or_create_stripe_customer(
+                self.example_user('hamlet'), 'token'
+            )
         mocked3.assert_called_once()
         self.assertEqual(returned_customer, customer)
 
@@ -2062,10 +2581,13 @@ class BillingHelpersTest(ZulipTestCase):
 
         self.assertEqual(get_current_plan_by_customer(customer), None)
 
-        plan = CustomerPlan.objects.create(customer=customer, status=CustomerPlan.ACTIVE,
-                                           billing_cycle_anchor=timezone_now(),
-                                           billing_schedule=CustomerPlan.ANNUAL,
-                                           tier=CustomerPlan.STANDARD)
+        plan = CustomerPlan.objects.create(
+            customer=customer,
+            status=CustomerPlan.ACTIVE,
+            billing_cycle_anchor=timezone_now(),
+            billing_schedule=CustomerPlan.ANNUAL,
+            tier=CustomerPlan.STANDARD,
+        )
         self.assertEqual(get_current_plan_by_customer(customer), plan)
 
         plan.status = CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE
@@ -2088,12 +2610,16 @@ class BillingHelpersTest(ZulipTestCase):
         customer = Customer.objects.create(realm=realm, stripe_customer_id='cus_12345')
         self.assertEqual(get_current_plan_by_realm(realm), None)
 
-        plan = CustomerPlan.objects.create(customer=customer, status=CustomerPlan.ACTIVE,
-                                           billing_cycle_anchor=timezone_now(),
-                                           billing_schedule=CustomerPlan.ANNUAL,
-                                           tier=CustomerPlan.STANDARD)
+        plan = CustomerPlan.objects.create(
+            customer=customer,
+            status=CustomerPlan.ACTIVE,
+            billing_cycle_anchor=timezone_now(),
+            billing_schedule=CustomerPlan.ANNUAL,
+            tier=CustomerPlan.STANDARD,
+        )
         self.assertEqual(get_current_plan_by_realm(realm), plan)
 
+
 class LicenseLedgerTest(StripeTestCase):
     def test_add_plan_renewal_if_needed(self) -> None:
         with patch('corporate.lib.stripe.timezone_now', return_value=self.now):
@@ -2109,8 +2635,12 @@ class LicenseLedgerTest(StripeTestCase):
         self.assertIsNone(new_plan)
         self.assertEqual(LicenseLedger.objects.count(), 2)
         ledger_params = {
-            'plan': plan, 'is_renewal': True, 'event_time': self.next_year,
-            'licenses': self.seat_count, 'licenses_at_next_renewal': self.seat_count}
+            'plan': plan,
+            'is_renewal': True,
+            'event_time': self.next_year,
+            'licenses': self.seat_count,
+            'licenses_at_next_renewal': self.seat_count,
+        }
         for key, value in ledger_params.items():
             self.assertEqual(getattr(ledger_entry, key), value)
         # Plan needs to renew, but we already added the plan_renewal ledger entry
@@ -2156,17 +2686,26 @@ class LicenseLedgerTest(StripeTestCase):
             update_license_ledger_for_automanaged_plan(realm, plan, self.now)
         # Increase, but after renewal date, and below last year's high watermark
         with patch('corporate.lib.stripe.get_latest_seat_count', return_value=22):
-            update_license_ledger_for_automanaged_plan(realm, plan, self.next_year + timedelta(seconds=1))
+            update_license_ledger_for_automanaged_plan(
+                realm, plan, self.next_year + timedelta(seconds=1)
+            )
 
-        ledger_entries = list(LicenseLedger.objects.values_list(
-            'is_renewal', 'event_time', 'licenses', 'licenses_at_next_renewal').order_by('id'))
-        self.assertEqual(ledger_entries,
-                         [(True, self.now, self.seat_count, self.seat_count),
-                          (False, self.now, 23, 23),
-                          (False, self.now, 23, 20),
-                          (False, self.now, 23, 21),
-                          (True, self.next_year, 21, 21),
-                          (False, self.next_year + timedelta(seconds=1), 22, 22)])
+        ledger_entries = list(
+            LicenseLedger.objects.values_list(
+                'is_renewal', 'event_time', 'licenses', 'licenses_at_next_renewal'
+            ).order_by('id')
+        )
+        self.assertEqual(
+            ledger_entries,
+            [
+                (True, self.now, self.seat_count, self.seat_count),
+                (False, self.now, 23, 23),
+                (False, self.now, 23, 20),
+                (False, self.now, 23, 21),
+                (True, self.next_year, 21, 21),
+                (False, self.next_year + timedelta(seconds=1), 22, 22),
+            ],
+        )
 
     def test_user_changes(self) -> None:
         self.local_upgrade(self.seat_count, True, CustomerPlan.ANNUAL, 'token')
@@ -2175,14 +2714,22 @@ class LicenseLedgerTest(StripeTestCase):
         do_reactivate_user(user)
         # Not a proper use of do_activate_user, but fine for this test
         do_activate_user(user)
-        ledger_entries = list(LicenseLedger.objects.values_list(
-            'is_renewal', 'licenses', 'licenses_at_next_renewal').order_by('id'))
-        self.assertEqual(ledger_entries,
-                         [(True, self.seat_count, self.seat_count),
-                          (False, self.seat_count + 1, self.seat_count + 1),
-                          (False, self.seat_count + 1, self.seat_count),
-                          (False, self.seat_count + 1, self.seat_count + 1),
-                          (False, self.seat_count + 1, self.seat_count + 1)])
+        ledger_entries = list(
+            LicenseLedger.objects.values_list(
+                'is_renewal', 'licenses', 'licenses_at_next_renewal'
+            ).order_by('id')
+        )
+        self.assertEqual(
+            ledger_entries,
+            [
+                (True, self.seat_count, self.seat_count),
+                (False, self.seat_count + 1, self.seat_count + 1),
+                (False, self.seat_count + 1, self.seat_count),
+                (False, self.seat_count + 1, self.seat_count + 1),
+                (False, self.seat_count + 1, self.seat_count + 1),
+            ],
+        )
+
 
 class InvoiceTest(StripeTestCase):
     def test_invoicing_status_is_started(self) -> None:
@@ -2221,13 +2768,15 @@ class InvoiceTest(StripeTestCase):
         self.assertIsNotNone(invoice0.status_transitions.finalized_at)
         [item0, item1, item2] = invoice0.lines
         line_item_params = {
-            'amount': int(8000 * (1 - ((400-366) / 365)) + .5),
+            'amount': int(8000 * (1 - ((400 - 366) / 365)) + 0.5),
             'description': 'Additional license (Feb 5, 2013 - Jan 2, 2014)',
             'discountable': False,
             'period': {
                 'start': datetime_to_timestamp(self.now + timedelta(days=400)),
-                'end': datetime_to_timestamp(self.now + timedelta(days=2*365 + 1))},
-            'quantity': 1}
+                'end': datetime_to_timestamp(self.now + timedelta(days=2 * 365 + 1)),
+            },
+            'quantity': 1,
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item0.get(key), value)
         line_item_params = {
@@ -2236,18 +2785,22 @@ class InvoiceTest(StripeTestCase):
             'discountable': False,
             'period': {
                 'start': datetime_to_timestamp(self.now + timedelta(days=366)),
-                'end': datetime_to_timestamp(self.now + timedelta(days=2*365 + 1))},
-            'quantity': (self.seat_count + 1)}
+                'end': datetime_to_timestamp(self.now + timedelta(days=2 * 365 + 1)),
+            },
+            'quantity': (self.seat_count + 1),
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item1.get(key), value)
         line_item_params = {
-            'amount': 3 * int(8000 * (366-100) / 366 + .5),
+            'amount': 3 * int(8000 * (366 - 100) / 366 + 0.5),
             'description': 'Additional license (Apr 11, 2012 - Jan 2, 2013)',
             'discountable': False,
             'period': {
                 'start': datetime_to_timestamp(self.now + timedelta(days=100)),
-                'end': datetime_to_timestamp(self.now + timedelta(days=366))},
-            'quantity': 3}
+                'end': datetime_to_timestamp(self.now + timedelta(days=366)),
+            },
+            'quantity': 3,
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item2.get(key), value)
 
@@ -2272,8 +2825,10 @@ class InvoiceTest(StripeTestCase):
             'discountable': False,
             'period': {
                 'start': datetime_to_timestamp(self.next_year),
-                'end': datetime_to_timestamp(self.next_year + timedelta(days=365))},
-            'quantity': 1}
+                'end': datetime_to_timestamp(self.next_year + timedelta(days=365)),
+            },
+            'quantity': 1,
+        }
         for key, value in line_item_params.items():
             self.assertEqual(item.get(key), value)
 
diff --git a/corporate/urls.py b/corporate/urls.py
index 085a783f2c..2b2409ea3e 100644
--- a/corporate/urls.py
+++ b/corporate/urls.py
@@ -18,23 +18,17 @@ i18n_urlpatterns: Any = [
     # Zephyr/MIT
     path('zephyr/', TemplateView.as_view(template_name='corporate/zephyr.html')),
     path('zephyr-mirror/', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')),
-
     path('jobs/', TemplateView.as_view(template_name='corporate/jobs.html')),
-
     # Billing
     path('billing/', billing_home),
     path('upgrade/', initial_upgrade, name='initial_upgrade'),
 ]
 
 v1_api_and_json_patterns = [
-    rest_path('billing/upgrade',
-              POST=upgrade),
-    rest_path('billing/sponsorship',
-              POST=sponsorship),
-    rest_path('billing/plan/change',
-              POST=change_plan_status),
-    rest_path('billing/sources/change',
-              POST=replace_payment_source),
+    rest_path('billing/upgrade', POST=upgrade),
+    rest_path('billing/sponsorship', POST=sponsorship),
+    rest_path('billing/plan/change', POST=change_plan_status),
+    rest_path('billing/sources/change', POST=replace_payment_source),
 ]
 
 # Make a copy of i18n_urlpatterns so that they appear without prefix for English
diff --git a/corporate/views.py b/corporate/views.py
index f6a30a4a09..fb90fa012d 100644
--- a/corporate/views.py
+++ b/corporate/views.py
@@ -51,15 +51,22 @@ from zerver.models import UserProfile, get_realm
 
 billing_logger = logging.getLogger('corporate.stripe')
 
+
 def unsign_seat_count(signed_seat_count: str, salt: str) -> int:
     try:
         return int(unsign_string(signed_seat_count, salt))
     except signing.BadSignature:
         raise BillingError('tampered seat count')
 
+
 def check_upgrade_parameters(
-        billing_modality: str, schedule: str, license_management: Optional[str], licenses: Optional[int],
-        has_stripe_token: bool, seat_count: int) -> None:
+    billing_modality: str,
+    schedule: str,
+    license_management: Optional[str],
+    licenses: Optional[int],
+    has_stripe_token: bool,
+    seat_count: int,
+) -> None:
     if billing_modality not in ['send_invoice', 'charge_automatically']:
         raise BillingError('unknown billing_modality')
     if schedule not in ['annual', 'monthly']:
@@ -78,14 +85,18 @@ def check_upgrade_parameters(
         max_licenses = MAX_INVOICED_LICENSES
 
     if licenses is None or licenses < min_licenses:
-        raise BillingError('not enough licenses',
-                           _("You must invoice for at least {} users.").format(min_licenses))
+        raise BillingError(
+            'not enough licenses', _("You must invoice for at least {} users.").format(min_licenses)
+        )
 
     if max_licenses is not None and licenses > max_licenses:
-        message = _("Invoices with more than {} licenses can't be processed from this page. To complete "
-                    "the upgrade, please contact {}.").format(max_licenses, settings.ZULIP_ADMINISTRATOR)
+        message = _(
+            "Invoices with more than {} licenses can't be processed from this page. To complete "
+            "the upgrade, please contact {}."
+        ).format(max_licenses, settings.ZULIP_ADMINISTRATOR)
         raise BillingError('too many licenses', message)
 
+
 # Should only be called if the customer is being charged automatically
 def payment_method_string(stripe_customer: stripe.Customer) -> str:
     stripe_source: Optional[Union[stripe.Card, stripe.Source]] = stripe_customer.default_source
@@ -95,7 +106,8 @@ def payment_method_string(stripe_customer: stripe.Customer) -> str:
     if stripe_source.object == "card":
         assert isinstance(stripe_source, stripe.Card)
         return _("{brand} ending in {last4}").format(
-            brand=stripe_source.brand, last4=stripe_source.last4,
+            brand=stripe_source.brand,
+            last4=stripe_source.last4,
         )
     # There might be one-off stuff we do for a particular customer that
     # would land them here. E.g. by default we don't support ACH for
@@ -105,16 +117,20 @@ def payment_method_string(stripe_customer: stripe.Customer) -> str:
         email=settings.ZULIP_ADMINISTRATOR,
     )  # nocoverage
 
+
 @require_organization_member
 @has_request_variables
-def upgrade(request: HttpRequest, user: UserProfile,
-            billing_modality: str=REQ(validator=check_string),
-            schedule: str=REQ(validator=check_string),
-            license_management: Optional[str]=REQ(validator=check_string, default=None),
-            licenses: Optional[int]=REQ(validator=check_int, default=None),
-            stripe_token: Optional[str]=REQ(validator=check_string, default=None),
-            signed_seat_count: str=REQ(validator=check_string),
-            salt: str=REQ(validator=check_string)) -> HttpResponse:
+def upgrade(
+    request: HttpRequest,
+    user: UserProfile,
+    billing_modality: str = REQ(validator=check_string),
+    schedule: str = REQ(validator=check_string),
+    license_management: Optional[str] = REQ(validator=check_string, default=None),
+    licenses: Optional[int] = REQ(validator=check_int, default=None),
+    stripe_token: Optional[str] = REQ(validator=check_string, default=None),
+    signed_seat_count: str = REQ(validator=check_string),
+    salt: str = REQ(validator=check_string),
+) -> HttpResponse:
     try:
         seat_count = unsign_seat_count(signed_seat_count, salt)
         if billing_modality == 'charge_automatically' and license_management == 'automatic':
@@ -123,21 +139,34 @@ def upgrade(request: HttpRequest, user: UserProfile,
             schedule = 'annual'
             license_management = 'manual'
         check_upgrade_parameters(
-            billing_modality, schedule, license_management, licenses,
-            stripe_token is not None, seat_count)
+            billing_modality,
+            schedule,
+            license_management,
+            licenses,
+            stripe_token is not None,
+            seat_count,
+        )
         assert licenses is not None
         automanage_licenses = license_management == 'automatic'
 
-        billing_schedule = {'annual': CustomerPlan.ANNUAL,
-                            'monthly': CustomerPlan.MONTHLY}[schedule]
+        billing_schedule = {'annual': CustomerPlan.ANNUAL, 'monthly': CustomerPlan.MONTHLY}[
+            schedule
+        ]
         process_initial_upgrade(user, licenses, automanage_licenses, billing_schedule, stripe_token)
     except BillingError as e:
         if not settings.TEST_SUITE:  # nocoverage
             billing_logger.warning(
                 "BillingError during upgrade: %s. user=%s, realm=%s (%s), billing_modality=%s, "
                 "schedule=%s, license_management=%s, licenses=%s, has stripe_token: %s",
-                e.description, user.id, user.realm.id, user.realm.string_id, billing_modality,
-                schedule, license_management, licenses, stripe_token is not None,
+                e.description,
+                user.id,
+                user.realm.id,
+                user.realm.string_id,
+                billing_modality,
+                schedule,
+                license_management,
+                licenses,
+                stripe_token is not None,
             )
         return json_error(e.message, data={'error_description': e.description})
     except Exception:
@@ -148,6 +177,7 @@ def upgrade(request: HttpRequest, user: UserProfile,
     else:
         return json_success()
 
+
 @zulip_login_required
 def initial_upgrade(request: HttpRequest) -> HttpResponse:
     user = request.user
@@ -158,7 +188,9 @@ def initial_upgrade(request: HttpRequest) -> HttpResponse:
     billing_page_url = reverse(billing_home)
 
     customer = get_customer_by_realm(user.realm)
-    if customer is not None and (get_current_plan_by_customer(customer) is not None or customer.sponsorship_pending):
+    if customer is not None and (
+        get_current_plan_by_customer(customer) is not None or customer.sponsorship_pending
+    ):
         if request.GET.get("onboarding") is not None:
             billing_page_url = f"{billing_page_url}?onboarding=true"
         return HttpResponseRedirect(billing_page_url)
@@ -194,20 +226,26 @@ def initial_upgrade(request: HttpRequest) -> HttpResponse:
     response = render(request, 'corporate/upgrade.html', context=context)
     return response
 
+
 @require_organization_member
 @has_request_variables
-def sponsorship(request: HttpRequest, user: UserProfile,
-                organization_type: str=REQ("organization-type", validator=check_string),
-                website: str=REQ("website", validator=check_string),
-                description: str=REQ("description", validator=check_string)) -> HttpResponse:
+def sponsorship(
+    request: HttpRequest,
+    user: UserProfile,
+    organization_type: str = REQ("organization-type", validator=check_string),
+    website: str = REQ("website", validator=check_string),
+    description: str = REQ("description", validator=check_string),
+) -> HttpResponse:
     realm = user.realm
 
     requested_by = user.full_name
     user_role = user.get_role_name()
 
     support_realm_uri = get_realm(settings.STAFF_SUBDOMAIN).uri
-    support_url = urljoin(support_realm_uri, urlunsplit(("", "", reverse("support"),
-                          urlencode({"q": realm.string_id}), "")))
+    support_url = urljoin(
+        support_realm_uri,
+        urlunsplit(("", "", reverse("support"), urlencode({"q": realm.string_id}), "")),
+    )
 
     context = {
         "requested_by": requested_by,
@@ -233,6 +271,7 @@ def sponsorship(request: HttpRequest, user: UserProfile,
 
     return json_success()
 
+
 @zulip_login_required
 def billing_home(request: HttpRequest) -> HttpResponse:
     user = request.user
@@ -266,14 +305,18 @@ def billing_home(request: HttpRequest) -> HttpResponse:
         if last_ledger_entry is not None:
             if new_plan is not None:  # nocoverage
                 plan = new_plan
-            assert(plan is not None)  # for mypy
+            assert plan is not None  # for mypy
             free_trial = plan.status == CustomerPlan.FREE_TRIAL
             downgrade_at_end_of_cycle = plan.status == CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE
-            switch_to_annual_at_end_of_cycle = plan.status == CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE
+            switch_to_annual_at_end_of_cycle = (
+                plan.status == CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE
+            )
             licenses = last_ledger_entry.licenses
             licenses_used = get_latest_seat_count(user.realm)
             # Should do this in javascript, using the user's timezone
-            renewal_date = '{dt:%B} {dt.day}, {dt.year}'.format(dt=start_of_next_billing_cycle(plan, now))
+            renewal_date = '{dt:%B} {dt.day}, {dt.year}'.format(
+                dt=start_of_next_billing_cycle(plan, now)
+            )
             renewal_cents = renewal_amount(plan, now)
             charge_automatically = plan.charge_automatically
             stripe_customer = stripe_get_customer(customer.stripe_customer_id)
@@ -303,36 +346,46 @@ def billing_home(request: HttpRequest) -> HttpResponse:
 
     return render(request, 'corporate/billing.html', context=context)
 
+
 @require_billing_access
 @has_request_variables
-def change_plan_status(request: HttpRequest, user: UserProfile,
-                       status: int=REQ("status", validator=check_int)) -> HttpResponse:
-    assert(status in [CustomerPlan.ACTIVE, CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE,
-                      CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE, CustomerPlan.ENDED])
+def change_plan_status(
+    request: HttpRequest, user: UserProfile, status: int = REQ("status", validator=check_int)
+) -> HttpResponse:
+    assert status in [
+        CustomerPlan.ACTIVE,
+        CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE,
+        CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE,
+        CustomerPlan.ENDED,
+    ]
 
     plan = get_current_plan_by_realm(user.realm)
-    assert(plan is not None)  # for mypy
+    assert plan is not None  # for mypy
 
     if status == CustomerPlan.ACTIVE:
-        assert(plan.status == CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE)
+        assert plan.status == CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE
         do_change_plan_status(plan, status)
     elif status == CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE:
-        assert(plan.status == CustomerPlan.ACTIVE)
+        assert plan.status == CustomerPlan.ACTIVE
         downgrade_at_the_end_of_billing_cycle(user.realm)
     elif status == CustomerPlan.SWITCH_TO_ANNUAL_AT_END_OF_CYCLE:
-        assert(plan.billing_schedule == CustomerPlan.MONTHLY)
-        assert(plan.status == CustomerPlan.ACTIVE)
-        assert(plan.fixed_price is None)
+        assert plan.billing_schedule == CustomerPlan.MONTHLY
+        assert plan.status == CustomerPlan.ACTIVE
+        assert plan.fixed_price is None
         do_change_plan_status(plan, status)
     elif status == CustomerPlan.ENDED:
-        assert(plan.status == CustomerPlan.FREE_TRIAL)
+        assert plan.status == CustomerPlan.FREE_TRIAL
         downgrade_now_without_creating_additional_invoices(user.realm)
     return json_success()
 
+
 @require_billing_access
 @has_request_variables
-def replace_payment_source(request: HttpRequest, user: UserProfile,
-                           stripe_token: str=REQ("stripe_token", validator=check_string)) -> HttpResponse:
+def replace_payment_source(
+    request: HttpRequest,
+    user: UserProfile,
+    stripe_token: str = REQ("stripe_token", validator=check_string),
+) -> HttpResponse:
     try:
         do_replace_payment_source(user, stripe_token, pay_invoices=True)
     except BillingError as e:
diff --git a/docs/conf.py b/docs/conf.py
index 693ff2716f..39360328a9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,7 +17,7 @@ from typing import Any, Dict, List, Optional
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 from version import ZULIP_VERSION
@@ -25,19 +25,18 @@ from version import ZULIP_VERSION
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions: List[str] = [
-]
+extensions: List[str] = []
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -65,9 +64,9 @@ language: Optional[str] = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -75,27 +74,27 @@ exclude_patterns = ['_build', 'README.md']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -111,6 +110,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 if not on_rtd:
     import sphinx_rtd_theme
+
     html_theme = 'sphinx_rtd_theme'
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 else:
@@ -122,20 +122,17 @@ else:
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-    'collapse_navigation': False,
-    'logo_only': True
-}
+html_theme_options = {'collapse_navigation': False, 'logo_only': True}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -144,7 +141,7 @@ html_logo = 'images/zulip-logo.svg'
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -154,62 +151,62 @@ html_static_path = ['_static']
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
+# html_search_language = 'en'
 
 # A dictionary with options for the search language support, empty by default.
 # Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
+# html_search_options = {'type': 'default'}
 
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
+# html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'zulip-contributor-docsdoc'
@@ -219,13 +216,10 @@ htmlhelp_basename = 'zulip-contributor-docsdoc'
 latex_elements: Dict[str, str] = {
     # The paper size ('letterpaper' or 'a4paper').
     #'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #'preamble': '',
-
     # Latex figure (float) alignment
     #'figure_align': 'htbp',
 }
@@ -234,29 +228,28 @@ latex_elements: Dict[str, str] = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'zulip-contributor-docs.tex', 'Zulip Documentation',
-     'The Zulip Team', 'manual'),
+    (master_doc, 'zulip-contributor-docs.tex', 'Zulip Documentation', 'The Zulip Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output ---------------------------------------
@@ -264,12 +257,11 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'zulip-contributor-docs', 'Zulip Documentation',
-     [author], 1),
+    (master_doc, 'zulip-contributor-docs', 'Zulip Documentation', [author], 1),
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -278,22 +270,28 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'zulip-contributor-docs', 'Zulip Documentation',
-     author, 'zulip-contributor-docs', 'Documentation for contributing to Zulip.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        'zulip-contributor-docs',
+        'Zulip Documentation',
+        author,
+        'zulip-contributor-docs',
+        'Documentation for contributing to Zulip.',
+        'Miscellaneous',
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False
 
 from recommonmark.transform import AutoStructify
 
@@ -315,19 +313,24 @@ class CustomCommonMarkParser(CommonMarkParser):
     def visit_document(self, node: Node) -> None:
         pass
 
+
 def setup(app: Any) -> None:
 
     app.add_source_parser(CustomCommonMarkParser)
-    app.add_config_value('recommonmark_config', {
-        'enable_eval_rst': True,
-        # Turn off recommonmark features we aren't using.
-        'enable_auto_doc_ref': False,
-        'auto_toc_tree_section': None,
-        'enable_auto_toc_tree': False,
-        'enable_math': False,
-        'enable_inline_math': False,
-        'url_resolver': lambda x: x,
-    }, True)
+    app.add_config_value(
+        'recommonmark_config',
+        {
+            'enable_eval_rst': True,
+            # Turn off recommonmark features we aren't using.
+            'enable_auto_doc_ref': False,
+            'auto_toc_tree_section': None,
+            'enable_auto_toc_tree': False,
+            'enable_math': False,
+            'enable_inline_math': False,
+            'url_resolver': lambda x: x,
+        },
+        True,
+    )
 
     # Enable `eval_rst`, and any other features enabled in recommonmark_config.
     # Docs: https://recommonmark.readthedocs.io/en/latest/auto_structify.html
diff --git a/manage.py b/manage.py
index c9440f8495..90fd6f5b2a 100755
--- a/manage.py
+++ b/manage.py
@@ -31,7 +31,9 @@ if __name__ == "__main__":
         # which case it's a production server, not a dev environment)
         # and lack of access for /etc/zulip/zulip-secrets.conf (which
         # should be only readable by root and zulip)
-        print("Error accessing Zulip secrets; manage.py in production must be run as the zulip user.")
+        print(
+            "Error accessing Zulip secrets; manage.py in production must be run as the zulip user."
+        )
         sys.exit(1)
 
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zproject.settings")
diff --git a/pgroonga/migrations/0001_enable.py b/pgroonga/migrations/0001_enable.py
index 2e5f645a93..9b2fe268d5 100644
--- a/pgroonga/migrations/0001_enable.py
+++ b/pgroonga/migrations/0001_enable.py
@@ -11,7 +11,10 @@ class Migration(migrations.Migration):
     database_setting = settings.DATABASES["default"]
     if "postgres" in database_setting["ENGINE"]:
         operations = [
-            migrations.RunSQL([("""
+            migrations.RunSQL(
+                [
+                    (
+                        """
 DO $$BEGIN
 EXECUTE format('ALTER ROLE %%I SET search_path TO %%L,public,pgroonga,pg_catalog', %(USER)s, %(SCHEMA)s);
 
@@ -25,8 +28,13 @@ ALTER TABLE zerver_message ADD COLUMN search_pgroonga text;
 CREATE INDEX zerver_message_search_pgroonga ON zerver_message
   USING pgroonga(search_pgroonga pgroonga.text_full_text_search_ops);
 END$$
-""", database_setting)],
-                              [("""
+""",
+                        database_setting,
+                    )
+                ],
+                [
+                    (
+                        """
 DO $$BEGIN
 SET search_path = %(SCHEMA)s,public,pgroonga,pg_catalog;
 
@@ -37,7 +45,11 @@ SET search_path = %(SCHEMA)s,public;
 
 EXECUTE format('ALTER ROLE %%I SET search_path TO %%L,public', %(USER)s, %(SCHEMA)s);
 END$$
-""", database_setting)]),
+""",
+                        database_setting,
+                    )
+                ],
+            ),
         ]
     else:
         operations = []
diff --git a/pgroonga/migrations/0002_html_escape_subject.py b/pgroonga/migrations/0002_html_escape_subject.py
index 3adfbe873d..dc0bec8c6e 100644
--- a/pgroonga/migrations/0002_html_escape_subject.py
+++ b/pgroonga/migrations/0002_html_escape_subject.py
@@ -15,6 +15,7 @@ def rebuild_pgroonga_index(apps: StateApps, schema_editor: DatabaseSchemaEditor)
             batch_size=10000,
         )
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -23,6 +24,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(rebuild_pgroonga_index,
-                             reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(rebuild_pgroonga_index, reverse_code=migrations.RunPython.noop),
     ]
diff --git a/pgroonga/migrations/0003_v2_api_upgrade.py b/pgroonga/migrations/0003_v2_api_upgrade.py
index 71c8c5d7b2..9e0060c4c9 100644
--- a/pgroonga/migrations/0003_v2_api_upgrade.py
+++ b/pgroonga/migrations/0003_v2_api_upgrade.py
@@ -11,7 +11,10 @@ class Migration(migrations.Migration):
 
     database_setting = settings.DATABASES["default"]
     operations = [
-        migrations.RunSQL([("""
+        migrations.RunSQL(
+            [
+                (
+                    """
 DO $$BEGIN
 EXECUTE format('ALTER ROLE %%I SET search_path TO %%L,public', %(USER)s, %(SCHEMA)s);
 
@@ -19,12 +22,18 @@ SET search_path = %(SCHEMA)s,public;
 
 DROP INDEX zerver_message_search_pgroonga;
 END$$
-""", database_setting), """
+""",
+                    database_setting,
+                ),
+                """
 
 CREATE INDEX CONCURRENTLY zerver_message_search_pgroonga ON zerver_message
   USING pgroonga(search_pgroonga pgroonga_text_full_text_search_ops_v2);
-"""],
-                          [("""
+""",
+            ],
+            [
+                (
+                    """
 DO $$BEGIN
 EXECUTE format('ALTER ROLE %%I SET search_path TO %%L,public,pgroonga,pg_catalog', %(USER)s, %(SCHEMA)s);
 
@@ -32,9 +41,14 @@ SET search_path = %(SCHEMA)s,public,pgroonga,pg_catalog;
 
 DROP INDEX zerver_message_search_pgroonga;
 END$$
-""", database_setting), """
+""",
+                    database_setting,
+                ),
+                """
 
 CREATE INDEX CONCURRENTLY zerver_message_search_pgroonga ON zerver_message
   USING pgroonga(search_pgroonga pgroonga.text_full_text_search_ops);
-        """]),
+        """,
+            ],
+        ),
     ]
diff --git a/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_cron_file b/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_cron_file
index 86df41348a..dd87fa3fb0 100755
--- a/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_cron_file
+++ b/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_cron_file
@@ -7,7 +7,7 @@ import time
 from typing import Tuple
 
 
-def nagios_from_file(results_file: str, max_time_diff: int=60 * 2) -> 'Tuple[int, str]':
+def nagios_from_file(results_file: str, max_time_diff: int = 60 * 2) -> 'Tuple[int, str]':
     """Returns a nagios-appropriate string and return code obtained by
     parsing the desired file on disk. The file on disk should be of format
 
@@ -39,6 +39,7 @@ def nagios_from_file(results_file: str, max_time_diff: int=60 * 2) -> 'Tuple[int
 
     return (ret, f"{state}: {data}")
 
+
 if __name__ == "__main__":
     RESULTS_FILE = sys.argv[1]
     extra_args = {}
diff --git a/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_send_receive_time b/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_send_receive_time
index 10037f95c7..1a47251a93 100755
--- a/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_send_receive_time
+++ b/puppet/zulip/files/nagios_plugins/zulip_app_frontend/check_send_receive_time
@@ -32,17 +32,13 @@ usage = """Usage: send-receive.py [options] [config]
         Otherwise, returns the output data."""
 
 parser = argparse.ArgumentParser(usage=usage)
-parser.add_argument('--site',
-                    default="https://api.zulip.com")
+parser.add_argument('--site', default="https://api.zulip.com")
 
-parser.add_argument('--nagios',
-                    action='store_true')
+parser.add_argument('--nagios', action='store_true')
 
-parser.add_argument('--insecure',
-                    action='store_true')
+parser.add_argument('--insecure', action='store_true')
 
-parser.add_argument('--munin',
-                    action='store_true')
+parser.add_argument('--munin', action='store_true')
 
 parser.add_argument('config', nargs='?')
 
@@ -54,13 +50,15 @@ if not options.nagios and not options.munin:
 
 if options.munin:
     if options.config == 'config':
-        print("""graph_title Send-Receive times
+        print(
+            """graph_title Send-Receive times
 graph_info The number of seconds it takes to send and receive a message from the server
 graph_args -u 5 -l 0
 graph_vlabel RTT (seconds)
 sendreceive.label Send-receive round trip time
 sendreceive.warning 3
-sendreceive.critical 5""")
+sendreceive.critical 5"""
+        )
         sys.exit(0)
 
 sys.path.append('/home/zulip/deployments/current')
@@ -79,6 +77,7 @@ states = {
     "UNKNOWN": 3,
 }
 
+
 def report(state: str, timestamp: Any = None, msg: Optional[str] = None) -> None:
     now = int(time.time())
     if msg is None:
@@ -90,11 +89,13 @@ def report(state: str, timestamp: Any = None, msg: Optional[str] = None) -> None
     print(f"{state}: {msg}")
     exit(states[state])
 
+
 def send_zulip(sender: zulip.Client, message: Dict[str, Any]) -> None:
     result = sender.send_message(message)
     if result["result"] != "success" and options.nagios:
         report("CRITICAL", msg=f"Error sending Zulip, args were: {message}, {result}")
 
+
 def get_zulips() -> List[Dict[str, Any]]:
     global queue_id, last_event_id
     res = zulip_recipient.get_events(queue_id=queue_id, last_event_id=last_event_id)
@@ -108,8 +109,12 @@ def get_zulips() -> List[Dict[str, Any]]:
         report("CRITICAL", msg="Got heartbeat waiting for Zulip, which means get_events is hanging")
     return [event['message'] for event in res['events']]
 
-if "staging" in options.site and settings.NAGIOS_STAGING_SEND_BOT is not None and \
-        settings.NAGIOS_STAGING_RECEIVE_BOT is not None:
+
+if (
+    "staging" in options.site
+    and settings.NAGIOS_STAGING_SEND_BOT is not None
+    and settings.NAGIOS_STAGING_RECEIVE_BOT is not None
+):
     sender = get_system_bot(settings.NAGIOS_STAGING_SEND_BOT)
     recipient = get_system_bot(settings.NAGIOS_STAGING_RECEIVE_BOT)
 else:
@@ -122,7 +127,8 @@ zulip_sender = zulip.Client(
     verbose=True,
     insecure=options.insecure,
     client="ZulipMonitoring/0.1",
-    site=options.site)
+    site=options.site,
+)
 
 zulip_recipient = zulip.Client(
     email=recipient.email,
@@ -130,7 +136,8 @@ zulip_recipient = zulip.Client(
     verbose=True,
     insecure=options.insecure,
     client="ZulipMonitoring/0.1",
-    site=options.site)
+    site=options.site,
+)
 
 try:
     res = zulip_recipient.register(event_types=["message"])
@@ -142,12 +149,15 @@ except Exception:
 msg_to_send = str(random.getrandbits(64))
 time_start = time.time()
 
-send_zulip(zulip_sender, {
-    "type": 'private',
-    "content": msg_to_send,
-    "subject": "time to send",
-    "to": recipient.email,
-})
+send_zulip(
+    zulip_sender,
+    {
+        "type": 'private',
+        "content": msg_to_send,
+        "subject": "time to send",
+        "to": recipient.email,
+    },
+)
 
 msg_content: List[str] = []
 
diff --git a/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_fts_update_log b/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_fts_update_log
index d5665b98e1..04b6b5840b 100755
--- a/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_fts_update_log
+++ b/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_fts_update_log
@@ -22,10 +22,12 @@ states = {
     "UNKNOWN": 3,
 }
 
+
 def report(state: str, num: str) -> None:
     print(f"{state}: {num} rows in fts_update_log table")
     exit(states[state])
 
+
 conn = psycopg2.connect(database="zulip")
 cursor = conn.cursor()
 
diff --git a/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_postgresql_replication_lag b/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_postgresql_replication_lag
index abdc6b8e70..20d7255ad4 100755
--- a/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_postgresql_replication_lag
+++ b/puppet/zulip/files/nagios_plugins/zulip_postgresql/check_postgresql_replication_lag
@@ -31,15 +31,15 @@ def run_sql_query(query: str) -> List[List[str]]:
         '-t',  # Omit header line
         '-A',  # Don't pad with spaces
         '-z',  # Separate columns with nulls
-        '-v', 'ON_ERROR_STOP=1',
+        '-v',
+        'ON_ERROR_STOP=1',
         'zulip',
-        '-c', f'SELECT {query}',
+        '-c',
+        f'SELECT {query}',
     ]
     try:
         output = subprocess.check_output(
-            command,
-            stderr=subprocess.STDOUT,
-            universal_newlines=True
+            command, stderr=subprocess.STDOUT, universal_newlines=True
         ).strip()
         if not output:
             return []
@@ -84,9 +84,9 @@ if replication_info:
         report('CRITICAL', f'replica is in state {state}, not streaming')
 
     msg = f'replica is {replay_lag} bytes behind in replay of WAL logs from {primary_server}'
-    if replay_lag > 5 * 16 * 1024**2:
+    if replay_lag > 5 * 16 * 1024 ** 2:
         report('CRITICAL', msg)
-    elif replay_lag > 16 * 1024**2:
+    elif replay_lag > 16 * 1024 ** 2:
         report('WARNING', msg)
     else:
         report('OK', msg)
@@ -115,9 +115,9 @@ else:
         for lag_type in ('write', 'flush', 'replay'):
             lag_bytes = lag[lag_type]
             msg = f'replica {client_addr} is {lag_bytes} bytes behind in {lag_type} of WAL logs'
-            if lag_bytes > 5 * 16 * 1024**2:
+            if lag_bytes > 5 * 16 * 1024 ** 2:
                 report('CRITICAL', msg)
-            elif lag_bytes > 16 * 1024**2:
+            elif lag_bytes > 16 * 1024 ** 2:
                 report('WARNING', msg)
             else:
                 report('OK', msg)
diff --git a/puppet/zulip/files/nagios_plugins/zulip_postgresql_backups/check_postgresql_backup b/puppet/zulip/files/nagios_plugins/zulip_postgresql_backups/check_postgresql_backup
index 3a49f28477..b337ea060c 100755
--- a/puppet/zulip/files/nagios_plugins/zulip_postgresql_backups/check_postgresql_backup
+++ b/puppet/zulip/files/nagios_plugins/zulip_postgresql_backups/check_postgresql_backup
@@ -12,13 +12,18 @@ states = {
     "UNKNOWN": 3,
 }
 
+
 def report(state: str, msg: str) -> None:
     print(f"{state}: {msg}")
     exit(states[state])
 
-if subprocess.check_output(['psql', '-v', 'ON_ERROR_STOP=1',
-                            'postgres', '-t', '-c',
-                            'SELECT pg_is_in_recovery()']).strip() != b'f':
+
+if (
+    subprocess.check_output(
+        ['psql', '-v', 'ON_ERROR_STOP=1', 'postgres', '-t', '-c', 'SELECT pg_is_in_recovery()']
+    ).strip()
+    != b'f'
+):
     report('OK', 'this is not the primary')
 
 try:
diff --git a/puppet/zulip/files/postgresql/pg_backup_and_purge b/puppet/zulip/files/postgresql/pg_backup_and_purge
index f5b5ba0bc0..4a8b41845d 100755
--- a/puppet/zulip/files/postgresql/pg_backup_and_purge
+++ b/puppet/zulip/files/postgresql/pg_backup_and_purge
@@ -15,6 +15,7 @@ logging.Formatter.converter = time.gmtime
 logging.basicConfig(format="%(asctime)s %(levelname)s: %(message)s")
 logger = logging.getLogger(__name__)
 
+
 def run(args: List[str], dry_run: bool = False) -> str:
     if dry_run:
         print("Would have run: " + " ".join(map(shlex.quote, args)))
@@ -22,7 +23,10 @@ def run(args: List[str], dry_run: bool = False) -> str:
 
     return subprocess.check_output(args, stdin=subprocess.DEVNULL, universal_newlines=True)
 
-recovery_val = run(['psql', '-v', 'ON_ERROR_STOP=1', '-t', '-c', 'SELECT pg_is_in_recovery()']).strip()
+
+recovery_val = run(
+    ['psql', '-v', 'ON_ERROR_STOP=1', '-t', '-c', 'SELECT pg_is_in_recovery()']
+).strip()
 # Assertion to check that we're extracting the value correctly.
 assert recovery_val in ['t', 'f']
 if recovery_val == 't':
diff --git a/puppet/zulip/files/postgresql/process_fts_updates b/puppet/zulip/files/postgresql/process_fts_updates
index 53a6555620..7b5377fde6 100755
--- a/puppet/zulip/files/postgresql/process_fts_updates
+++ b/puppet/zulip/files/postgresql/process_fts_updates
@@ -36,8 +36,7 @@ import psycopg2.extensions
 BATCH_SIZE = 1000
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--quiet',
-                    action='store_true')
+parser.add_argument('--quiet', action='store_true')
 options = parser.parse_args()
 
 logging.Formatter.converter = time.gmtime
@@ -48,6 +47,7 @@ if options.quiet:
 else:
     logger.setLevel(logging.DEBUG)
 
+
 def update_fts_columns(cursor: psycopg2.extensions.cursor) -> int:
     cursor.execute(
         "SELECT id, message_id FROM fts_update_log LIMIT %s;",
@@ -56,22 +56,30 @@ def update_fts_columns(cursor: psycopg2.extensions.cursor) -> int:
     ids = []
     for (id, message_id) in cursor.fetchall():
         if USING_PGROONGA:
-            cursor.execute("UPDATE zerver_message SET "
-                           "search_pgroonga = "
-                           "escape_html(subject) || ' ' || rendered_content "
-                           "WHERE id = %s", (message_id,))
-        cursor.execute("UPDATE zerver_message SET "
-                       "search_tsvector = to_tsvector('zulip.english_us_search', "
-                       "subject || rendered_content) "
-                       "WHERE id = %s", (message_id,))
+            cursor.execute(
+                "UPDATE zerver_message SET "
+                "search_pgroonga = "
+                "escape_html(subject) || ' ' || rendered_content "
+                "WHERE id = %s",
+                (message_id,),
+            )
+        cursor.execute(
+            "UPDATE zerver_message SET "
+            "search_tsvector = to_tsvector('zulip.english_us_search', "
+            "subject || rendered_content) "
+            "WHERE id = %s",
+            (message_id,),
+        )
         ids.append(id)
     cursor.execute("DELETE FROM fts_update_log WHERE id = ANY(%s)", (ids,))
     return len(ids)
 
+
 def am_master(cursor: psycopg2.extensions.cursor) -> bool:
     cursor.execute("SELECT pg_is_in_recovery()")
     return not cursor.fetchall()[0][0]
 
+
 pg_args = {}
 
 # Path to the root of the Zulip codebase in production
@@ -81,6 +89,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../.
 try:
     os.environ['DJANGO_SETTINGS_MODULE'] = 'zproject.settings'
     from django.conf import settings
+
     if settings.REMOTE_POSTGRES_HOST != '':
         pg_args['host'] = settings.REMOTE_POSTGRES_HOST
     if settings.REMOTE_POSTGRES_PORT != '':
diff --git a/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors
index fe498f3e04..c46773220a 100755
--- a/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors
+++ b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_personal_zephyr_mirrors
@@ -21,10 +21,12 @@ states: Dict[str, int] = {
     "UNKNOWN": 3,
 }
 
+
 def report(state: str, output: str) -> None:
     print(f"{state}\n{output}")
     exit(states[state])
 
+
 output = ""
 down_count = 0
 for results_file_name in os.listdir(RESULTS_DIR):
diff --git a/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness
index e85131282e..83d3e35f69 100755
--- a/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness
+++ b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_user_zephyr_mirror_liveness
@@ -35,29 +35,36 @@ states: Dict[str, int] = {
     "UNKNOWN": 3,
 }
 
+
 def report(state: str, short_msg: str, too_old: AbstractSet[Any] = set()) -> None:
     too_old_data = ""
     if too_old:
         too_old_data = "\nLast call to get_message for recently out of date mirrors:\n" + "\n".join(
-            "{:>16}: {}".format(user.user_profile.email,
-                                user.last_visit.strftime("%Y-%m-%d %H:%M %Z"),
-                                ) for user in too_old
+            "{:>16}: {}".format(
+                user.user_profile.email,
+                user.last_visit.strftime("%Y-%m-%d %H:%M %Z"),
+            )
+            for user in too_old
         )
     print(f"{state}: {short_msg}{too_old_data}")
 
     exit(states[state])
 
+
 now = timezone_now()
 
-all_users = UserActivity.objects.filter(query__in=["get_events", "/api/v1/events"],
-                                        client__name="zephyr_mirror")
-new_inactive_users = [user for user in all_users if user.last_visit <
-                      now - datetime.timedelta(minutes=10)]
-old_inactive_users = [user for user in new_inactive_users if user.last_visit <
-                      now - datetime.timedelta(minutes=60)]
+all_users = UserActivity.objects.filter(
+    query__in=["get_events", "/api/v1/events"], client__name="zephyr_mirror"
+)
+new_inactive_users = [
+    user for user in all_users if user.last_visit < now - datetime.timedelta(minutes=10)
+]
+old_inactive_users = [
+    user for user in new_inactive_users if user.last_visit < now - datetime.timedelta(minutes=60)
+]
 recently_inactive_users = set(new_inactive_users) - set(old_inactive_users)
 
-if (len(recently_inactive_users) / float(len(old_inactive_users))) > .25:
+if (len(recently_inactive_users) / float(len(old_inactive_users))) > 0.25:
     report("CRITICAL", "Many mirrors recently became inactive", recently_inactive_users)
 else:
     report("OK", "Most mirrors that were recently active continue to be active")
diff --git a/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror
index d095b257ad..0ccb8987c3 100755
--- a/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror
+++ b/puppet/zulip_ops/files/nagios_plugins/zulip_zephyr_mirror/check_zephyr_mirror
@@ -22,12 +22,16 @@ states: Dict[str, int] = {
     "UNKNOWN": 3,
 }
 
+
 def report(state: str, data: str, last_check: float) -> None:
-    print("{}: Last test run completed at {}\n{}".format(
-        state, time.strftime("%Y-%m-%d %H:%M %Z", time.gmtime(last_check)),
-        data))
+    print(
+        "{}: Last test run completed at {}\n{}".format(
+            state, time.strftime("%Y-%m-%d %H:%M %Z", time.gmtime(last_check)), data
+        )
+    )
     exit(states[state])
 
+
 with open(RESULTS_FILE) as f:
     data = f.read().strip()
 if data.split("\n")[-1].strip() == "0":
diff --git a/puppet/zulip_ops/files/zulip-ec2-configure-interfaces b/puppet/zulip_ops/files/zulip-ec2-configure-interfaces
index f63eb4f753..5b46fd5f51 100755
--- a/puppet/zulip_ops/files/zulip-ec2-configure-interfaces
+++ b/puppet/zulip_ops/files/zulip-ec2-configure-interfaces
@@ -56,6 +56,7 @@ def address_of(device_id: int) -> Optional[str]:
     except KeyError:
         return None
 
+
 def guess_gateway(device_id: int) -> Optional[str]:
     # This will not work if the default gateway isn't n.n.n.1.
     address = address_of(device_id)
@@ -65,6 +66,7 @@ def guess_gateway(device_id: int) -> Optional[str]:
     gateway[3] = '1'
     return '.'.join(gateway)
 
+
 log = logging.getLogger('configure-cloud-interfaces')
 log.setLevel(logging.DEBUG)
 
@@ -107,19 +109,43 @@ for device in macs.values():
         dev_num = str(device_number)
         address = address_of(device_number)
         gateway = guess_gateway(device_number)
-        assert(address is not None)
-        assert(gateway is not None)
+        assert address is not None
+        assert gateway is not None
 
         # Horrible hack to route return packets on the correct interface
         # See https://unix.stackexchange.com/a/4421/933
+        subprocess.check_call(['/sbin/ip', 'rule', 'add', 'fwmark', dev_num, 'table', dev_num])
         subprocess.check_call(
-            ['/sbin/ip', 'rule', 'add', 'fwmark', dev_num, 'table', dev_num])
+            [
+                '/sbin/ip',
+                'route',
+                'add',
+                '0.0.0.0/0',
+                'table',
+                dev_num,
+                'dev',
+                f'ens{device_number}',
+                'via',
+                gateway,
+            ]
+        )
         subprocess.check_call(
-            ['/sbin/ip', 'route', 'add', '0.0.0.0/0', 'table', dev_num, 'dev',
-             f'ens{device_number}', 'via', gateway])
-        subprocess.check_call(
-            ['/sbin/iptables', '-t', 'mangle', '-A', 'OUTPUT', '-m', 'conntrack', '--ctorigdst',
-             address, '-j', 'MARK', '--set-mark', dev_num])
+            [
+                '/sbin/iptables',
+                '-t',
+                'mangle',
+                '-A',
+                'OUTPUT',
+                '-m',
+                'conntrack',
+                '--ctorigdst',
+                address,
+                '-j',
+                'MARK',
+                '--set-mark',
+                dev_num,
+            ]
+        )
 
     to_configure.remove(address)
 
@@ -129,12 +155,25 @@ for device in macs.values():
         log.info(f"Configuring {device} with IP {ip}")
         subprocess.check_call(['/sbin/ifconfig', device, ip])
         subprocess.check_call(
-            ['/sbin/iptables', '-t', 'mangle', '-A', 'OUTPUT', '-m', 'conntrack', '--ctorigdst',
-             ip, '-j', 'MARK', '--set-mark', str(device_number)])
+            [
+                '/sbin/iptables',
+                '-t',
+                'mangle',
+                '-A',
+                'OUTPUT',
+                '-m',
+                'conntrack',
+                '--ctorigdst',
+                ip,
+                '-j',
+                'MARK',
+                '--set-mark',
+                str(device_number),
+            ]
+        )
 
     for throwaway in range(2):
         # Don't freak out if this doesn't work.
-        subprocess.call(
-            ['/sbin/ip', 'route', 'del', '10.0.0.0/8'])
+        subprocess.call(['/sbin/ip', 'route', 'del', '10.0.0.0/8'])
 
 log.info("Finished.")
diff --git a/scripts/lib/check_rabbitmq_queue.py b/scripts/lib/check_rabbitmq_queue.py
index 45a5598dae..a366cd6e59 100644
--- a/scripts/lib/check_rabbitmq_queue.py
+++ b/scripts/lib/check_rabbitmq_queue.py
@@ -50,13 +50,13 @@ CRITICAL_SECONDS_TO_CLEAR: DefaultDict[str, int] = defaultdict(
     embed_links=90,
 )
 
-def analyze_queue_stats(queue_name: str, stats: Dict[str, Any],
-                        queue_count_rabbitmqctl: int) -> Dict[str, Any]:
+
+def analyze_queue_stats(
+    queue_name: str, stats: Dict[str, Any], queue_count_rabbitmqctl: int
+) -> Dict[str, Any]:
     now = int(time.time())
     if stats == {}:
-        return dict(status=UNKNOWN,
-                    name=queue_name,
-                    message='invalid or no stats data')
+        return dict(status=UNKNOWN, name=queue_name, message='invalid or no stats data')
 
     if now - stats['update_time'] > 180 and queue_count_rabbitmqctl > 10:
         # Queue isn't updating the stats file and has some events in
@@ -72,10 +72,13 @@ def analyze_queue_stats(queue_name: str, stats: Dict[str, Any],
         # chance of that happening should be negligible because the queue
         # worker should wake up immediately and log statistics before
         # starting to process the first event.
-        return dict(status=CRITICAL,
-                    name=queue_name,
-                    message='queue appears to be stuck, last update {}, queue size {}'.format(
-                        stats['update_time'], queue_count_rabbitmqctl))
+        return dict(
+            status=CRITICAL,
+            name=queue_name,
+            message='queue appears to be stuck, last update {}, queue size {}'.format(
+                stats['update_time'], queue_count_rabbitmqctl
+            ),
+        )
 
     current_size = queue_count_rabbitmqctl
     average_consume_time = stats['recent_average_consume_time']
@@ -84,9 +87,7 @@ def analyze_queue_stats(queue_name: str, stats: Dict[str, Any],
         #
         # If the queue is stuck in this state and not processing
         # anything, eventually the `update_time` rule above will fire.
-        return dict(status=OK,
-                    name=queue_name,
-                    message='')
+        return dict(status=OK, name=queue_name, message='')
 
     expected_time_to_clear_backlog = current_size * average_consume_time
     if expected_time_to_clear_backlog > MAX_SECONDS_TO_CLEAR[queue_name]:
@@ -95,16 +96,19 @@ def analyze_queue_stats(queue_name: str, stats: Dict[str, Any],
         else:
             status = WARNING
 
-        return dict(status=status,
-                    name=queue_name,
-                    message=f'clearing the backlog will take too long: {expected_time_to_clear_backlog}s, size: {current_size}')
+        return dict(
+            status=status,
+            name=queue_name,
+            message=f'clearing the backlog will take too long: {expected_time_to_clear_backlog}s, size: {current_size}',
+        )
+
+    return dict(status=OK, name=queue_name, message='')
 
-    return dict(status=OK,
-                name=queue_name,
-                message='')
 
 WARN_COUNT_THRESHOLD_DEFAULT = 10
 CRITICAL_COUNT_THRESHOLD_DEFAULT = 50
+
+
 def check_other_queues(queue_counts_dict: Dict[str, int]) -> List[Dict[str, Any]]:
     """ Do a simple queue size check for queues whose workers don't publish stats files."""
 
@@ -114,24 +118,24 @@ def check_other_queues(queue_counts_dict: Dict[str, int]) -> List[Dict[str, Any]
             continue
 
         if count > CRITICAL_COUNT_THRESHOLD_DEFAULT:
-            results.append(dict(status=CRITICAL, name=queue,
-                                message=f'count critical: {count}'))
+            results.append(dict(status=CRITICAL, name=queue, message=f'count critical: {count}'))
         elif count > WARN_COUNT_THRESHOLD_DEFAULT:
-            results.append(dict(status=WARNING, name=queue,
-                                message=f'count warning: {count}'))
+            results.append(dict(status=WARNING, name=queue, message=f'count warning: {count}'))
         else:
             results.append(dict(status=OK, name=queue, message=''))
 
     return results
 
+
 def check_rabbitmq_queues() -> None:
     pattern = re.compile(r'(\w+)\t(\d+)\t(\d+)')
     if 'USER' in os.environ and not os.environ['USER'] in ['root', 'rabbitmq']:
         print("This script must be run as the root or rabbitmq user")
 
-    list_queues_output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_queues',
-                                                  'name', 'messages', 'consumers'],
-                                                 universal_newlines=True)
+    list_queues_output = subprocess.check_output(
+        ['/usr/sbin/rabbitmqctl', 'list_queues', 'name', 'messages', 'consumers'],
+        universal_newlines=True,
+    )
     queue_counts_rabbitmqctl = {}
     queues_with_consumers = []
     for line in list_queues_output.split("\n"):
@@ -145,9 +149,10 @@ def check_rabbitmq_queues() -> None:
             if consumers > 0 and not queue.startswith("notify_tornado"):
                 queues_with_consumers.append(queue)
 
-    queue_stats_dir = subprocess.check_output([os.path.join(ZULIP_PATH, 'scripts/get-django-setting'),
-                                               'QUEUE_STATS_DIR'],
-                                              universal_newlines=True).strip()
+    queue_stats_dir = subprocess.check_output(
+        [os.path.join(ZULIP_PATH, 'scripts/get-django-setting'), 'QUEUE_STATS_DIR'],
+        universal_newlines=True,
+    ).strip()
     queue_stats: Dict[str, Dict[str, Any]] = {}
     queues_to_check = set(normal_queues).intersection(set(queues_with_consumers))
     for queue in queues_to_check:
@@ -177,7 +182,8 @@ def check_rabbitmq_queues() -> None:
         queue_error_template = "queue {} problem: {}:{}"
         error_message = '; '.join(
             queue_error_template.format(result['name'], states[result['status']], result['message'])
-            for result in results if result['status'] > 0
+            for result in results
+            if result['status'] > 0
         )
         print(f"{now}|{status}|{states[status]}|{error_message}")
     else:
diff --git a/scripts/lib/clean-unused-caches b/scripts/lib/clean-unused-caches
index 3d3f4d0202..2fd316c0ce 100755
--- a/scripts/lib/clean-unused-caches
+++ b/scripts/lib/clean-unused-caches
@@ -15,5 +15,6 @@ def main() -> None:
     clean_node_cache.main(args)
     clean_emoji_cache.main(args)
 
+
 if __name__ == "__main__":
     main()
diff --git a/scripts/lib/clean_emoji_cache.py b/scripts/lib/clean_emoji_cache.py
index ded3759667..6ad2d3c23a 100755
--- a/scripts/lib/clean_emoji_cache.py
+++ b/scripts/lib/clean_emoji_cache.py
@@ -16,6 +16,7 @@ from scripts.lib.zulip_tools import (
 ENV = get_environment()
 EMOJI_CACHE_PATH = "/srv/zulip-emoji-cache"
 
+
 def get_caches_in_use(threshold_days: int) -> Set[str]:
     setups_to_check = {ZULIP_PATH}
     caches_in_use = set()
@@ -37,10 +38,11 @@ def get_caches_in_use(threshold_days: int) -> Set[str]:
         caches_in_use.add(os.path.dirname(os.readlink(emoji_link_path)))
     return caches_in_use
 
+
 def main(args: argparse.Namespace) -> None:
     caches_in_use = get_caches_in_use(args.threshold_days)
-    purge_unused_caches(
-        EMOJI_CACHE_PATH, caches_in_use, "emoji cache", args)
+    purge_unused_caches(EMOJI_CACHE_PATH, caches_in_use, "emoji cache", args)
+
 
 if __name__ == "__main__":
     args = parse_cache_script_args("This script cleans unused Zulip emoji caches.")
diff --git a/scripts/lib/clean_node_cache.py b/scripts/lib/clean_node_cache.py
index c3a36c2ea5..5cc7436466 100755
--- a/scripts/lib/clean_node_cache.py
+++ b/scripts/lib/clean_node_cache.py
@@ -16,6 +16,7 @@ from scripts.lib.zulip_tools import (
 ENV = get_environment()
 NODE_MODULES_CACHE_PATH = "/srv/zulip-npm-cache"
 
+
 def get_caches_in_use(threshold_days: int) -> Set[str]:
     setups_to_check = {ZULIP_PATH}
     caches_in_use = set()
@@ -40,10 +41,11 @@ def get_caches_in_use(threshold_days: int) -> Set[str]:
 
     return caches_in_use
 
+
 def main(args: argparse.Namespace) -> None:
     caches_in_use = get_caches_in_use(args.threshold_days)
-    purge_unused_caches(
-        NODE_MODULES_CACHE_PATH, caches_in_use, "node modules cache", args)
+    purge_unused_caches(NODE_MODULES_CACHE_PATH, caches_in_use, "node modules cache", args)
+
 
 if __name__ == "__main__":
     args = parse_cache_script_args("This script cleans unused Zulip npm caches.")
diff --git a/scripts/lib/clean_venv_cache.py b/scripts/lib/clean_venv_cache.py
index e8090cf10f..474773c19f 100755
--- a/scripts/lib/clean_venv_cache.py
+++ b/scripts/lib/clean_venv_cache.py
@@ -18,6 +18,7 @@ from scripts.lib.zulip_tools import (
 ENV = get_environment()
 VENV_CACHE_DIR = '/srv/zulip-venv-cache'
 
+
 def get_caches_in_use(threshold_days: int) -> Set[str]:
     setups_to_check = {ZULIP_PATH}
     caches_in_use = set()
@@ -48,10 +49,11 @@ def get_caches_in_use(threshold_days: int) -> Set[str]:
 
     return caches_in_use
 
+
 def main(args: argparse.Namespace) -> None:
     caches_in_use = get_caches_in_use(args.threshold_days)
-    purge_unused_caches(
-        VENV_CACHE_DIR, caches_in_use, "venv cache", args)
+    purge_unused_caches(VENV_CACHE_DIR, caches_in_use, "venv cache", args)
+
 
 if __name__ == "__main__":
     args = parse_cache_script_args("This script cleans unused Zulip venv caches.")
diff --git a/scripts/lib/create-production-venv b/scripts/lib/create-production-venv
index 969ead5f9c..0cbd2881f7 100755
--- a/scripts/lib/create-production-venv
+++ b/scripts/lib/create-production-venv
@@ -33,8 +33,8 @@ os.chdir(ZULIP_PATH)
 
 venv_name = "zulip-py3-venv"
 cached_venv_path = setup_virtualenv(
-    os.path.join(args.deploy_path, venv_name),
-    os.path.join(ZULIP_PATH, "requirements", "prod.txt"))
+    os.path.join(args.deploy_path, venv_name), os.path.join(ZULIP_PATH, "requirements", "prod.txt")
+)
 
 current_venv_path = os.path.join(args.deploy_path, 'zulip-current-venv')
 overwrite_symlink(venv_name, current_venv_path)
diff --git a/scripts/lib/create-thumbor-venv b/scripts/lib/create-thumbor-venv
index d9b9ba29f4..546f056424 100755
--- a/scripts/lib/create-thumbor-venv
+++ b/scripts/lib/create-thumbor-venv
@@ -31,4 +31,5 @@ else:
 venv_name = "zulip-thumbor-venv"
 cached_venv_path = setup_virtualenv(
     os.path.join(args.deploy_path, venv_name),
-    os.path.join(ZULIP_PATH, "requirements", "thumbor.txt"))
+    os.path.join(ZULIP_PATH, "requirements", "thumbor.txt"),
+)
diff --git a/scripts/lib/email-mirror-postfix b/scripts/lib/email-mirror-postfix
index 458e2faa11..cc044b8a77 100755
--- a/scripts/lib/email-mirror-postfix
+++ b/scripts/lib/email-mirror-postfix
@@ -54,24 +54,36 @@ from urllib.request import Request, urlopen
 
 parser = argparse.ArgumentParser()
 
-parser.add_argument('-r', '--recipient', default='',
-                    help="Original recipient.")
+parser.add_argument('-r', '--recipient', default='', help="Original recipient.")
 
-parser.add_argument('-s', '--shared-secret', default='',
-                    help="Secret access key.")
+parser.add_argument('-s', '--shared-secret', default='', help="Secret access key.")
 
-parser.add_argument('-d', '--dst-host', dest="host", default='https://127.0.0.1',
-                    help="Destination server address for uploading email from email mirror. "
-                         "Address must contain a HTTP protocol.")
+parser.add_argument(
+    '-d',
+    '--dst-host',
+    dest="host",
+    default='https://127.0.0.1',
+    help="Destination server address for uploading email from email mirror. "
+    "Address must contain a HTTP protocol.",
+)
 
-parser.add_argument('-u', '--dst-url', dest="url", default='/email_mirror_message',
-                    help="Destination relative URL for uploading email from email mirror.")
+parser.add_argument(
+    '-u',
+    '--dst-url',
+    dest="url",
+    default='/email_mirror_message',
+    help="Destination relative URL for uploading email from email mirror.",
+)
 
-parser.add_argument('-n', '--not-verify-ssl', dest="verify_ssl", action='store_false',
-                    help="Disable ssl certificate verifying for self-signed certificates")
+parser.add_argument(
+    '-n',
+    '--not-verify-ssl',
+    dest="verify_ssl",
+    action='store_false',
+    help="Disable ssl certificate verifying for self-signed certificates",
+)
 
-parser.add_argument('-t', '--test', action='store_true',
-                    help="Test mode.")
+parser.add_argument('-t', '--test', action='store_true', help="Test mode.")
 
 options = parser.parse_args()
 
@@ -90,7 +102,12 @@ def process_response_error(e: HTTPError) -> None:
 
 
 def send_email_mirror(
-    rcpt_to: str, shared_secret: str, host: str, url: str, test: bool, verify_ssl: bool,
+    rcpt_to: str,
+    shared_secret: str,
+    host: str,
+    url: str,
+    test: bool,
+    verify_ssl: bool,
 ) -> None:
     if not rcpt_to:
         print("5.1.1 Bad destination mailbox address: No missed message email address.")
@@ -136,5 +153,6 @@ def send_email_mirror(
 
 
 recipient = str(os.environ.get("ORIGINAL_RECIPIENT", options.recipient))
-send_email_mirror(recipient, options.shared_secret, options.host, options.url, options.test,
-                  options.verify_ssl)
+send_email_mirror(
+    recipient, options.shared_secret, options.host, options.url, options.test, options.verify_ssl
+)
diff --git a/scripts/lib/hash_reqs.py b/scripts/lib/hash_reqs.py
index c338e43454..9be7893f8d 100755
--- a/scripts/lib/hash_reqs.py
+++ b/scripts/lib/hash_reqs.py
@@ -19,6 +19,7 @@ def expand_reqs_helper(fpath: str) -> List[str]:
                 result.append(dep)
     return result
 
+
 def expand_reqs(fpath: str) -> List[str]:
     """
     Returns a sorted list of unique dependencies specified by the requirements file `fpath`.
@@ -29,24 +30,29 @@ def expand_reqs(fpath: str) -> List[str]:
     output = expand_reqs_helper(absfpath)
     return sorted(set(output))
 
+
 def python_version() -> str:
     """
     Returns the Python version as string 'Python major.minor.patchlevel'
     """
     return subprocess.check_output(["/usr/bin/python3", "-VV"], universal_newlines=True)
 
+
 def hash_deps(deps: Iterable[str]) -> str:
     deps_str = "\n".join(deps) + "\n" + python_version()
     return hashlib.sha1(deps_str.encode('utf-8')).hexdigest()
 
+
 def main() -> int:
-    description = ("Finds the SHA1 hash of list of dependencies in a requirements file"
-                   " after recursively visiting all files specified in it.")
+    description = (
+        "Finds the SHA1 hash of list of dependencies in a requirements file"
+        " after recursively visiting all files specified in it."
+    )
     parser = argparse.ArgumentParser(description=description)
-    parser.add_argument("fpath", metavar="FILE",
-                        help="Path to requirements file")
-    parser.add_argument("--print", dest="print_reqs", action='store_true',
-                        help="Print all dependencies")
+    parser.add_argument("fpath", metavar="FILE", help="Path to requirements file")
+    parser.add_argument(
+        "--print", dest="print_reqs", action='store_true', help="Print all dependencies"
+    )
     args = parser.parse_args()
 
     deps = expand_reqs(args.fpath)
@@ -57,5 +63,6 @@ def main() -> int:
             print(dep)
     return 0
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/scripts/lib/node_cache.py b/scripts/lib/node_cache.py
index a6015f2e26..308681cc13 100644
--- a/scripts/lib/node_cache.py
+++ b/scripts/lib/node_cache.py
@@ -16,6 +16,7 @@ YARN_PACKAGE_JSON = os.path.join(ZULIP_SRV_PATH, 'zulip-yarn/package.json')
 
 DEFAULT_PRODUCTION = False
 
+
 def get_yarn_args(production: bool) -> List[str]:
     if production:
         yarn_args = ["--prod"]
@@ -23,8 +24,10 @@ def get_yarn_args(production: bool) -> List[str]:
         yarn_args = []
     return yarn_args
 
+
 def generate_sha1sum_node_modules(
-    setup_dir: Optional[str] = None, production: bool = DEFAULT_PRODUCTION,
+    setup_dir: Optional[str] = None,
+    production: bool = DEFAULT_PRODUCTION,
 ) -> str:
     if setup_dir is None:
         setup_dir = os.path.realpath(os.getcwd())
@@ -45,6 +48,7 @@ def generate_sha1sum_node_modules(
     sha1sum.update(''.join(sorted(yarn_args)).encode('utf8'))
     return sha1sum.hexdigest()
 
+
 def setup_node_modules(
     production: bool = DEFAULT_PRODUCTION,
     prefer_offline: bool = False,
@@ -58,9 +62,7 @@ def setup_node_modules(
     success_stamp = os.path.join(target_path, '.success-stamp')
     # Check if a cached version already exists
     if not os.path.exists(success_stamp):
-        do_yarn_install(target_path,
-                        yarn_args,
-                        success_stamp)
+        do_yarn_install(target_path, yarn_args, success_stamp)
 
     print("Using cached node modules from {}".format(cached_node_modules))
     if os.path.islink('node_modules'):
@@ -69,6 +71,7 @@ def setup_node_modules(
         shutil.rmtree('node_modules')
     os.symlink(cached_node_modules, 'node_modules')
 
+
 def do_yarn_install(
     target_path: str,
     yarn_args: List[str],
@@ -86,7 +89,8 @@ def do_yarn_install(
         shutil.copytree("node_modules/", cached_node_modules, symlinks=True)
     if os.environ.get('CUSTOM_CA_CERTIFICATES'):
         run([YARN_BIN, "config", "set", "cafile", os.environ['CUSTOM_CA_CERTIFICATES']])
-    run([YARN_BIN, "install", "--non-interactive", "--frozen-lockfile", *yarn_args],
-        cwd=target_path)
+    run(
+        [YARN_BIN, "install", "--non-interactive", "--frozen-lockfile", *yarn_args], cwd=target_path
+    )
     with open(success_stamp, 'w'):
         pass
diff --git a/scripts/lib/pythonrc.py b/scripts/lib/pythonrc.py
index 016d180943..45fbf56669 100644
--- a/scripts/lib/pythonrc.py
+++ b/scripts/lib/pythonrc.py
@@ -6,6 +6,7 @@ try:
     from zerver.models import *  # noqa: F401, F403
 except Exception:
     import traceback
+
     print("\nException importing Zulip core modules on startup!")
     traceback.print_exc()
 else:
diff --git a/scripts/lib/setup_venv.py b/scripts/lib/setup_venv.py
index e06c4a7510..286e0d4af1 100644
--- a/scripts/lib/setup_venv.py
+++ b/scripts/lib/setup_venv.py
@@ -13,30 +13,28 @@ VENV_CACHE_PATH = "/srv/zulip-venv-cache"
 VENV_DEPENDENCIES = [
     "build-essential",
     "libffi-dev",
-    "libfreetype6-dev",     # Needed for image types with Pillow
-    "zlib1g-dev",             # Needed to handle compressed PNGs with Pillow
-    "libjpeg-dev",          # Needed to handle JPEGs with Pillow
+    "libfreetype6-dev",  # Needed for image types with Pillow
+    "zlib1g-dev",  # Needed to handle compressed PNGs with Pillow
+    "libjpeg-dev",  # Needed to handle JPEGs with Pillow
     "libldap2-dev",
-    "python3-dev",          # Needed to install typed-ast dependency of mypy
+    "python3-dev",  # Needed to install typed-ast dependency of mypy
     "python3-pip",
     "virtualenv",
-    "libxml2-dev",          # Used for installing talon and python-xmlsec
-    "libxslt1-dev",         # Used for installing talon
-    "libpq-dev",            # Needed by psycopg2
-    "libssl-dev",           # Needed to build pycurl and other libraries
-    "libmagic1",            # Used for install python-magic
-    "libyaml-dev",          # For fast YAML parsing in PyYAML
+    "libxml2-dev",  # Used for installing talon and python-xmlsec
+    "libxslt1-dev",  # Used for installing talon
+    "libpq-dev",  # Needed by psycopg2
+    "libssl-dev",  # Needed to build pycurl and other libraries
+    "libmagic1",  # Used for install python-magic
+    "libyaml-dev",  # For fast YAML parsing in PyYAML
     # Needed by python-xmlsec:
     "libxmlsec1-dev",
     "pkg-config",
-
     # This is technically a node dependency, but we add it here
     # because we don't have another place that we install apt packages
     # on upgrade of a production server, and it's not worth adding
     # another call to `apt install` for.
-    "jq",                   # Used by scripts/lib/install-node to check yarn version
-
-    "libsasl2-dev",         # For building python-ldap from source
+    "jq",  # Used by scripts/lib/install-node to check yarn version
+    "libsasl2-dev",  # For building python-ldap from source
 ]
 
 COMMON_YUM_VENV_DEPENDENCIES = [
@@ -89,6 +87,7 @@ YUM_THUMBOR_VENV_DEPENDENCIES = [
     "gifsicle",
 ]
 
+
 def get_venv_dependencies(vendor: str, os_version: str) -> List[str]:
     if "debian" in os_families():
         return VENV_DEPENDENCIES
@@ -99,14 +98,17 @@ def get_venv_dependencies(vendor: str, os_version: str) -> List[str]:
     else:
         raise AssertionError("Invalid vendor")
 
+
 def install_venv_deps(pip: str, requirements_file: str) -> None:
     pip_requirements = os.path.join(ZULIP_PATH, "requirements", "pip.txt")
     run([pip, "install", "--force-reinstall", "--require-hashes", "-r", pip_requirements])
     run([pip, "install", "--no-deps", "--require-hashes", "-r", requirements_file])
 
+
 def get_index_filename(venv_path: str) -> str:
     return os.path.join(venv_path, 'package_index')
 
+
 def get_package_names(requirements_file: str) -> List[str]:
     packages = expand_reqs(requirements_file)
     cleaned = []
@@ -129,6 +131,7 @@ def get_package_names(requirements_file: str) -> List[str]:
 
     return sorted(cleaned)
 
+
 def create_requirements_index_file(venv_path: str, requirements_file: str) -> str:
     """
     Creates a file, called package_index, in the virtual environment
@@ -144,6 +147,7 @@ def create_requirements_index_file(venv_path: str, requirements_file: str) -> st
 
     return index_filename
 
+
 def get_venv_packages(venv_path: str) -> Set[str]:
     """
     Returns the packages installed in the virtual environment using the
@@ -152,6 +156,7 @@ def get_venv_packages(venv_path: str) -> Set[str]:
     with open(get_index_filename(venv_path)) as reader:
         return {p.strip() for p in reader.read().split('\n') if p.strip()}
 
+
 def try_to_copy_venv(venv_path: str, new_packages: Set[str]) -> bool:
     """
     Tries to copy packages from an old virtual environment in the cache
@@ -174,16 +179,16 @@ def try_to_copy_venv(venv_path: str, new_packages: Set[str]) -> bool:
     old_packages = set()  # type: Set[str]
     for sha1sum in os.listdir(VENV_CACHE_PATH):
         curr_venv_path = os.path.join(VENV_CACHE_PATH, sha1sum, venv_name)
-        if (curr_venv_path == venv_path or
-                not os.path.exists(get_index_filename(curr_venv_path))):
+        if curr_venv_path == venv_path or not os.path.exists(get_index_filename(curr_venv_path)):
             continue
 
         # Check the Python version in the venv matches the version we want to use.
         venv_python3 = os.path.join(curr_venv_path, "bin", "python3")
         if not os.path.exists(venv_python3):
             continue
-        venv_python_version = subprocess.check_output([
-            venv_python3, "-VV"], universal_newlines=True)
+        venv_python_version = subprocess.check_output(
+            [venv_python3, "-VV"], universal_newlines=True
+        )
         if desired_python_version != venv_python_version:
             continue
 
@@ -225,29 +230,33 @@ def try_to_copy_venv(venv_path: str, new_packages: Set[str]) -> bool:
         success_stamp_path = os.path.join(venv_path, 'success-stamp')
         run_as_root(["rm", "-f", success_stamp_path])
 
-        run_as_root(["chown", "-R",
-                     "{}:{}".format(os.getuid(), os.getgid()), venv_path])
+        run_as_root(["chown", "-R", "{}:{}".format(os.getuid(), os.getgid()), venv_path])
         source_log = get_logfile_name(source_venv_path)
         copy_parent_log(source_log, target_log)
-        create_log_entry(target_log, source_venv_path, copied_packages,
-                         new_packages - copied_packages)
+        create_log_entry(
+            target_log, source_venv_path, copied_packages, new_packages - copied_packages
+        )
         return True
 
     return False
 
+
 def get_logfile_name(venv_path: str) -> str:
     return "{}/setup-venv.log".format(venv_path)
 
+
 def create_log_entry(
-    target_log: str, parent: str, copied_packages: Set[str], new_packages: Set[str],
+    target_log: str,
+    parent: str,
+    copied_packages: Set[str],
+    new_packages: Set[str],
 ) -> None:
 
     venv_path = os.path.dirname(target_log)
     with open(target_log, 'a') as writer:
         writer.write("{}\n".format(venv_path))
         if copied_packages:
-            writer.write(
-                "Copied from {}:\n".format(parent))
+            writer.write("Copied from {}:\n".format(parent))
             writer.write("\n".join('- {}'.format(p) for p in sorted(copied_packages)))
             writer.write("\n")
 
@@ -255,10 +264,12 @@ def create_log_entry(
         writer.write("\n".join('- {}'.format(p) for p in sorted(new_packages)))
         writer.write("\n\n")
 
+
 def copy_parent_log(source_log: str, target_log: str) -> None:
     if os.path.exists(source_log):
         shutil.copyfile(source_log, target_log)
 
+
 def do_patch_activate_script(venv_path: str) -> None:
     """
     Patches the bin/activate script so that the value of the environment variable VIRTUAL_ENV
@@ -276,11 +287,13 @@ def do_patch_activate_script(venv_path: str) -> None:
     with open(script_path, 'w') as f:
         f.write("".join(lines))
 
+
 def generate_hash(requirements_file: str) -> str:
     path = os.path.join(ZULIP_PATH, 'scripts', 'lib', 'hash_reqs.py')
     output = subprocess.check_output([path, requirements_file], universal_newlines=True)
     return output.split()[0]
 
+
 def setup_virtualenv(
     target_venv_path: Optional[str],
     requirements_file: str,
@@ -292,7 +305,9 @@ def setup_virtualenv(
     if target_venv_path is None:
         cached_venv_path = os.path.join(VENV_CACHE_PATH, sha1sum, 'venv')
     else:
-        cached_venv_path = os.path.join(VENV_CACHE_PATH, sha1sum, os.path.basename(target_venv_path))
+        cached_venv_path = os.path.join(
+            VENV_CACHE_PATH, sha1sum, os.path.basename(target_venv_path)
+        )
     success_stamp = os.path.join(cached_venv_path, "success-stamp")
     if not os.path.exists(success_stamp):
         do_setup_virtualenv(cached_venv_path, requirements_file)
@@ -306,12 +321,14 @@ def setup_virtualenv(
             do_patch_activate_script(target_venv_path)
     return cached_venv_path
 
+
 def add_cert_to_pipconf() -> None:
     conffile = os.path.expanduser("~/.pip/pip.conf")
     confdir = os.path.expanduser("~/.pip/")
     os.makedirs(confdir, exist_ok=True)
     run(["crudini", "--set", conffile, "global", "cert", os.environ["CUSTOM_CA_CERTIFICATES"]])
 
+
 def do_setup_virtualenv(venv_path: str, requirements_file: str) -> None:
 
     # Setup Python virtualenv
@@ -322,8 +339,7 @@ def do_setup_virtualenv(venv_path: str, requirements_file: str) -> None:
         # Create new virtualenv.
         run_as_root(["mkdir", "-p", venv_path])
         run_as_root(["virtualenv", "-p", "python3", venv_path])
-        run_as_root(["chown", "-R",
-                     "{}:{}".format(os.getuid(), os.getgid()), venv_path])
+        run_as_root(["chown", "-R", "{}:{}".format(os.getuid(), os.getgid()), venv_path])
         create_log_entry(get_logfile_name(venv_path), "", set(), new_packages)
 
     create_requirements_index_file(venv_path, requirements_file)
diff --git a/scripts/lib/sharding.py b/scripts/lib/sharding.py
index 417dff8576..1393add421 100755
--- a/scripts/lib/sharding.py
+++ b/scripts/lib/sharding.py
@@ -17,9 +17,12 @@ from scripts.lib.zulip_tools import get_config_file, get_tornado_ports
 
 
 def write_realm_nginx_config_line(f: Any, host: str, port: str) -> None:
-    f.write(f"""if ($host = '{host}') {{
+    f.write(
+        f"""if ($host = '{host}') {{
     set $tornado_server http://tornado{port};
-}}\n""")
+}}\n"""
+    )
+
 
 # Basic system to do Tornado sharding.  Writes two output .tmp files that need
 # to be renamed to the following files to finalize the changes:
@@ -32,12 +35,14 @@ def write_updated_configs() -> None:
     config_file = get_config_file()
     ports = get_tornado_ports(config_file)
 
-    expected_ports = list(range(9800, max(ports)+1))
-    assert sorted(ports) == expected_ports, \
-        f"ports ({sorted(ports)}) must be contiguous, starting with 9800"
+    expected_ports = list(range(9800, max(ports) + 1))
+    assert (
+        sorted(ports) == expected_ports
+    ), f"ports ({sorted(ports)}) must be contiguous, starting with 9800"
 
-    with open('/etc/zulip/nginx_sharding.conf.tmp', 'w') as nginx_sharding_conf_f, \
-            open('/etc/zulip/sharding.json.tmp', 'w') as sharding_json_f:
+    with open('/etc/zulip/nginx_sharding.conf.tmp', 'w') as nginx_sharding_conf_f, open(
+        '/etc/zulip/sharding.json.tmp', 'w'
+    ) as sharding_json_f:
 
         if len(ports) == 1:
             nginx_sharding_conf_f.write("set $tornado_server http://tornado;\n")
@@ -46,9 +51,10 @@ def write_updated_configs() -> None:
 
         nginx_sharding_conf_f.write("set $tornado_server http://tornado9800;\n")
         shard_map: Dict[str, int] = {}
-        external_host = subprocess.check_output([os.path.join(BASE_DIR, 'scripts/get-django-setting'),
-                                                 'EXTERNAL_HOST'],
-                                                universal_newlines=True).strip()
+        external_host = subprocess.check_output(
+            [os.path.join(BASE_DIR, 'scripts/get-django-setting'), 'EXTERNAL_HOST'],
+            universal_newlines=True,
+        ).strip()
         for port in config_file["tornado_sharding"]:
             shards = config_file["tornado_sharding"][port].strip()
 
@@ -65,12 +71,14 @@ def write_updated_configs() -> None:
 
         sharding_json_f.write(json.dumps(shard_map) + '\n')
 
+
 parser = argparse.ArgumentParser(
     description="Adjust Tornado sharding configuration",
 )
 parser.add_argument(
-    "--errors-ok", action="store_true",
-    help="Exits 1 if there are no changes; if there are errors or changes, exits 0."
+    "--errors-ok",
+    action="store_true",
+    help="Exits 1 if there are no changes; if there are errors or changes, exits 0.",
 )
 options = parser.parse_args()
 
diff --git a/scripts/lib/unpack-zulip b/scripts/lib/unpack-zulip
index bf22d02053..ed19ade077 100755
--- a/scripts/lib/unpack-zulip
+++ b/scripts/lib/unpack-zulip
@@ -34,17 +34,16 @@ subprocess.check_call(["tar", "-xf", tarball_path, "-C", extract_path])
 new_version = get_deployment_version(extract_path)
 current_version = version.ZULIP_VERSION
 if is_invalid_upgrade(current_version, new_version):
-    print(FAIL +
-          "Your current version is very old. Please first upgrade to version "
-          "1.4.3 and then upgrade to {}.".format(new_version) +
-          ENDC)
+    print(
+        FAIL + "Your current version is very old. Please first upgrade to version "
+        "1.4.3 and then upgrade to {}.".format(new_version) + ENDC
+    )
     shutil.rmtree(extract_path)
     sys.exit(1)
 
 shutil.move(glob.glob(os.path.join(extract_path, "zulip-server-*"))[0], deploy_path)
 os.rmdir(extract_path)
-overwrite_symlink("/etc/zulip/settings.py",
-                  os.path.join(deploy_path, "zproject/prod_settings.py"))
+overwrite_symlink("/etc/zulip/settings.py", os.path.join(deploy_path, "zproject/prod_settings.py"))
 overwrite_symlink(deploy_path, os.path.join(DEPLOYMENTS_DIR, "next"))
 
 print(deploy_path)
diff --git a/scripts/lib/upgrade-zulip b/scripts/lib/upgrade-zulip
index 1d8fc5c379..01a5feeb55 100755
--- a/scripts/lib/upgrade-zulip
+++ b/scripts/lib/upgrade-zulip
@@ -32,8 +32,7 @@ assert_running_as_root(strip_lib_from_paths=True)
 os.umask(0o22)
 
 logging.Formatter.converter = time.gmtime
-logging.basicConfig(format="%(asctime)s upgrade-zulip: %(message)s",
-                    level=logging.INFO)
+logging.basicConfig(format="%(asctime)s upgrade-zulip: %(message)s", level=logging.INFO)
 
 if len(sys.argv) != 2:
     print(FAIL + f"Usage: {sys.argv[0]} <tarball>" + ENDC)
@@ -57,15 +56,17 @@ try:
 
     logging.info("Unpacking the tarball")
     unpack_zulip = os.path.realpath(os.path.join(os.path.dirname(__file__), 'unpack-zulip'))
-    deploy_path = subprocess.check_output([unpack_zulip, archived_tarball_path],
-                                          preexec_fn=su_to_zulip, universal_newlines=True)
+    deploy_path = subprocess.check_output(
+        [unpack_zulip, archived_tarball_path], preexec_fn=su_to_zulip, universal_newlines=True
+    )
 
     # Chdir to deploy_path and then run upgrade-zulip-stage-2 from the
     # new version of Zulip (having the upgrade logic run from the new
     # version is much better for fixing bugs in the upgrade process).
     deploy_path = deploy_path.strip()
     os.chdir(deploy_path)
-    subprocess.check_call([os.path.abspath("./scripts/lib/upgrade-zulip-stage-2"), deploy_path,
-                           *deploy_options])
+    subprocess.check_call(
+        [os.path.abspath("./scripts/lib/upgrade-zulip-stage-2"), deploy_path, *deploy_options]
+    )
 finally:
     release_deployment_lock()
diff --git a/scripts/lib/upgrade-zulip-from-git b/scripts/lib/upgrade-zulip-from-git
index cfb4fe3c7c..ef519d689d 100755
--- a/scripts/lib/upgrade-zulip-from-git
+++ b/scripts/lib/upgrade-zulip-from-git
@@ -25,7 +25,9 @@ from scripts.lib.zulip_tools import (
 
 config_file = get_config_file()
 deploy_options = get_deploy_options(config_file)
-remote_url = get_config(config_file, 'deployment', 'git_repo_url', "https://github.com/zulip/zulip.git")
+remote_url = get_config(
+    config_file, 'deployment', 'git_repo_url', "https://github.com/zulip/zulip.git"
+)
 
 assert_running_as_root(strip_lib_from_paths=True)
 
@@ -33,13 +35,13 @@ assert_running_as_root(strip_lib_from_paths=True)
 os.umask(0o22)
 
 logging.Formatter.converter = time.gmtime
-logging.basicConfig(format="%(asctime)s upgrade-zulip-from-git: %(message)s",
-                    level=logging.INFO)
+logging.basicConfig(format="%(asctime)s upgrade-zulip-from-git: %(message)s", level=logging.INFO)
 
 parser = argparse.ArgumentParser()
 parser.add_argument("refname", help="Git reference, e.g. a branch, tag, or commit ID.")
-parser.add_argument("--remote-url",
-                    help="Override the Git remote URL configured in /etc/zulip/zulip.conf.")
+parser.add_argument(
+    "--remote-url", help="Override the Git remote URL configured in /etc/zulip/zulip.conf."
+)
 args = parser.parse_args()
 
 refname = args.refname
@@ -58,26 +60,38 @@ try:
     deploy_path = make_deploy_path()
     if not os.path.exists(LOCAL_GIT_CACHE_DIR):
         logging.info("Cloning the repository")
-        subprocess.check_call(["git", "clone", "-q", remote_url, "--mirror", LOCAL_GIT_CACHE_DIR],
-                              stdout=open('/dev/null', 'w'))
+        subprocess.check_call(
+            ["git", "clone", "-q", remote_url, "--mirror", LOCAL_GIT_CACHE_DIR],
+            stdout=open('/dev/null', 'w'),
+        )
     if os.stat(LOCAL_GIT_CACHE_DIR).st_uid == 0:
         subprocess.check_call(["chown", "-R", "zulip:zulip", LOCAL_GIT_CACHE_DIR])
 
     logging.info("Fetching the latest commits")
     os.chdir(LOCAL_GIT_CACHE_DIR)
-    subprocess.check_call(["git", "remote", "set-url", "origin", remote_url], preexec_fn=su_to_zulip)
+    subprocess.check_call(
+        ["git", "remote", "set-url", "origin", remote_url], preexec_fn=su_to_zulip
+    )
     subprocess.check_call(["git", "fetch", "-q", "--tags"], preexec_fn=su_to_zulip)
 
-    subprocess.check_call(["git", "clone", "-q", "-b", refname, LOCAL_GIT_CACHE_DIR, deploy_path],
-                          stdout=open('/dev/null', 'w'),
-                          preexec_fn=su_to_zulip)
+    subprocess.check_call(
+        ["git", "clone", "-q", "-b", refname, LOCAL_GIT_CACHE_DIR, deploy_path],
+        stdout=open('/dev/null', 'w'),
+        preexec_fn=su_to_zulip,
+    )
     os.chdir(deploy_path)
 
     overwrite_symlink("/etc/zulip/settings.py", "zproject/prod_settings.py")
 
     overwrite_symlink(deploy_path, os.path.join(DEPLOYMENTS_DIR, "next"))
 
-    subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "upgrade-zulip-stage-2"),
-                           deploy_path, "--from-git", *deploy_options])
+    subprocess.check_call(
+        [
+            os.path.join(deploy_path, "scripts", "lib", "upgrade-zulip-stage-2"),
+            deploy_path,
+            "--from-git",
+            *deploy_options,
+        ]
+    )
 finally:
     release_deployment_lock()
diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2
index a8d682edf2..89e7d7cc7e 100755
--- a/scripts/lib/upgrade-zulip-stage-2
+++ b/scripts/lib/upgrade-zulip-stage-2
@@ -39,17 +39,18 @@ from scripts.lib.zulip_tools import (
 assert_running_as_root()
 
 logging.Formatter.converter = time.gmtime
-logging.basicConfig(format="%(asctime)s upgrade-zulip-stage-2: %(message)s",
-                    level=logging.INFO)
+logging.basicConfig(format="%(asctime)s upgrade-zulip-stage-2: %(message)s", level=logging.INFO)
 
 
 def error_desupported_os(vendor: str, os_version: str) -> "NoReturn":
     # Link to documentation for how to correctly upgrade the OS.
     logging.critical("Unsupported platform: %s %s", vendor, os_version)
-    logging.info("Sorry! The support for your OS has been discontinued.\n"
-                 "Please upgrade your OS to a supported release first.\n"
-                 "See https://zulip.readthedocs.io/en/latest/production/"
-                 "upgrade-or-modify.html#upgrading-the-operating-system")
+    logging.info(
+        "Sorry! The support for your OS has been discontinued.\n"
+        "Please upgrade your OS to a supported release first.\n"
+        "See https://zulip.readthedocs.io/en/latest/production/"
+        "upgrade-or-modify.html#upgrading-the-operating-system"
+    )
     sys.exit(1)
 
 
@@ -70,20 +71,23 @@ if (vendor, os_version) in UNSUPPORTED_DISTROS:
 os.umask(0o22)
 
 parser = argparse.ArgumentParser()
-parser.add_argument("deploy_path", metavar="deploy_path",
-                    help="Path to deployment directory")
-parser.add_argument("--skip-puppet", action='store_true',
-                    help="Skip doing puppet/apt upgrades.")
-parser.add_argument("--skip-migrations", action='store_true',
-                    help="Skip doing migrations.")
-parser.add_argument("--from-git", action='store_true',
-                    help="Upgrading from git, so run update-prod-static.")
-parser.add_argument("--ignore-static-assets", action='store_true',
-                    help="Do not attempt to copy/manage static assets.")
-parser.add_argument("--skip-purge-old-deployments",
-                    action="store_true", help="Skip purging old deployments.")
-parser.add_argument("--audit-fts-indexes",
-                    action="store_true", help="Audit and fix full text search indexes.")
+parser.add_argument("deploy_path", metavar="deploy_path", help="Path to deployment directory")
+parser.add_argument("--skip-puppet", action='store_true', help="Skip doing puppet/apt upgrades.")
+parser.add_argument("--skip-migrations", action='store_true', help="Skip doing migrations.")
+parser.add_argument(
+    "--from-git", action='store_true', help="Upgrading from git, so run update-prod-static."
+)
+parser.add_argument(
+    "--ignore-static-assets",
+    action='store_true',
+    help="Do not attempt to copy/manage static assets.",
+)
+parser.add_argument(
+    "--skip-purge-old-deployments", action="store_true", help="Skip purging old deployments."
+)
+parser.add_argument(
+    "--audit-fts-indexes", action="store_true", help="Audit and fix full text search indexes."
+)
 args = parser.parse_args()
 
 deploy_path = args.deploy_path
@@ -94,21 +98,26 @@ tornado_processes = len(get_tornado_ports(config_file))
 
 IS_SERVER_UP = True
 
+
 def shutdown_server() -> None:
     global IS_SERVER_UP
 
-    core_server_services = ["zulip-django",
-                            "zulip-tornado" if tornado_processes == 1 else "zulip-tornado:*"]
+    core_server_services = [
+        "zulip-django",
+        "zulip-tornado" if tornado_processes == 1 else "zulip-tornado:*",
+    ]
     worker_services = ["zulip-workers:*"]
     # Stop and start thumbor service only if thumbor is installed.
     if os.path.exists("/etc/supervisor/conf.d/thumbor.conf"):
         core_server_services.append("zulip-thumbor")
 
     logging.info("Stopping Zulip...")
-    subprocess.check_call(["supervisorctl", "stop", *worker_services, *core_server_services],
-                          preexec_fn=su_to_zulip)
+    subprocess.check_call(
+        ["supervisorctl", "stop", *worker_services, *core_server_services], preexec_fn=su_to_zulip
+    )
     IS_SERVER_UP = False
 
+
 # postgresql.version is required for database servers, but wasn't
 # previously; fill it in based on what the OS provides.
 if os.path.exists('/etc/init.d/postgresql'):
@@ -124,15 +133,27 @@ if os.path.exists('/etc/init.d/postgresql'):
             postgresql_version = default_postgresql_version[(vendor, os_version)]
         else:
             error_desupported_os(vendor, os_version)
-        subprocess.check_call([
-            "crudini", "--set", "/etc/zulip/zulip.conf",
-            "postgresql", "version", postgresql_version])
+        subprocess.check_call(
+            [
+                "crudini",
+                "--set",
+                "/etc/zulip/zulip.conf",
+                "postgresql",
+                "version",
+                postgresql_version,
+            ]
+        )
 
 if glob.glob("/usr/share/postgresql/*/extension/tsearch_extras.control"):
     # Remove legacy tsearch_extras package references
-    subprocess.check_call([
-        "su", "postgres", "-c",
-        'psql -v ON_ERROR_STOP=1 zulip -c "DROP EXTENSION IF EXISTS tsearch_extras;"'])
+    subprocess.check_call(
+        [
+            "su",
+            "postgres",
+            "-c",
+            'psql -v ON_ERROR_STOP=1 zulip -c "DROP EXTENSION IF EXISTS tsearch_extras;"',
+        ]
+    )
     subprocess.check_call(["apt-get", "remove", "-y", "postgresql-*-tsearch-extras"])
 
 if not args.skip_puppet:
@@ -143,26 +164,27 @@ if not args.skip_puppet:
 if not os.path.exists(os.path.join(deploy_path, "zproject/prod_settings.py")):
     # This is normally done in unpack-zulip, but for upgrading from
     # zulip<1.4.0, we need to do it.  See discussion in commit 586b23637.
-    os.symlink("/etc/zulip/settings.py",
-               os.path.join(deploy_path, "zproject/prod_settings.py"))
+    os.symlink("/etc/zulip/settings.py", os.path.join(deploy_path, "zproject/prod_settings.py"))
 
 # Now we should have an environment setup where we can run our tools;
 # first, creating the production venv.
-subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "create-production-venv"),
-                       deploy_path])
+subprocess.check_call(
+    [os.path.join(deploy_path, "scripts", "lib", "create-production-venv"), deploy_path]
+)
 
 # Set up the thumbor venv
-subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "create-thumbor-venv"),
-                       deploy_path])
+subprocess.check_call(
+    [os.path.join(deploy_path, "scripts", "lib", "create-thumbor-venv"), deploy_path]
+)
 
 # Make sure the right version of node is installed
-subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "install-node"),
-                       deploy_path])
+subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "install-node"), deploy_path])
 
 # Generate any new secrets that were added in the new version required.
 # TODO: Do caching to only run this when it has changed.
-subprocess.check_call([os.path.join(deploy_path, "scripts", "setup", "generate_secrets.py"),
-                       "--production"])
+subprocess.check_call(
+    [os.path.join(deploy_path, "scripts", "setup", "generate_secrets.py"), "--production"]
+)
 
 # Unpleasant migration: Remove any legacy deployed copies of
 # images-google-64 from before we renamed that emojiset to
@@ -174,6 +196,7 @@ if os.path.exists(emoji_path):
     emoji_sha = hashlib.sha1(emoji_data).hexdigest()
     if emoji_sha == "47033121dc20b376e0f86f4916969872ad22a293":
         import shutil
+
         shutil.rmtree("/home/zulip/prod-static/generated/emoji/images-google-64")
 
 # And then, building/installing the static assets.
@@ -190,7 +213,7 @@ elif args.from_git:
     # Because `upgrade-zulip-from-git` needs to build static assets, it
     # is at risk of being OOM killed on systems with limited free RAM.
     mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')
-    mem_gib = mem_bytes/(1024.**3)  # e.g. 3.74
+    mem_gib = mem_bytes / (1024.0 ** 3)  # e.g. 3.74
 
     # Ideally, we'd have 2 thresholds here, depending on whether the
     # system is running queue workers multithreaded or multiprocess.
@@ -204,17 +227,20 @@ elif args.from_git:
     # update-prod-static with the Git upgrade process.  But it'll fail
     # safely; this seems like a worthwhile tradeoff to minimize downtime.
     logging.info("Building static assets...")
-    subprocess.check_call(["./tools/update-prod-static", "--prev-deploy=" +
-                           os.path.join(DEPLOYMENTS_DIR, 'current')],
-                          preexec_fn=su_to_zulip)
+    subprocess.check_call(
+        ["./tools/update-prod-static", "--prev-deploy=" + os.path.join(DEPLOYMENTS_DIR, 'current')],
+        preexec_fn=su_to_zulip,
+    )
     logging.info("Caching Zulip Git version...")
     subprocess.check_call(["./tools/cache-zulip-git-version"], preexec_fn=su_to_zulip)
 else:
     # Since this doesn't do any actual work, it's likely safe to have
     # this run before we apply Puppet changes (saving a bit of downtime).
     logging.info("Installing static assets...")
-    subprocess.check_call(["cp", "-rT", os.path.join(deploy_path, 'prod-static/serve'),
-                           '/home/zulip/prod-static'], preexec_fn=su_to_zulip)
+    subprocess.check_call(
+        ["cp", "-rT", os.path.join(deploy_path, 'prod-static/serve'), '/home/zulip/prod-static'],
+        preexec_fn=su_to_zulip,
+    )
 
 usermessage_index_migrations = [
     "[ ] 0082_index_starred_user_messages",
@@ -231,8 +257,9 @@ usermessage_index_migrations = [
 migrations_needed = False
 if not args.skip_migrations:
     logging.info("Checking for needed migrations")
-    migrations_output = subprocess.check_output(["./manage.py", "showmigrations"],
-                                                preexec_fn=su_to_zulip, universal_newlines=True)
+    migrations_output = subprocess.check_output(
+        ["./manage.py", "showmigrations"], preexec_fn=su_to_zulip, universal_newlines=True
+    )
     need_create_large_indexes = False
     for ln in migrations_output.split("\n"):
         line_str = ln.strip()
@@ -242,8 +269,7 @@ if not args.skip_migrations:
                 need_create_large_indexes = True
     if need_create_large_indexes:
         logging.info("Creating some expensive indexes before starting downtime.")
-        subprocess.check_call(["./manage.py", "create_large_indexes"],
-                              preexec_fn=su_to_zulip)
+        subprocess.check_call(["./manage.py", "create_large_indexes"], preexec_fn=su_to_zulip)
 
 # Now we start shutting down services; we start with
 # process-fts-updates, which isn't on the critical serving path.
@@ -271,8 +297,16 @@ classes = re.split(r'\s*,\s*', get_config(config_file, 'machine', 'puppet_classe
 new_classes = [class_renames.get(c, c) for c in classes if c != 'zulip::base']
 if classes != new_classes:
     logging.info("Adjusting Puppet classes for renames...")
-    subprocess.check_call(["crudini", "--set", "/etc/zulip/zulip.conf",
-                           "machine", "puppet_classes", ", ".join(new_classes)])
+    subprocess.check_call(
+        [
+            "crudini",
+            "--set",
+            "/etc/zulip/zulip.conf",
+            "machine",
+            "puppet_classes",
+            ", ".join(new_classes),
+        ]
+    )
 
 
 if not args.skip_puppet:
diff --git a/scripts/lib/zulip_tools.py b/scripts/lib/zulip_tools.py
index 61f3861e5a..a04fda450c 100755
--- a/scripts/lib/zulip_tools.py
+++ b/scripts/lib/zulip_tools.py
@@ -39,6 +39,7 @@ BLUE = '\x1b[34m'
 MAGENTA = '\x1b[35m'
 CYAN = '\x1b[36m'
 
+
 def overwrite_symlink(src: str, dst: str) -> None:
     dir, base = os.path.split(dst)
     while True:
@@ -57,38 +58,53 @@ def overwrite_symlink(src: str, dst: str) -> None:
         os.remove(tmp)
         raise
 
+
 def parse_cache_script_args(description: str) -> argparse.Namespace:
     # Keep this in sync with clean_unused_caches in provision_inner.py
     parser = argparse.ArgumentParser(description=description)
 
     parser.add_argument(
-        "--threshold", dest="threshold_days", type=int, default=14,
-        metavar="<days>", help="Any cache which is not in "
+        "--threshold",
+        dest="threshold_days",
+        type=int,
+        default=14,
+        metavar="<days>",
+        help="Any cache which is not in "
         "use by a deployment not older than threshold days(current "
         "installation in dev) and older than threshold days will be "
-        "deleted. (defaults to 14)")
+        "deleted. (defaults to 14)",
+    )
     parser.add_argument(
-        "--dry-run", action="store_true",
+        "--dry-run",
+        action="store_true",
         help="If specified then script will only print the caches "
-        "that it will delete/keep back. It will not delete any cache.")
+        "that it will delete/keep back. It will not delete any cache.",
+    )
     parser.add_argument(
-        "--verbose", action="store_true",
+        "--verbose",
+        action="store_true",
         help="If specified then script will print a detailed report "
-        "of what is being will deleted/kept back.")
+        "of what is being will deleted/kept back.",
+    )
     parser.add_argument(
-        "--no-print-headings", dest="no_headings", action="store_true",
+        "--no-print-headings",
+        dest="no_headings",
+        action="store_true",
         help="If specified then script will not print headings for "
-        "what will be deleted/kept back.")
+        "what will be deleted/kept back.",
+    )
 
     args = parser.parse_args()
-    args.verbose |= args.dry_run    # Always print a detailed report in case of dry run.
+    args.verbose |= args.dry_run  # Always print a detailed report in case of dry run.
     return args
 
+
 def get_deploy_root() -> str:
     return os.path.realpath(
         os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")),
     )
 
+
 def get_deployment_version(extract_path: str) -> str:
     version = '0.0.0'
     for item in os.listdir(extract_path):
@@ -101,11 +117,13 @@ def get_deployment_version(extract_path: str) -> str:
             break
     return version
 
+
 def is_invalid_upgrade(current_version: str, new_version: str) -> bool:
     if new_version > '1.4.3' and current_version <= '1.3.10':
         return True
     return False
 
+
 def get_zulip_pwent() -> pwd.struct_passwd:
     deploy_root_uid = os.stat(get_deploy_root()).st_uid
     if deploy_root_uid != 0:
@@ -116,12 +134,14 @@ def get_zulip_pwent() -> pwd.struct_passwd:
     # `zulip` user as that's the correct value in production.
     return pwd.getpwnam("zulip")
 
+
 def get_postgres_pwent() -> pwd.struct_passwd:
     try:
         return pwd.getpwnam("postgres")
     except KeyError:
         return get_zulip_pwent()
 
+
 def su_to_zulip(save_suid: bool = False) -> None:
     """Warning: su_to_zulip assumes that the zulip checkout is owned by
     the zulip user (or whatever normal user is running the Zulip
@@ -136,11 +156,15 @@ def su_to_zulip(save_suid: bool = False) -> None:
         os.setuid(pwent.pw_uid)
     os.environ['HOME'] = pwent.pw_dir
 
+
 def make_deploy_path() -> str:
     timestamp = datetime.datetime.now().strftime(TIMESTAMP_FORMAT)
     return os.path.join(DEPLOYMENTS_DIR, timestamp)
 
+
 TEMPLATE_DATABASE_DIR = "test-backend/databases"
+
+
 def get_dev_uuid_var_path(create_if_missing: bool = False) -> str:
     zulip_path = get_deploy_root()
     uuid_path = os.path.join(os.path.realpath(os.path.dirname(zulip_path)), ".zulip-dev-uuid")
@@ -152,8 +176,7 @@ def get_dev_uuid_var_path(create_if_missing: bool = False) -> str:
             zulip_uuid = str(uuid.uuid4())
             # We need root access here, since the path will be under /srv/ in the
             # development environment.
-            run_as_root(["sh", "-c", 'echo "$1" > "$2"', "-",
-                         zulip_uuid, uuid_path])
+            run_as_root(["sh", "-c", 'echo "$1" > "$2"', "-", zulip_uuid, uuid_path])
         else:
             raise AssertionError("Missing UUID file; please run tools/provision!")
 
@@ -161,6 +184,7 @@ def get_dev_uuid_var_path(create_if_missing: bool = False) -> str:
     os.makedirs(result_path, exist_ok=True)
     return result_path
 
+
 def get_deployment_lock(error_rerun_script: str) -> None:
     start_time = time.time()
     got_lock = False
@@ -170,23 +194,32 @@ def get_deployment_lock(error_rerun_script: str) -> None:
             got_lock = True
             break
         except OSError:
-            print(WARNING + "Another deployment in progress; waiting for lock... " +
-                  "(If no deployment is running, rmdir {})".format(LOCK_DIR) + ENDC)
+            print(
+                WARNING
+                + "Another deployment in progress; waiting for lock... "
+                + "(If no deployment is running, rmdir {})".format(LOCK_DIR)
+                + ENDC
+            )
             sys.stdout.flush()
             time.sleep(3)
 
     if not got_lock:
-        print(FAIL + "Deployment already in progress.  Please run\n" +
-              "  {}\n".format(error_rerun_script) +
-              "manually when the previous deployment finishes, or run\n" +
-              "  rmdir {}\n".format(LOCK_DIR) +
-              "if the previous deployment crashed." +
-              ENDC)
+        print(
+            FAIL
+            + "Deployment already in progress.  Please run\n"
+            + "  {}\n".format(error_rerun_script)
+            + "manually when the previous deployment finishes, or run\n"
+            + "  rmdir {}\n".format(LOCK_DIR)
+            + "if the previous deployment crashed."
+            + ENDC
+        )
         sys.exit(1)
 
+
 def release_deployment_lock() -> None:
     shutil.rmtree(LOCK_DIR)
 
+
 def run(args: Sequence[str], **kwargs: Any) -> None:
     # Output what we're doing in the `set -x` style
     print("+ {}".format(" ".join(map(shlex.quote, args))))
@@ -195,14 +228,19 @@ def run(args: Sequence[str], **kwargs: Any) -> None:
         subprocess.check_call(args, **kwargs)
     except subprocess.CalledProcessError:
         print()
-        print(WHITEONRED + "Error running a subcommand of {}: {}".format(
-            sys.argv[0], " ".join(map(shlex.quote, args)),
-        ) + ENDC)
-        print(WHITEONRED + "Actual error output for the subcommand is just above this." +
-              ENDC)
+        print(
+            WHITEONRED
+            + "Error running a subcommand of {}: {}".format(
+                sys.argv[0],
+                " ".join(map(shlex.quote, args)),
+            )
+            + ENDC
+        )
+        print(WHITEONRED + "Actual error output for the subcommand is just above this." + ENDC)
         print()
         raise
 
+
 def log_management_command(cmd: Sequence[str], log_path: str) -> None:
     log_dir = os.path.dirname(log_path)
     if not os.path.exists(log_dir):
@@ -217,11 +255,13 @@ def log_management_command(cmd: Sequence[str], log_path: str) -> None:
 
     logger.info("Ran %s", " ".join(map(shlex.quote, cmd)))
 
+
 def get_environment() -> str:
     if os.path.exists(DEPLOYMENTS_DIR):
         return "prod"
     return "dev"
 
+
 def get_recent_deployments(threshold_days: int) -> Set[str]:
     # Returns a list of deployments not older than threshold days
     # including `/root/zulip` directory if it exists.
@@ -249,6 +289,7 @@ def get_recent_deployments(threshold_days: int) -> Set[str]:
         recent.add("/root/zulip")
     return recent
 
+
 def get_threshold_timestamp(threshold_days: int) -> int:
     # Given number of days, this function returns timestamp corresponding
     # to the time prior to given number of days.
@@ -256,7 +297,10 @@ def get_threshold_timestamp(threshold_days: int) -> int:
     threshold_timestamp = int(time.mktime(threshold.utctimetuple()))
     return threshold_timestamp
 
-def get_caches_to_be_purged(caches_dir: str, caches_in_use: Set[str], threshold_days: int) -> Set[str]:
+
+def get_caches_to_be_purged(
+    caches_dir: str, caches_in_use: Set[str], threshold_days: int
+) -> Set[str]:
     # Given a directory containing caches, a list of caches in use
     # and threshold days, this function return a list of caches
     # which can be purged. Remove the cache only if it is:
@@ -275,18 +319,24 @@ def get_caches_to_be_purged(caches_dir: str, caches_in_use: Set[str], threshold_
             caches_to_purge.add(cache_dir)
     return caches_to_purge
 
+
 def purge_unused_caches(
-    caches_dir: str, caches_in_use: Set[str], cache_type: str, args: argparse.Namespace,
+    caches_dir: str,
+    caches_in_use: Set[str],
+    cache_type: str,
+    args: argparse.Namespace,
 ) -> None:
     all_caches = {os.path.join(caches_dir, cache) for cache in os.listdir(caches_dir)}
     caches_to_purge = get_caches_to_be_purged(caches_dir, caches_in_use, args.threshold_days)
     caches_to_keep = all_caches - caches_to_purge
 
     may_be_perform_purging(
-        caches_to_purge, caches_to_keep, cache_type, args.dry_run, args.verbose, args.no_headings)
+        caches_to_purge, caches_to_keep, cache_type, args.dry_run, args.verbose, args.no_headings
+    )
     if args.verbose:
         print("Done!")
 
+
 def generate_sha1sum_emoji(zulip_path: str) -> str:
     sha = hashlib.sha1()
 
@@ -325,6 +375,7 @@ def generate_sha1sum_emoji(zulip_path: str) -> str:
 
     return sha.hexdigest()
 
+
 def may_be_perform_purging(
     dirs_to_purge: Set[str],
     dirs_to_keep: Set[str],
@@ -348,6 +399,7 @@ def may_be_perform_purging(
         if verbose:
             print("Keeping used {}: {}".format(dir_type, directory))
 
+
 @functools.lru_cache(None)
 def parse_os_release() -> Dict[str, str]:
     """
@@ -375,6 +427,7 @@ def parse_os_release() -> Dict[str, str]:
             [distro_info[k]] = shlex.split(v)
     return distro_info
 
+
 @functools.lru_cache(None)
 def os_families() -> Set[str]:
     """
@@ -388,8 +441,8 @@ def os_families() -> Set[str]:
     distro_info = parse_os_release()
     return {distro_info["ID"], *distro_info.get("ID_LIKE", "").split()}
 
-def files_and_string_digest(filenames: Sequence[str],
-                            extra_strings: Sequence[str]) -> str:
+
+def files_and_string_digest(filenames: Sequence[str], extra_strings: Sequence[str]) -> str:
     # see is_digest_obsolete for more context
     sha1sum = hashlib.sha1()
     for fn in filenames:
@@ -401,10 +454,11 @@ def files_and_string_digest(filenames: Sequence[str],
 
     return sha1sum.hexdigest()
 
-def is_digest_obsolete(hash_name: str,
-                       filenames: Sequence[str],
-                       extra_strings: Sequence[str] = []) -> bool:
-    '''
+
+def is_digest_obsolete(
+    hash_name: str, filenames: Sequence[str], extra_strings: Sequence[str] = []
+) -> bool:
+    """
     In order to determine if we need to run some
     process, we calculate a digest of the important
     files and strings whose respective contents
@@ -421,7 +475,7 @@ def is_digest_obsolete(hash_name: str,
         - package versions (that we import)
         - settings values (that we stringify with
           json, deterministically)
-    '''
+    """
     last_hash_path = os.path.join(get_dev_uuid_var_path(), hash_name)
     try:
         with open(last_hash_path) as f:
@@ -435,9 +489,10 @@ def is_digest_obsolete(hash_name: str,
 
     return new_hash != old_hash
 
-def write_new_digest(hash_name: str,
-                     filenames: Sequence[str],
-                     extra_strings: Sequence[str] = []) -> None:
+
+def write_new_digest(
+    hash_name: str, filenames: Sequence[str], extra_strings: Sequence[str] = []
+) -> None:
     hash_path = os.path.join(get_dev_uuid_var_path(), hash_name)
     new_hash = files_and_string_digest(filenames, extra_strings)
     with open(hash_path, 'w') as f:
@@ -449,31 +504,34 @@ def write_new_digest(hash_name: str,
     # can help them troubleshoot provisioning glitches.
     print('New digest written to: ' + hash_path)
 
+
 def is_root() -> bool:
     if 'posix' in os.name and os.geteuid() == 0:
         return True
     return False
 
+
 def run_as_root(args: List[str], **kwargs: Any) -> None:
     sudo_args = kwargs.pop('sudo_args', [])
     if not is_root():
         args = ["sudo", *sudo_args, "--", *args]
     run(args, **kwargs)
 
+
 def assert_not_running_as_root() -> None:
     script_name = os.path.abspath(sys.argv[0])
     if is_root():
         pwent = get_zulip_pwent()
-        msg = ("{shortname} should not be run as root. Use `su {user}` to switch to the 'zulip'\n"
-               "user before rerunning this, or use \n  su {user} -c '{name} ...'\n"
-               "to switch users and run this as a single command.").format(
-            name=script_name,
-            shortname=os.path.basename(script_name),
-            user=pwent.pw_name)
+        msg = (
+            "{shortname} should not be run as root. Use `su {user}` to switch to the 'zulip'\n"
+            "user before rerunning this, or use \n  su {user} -c '{name} ...'\n"
+            "to switch users and run this as a single command."
+        ).format(name=script_name, shortname=os.path.basename(script_name), user=pwent.pw_name)
         print(msg)
         sys.exit(1)
 
-def assert_running_as_root(strip_lib_from_paths: bool=False) -> None:
+
+def assert_running_as_root(strip_lib_from_paths: bool = False) -> None:
     script_name = os.path.abspath(sys.argv[0])
     # Since these Python scripts are run inside a thin shell wrapper,
     # we need to replace the paths in order to ensure we instruct
@@ -484,6 +542,7 @@ def assert_running_as_root(strip_lib_from_paths: bool=False) -> None:
         print("{} must be run as root.".format(script_name))
         sys.exit(1)
 
+
 def get_config(
     config_file: configparser.RawConfigParser,
     section: str,
@@ -494,6 +553,7 @@ def get_config(
         return config_file.get(section, key)
     return default_value
 
+
 def set_config(
     config_file: configparser.RawConfigParser,
     section: str,
@@ -504,14 +564,17 @@ def set_config(
         config_file.add_section(section)
     config_file.set(section, key, value)
 
+
 def get_config_file() -> configparser.RawConfigParser:
     config_file = configparser.RawConfigParser()
     config_file.read("/etc/zulip/zulip.conf")
     return config_file
 
+
 def get_deploy_options(config_file: configparser.RawConfigParser) -> List[str]:
     return get_config(config_file, 'deployment', 'deploy_options', "").strip().split()
 
+
 def get_tornado_ports(config_file: configparser.RawConfigParser) -> List[int]:
     ports = []
     if config_file.has_section("tornado_sharding"):
@@ -520,14 +583,17 @@ def get_tornado_ports(config_file: configparser.RawConfigParser) -> List[int]:
         ports = [9800]
     return ports
 
+
 def get_or_create_dev_uuid_var_path(path: str) -> str:
     absolute_path = '{}/{}'.format(get_dev_uuid_var_path(), path)
     os.makedirs(absolute_path, exist_ok=True)
     return absolute_path
 
+
 def is_vagrant_env_host(path: str) -> bool:
     return '.vagrant' in os.listdir(path)
 
+
 def deport(netloc: str) -> str:
     """Remove the port from a hostname:port string.  Brackets on a literal
     IPv6 address are included."""
@@ -535,6 +601,7 @@ def deport(netloc: str) -> str:
     assert r.hostname is not None
     return "[" + r.hostname + "]" if ":" in r.hostname else r.hostname
 
+
 if __name__ == '__main__':
     cmd = sys.argv[1]
     if cmd == 'make_deploy_path':
diff --git a/scripts/nagios/check-rabbitmq-consumers b/scripts/nagios/check-rabbitmq-consumers
index 0b7b99a6f4..c0eb2c1ddc 100755
--- a/scripts/nagios/check-rabbitmq-consumers
+++ b/scripts/nagios/check-rabbitmq-consumers
@@ -26,18 +26,16 @@ if 'USER' in os.environ and not os.environ['USER'] in ['root', 'rabbitmq']:
 usage = """Usage: check-rabbitmq-consumers --queue=[queue-name] --min-threshold=[min-threshold]"""
 
 parser = argparse.ArgumentParser(usage=usage)
-parser.add_argument('--min-threshold',
-                    dest='min_count',
-                    type=int,
-                    default=1)
+parser.add_argument('--min-threshold', dest='min_count', type=int, default=1)
 
 options = parser.parse_args()
 
 config_file = get_config_file()
 TORNADO_PROCESSES = len(get_tornado_ports(config_file))
 
-output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_consumers'],
-                                 universal_newlines=True)
+output = subprocess.check_output(
+    ['/usr/sbin/rabbitmqctl', 'list_consumers'], universal_newlines=True
+)
 
 consumers: Dict[str, int] = defaultdict(int)
 
@@ -74,5 +72,7 @@ for queue_name in consumers.keys():
     else:
         status = 0
     with open(state_file_tmp, "w") as f:
-        f.write(f"{now}|{status}|{states[status]}|queue {queue_name} has {consumers[queue_name]} consumers, needs {target_count}\n")
+        f.write(
+            f"{now}|{status}|{states[status]}|queue {queue_name} has {consumers[queue_name]} consumers, needs {target_count}\n"
+        )
     os.rename(state_file_tmp, state_file_path)
diff --git a/scripts/purge-old-deployments b/scripts/purge-old-deployments
index 6eee8fe525..953feb9891 100755
--- a/scripts/purge-old-deployments
+++ b/scripts/purge-old-deployments
@@ -14,26 +14,37 @@ def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description="This script can be used for cleaning old unused deployments.",
         epilog="Orphaned/unused caches older than threshold days will be automatically "
-        "examined and removed.")
+        "examined and removed.",
+    )
     parser.add_argument(
-        "--threshold", dest="threshold_days", type=int, default=14,
+        "--threshold",
+        dest="threshold_days",
+        type=int,
+        default=14,
         metavar="<days>",
-        help="Deployments older than threshold days will be deleted. (defaults to 14)")
+        help="Deployments older than threshold days will be deleted. (defaults to 14)",
+    )
     parser.add_argument(
-        "--dry-run", action="store_true",
+        "--dry-run",
+        action="store_true",
         help="If specified then script will only print the deployments and "
-        "caches that it will delete/keep back. It will not delete anything.")
+        "caches that it will delete/keep back. It will not delete anything.",
+    )
     parser.add_argument(
-        "--verbose", action="store_true",
-        help="If specified then script will print a detailed report of what is going on.")
+        "--verbose",
+        action="store_true",
+        help="If specified then script will print a detailed report of what is going on.",
+    )
 
     args = parser.parse_args()
-    args.verbose |= args.dry_run    # Always print a detailed report in case of dry run.
+    args.verbose |= args.dry_run  # Always print a detailed report in case of dry run.
     return args
 
+
 def get_deployments_to_be_purged(recent_deployments: Set[str]) -> Set[str]:
-    all_deployments = {os.path.join(DEPLOYMENTS_DIR, deployment)
-                       for deployment in os.listdir(DEPLOYMENTS_DIR)}
+    all_deployments = {
+        os.path.join(DEPLOYMENTS_DIR, deployment) for deployment in os.listdir(DEPLOYMENTS_DIR)
+    }
     deployments_to_purge = set()
     for deployment in all_deployments:
         # Deployments whose name is not in the format of a timestamp are
@@ -48,21 +59,26 @@ def get_deployments_to_be_purged(recent_deployments: Set[str]) -> Set[str]:
             deployments_to_purge.add(deployment)
     return deployments_to_purge
 
+
 def main() -> None:
     args = parse_args()
     deployments_to_keep = get_recent_deployments(args.threshold_days)
     deployments_to_purge = get_deployments_to_be_purged(deployments_to_keep)
 
     may_be_perform_purging(
-        deployments_to_purge, deployments_to_keep, "deployment", args.dry_run, args.verbose, True)
+        deployments_to_purge, deployments_to_keep, "deployment", args.dry_run, args.verbose, True
+    )
 
     if not args.dry_run:
         print("Deployments cleaned successfully...")
         print("Cleaning orphaned/unused caches...")
 
     # Call 'clean-unused-caches' script to clean any orphaned/unused caches.
-    subprocess.check_call([os.path.join(ZULIP_PATH, "scripts/lib/clean-unused-caches"), *sys.argv[1:]])
+    subprocess.check_call(
+        [os.path.join(ZULIP_PATH, "scripts/lib/clean-unused-caches"), *sys.argv[1:]]
+    )
     print("Done!")
 
+
 if __name__ == "__main__":
     main()
diff --git a/scripts/restart-server b/scripts/restart-server
index eae0b3f695..eccd690eed 100755
--- a/scripts/restart-server
+++ b/scripts/restart-server
@@ -20,12 +20,10 @@ from scripts.lib.zulip_tools import (
 )
 
 logging.Formatter.converter = time.gmtime
-logging.basicConfig(format="%(asctime)s restart-server: %(message)s",
-                    level=logging.INFO)
+logging.basicConfig(format="%(asctime)s restart-server: %(message)s", level=logging.INFO)
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--fill-cache', action='store_true',
-                    help='Fill the memcached caches')
+parser.add_argument('--fill-cache', action='store_true', help='Fill the memcached caches')
 args = parser.parse_args()
 
 deploy_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
@@ -36,7 +34,9 @@ if pwd.getpwuid(os.getuid()).pw_name != "zulip":
     sys.exit(1)
 
 # Send a statsd event on restarting the server
-subprocess.check_call(["./manage.py", "send_stats", "incr", "events.server_restart", str(int(time.time()))])
+subprocess.check_call(
+    ["./manage.py", "send_stats", "incr", "events.server_restart", str(int(time.time()))]
+)
 
 if args.fill_cache:
     logging.info("Filling memcached caches")
@@ -105,6 +105,8 @@ if change_symlink and "PWD" in os.environ:
 which has now changed. Your shell will not see this change until you run:
   cd {}
 to traverse the symlink again.{}
-""".format(WARNING, symlink, shlex.quote(os.environ["PWD"]), ENDC),
+""".format(
+                    WARNING, symlink, shlex.quote(os.environ["PWD"]), ENDC
+                ),
                 file=sys.stderr,
             )
diff --git a/scripts/setup/generate_secrets.py b/scripts/setup/generate_secrets.py
index a9c0ecb0c6..23d28624d5 100755
--- a/scripts/setup/generate_secrets.py
+++ b/scripts/setup/generate_secrets.py
@@ -26,6 +26,7 @@ AUTOGENERATED_SETTINGS = [
     'thumbor_key',
 ]
 
+
 def random_string(cnt: int) -> str:
     # We do in-function imports so that we only do the expensive work
     # of importing cryptography modules when necessary.
@@ -35,6 +36,7 @@ def random_string(cnt: int) -> str:
 
     return get_random_string(cnt)
 
+
 def random_token() -> str:
     # We do in-function imports so that we only do the expensive work
     # of importing cryptography modules when necessary.
@@ -44,6 +46,7 @@ def random_token() -> str:
 
     return secrets.token_hex(32)
 
+
 def generate_django_secretkey() -> str:
     """Secret key generation taken from Django's startproject.py"""
 
@@ -56,6 +59,7 @@ def generate_django_secretkey() -> str:
     chars = 'abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)'
     return get_random_string(50, chars)
 
+
 def get_old_conf(output_filename: str) -> Dict[str, str]:
     if not os.path.exists(output_filename) or os.path.getsize(output_filename) == 0:
         return {}
@@ -65,6 +69,7 @@ def get_old_conf(output_filename: str) -> Dict[str, str]:
 
     return dict(secrets_file.items("secrets"))
 
+
 def generate_secrets(development: bool = False) -> None:
     if development:
         OUTPUT_SETTINGS_FILENAME = "zproject/dev-secrets.conf"
@@ -104,6 +109,7 @@ def generate_secrets(development: bool = False) -> None:
         add_secret('secret_key', secret_key)
         # To prevent Django ImproperlyConfigured error
         from zproject import settings
+
         settings.SECRET_KEY = secret_key
 
     # Secret key for the Camo HTTPS proxy.
@@ -179,14 +185,20 @@ def generate_secrets(development: bool = False) -> None:
 
     print(f"Generated new secrets in {OUTPUT_SETTINGS_FILENAME}.")
 
+
 if __name__ == '__main__':
 
     parser = argparse.ArgumentParser()
     group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument('--development', action='store_true',
-                       help='For setting up the developer env for zulip')
-    group.add_argument('--production', action='store_false', dest='development',
-                       help='For setting up the production env for zulip')
+    group.add_argument(
+        '--development', action='store_true', help='For setting up the developer env for zulip'
+    )
+    group.add_argument(
+        '--production',
+        action='store_false',
+        dest='development',
+        help='For setting up the production env for zulip',
+    )
     results = parser.parse_args()
 
     generate_secrets(results.development)
diff --git a/scripts/setup/inline_email_css.py b/scripts/setup/inline_email_css.py
index c5bfb6c712..605eaad4e1 100755
--- a/scripts/setup/inline_email_css.py
+++ b/scripts/setup/inline_email_css.py
@@ -11,6 +11,7 @@ EMAIL_TEMPLATES_PATH = os.path.join(ZULIP_PATH, 'templates', 'zerver', 'emails')
 COMPILED_EMAIL_TEMPLATES_PATH = os.path.join(EMAIL_TEMPLATES_PATH, 'compiled')
 CSS_SOURCE_PATH = os.path.join(EMAIL_TEMPLATES_PATH, "email.css")
 
+
 def configure_cssutils() -> None:
     # These properties are not supported by cssutils by default and will
     # result in warnings when premailer package is run.
@@ -20,26 +21,32 @@ def configure_cssutils() -> None:
     properties[Profiles.CSS_LEVEL_2]['mso-table-rspace'] = r'0|{num}(pt)'
     properties[Profiles.CSS_LEVEL_2]['-webkit-text-size-adjust'] = r'none|auto|{percentage}'
     properties[Profiles.CSS_LEVEL_2]['mso-hide'] = 'all'
-    properties[Profiles.CSS_LEVEL_2]['pointer-events'] = (r'auto|none|visiblePainted|'
-                                                          r'visibleFill|visibleStroke|'
-                                                          r'visible|painted|fill|stroke|all|inherit')
+    properties[Profiles.CSS_LEVEL_2]['pointer-events'] = (
+        r'auto|none|visiblePainted|'
+        r'visibleFill|visibleStroke|'
+        r'visible|painted|fill|stroke|all|inherit'
+    )
+
+    profile.addProfiles(
+        [(Profiles.CSS_LEVEL_2, properties[Profiles.CSS_LEVEL_2], macros[Profiles.CSS_LEVEL_2])]
+    )
+
 
-    profile.addProfiles([(Profiles.CSS_LEVEL_2, properties[Profiles.CSS_LEVEL_2],
-                          macros[Profiles.CSS_LEVEL_2])])
 configure_cssutils()
 
+
 def inline_template(template_source_name: str) -> None:
     template_name = template_source_name.split('.source.html')[0]
     template_path = os.path.join(EMAIL_TEMPLATES_PATH, template_source_name)
-    compiled_template_path = os.path.join(os.path.dirname(template_path), "compiled",
-                                          os.path.basename(template_name) + ".html")
+    compiled_template_path = os.path.join(
+        os.path.dirname(template_path), "compiled", os.path.basename(template_name) + ".html"
+    )
 
     os.makedirs(os.path.dirname(compiled_template_path), exist_ok=True)
 
     with open(template_path) as template_source_file:
         template_str = template_source_file.read()
-    output = Premailer(template_str,
-                       external_styles=[CSS_SOURCE_PATH]).transform()
+    output = Premailer(template_str, external_styles=[CSS_SOURCE_PATH]).transform()
 
     output = escape_jinja2_characters(output)
 
@@ -53,8 +60,10 @@ def inline_template(template_source_name: str) -> None:
     if template_name not in ['email_base_default', 'macros']:
         output = strip_unnecesary_tags(output)
 
-    if ('zerver/emails/compiled/email_base_default.html' in output or
-            'zerver/emails/email_base_messages.html' in output):
+    if (
+        'zerver/emails/compiled/email_base_default.html' in output
+        or 'zerver/emails/email_base_messages.html' in output
+    ):
         assert output.count('<html>') == 0
         assert output.count('<body>') == 0
         assert output.count('</html>') == 0
@@ -63,12 +72,14 @@ def inline_template(template_source_name: str) -> None:
     with open(compiled_template_path, 'w') as final_template_file:
         final_template_file.write(output)
 
+
 def escape_jinja2_characters(text: str) -> str:
     escaped_jinja2_characters = [('%7B%7B%20', '{{ '), ('%20%7D%7D', ' }}'), ('&gt;', '>')]
     for escaped, original in escaped_jinja2_characters:
         text = text.replace(escaped, original)
     return text
 
+
 def strip_unnecesary_tags(text: str) -> str:
     end_block = '</body>\n</html>'
     start_block = '{% extends'
@@ -80,6 +91,7 @@ def strip_unnecesary_tags(text: str) -> str:
     else:
         raise ValueError(f"Template does not have {start_block} or {end_block}")
 
+
 def get_all_templates_from_directory(directory: str) -> Set[str]:
     result = set()
     for f in os.listdir(directory):
@@ -87,6 +99,7 @@ def get_all_templates_from_directory(directory: str) -> Set[str]:
             result.add(f)
     return result
 
+
 if __name__ == "__main__":
     templates_to_inline = get_all_templates_from_directory(EMAIL_TEMPLATES_PATH)
 
diff --git a/scripts/setup/restore-backup b/scripts/setup/restore-backup
index 680540f7d0..642b4840db 100755
--- a/scripts/setup/restore-backup
+++ b/scripts/setup/restore-backup
@@ -32,13 +32,7 @@ def restore_backup(tarball_file: IO[bytes]) -> None:
     # (E.g. because this is a development backup).
     tarball_file.seek(0, 0)
     subprocess.call(
-        [
-            "tar",
-            "--directory=/etc/zulip",
-            "--strip-components=2",
-            "-xz",
-            "zulip-backup/settings"
-        ],
+        ["tar", "--directory=/etc/zulip", "--strip-components=2", "-xz", "zulip-backup/settings"],
         stdin=tarball_file,
     )
 
@@ -67,7 +61,8 @@ def restore_backup(tarball_file: IO[bytes]) -> None:
         assert not any("|" in name or "|" in path for name, path in paths)
         transform_args = [
             r"--transform=s|^zulip-backup/{}(/.*)?$|{}\1|x".format(
-                re.escape(name), path.replace("\\", r"\\"),
+                re.escape(name),
+                path.replace("\\", r"\\"),
             )
             for name, path in paths
         ]
@@ -96,24 +91,28 @@ def restore_backup(tarball_file: IO[bytes]) -> None:
 
         run(
             [
-                os.path.join(
-                    settings.DEPLOY_ROOT, "scripts", "setup", "terminate-psql-sessions"
-                ),
-                db["NAME"]
+                os.path.join(settings.DEPLOY_ROOT, "scripts", "setup", "terminate-psql-sessions"),
+                db["NAME"],
             ],
             env=postgresql_env,
         )
         run(["dropdb", "--if-exists", "--", db["NAME"]], cwd="/", env=postgresql_env)
-        run(["createdb", "--owner=zulip", "--template=template0", "--", db["NAME"]], cwd="/", env=postgresql_env)
+        run(
+            ["createdb", "--owner=zulip", "--template=template0", "--", db["NAME"]],
+            cwd="/",
+            env=postgresql_env,
+        )
         os.setresuid(0, 0, 0)
 
         if settings.PRODUCTION:
             # In case we are restoring a backup from an older Zulip
             # version, there may be new secrets to generate.
-            subprocess.check_call([
-                os.path.join(settings.DEPLOY_ROOT, "scripts", "setup", "generate_secrets.py"),
-                "--production",
-            ])
+            subprocess.check_call(
+                [
+                    os.path.join(settings.DEPLOY_ROOT, "scripts", "setup", "generate_secrets.py"),
+                    "--production",
+                ]
+            )
 
             # If there is a local RabbitMQ, we need to reconfigure it
             # to ensure the RabbitMQ password matches the value in the
@@ -121,24 +120,21 @@ def restore_backup(tarball_file: IO[bytes]) -> None:
             # only do this if RabbitMQ is configured to run locally on
             # the system.
             rabbitmq_host = subprocess.check_output(
-                [os.path.join(settings.DEPLOY_ROOT,
-                              "scripts", "get-django-setting"),
-                 "RABBITMQ_HOST"], universal_newlines=True).strip()
+                [
+                    os.path.join(settings.DEPLOY_ROOT, "scripts", "get-django-setting"),
+                    "RABBITMQ_HOST",
+                ],
+                universal_newlines=True,
+            ).strip()
             if rabbitmq_host in ["127.0.0.1", "::1", "localhost", "localhost6"]:
-                run([os.path.join(settings.DEPLOY_ROOT,
-                                  "scripts", "setup", "configure-rabbitmq")])
+                run([os.path.join(settings.DEPLOY_ROOT, "scripts", "setup", "configure-rabbitmq")])
 
             # In production, we also need to do a `zulip-puppet-apply`
             # in order to apply any configuration from
             # /etc/zulip/zulip.conf to this system, since it was
             # originally installed without the restored copy of that
             # file.
-            run(
-                [
-                    os.path.join(settings.DEPLOY_ROOT, "scripts", "zulip-puppet-apply"),
-                    "-f"
-                ]
-            )
+            run([os.path.join(settings.DEPLOY_ROOT, "scripts", "zulip-puppet-apply"), "-f"])
 
         # Now, restore the the database backup using pg_restore.  This
         # needs to run after zulip-puppet-apply to ensure full-text
diff --git a/scripts/zulip-puppet-apply b/scripts/zulip-puppet-apply
index 42bebb38fb..b3fcf64884 100755
--- a/scripts/zulip-puppet-apply
+++ b/scripts/zulip-puppet-apply
@@ -12,13 +12,11 @@ assert_running_as_root()
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 parser = argparse.ArgumentParser(description="Run Puppet")
-parser.add_argument('--force', '-f', action="store_true",
-                    help="Do not prompt with proposed changes")
-parser.add_argument('--noop', action="store_true",
-                    help="Do not apply the changes")
-parser.add_argument('--config',
-                    default="/etc/zulip/zulip.conf",
-                    help="Alternate zulip.conf path")
+parser.add_argument(
+    '--force', '-f', action="store_true", help="Do not prompt with proposed changes"
+)
+parser.add_argument('--noop', action="store_true", help="Do not apply the changes")
+parser.add_argument('--config', default="/etc/zulip/zulip.conf", help="Alternate zulip.conf path")
 args, extra_args = parser.parse_known_args()
 
 config = configparser.RawConfigParser()
diff --git a/tools/check-capitalization b/tools/check-capitalization
index 82365b1fc6..47d661a454 100755
--- a/tools/check-capitalization
+++ b/tools/check-capitalization
@@ -20,17 +20,18 @@ DJANGO_PO_REGEX = re.compile('msgid "(.*?)"')
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('--show-ignored',
-                        action='store_true',
-                        help='Show strings that passed the check because they contained ignored phrases.')
-    parser.add_argument('--no-generate',
-                        action='store_true',
-                        help="Don't run makemessages command.")
+    parser.add_argument(
+        '--show-ignored',
+        action='store_true',
+        help='Show strings that passed the check because they contained ignored phrases.',
+    )
+    parser.add_argument(
+        '--no-generate', action='store_true', help="Don't run makemessages command."
+    )
     args = parser.parse_args()
 
     if not args.no_generate:
-        subprocess.call(['./manage.py', 'makemessages', '--locale', 'en'],
-                        stderr=subprocess.STDOUT)
+        subprocess.call(['./manage.py', 'makemessages', '--locale', 'en'], stderr=subprocess.STDOUT)
 
     with open('locale/en/translations.json') as f:
         data = json.load(f)
@@ -64,7 +65,9 @@ if __name__ == '__main__':
 
     if frontend_errors or backend_errors or banned_errors_back or banned_errors_front:
         # Point the user to the documentation on what the policy is.
-        docs_url = "https://zulip.readthedocs.io/en/latest/translating/translating.html#capitalization"
+        docs_url = (
+            "https://zulip.readthedocs.io/en/latest/translating/translating.html#capitalization"
+        )
         print(WARNING + "See " + docs_url + ENDC)
         print(FAIL + "Failed!" + ENDC)
         sys.exit(1)
diff --git a/tools/check-frontend-i18n b/tools/check-frontend-i18n
index 1fa3830ce8..a0000125f7 100755
--- a/tools/check-frontend-i18n
+++ b/tools/check-frontend-i18n
@@ -23,16 +23,16 @@ def find_handlebars(translatable_strings: List[str]) -> List[str]:
             errored.append(string)
     return errored
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('--no-generate',
-                        action='store_true',
-                        help="Don't run makemessages command.")
+    parser.add_argument(
+        '--no-generate', action='store_true', help="Don't run makemessages command."
+    )
     args = parser.parse_args()
 
     if not args.no_generate:
-        subprocess.call(['./manage.py', 'makemessages', '--locale', 'en'],
-                        stderr=subprocess.STDOUT)
+        subprocess.call(['./manage.py', 'makemessages', '--locale', 'en'], stderr=subprocess.STDOUT)
 
     with open('locale/en/translations.json') as f:
         data = json.load(f)
@@ -44,10 +44,11 @@ if __name__ == '__main__':
     print(WARNING + "Translation strings contain handlebars:" + ENDC)
     print('\n'.join(found))
 
-    print(WARNING +
-          "See https://zulip.readthedocs.io/en/latest/translating/translating.html#frontend-translations "
-          "on how you can insert variables in the frontend translatable "
-          "strings." +
-          ENDC)
+    print(
+        WARNING
+        + "See https://zulip.readthedocs.io/en/latest/translating/translating.html#frontend-translations "
+        "on how you can insert variables in the frontend translatable "
+        "strings." + ENDC
+    )
     print(FAIL + "Failed!" + ENDC)
     sys.exit(1)
diff --git a/tools/check-issue-labels b/tools/check-issue-labels
index fa2b1b6ecf..32d966991e 100755
--- a/tools/check-issue-labels
+++ b/tools/check-issue-labels
@@ -20,11 +20,13 @@ import requests
 # usage: python check-issue-labels
 # Pass --force as an argument to run without a token.
 
+
 def get_config() -> configparser.ConfigParser:
     config = configparser.ConfigParser()
     config.read(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf.ini'))
     return config
 
+
 def area_labeled(issue: Dict[str, Any]) -> bool:
     for label in issue["labels"]:
         label_name = str(label["name"])
@@ -32,9 +34,11 @@ def area_labeled(issue: Dict[str, Any]) -> bool:
             return True
     return False
 
+
 def is_issue(item: Dict[str, Any]) -> bool:
     return "issues" in item["html_url"]
 
+
 def get_next_page_url(link_header: str) -> Optional[str]:
     matches = re.findall(r'\<(\S+)\>; rel=\"next\"', link_header)
     try:
@@ -42,6 +46,7 @@ def get_next_page_url(link_header: str) -> Optional[str]:
     except IndexError:
         return None
 
+
 def check_issue_labels() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument('--force', action="store_true")
@@ -52,8 +57,10 @@ def check_issue_labels() -> None:
         try:
             token = config.get('github', 'api_token')
         except configparser.Error:
-            print("Error fetching GitHub API token. Copy conf.ini-template to conf.ini and populate with "
-                  "your API token. If you want to continue without using a token use --force.")
+            print(
+                "Error fetching GitHub API token. Copy conf.ini-template to conf.ini and populate with "
+                "your API token. If you want to continue without using a token use --force."
+            )
             sys.exit(1)
 
     next_page_url: Optional[str] = 'https://api.github.com/repos/zulip/zulip/issues'
@@ -67,8 +74,10 @@ def check_issue_labels() -> None:
             if response.status_code == 401:
                 sys.exit("Error. Please check the token.")
             if response.status_code == 403:
-                sys.exit("403 Error. This is generally caused when API limit is exceeded. You use an API "
-                         "token to overcome this limit.")
+                sys.exit(
+                    "403 Error. This is generally caused when API limit is exceeded. You use an API "
+                    "token to overcome this limit."
+                )
         except requests.exceptions.RequestException as e:
             print(e)
             sys.exit(1)
@@ -84,5 +93,6 @@ def check_issue_labels() -> None:
     else:
         print("No GitHub issues found with missing area labels.")
 
+
 if __name__ == '__main__':
     check_issue_labels()
diff --git a/tools/check-provision b/tools/check-provision
index 9a6ad52aea..7222c37460 100755
--- a/tools/check-provision
+++ b/tools/check-provision
@@ -12,12 +12,11 @@ from tools.lib.test_script import assert_provisioning_status_ok
 
 def run() -> None:
     parser = argparse.ArgumentParser()
-    parser.add_argument('--force',
-                        action="store_true",
-                        help='Run tests despite possible problems.')
+    parser.add_argument('--force', action="store_true", help='Run tests despite possible problems.')
     options = parser.parse_args()
 
     assert_provisioning_status_ok(options.force)
 
+
 if __name__ == '__main__':
     run()
diff --git a/tools/check-schemas b/tools/check-schemas
index a986b67c26..5301acc390 100755
--- a/tools/check-schemas
+++ b/tools/check-schemas
@@ -85,9 +85,7 @@ EXEMPT_OPENAPI_NAMES = [
 ]
 
 
-def get_event_checker(
-    event: Dict[str, Any]
-) -> Optional[Callable[[str, Dict[str, Any]], None]]:
+def get_event_checker(event: Dict[str, Any]) -> Optional[Callable[[str, Dict[str, Any]], None]]:
     name = event["type"]
     if "op" in event:
         name += "_" + event["op"]
@@ -180,9 +178,9 @@ def from_openapi(node: Dict[str, Any]) -> Any:
 
 
 def validate_openapi_against_event_schema() -> None:
-    node = openapi_spec.openapi()["paths"]["/events"]["get"]["responses"]["200"][
-        "content"
-    ]["application/json"]["schema"]["properties"]["events"]["items"]["oneOf"]
+    node = openapi_spec.openapi()["paths"]["/events"]["get"]["responses"]["200"]["content"][
+        "application/json"
+    ]["schema"]["properties"]["events"]["items"]["oneOf"]
 
     for sub_node in node:
         name = sub_node["properties"]["type"]["enum"][0]
diff --git a/tools/check-templates b/tools/check-templates
index 0a0733504a..117a9a4eb7 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -24,17 +24,20 @@ EXCLUDED_FILES = [
     'static/assets/icons/template.hbs',
 ]
 
+
 def check_our_files(modified_only: bool, all_dups: bool, fix: bool, targets: List[str]) -> None:
     by_lang = lister.list_files(
         targets=targets,
         modified_only=args.modified,
         ftypes=['hbs', 'html'],
-        group_by_ftype=True, exclude=EXCLUDED_FILES,
+        group_by_ftype=True,
+        exclude=EXCLUDED_FILES,
     )
 
     check_handlebar_templates(by_lang['hbs'], fix)
     check_html_templates(by_lang['html'], all_dups, fix)
 
+
 def check_html_templates(templates: Iterable[str], all_dups: bool, fix: bool) -> None:
     # Our files with .html extensions are usually for Django, but we also
     # have a few static .html files.
@@ -72,22 +75,28 @@ def check_html_templates(templates: Iterable[str], all_dups: bool, fix: bool) ->
             'searchbox_form',
             'searchbox',
         ]
-        bad_ids_dict = {ids: fns for ids, fns in template_id_dict.items()
-                        if (ids not in IGNORE_IDS) and len(fns) > 1}
+        bad_ids_dict = {
+            ids: fns
+            for ids, fns in template_id_dict.items()
+            if (ids not in IGNORE_IDS) and len(fns) > 1
+        }
 
         if all_dups:
-            ignorable_ids_dict = {ids: fns for ids, fns in template_id_dict.items()
-                                  if ids in IGNORE_IDS and len(fns) > 1}
+            ignorable_ids_dict = {
+                ids: fns
+                for ids, fns in template_id_dict.items()
+                if ids in IGNORE_IDS and len(fns) > 1
+            }
 
             for ids, fns in ignorable_ids_dict.items():
-                logging.warning("Duplicate ID(s) detected :Id '" + ids +
-                                "' present at following files:")
+                logging.warning(
+                    "Duplicate ID(s) detected :Id '" + ids + "' present at following files:"
+                )
                 for fn in fns:
                     print(fn)
 
         for ids, fns in bad_ids_dict.items():
-            logging.error("Duplicate ID(s) detected :Id '" + ids +
-                          "' present at following files:")
+            logging.error("Duplicate ID(s) detected :Id '" + ids + "' present at following files:")
             for fn in fns:
                 print(fn)
         return bad_ids_dict
@@ -133,6 +142,7 @@ def check_html_templates(templates: Iterable[str], all_dups: bool, fix: bool) ->
             if not validate_indent_html(fn, fix):
                 sys.exit(1)
 
+
 def check_handlebar_templates(templates: Iterable[str], fix: bool) -> None:
     # Check all our handlebars templates.
     templates = [fn for fn in templates if fn.endswith('.hbs')]
@@ -153,17 +163,18 @@ def check_handlebar_templates(templates: Iterable[str], fix: bool) -> None:
         if not validate_indent_html(fn, fix):
             sys.exit(1)
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('-m', '--modified',
-                        action='store_true',
-                        help='only check modified files')
-    parser.add_argument('--all-dups',
-                        action="store_true",
-                        help='Run lint tool to detect duplicate ids on ignored files as well')
-    parser.add_argument('--fix',
-                        action='store_true',
-                        help='Automatically fix indentation problems.')
+    parser.add_argument('-m', '--modified', action='store_true', help='only check modified files')
+    parser.add_argument(
+        '--all-dups',
+        action="store_true",
+        help='Run lint tool to detect duplicate ids on ignored files as well',
+    )
+    parser.add_argument(
+        '--fix', action='store_true', help='Automatically fix indentation problems.'
+    )
     parser.add_argument('targets', nargs=argparse.REMAINDER)
     args = parser.parse_args()
     check_our_files(args.modified, args.all_dups, args.fix, args.targets)
diff --git a/tools/check-thirdparty b/tools/check-thirdparty
index 4cd1060fcc..193f79ac98 100755
--- a/tools/check-thirdparty
+++ b/tools/check-thirdparty
@@ -20,7 +20,8 @@ os.chdir(os.path.join(os.path.dirname(__file__), ".."))
 status = 0
 
 *files, empty = subprocess.check_output(
-    ["git", "ls-files", "-z"], encoding="utf-8",
+    ["git", "ls-files", "-z"],
+    encoding="utf-8",
 ).split("\0")
 assert empty == ""
 files += [
diff --git a/tools/ci/generate-dockerfiles b/tools/ci/generate-dockerfiles
index f07b45a2ba..e6302e59a0 100755
--- a/tools/ci/generate-dockerfiles
+++ b/tools/ci/generate-dockerfiles
@@ -17,9 +17,11 @@ if __name__ == "__main__":
         dockerfile_path = f"images/{distro}/Dockerfile"
         os.makedirs(os.path.dirname(dockerfile_path), exist_ok=True)
         with open(dockerfile_path, "w") as f:
-            f.write("""\
+            f.write(
+                """\
 # THIS IS A GENERATED FILE. DO NOT EDIT.
 # See template: tools/ci/Dockerfile.template
 
-""")
+"""
+            )
             f.write(docker_template.format_map(dockerfile_settings[distro]))
diff --git a/tools/create-test-api-docs b/tools/create-test-api-docs
index 672d424f44..e122c90a63 100755
--- a/tools/create-test-api-docs
+++ b/tools/create-test-api-docs
@@ -15,6 +15,7 @@ import orjson
 
 Call = Dict[str, Any]
 
+
 def clean_up_pattern(s: str) -> str:
     paren_level = 0
     in_braces = False
@@ -35,6 +36,7 @@ def clean_up_pattern(s: str) -> str:
         prior_char = c
     return result
 
+
 def encode_info(info: Any) -> str:
     try:
         result = ''
@@ -53,19 +55,23 @@ def encode_info(info: Any) -> str:
         pass
     return 'NOT ENCODABLE'
 
+
 def fix_test_name(s: str) -> str:
     return s.replace('zerver.tests.', '')
 
+
 def create_single_page(pattern: str, out_dir: str, href: str, calls: List[Call]) -> None:
     fn = out_dir + '/' + href
     with open(fn, 'w') as f:
-        f.write('''
+        f.write(
+            '''
             <style>
             .test {
                 margin: 20px;
             }
             </style>
-            ''')
+            '''
+        )
         f.write(f'<h3>{html.escape(pattern)}</h3>\n')
         calls.sort(key=lambda call: call['status_code'])
         for call in calls:
@@ -79,6 +85,7 @@ def create_single_page(pattern: str, out_dir: str, href: str, calls: List[Call])
             f.write('<br>')
             f.write('</div>')
 
+
 def create_user_docs() -> None:
     fn = 'var/url_coverage.txt'  # TODO: make path more robust, maybe use json suffix
 
@@ -91,7 +98,8 @@ def create_user_docs() -> None:
     main_page = out_dir + '/index.html'
 
     with open(main_page, 'w') as f:
-        f.write('''
+        f.write(
+            '''
             <style>
             li {
                 list-style-type: none;
@@ -101,7 +109,8 @@ def create_user_docs() -> None:
                 text-decoration: none;
             }
             </style>
-            ''')
+            '''
+        )
 
         with open(fn, "rb") as coverage:
             calls = [orjson.loads(line) for line in coverage]
diff --git a/tools/diagnose b/tools/diagnose
index 80f1ce75e7..52097ec63f 100755
--- a/tools/diagnose
+++ b/tools/diagnose
@@ -13,42 +13,50 @@ from scripts.lib.zulip_tools import get_dev_uuid_var_path
 
 UUID_VAR_PATH = get_dev_uuid_var_path()
 
+
 def run(check_func: Callable[[], bool]) -> None:
-    '''
+    """
     This decorator simply runs functions.  It makes it more
     convenient to add new checks without a big main() function.
-    '''
+    """
     rc = check_func()
     if not rc:
         sys.exit(1)
 
+
 def run_command(args: List[str]) -> None:
     print(' '.join(map(shlex.quote, args)))
     subprocess.check_call(args)
 
+
 @run
 def check_python_version() -> bool:
     subprocess.check_call(['/usr/bin/env', 'python', '-V'])
     return True
 
+
 @run
 def pwd() -> bool:
     print(os.getcwd())
     return True
 
+
 @run
 def host_info() -> bool:
     print(platform.platform())
     return True
 
+
 @run
 def check_django() -> bool:
     try:
         import django
+
         print('Django version:', django.get_version())
         return True
     except ImportError:
-        print('''
+        print(
+            '''
             ERROR!
             We cannot import Django, which is usually a
             symptom of not having your Python venv
@@ -59,9 +67,11 @@ def check_django() -> bool:
             source /srv/zulip-py3-venv/bin/activate
 
             Or maybe you forget to run inside your VM?
-            ''')
+            '''
+        )
         return False
 
+
 @run
 def provision_version() -> bool:
     fn = os.path.join(UUID_VAR_PATH, 'provision_version')
@@ -69,29 +79,35 @@ def provision_version() -> bool:
         version = f.read().strip()
     print('latest version provisioned:', version)
     from version import PROVISION_VERSION
+
     print('desired version:', PROVISION_VERSION)
     if version != PROVISION_VERSION:
         print('You need to provision!')
         return False
     return True
 
+
 @run
 def node_stuff() -> bool:
     print('node version:')
     subprocess.check_call(['node', '--version'])
     return True
 
+
 @run
 def test_models() -> bool:
     settings_module = "zproject.settings"
     os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
     import django
+
     django.setup()
     from zerver.models import Realm, UserProfile
+
     print('Num realms: ', Realm.objects.count())
     print('Num users: ', UserProfile.objects.count())
     return True
 
+
 @run
 def check_venv() -> bool:
     path = os.path.join(ROOT_DIR, 'scripts', 'lib', 'hash_reqs.py')
@@ -106,8 +122,9 @@ def check_venv() -> bool:
             return False
     return True
 
+
 @run
 def check_migrations() -> bool:
     print()
     rc = subprocess.check_call('./tools/test-migrations')
-    return (rc == 0)
+    return rc == 0
diff --git a/tools/documentation_crawler/documentation_crawler/settings.py b/tools/documentation_crawler/documentation_crawler/settings.py
index da821f8a97..b39a10891a 100644
--- a/tools/documentation_crawler/documentation_crawler/settings.py
+++ b/tools/documentation_crawler/documentation_crawler/settings.py
@@ -17,77 +17,79 @@ DOWNLOAD_TIMEOUT = 15
 
 
 # Crawl responsibly by identifying yourself (and your website) on the user-agent
-USER_AGENT = ('Mozilla/5.0 (X11; Linux x86_64) '
-              'AppleWebKit/537.36 (KHTML, like Gecko) '
-              'Chrome/54.0.2840.59 Safari/537.36')
+USER_AGENT = (
+    'Mozilla/5.0 (X11; Linux x86_64) '
+    'AppleWebKit/537.36 (KHTML, like Gecko) '
+    'Chrome/54.0.2840.59 Safari/537.36'
+)
 
 # Obey robots.txt rules
 ROBOTSTXT_OBEY = False
 
 # Configure maximum concurrent requests performed by Scrapy (default: 16)
-#CONCURRENT_REQUESTS = 32
+# CONCURRENT_REQUESTS = 32
 
 # Configure a delay for requests for the same website (default: 0)
 # See http://scrapy.readthedocs.org/en/latest/topics/settings.html#download-delay
 # See also autothrottle settings and docs
-#DOWNLOAD_DELAY = 3
+# DOWNLOAD_DELAY = 3
 # The download delay setting will honor only one of:
-#CONCURRENT_REQUESTS_PER_DOMAIN = 16
-#CONCURRENT_REQUESTS_PER_IP = 16
+# CONCURRENT_REQUESTS_PER_DOMAIN = 16
+# CONCURRENT_REQUESTS_PER_IP = 16
 
 # Disable cookies (enabled by default)
-#COOKIES_ENABLED = False
+# COOKIES_ENABLED = False
 
 # Disable Telnet Console (enabled by default)
-#TELNETCONSOLE_ENABLED = False
+# TELNETCONSOLE_ENABLED = False
 
 # Override the default request headers:
-#DEFAULT_REQUEST_HEADERS = {
+# DEFAULT_REQUEST_HEADERS = {
 #   'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
 #   'Accept-Language': 'en',
-#}
+# }
 
 # Enable or disable spider middlewares
 # See http://scrapy.readthedocs.org/en/latest/topics/spider-middleware.html
-#SPIDER_MIDDLEWARES = {
+# SPIDER_MIDDLEWARES = {
 #    'documentation_crawler.middlewares.MyCustomSpiderMiddleware': 543,
-#}
+# }
 
 # Enable or disable downloader middlewares
 # See http://scrapy.readthedocs.org/en/latest/topics/downloader-middleware.html
-#DOWNLOADER_MIDDLEWARES = {
+# DOWNLOADER_MIDDLEWARES = {
 #    'documentation_crawler.middlewares.MyCustomDownloaderMiddleware': 543,
-#}
+# }
 
 # Enable or disable extensions
 # See http://scrapy.readthedocs.org/en/latest/topics/extensions.html
-#EXTENSIONS = {
+# EXTENSIONS = {
 #    'scrapy.extensions.telnet.TelnetConsole': None,
-#}
+# }
 
 # Configure item pipelines
 # See http://scrapy.readthedocs.org/en/latest/topics/item-pipeline.html
-#ITEM_PIPELINES = {
+# ITEM_PIPELINES = {
 #    'documentation_crawler.pipelines.SomePipeline': 300,
-#}
+# }
 
 # Enable and configure the AutoThrottle extension (disabled by default)
 # See http://doc.scrapy.org/en/latest/topics/autothrottle.html
-#AUTOTHROTTLE_ENABLED = True
+# AUTOTHROTTLE_ENABLED = True
 # The initial download delay
-#AUTOTHROTTLE_START_DELAY = 5
+# AUTOTHROTTLE_START_DELAY = 5
 # The maximum download delay to be set in case of high latencies
-#AUTOTHROTTLE_MAX_DELAY = 60
+# AUTOTHROTTLE_MAX_DELAY = 60
 # The average number of requests Scrapy should be sending in parallel to
 # each remote server
-#AUTOTHROTTLE_TARGET_CONCURRENCY = 1.0
+# AUTOTHROTTLE_TARGET_CONCURRENCY = 1.0
 # Enable showing throttling stats for every response received:
-#AUTOTHROTTLE_DEBUG = False
+# AUTOTHROTTLE_DEBUG = False
 
 # Enable and configure HTTP caching (disabled by default)
 # See http://scrapy.readthedocs.org/en/latest/topics/downloader-middleware.html#httpcache-middleware-settings
-#HTTPCACHE_ENABLED = True
-#HTTPCACHE_EXPIRATION_SECS = 0
-#HTTPCACHE_DIR = 'httpcache'
-#HTTPCACHE_IGNORE_HTTP_CODES = []
-#HTTPCACHE_STORAGE = 'scrapy.extensions.httpcache.FilesystemCacheStorage'
+# HTTPCACHE_ENABLED = True
+# HTTPCACHE_EXPIRATION_SECS = 0
+# HTTPCACHE_DIR = 'httpcache'
+# HTTPCACHE_IGNORE_HTTP_CODES = []
+# HTTPCACHE_STORAGE = 'scrapy.extensions.httpcache.FilesystemCacheStorage'
diff --git a/tools/documentation_crawler/documentation_crawler/spiders/check_documentation.py b/tools/documentation_crawler/documentation_crawler/spiders/check_documentation.py
index 0d304a6dd5..03399382b3 100755
--- a/tools/documentation_crawler/documentation_crawler/spiders/check_documentation.py
+++ b/tools/documentation_crawler/documentation_crawler/spiders/check_documentation.py
@@ -8,8 +8,9 @@ from .common.spiders import BaseDocumentationSpider
 def get_start_url() -> List[str]:
     # Get index.html file as start URL and convert it to file URI
     dir_path = os.path.dirname(os.path.realpath(__file__))
-    start_file = os.path.join(dir_path, os.path.join(*[os.pardir] * 4),
-                              "docs/_build/html/index.html")
+    start_file = os.path.join(
+        dir_path, os.path.join(*[os.pardir] * 4), "docs/_build/html/index.html"
+    )
     return [
         pathlib.Path(os.path.abspath(start_file)).as_uri(),
     ]
diff --git a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py
index 1b9f597619..d0f510e6c3 100644
--- a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py
+++ b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py
@@ -30,10 +30,13 @@ class UnusedImagesLinterSpider(BaseDocumentationSpider):
     def closed(self, *args: Any, **kwargs: Any) -> None:
         unused_images = set(os.listdir(self.images_static_dir)) - self.static_images
         if unused_images:
-            exception_message = "The following images are not used in documentation and can be removed: {}"
+            exception_message = (
+                "The following images are not used in documentation and can be removed: {}"
+            )
             self._set_error_state()
             unused_images_relatedpath = [
-                os.path.join(self.images_path, img) for img in unused_images]
+                os.path.join(self.images_path, img) for img in unused_images
+            ]
             raise Exception(exception_message.format(', '.join(unused_images_relatedpath)))
 
 
@@ -51,6 +54,7 @@ class APIDocumentationSpider(UnusedImagesLinterSpider):
     deny_domains: List[str] = []
     images_path = "static/images/api"
 
+
 class PorticoDocumentationSpider(BaseDocumentationSpider):
     def _is_external_url(self, url: str) -> bool:
         return (
@@ -61,19 +65,21 @@ class PorticoDocumentationSpider(BaseDocumentationSpider):
         )
 
     name = 'portico_documentation_crawler'
-    start_urls = ['http://localhost:9981/hello',
-                  'http://localhost:9981/history',
-                  'http://localhost:9981/plans',
-                  'http://localhost:9981/team',
-                  'http://localhost:9981/apps',
-                  'http://localhost:9981/integrations',
-                  'http://localhost:9981/terms',
-                  'http://localhost:9981/privacy',
-                  'http://localhost:9981/features',
-                  'http://localhost:9981/why-zulip',
-                  'http://localhost:9981/for/open-source',
-                  'http://localhost:9981/for/companies',
-                  'http://localhost:9981/for/working-groups-and-communities',
-                  'http://localhost:9981/for/research',
-                  'http://localhost:9981/security']
+    start_urls = [
+        'http://localhost:9981/hello',
+        'http://localhost:9981/history',
+        'http://localhost:9981/plans',
+        'http://localhost:9981/team',
+        'http://localhost:9981/apps',
+        'http://localhost:9981/integrations',
+        'http://localhost:9981/terms',
+        'http://localhost:9981/privacy',
+        'http://localhost:9981/features',
+        'http://localhost:9981/why-zulip',
+        'http://localhost:9981/for/open-source',
+        'http://localhost:9981/for/companies',
+        'http://localhost:9981/for/working-groups-and-communities',
+        'http://localhost:9981/for/research',
+        'http://localhost:9981/security',
+    ]
     deny_domains: List[str] = []
diff --git a/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py b/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py
index dad7ff1086..813cba7327 100644
--- a/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py
+++ b/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py
@@ -37,7 +37,6 @@ VNU_IGNORE = [
     r'No “p” element in scope but a “p” end tag seen\.',
     r'Element “div” not allowed as child of element “ul” in this context\. '
     + r'\(Suppressing further errors from this subtree\.\)',
-
     # Warnings that are probably less important.
     r'The “type” attribute is unnecessary for JavaScript resources\.',
 ]
@@ -48,6 +47,7 @@ DEPLOY_ROOT = os.path.abspath(os.path.join(__file__, "../../../../../.."))
 ZULIP_SERVER_GITHUB_FILE_URL_PREFIX = "https://github.com/zulip/zulip/blob/master"
 ZULIP_SERVER_GITHUB_DIRECTORY_URL_PREFIX = "https://github.com/zulip/zulip/tree/master"
 
+
 class BaseDocumentationSpider(scrapy.Spider):
     name: Optional[str] = None
     # Exclude domain address.
@@ -80,7 +80,9 @@ class BaseDocumentationSpider(scrapy.Spider):
         if (len(url) > 4 and url[:4] == "file") or ("localhost" in url):
             # We also want CI to check any links to built documentation.
             return False
-        if url.startswith(ZULIP_SERVER_GITHUB_FILE_URL_PREFIX) or url.startswith(ZULIP_SERVER_GITHUB_DIRECTORY_URL_PREFIX):
+        if url.startswith(ZULIP_SERVER_GITHUB_FILE_URL_PREFIX) or url.startswith(
+            ZULIP_SERVER_GITHUB_DIRECTORY_URL_PREFIX
+        ):
             # We can verify these links directly in the local git repo without making any requests to GitHub servers.
             return False
         if 'github.com/zulip' in url:
@@ -100,7 +102,8 @@ class BaseDocumentationSpider(scrapy.Spider):
         # Check fragment existing on response page.
         if not response.selector.xpath(xpath_template.format(fragment=fragment)):
             self.logger.error(
-                "Fragment #%s is not found on page %s", fragment, response.request.url)
+                "Fragment #%s is not found on page %s", fragment, response.request.url
+            )
 
     def _vnu_callback(self, url: str) -> Callable[[Response], None]:
         def callback(response: Response) -> None:
@@ -125,7 +128,11 @@ class BaseDocumentationSpider(scrapy.Spider):
         # can be accessible without login an account.  While we do
         # crawl documentation served by the webapp (E.g. /help/), we
         # don't want to crawl the webapp itself, so we exclude these.
-        if url in ['http://localhost:9981/', 'http://localhost:9981'] or url.startswith('http://localhost:9981/#') or url.startswith('http://localhost:9981#'):
+        if (
+            url in ['http://localhost:9981/', 'http://localhost:9981']
+            or url.startswith('http://localhost:9981/#')
+            or url.startswith('http://localhost:9981#')
+        ):
             return
 
         callback: Callable[[Response], Optional[Iterator[Request]]] = self.parse
@@ -141,20 +148,29 @@ class BaseDocumentationSpider(scrapy.Spider):
                 if hash_index != -1:
                     file_path = file_path[:hash_index]
                 if not os.path.isfile(file_path):
-                    self.logger.error("There is no local file associated with the GitHub URL: %s", url)
+                    self.logger.error(
+                        "There is no local file associated with the GitHub URL: %s", url
+                    )
                 return
             elif url.startswith(ZULIP_SERVER_GITHUB_DIRECTORY_URL_PREFIX):
                 dir_path = url.replace(ZULIP_SERVER_GITHUB_DIRECTORY_URL_PREFIX, DEPLOY_ROOT)
                 if not os.path.isdir(dir_path):
-                    self.logger.error("There is no local directory associated with the GitHub URL: %s", url)
+                    self.logger.error(
+                        "There is no local directory associated with the GitHub URL: %s", url
+                    )
                 return
         elif '#' in url:
             dont_filter = True
             callback = self.check_fragment
         if getattr(self, 'skip_external', False) and self._is_external_link(url):
             return
-        yield Request(url, method=method, callback=callback, dont_filter=dont_filter,
-                      errback=self.error_callback)
+        yield Request(
+            url,
+            method=method,
+            callback=callback,
+            dont_filter=dont_filter,
+            errback=self.error_callback,
+        )
 
     def start_requests(self) -> Iterator[Request]:
         for url in self.start_urls:
@@ -173,9 +189,14 @@ class BaseDocumentationSpider(scrapy.Spider):
                 errback=self.error_callback,
             )
 
-        for link in LxmlLinkExtractor(deny_domains=self.deny_domains, deny_extensions=['doc'],
-                                      tags=self.tags, attrs=self.attrs, deny=self.deny,
-                                      canonicalize=False).extract_links(response):
+        for link in LxmlLinkExtractor(
+            deny_domains=self.deny_domains,
+            deny_extensions=['doc'],
+            tags=self.tags,
+            attrs=self.attrs,
+            deny=self.deny,
+            canonicalize=False,
+        ).extract_links(response):
             yield from self._make_requests(link.url)
 
     def retry_request_with_get(self, request: Request) -> Iterator[Request]:
diff --git a/tools/droplets/add_mentor.py b/tools/droplets/add_mentor.py
index 1b408edb9d..c22213e616 100644
--- a/tools/droplets/add_mentor.py
+++ b/tools/droplets/add_mentor.py
@@ -20,8 +20,7 @@ import requests
 
 parser = ArgumentParser(description='Give a mentor ssh access to this machine.')
 parser.add_argument('username', help='GitHub username of the mentor.')
-parser.add_argument('--remove', help='Remove his/her key from the machine.',
-                    action='store_true')
+parser.add_argument('--remove', help='Remove his/her key from the machine.', action='store_true')
 
 # Wrap keys with line comments for easier key removal.
 append_key = """\
@@ -30,6 +29,7 @@ append_key = """\
 #}}}}<{username}>
 """
 
+
 def get_mentor_keys(username: str) -> List[str]:
     url = f'https://api.github.com/users/{username}/keys'
 
@@ -51,8 +51,9 @@ if __name__ == '__main__':
     authorized_keys = os.path.expanduser('~/.ssh/authorized_keys')
 
     if args.remove:
-        remove_re = re.compile('#<{0}>{{{{.+}}}}<{0}>(\n)?'.format(args.username),
-                               re.DOTALL | re.MULTILINE)
+        remove_re = re.compile(
+            '#<{0}>{{{{.+}}}}<{0}>(\n)?'.format(args.username), re.DOTALL | re.MULTILINE
+        )
 
         with open(authorized_keys, 'r+') as f:
             old_content = f.read()
diff --git a/tools/droplets/create.py b/tools/droplets/create.py
index 8863b5e613..10fd0c2a33 100644
--- a/tools/droplets/create.py
+++ b/tools/droplets/create.py
@@ -28,15 +28,19 @@ import digitalocean
 
 # initiation argument parser
 parser = argparse.ArgumentParser(description='Create a Zulip devopment VM DigitalOcean droplet.')
-parser.add_argument("username", help="GitHub username for whom you want to create a Zulip dev droplet")
+parser.add_argument(
+    "username", help="GitHub username for whom you want to create a Zulip dev droplet"
+)
 parser.add_argument('--tags', nargs='+', default=[])
 parser.add_argument('-f', '--recreate', action="store_true")
 
+
 def get_config() -> configparser.ConfigParser:
     config = configparser.ConfigParser()
     config.read(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf.ini'))
     return config
 
+
 def user_exists(username: str) -> bool:
     print(f"Checking to see if GitHub user {username} exists...")
     user_api_url = f"https://api.github.com/users/{username}"
@@ -50,6 +54,7 @@ def user_exists(username: str) -> bool:
         print(f"Does the GitHub user {username} exist?")
         sys.exit(1)
 
+
 def get_keys(username: str) -> List[Dict[str, Any]]:
     print("Checking to see that GitHub user has available public keys...")
     apiurl_keys = f"https://api.github.com/users/{username}/keys"
@@ -66,6 +71,7 @@ def get_keys(username: str) -> List[Dict[str, Any]]:
         print(f"Has user {username} added SSH keys to their GitHub account?")
         sys.exit(1)
 
+
 def fork_exists(username: str) -> bool:
     print("Checking to see GitHub user has forked zulip/zulip...")
     apiurl_fork = f"https://api.github.com/repos/{username}/zulip"
@@ -79,6 +85,7 @@ def fork_exists(username: str) -> bool:
         print(f"Has user {username} forked zulip/zulip?")
         sys.exit(1)
 
+
 def exit_if_droplet_exists(my_token: str, username: str, recreate: bool) -> None:
     print(f"Checking to see if droplet for {username} already exists...")
     manager = digitalocean.Manager(token=my_token)
@@ -86,8 +93,10 @@ def exit_if_droplet_exists(my_token: str, username: str, recreate: bool) -> None
     for droplet in my_droplets:
         if droplet.name.lower() == f"{username}.zulipdev.org":
             if not recreate:
-                print("Droplet for user {} already exists. Pass --recreate if you "
-                      "need to recreate the droplet.".format(username))
+                print(
+                    "Droplet for user {} already exists. Pass --recreate if you "
+                    "need to recreate the droplet.".format(username)
+                )
                 sys.exit(1)
             else:
                 print(f"Deleting existing droplet for {username}.")
@@ -95,6 +104,7 @@ def exit_if_droplet_exists(my_token: str, username: str, recreate: bool) -> None
                 return
     print("...No droplet found...proceeding.")
 
+
 def set_user_data(username: str, userkey_dicts: List[Dict[str, Any]]) -> str:
     print("Setting cloud-config data, populated with GitHub user's public keys...")
     userkeys = [userkey_dict["key"] for userkey_dict in userkey_dicts]
@@ -134,7 +144,10 @@ su -c 'git config --global pull.rebase true' zulipdev
     print("...returning cloud-config data.")
     return cloudconf
 
-def create_droplet(my_token: str, template_id: str, username: str, tags: List[str], user_data: str) -> str:
+
+def create_droplet(
+    my_token: str, template_id: str, username: str, tags: List[str], user_data: str
+) -> str:
     droplet = digitalocean.Droplet(
         token=my_token,
         name=f'{username}.zulipdev.org',
@@ -143,7 +156,8 @@ def create_droplet(my_token: str, template_id: str, username: str, tags: List[st
         size_slug='s-1vcpu-2gb',
         user_data=user_data,
         tags=tags,
-        backups=False)
+        backups=False,
+    )
 
     print("Initiating droplet creation...")
     droplet.create()
@@ -164,6 +178,7 @@ def create_droplet(my_token: str, template_id: str, username: str, tags: List[st
     print(f"...ip address for new droplet is: {droplet.ip_address}.")
     return droplet.ip_address
 
+
 def delete_existing_records(records: List[digitalocean.Record], record_name: str) -> None:
     count = 0
     for record in records:
@@ -173,6 +188,7 @@ def delete_existing_records(records: List[digitalocean.Record], record_name: str
     if count:
         print(f"Deleted {count} existing A records for {record_name}.zulipdev.org.")
 
+
 def create_dns_record(my_token: str, username: str, ip_address: str) -> None:
     domain = digitalocean.Domain(token=my_token, name='zulipdev.org')
     domain.load()
@@ -187,8 +203,10 @@ def create_dns_record(my_token: str, username: str, ip_address: str) -> None:
     print(f"Creating new A record for *.{username}.zulipdev.org that points to {ip_address}.")
     domain.create_new_domain_record(type='A', name=wildcard_name, data=ip_address)
 
+
 def print_completion(username: str) -> None:
-    print("""
+    print(
+        """
 COMPLETE! Droplet for GitHub user {0} is available at {0}.zulipdev.org.
 
 Instructions for use are below. (copy and paste to the user)
@@ -204,17 +222,25 @@ Your remote Zulip dev server has been created!
 - To start the dev server, `cd zulip` and then run `./tools/run-dev.py`.
 - While the dev server is running, you can see the Zulip server in your browser at
   http://{0}.zulipdev.org:9991.
-""".format(username))
+""".format(
+            username
+        )
+    )
 
-    print("See [Developing remotely](https://zulip.readthedocs.io/en/latest/development/remote.html) "
-          "for tips on using the remote dev instance and "
-          "[Git & GitHub Guide](https://zulip.readthedocs.io/en/latest/git/index.html) "
-          "to learn how to use Git with Zulip.\n")
-    print("Note that this droplet will automatically be deleted after a month of inactivity. "
-          "If you are leaving Zulip for more than a few weeks, we recommend pushing all of your "
-          "active branches to GitHub.")
+    print(
+        "See [Developing remotely](https://zulip.readthedocs.io/en/latest/development/remote.html) "
+        "for tips on using the remote dev instance and "
+        "[Git & GitHub Guide](https://zulip.readthedocs.io/en/latest/git/index.html) "
+        "to learn how to use Git with Zulip.\n"
+    )
+    print(
+        "Note that this droplet will automatically be deleted after a month of inactivity. "
+        "If you are leaving Zulip for more than a few weeks, we recommend pushing all of your "
+        "active branches to GitHub."
+    )
     print("------")
 
+
 if __name__ == '__main__':
     # define id of image to create new droplets from
     # You can get this with something like the following. You may need to try other pages.
@@ -248,11 +274,13 @@ if __name__ == '__main__':
     user_data = set_user_data(username=username, userkey_dicts=public_keys)
 
     # create droplet
-    ip_address = create_droplet(my_token=api_token,
-                                template_id=template_id,
-                                username=username,
-                                tags=args.tags,
-                                user_data=user_data)
+    ip_address = create_droplet(
+        my_token=api_token,
+        template_id=template_id,
+        username=username,
+        tags=args.tags,
+        user_data=user_data,
+    )
 
     # create dns entry
     create_dns_record(my_token=api_token, username=username, ip_address=ip_address)
diff --git a/tools/fetch-contributor-data b/tools/fetch-contributor-data
index db0022a08e..414dd5229f 100755
--- a/tools/fetch-contributor-data
+++ b/tools/fetch-contributor-data
@@ -36,14 +36,17 @@ from zproject.config import get_secret
 duplicate_commits_file = os.path.join(os.path.dirname(__file__), 'duplicate_commits.json')
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--max-retries', type=int, default=10,
-                    help='Number of times to retry fetching data from GitHub')
+parser.add_argument(
+    '--max-retries', type=int, default=10, help='Number of times to retry fetching data from GitHub'
+)
 args = parser.parse_args()
 
+
 class ContributorsJSON(TypedDict):
     date: str
     contributors: List[Dict[str, Union[int, str]]]
 
+
 class Contributor(TypedDict):
     avatar_url: Optional[str]
     contributions: int
@@ -51,8 +54,10 @@ class Contributor(TypedDict):
     email: Optional[str]
     name: Optional[str]
 
+
 logger = logging.getLogger('zulip.fetch_contributors_json')
 
+
 def fetch_contributors(repo_name: str, max_retries: int) -> List[Contributor]:
     contributors: List[Contributor] = []
     retry_attempts = 0
@@ -68,7 +73,9 @@ def fetch_contributors(repo_name: str, max_retries: int) -> List[Contributor]:
         headers = {"Authorization": f"token {personal_access_token}"}
 
     while True:
-        response: requests.Response = requests.get(api_link, {**api_data, "page": f"{page_index}"}, verify=certificates, headers=headers)
+        response: requests.Response = requests.get(
+            api_link, {**api_data, "page": f"{page_index}"}, verify=certificates, headers=headers
+        )
         if response.status_code == 200:
             data = response.json()
             if len(data) == 0:
@@ -82,20 +89,31 @@ def fetch_contributors(repo_name: str, max_retries: int) -> List[Contributor]:
                 logger.warning("Failed retries fetching contributors data from GitHub.")
                 sys.exit(1)
 
-            sleep_time = randrange(0, min(64, 2**retry_attempts))
+            sleep_time = randrange(0, min(64, 2 ** retry_attempts))
             sleep(sleep_time)
 
+
 def write_to_disk(json_data: ContributorsJSON, out_file: str) -> None:
     with open(out_file, 'w') as f:
         json.dump(json_data, f, indent=2, sort_keys=True)
         f.write("\n")
 
+
 def update_contributor_data_file() -> None:
     # This list should hold all repositories that should be included in
     # the total count, including those that should *not* have tabs on the team
     # page (e.g. if they are deprecated).
-    repo_names = ['zulip', 'zulip-desktop', 'zulip-mobile', 'python-zulip-api', 'zulip-js', 'zulipbot',
-                  'zulip-terminal', 'zulip-ios-legacy', 'zulip-android']
+    repo_names = [
+        'zulip',
+        'zulip-desktop',
+        'zulip-mobile',
+        'python-zulip-api',
+        'zulip-js',
+        'zulipbot',
+        'zulip-terminal',
+        'zulip-ios-legacy',
+        'zulip-android',
+    ]
 
     data: ContributorsJSON = dict(date=str(date.today()), contributors=[])
     contributor_username_to_data: Dict[str, Dict[str, Union[str, int]]] = {}
@@ -104,13 +122,11 @@ def update_contributor_data_file() -> None:
         contributors = fetch_contributors(repo_name, args.max_retries)
         for contributor in contributors:
             username = contributor.get('login') or contributor.get('email')
-            assert(username is not None)
+            assert username is not None
             if username in contributor_username_to_data:
                 contributor_username_to_data[username][repo_name] = contributor['contributions']
             else:
-                contributor_username_to_data[username] = {
-                    repo_name: contributor['contributions']
-                }
+                contributor_username_to_data[username] = {repo_name: contributor['contributions']}
 
                 avatar_url = contributor.get('avatar_url')
                 if avatar_url is not None:
@@ -136,7 +152,9 @@ def update_contributor_data_file() -> None:
     with open(duplicate_commits_file) as f:
         duplicate_commits = json.load(f)
         for committer in duplicate_commits:
-            if committer in contributor_username_to_data and contributor_username_to_data[committer].get('zulip'):
+            if committer in contributor_username_to_data and contributor_username_to_data[
+                committer
+            ].get('zulip'):
                 total_commits = contributor_username_to_data[committer]['zulip']
                 assert isinstance(total_commits, int)
                 duplicate_commits_count = duplicate_commits[committer]
@@ -146,5 +164,6 @@ def update_contributor_data_file() -> None:
     data['contributors'] = list(contributor_username_to_data.values())
     write_to_disk(data, settings.CONTRIBUTOR_DATA_FILE_PATH)
 
+
 if __name__ == "__main__":
     update_contributor_data_file()
diff --git a/tools/generate-integration-docs-screenshot b/tools/generate-integration-docs-screenshot
index 4b11b7e49d..dfa03f137e 100755
--- a/tools/generate-integration-docs-screenshot
+++ b/tools/generate-integration-docs-screenshot
@@ -53,7 +53,9 @@ from zerver.lib.webhooks.common import get_fixture_http_headers
 from zerver.models import Message, UserProfile, get_realm, get_user_by_delivery_email
 
 
-def create_integration_bot(integration: WebhookIntegration, bot_name: Optional[str]=None) -> UserProfile:
+def create_integration_bot(
+    integration: WebhookIntegration, bot_name: Optional[str] = None
+) -> UserProfile:
     realm = get_realm('zulip')
     owner = get_user_by_delivery_email("iago@zulip.com", realm)
     bot_email = f"{integration.name}-bot@example.com"
@@ -83,26 +85,30 @@ def create_integration_bot(integration: WebhookIntegration, bot_name: Optional[s
 
     return bot
 
+
 def create_integration_stream(integration: WebhookIntegration, bot: UserProfile) -> None:
     assert isinstance(bot.bot_owner, UserProfile)
     realm = bot.bot_owner.realm
     stream, created = create_stream_if_needed(realm, integration.stream_name)
     bulk_add_subscriptions(realm, [stream], [bot, bot.bot_owner])
 
+
 def get_integration(integration_name: str) -> WebhookIntegration:
     integration = INTEGRATIONS[integration_name]
     assert isinstance(integration, WebhookIntegration), "Not a WebhookIntegration"
     return integration
 
+
 def get_requests_headers(integration_name: str, fixture_name: str) -> Dict[str, Any]:
     headers = get_fixture_http_headers(integration_name, fixture_name)
 
     def fix_name(header: str) -> str:
-        header = header if not header.startswith('HTTP_') else header[len('HTTP_'):]
+        header = header if not header.startswith('HTTP_') else header[len('HTTP_') :]
         return header.replace('_', '-')
 
     return {fix_name(k): v for k, v in headers.items()}
 
+
 def custom_headers(headers_json: str) -> Dict[str, str]:
     if not headers_json:
         return {}
@@ -111,10 +117,13 @@ def custom_headers(headers_json: str) -> Dict[str, str]:
     except orjson.JSONDecodeError as ve:
         raise argparse.ArgumentTypeError(
             'Encountered an error while attempting to parse custom headers: {}\n'
-            'Note: all strings must be enclosed within "" instead of \'\''.format(ve))
+            'Note: all strings must be enclosed within "" instead of \'\''.format(ve)
+        )
 
-def send_bot_payload_message(bot: UserProfile, integration: WebhookIntegration, fixture_path: str,
-                             config: ScreenshotConfig) -> bool:
+
+def send_bot_payload_message(
+    bot: UserProfile, integration: WebhookIntegration, fixture_path: str, config: ScreenshotConfig
+) -> bool:
     # Delete all messages, so new message is the only one it's message group
     Message.objects.filter(sender=bot).delete()
     json_fixture = fixture_path.endswith('.json')
@@ -162,8 +171,10 @@ def send_bot_payload_message(bot: UserProfile, integration: WebhookIntegration,
     try:
         response = requests.post(url=url, headers=headers, **extra_args)
     except requests.exceptions.ConnectionError:
-        print('This tool needs the local dev server to be running. '
-              'Please start it using tools/run-dev.py before running this tool.')
+        print(
+            'This tool needs the local dev server to be running. '
+            'Please start it using tools/run-dev.py before running this tool.'
+        )
         sys.exit(1)
     if response.status_code != 200:
         print(response.json())
@@ -173,6 +184,7 @@ def send_bot_payload_message(bot: UserProfile, integration: WebhookIntegration,
         print(f'Triggered {integration.name} webhook')
         return True
 
+
 def capture_last_message_screenshot(bot: UserProfile, image_path: str) -> None:
     message = Message.objects.filter(sender=bot).last()
     if message is None:
@@ -182,7 +194,10 @@ def capture_last_message_screenshot(bot: UserProfile, image_path: str) -> None:
     screenshot_script = os.path.join(TOOLS_DIR, 'message-screenshot.js')
     subprocess.check_call(['node', screenshot_script, message_id, image_path])
 
-def generate_screenshot_from_config(integration_name: str, screenshot_config: ScreenshotConfig) -> None:
+
+def generate_screenshot_from_config(
+    integration_name: str, screenshot_config: ScreenshotConfig
+) -> None:
     integration = get_integration(integration_name)
     fixture_path, image_path = get_fixture_and_image_paths(integration, screenshot_config)
     bot = create_integration_bot(integration, screenshot_config.bot_name)
@@ -192,6 +207,7 @@ def generate_screenshot_from_config(integration_name: str, screenshot_config: Sc
         capture_last_message_screenshot(bot, image_path)
         print(f'Screenshot captured to: {BOLDRED}{image_path}{ENDC}')
 
+
 parser = argparse.ArgumentParser()
 group = parser.add_mutually_exclusive_group(required=True)
 group.add_argument('--all', action='store_true')
@@ -200,15 +216,22 @@ parser.add_argument('--fixture', help='Name of the fixture file to use')
 parser.add_argument('--image-name', help='Name for the screenshot image')
 parser.add_argument('--image-dir', help='Directory name where to save the screenshot image')
 parser.add_argument('--bot-name', help='Name to use for the bot')
-parser.add_argument('-A', '--use-basic-auth', action='store_true',
-                    help='Add basic auth headers to the request')
-parser.add_argument('-Q', '--payload-as-query-param', action='store_true',
-                    help='Send payload as query param instead of body')
-parser.add_argument('-P', '--payload-param-name',
-                    help='Param name to use for the payload')
-parser.add_argument('-H', '--custom-headers',
-                    type=custom_headers,
-                    help='Any additional headers to be sent with the request.')
+parser.add_argument(
+    '-A', '--use-basic-auth', action='store_true', help='Add basic auth headers to the request'
+)
+parser.add_argument(
+    '-Q',
+    '--payload-as-query-param',
+    action='store_true',
+    help='Send payload as query param instead of body',
+)
+parser.add_argument('-P', '--payload-param-name', help='Param name to use for the payload')
+parser.add_argument(
+    '-H',
+    '--custom-headers',
+    type=custom_headers,
+    help='Any additional headers to be sent with the request.',
+)
 
 options = parser.parse_args()
 prepare_puppeteer_run()
@@ -222,9 +245,12 @@ if options.all:
             generate_screenshot_from_config(integration_name, screenshot_config)
 
 elif options.fixture:
-    config = dict(fixture_name=options.fixture, use_basic_auth=options.use_basic_auth,
-                  custom_headers=options.custom_headers,
-                  payload_as_query_param=options.payload_as_query_param)
+    config = dict(
+        fixture_name=options.fixture,
+        use_basic_auth=options.use_basic_auth,
+        custom_headers=options.custom_headers,
+        payload_as_query_param=options.payload_as_query_param,
+    )
     if options.image_name:
         config['image_name'] = options.image_name
     if options.image_dir:
diff --git a/tools/i18n/process-mobile-i18n b/tools/i18n/process-mobile-i18n
index 5533446114..c6e27dd5aa 100755
--- a/tools/i18n/process-mobile-i18n
+++ b/tools/i18n/process-mobile-i18n
@@ -9,6 +9,7 @@ from typing import Dict, List
 def get_json_filename(locale: str) -> str:
     return f"locale/{locale}/mobile.json"
 
+
 def get_locales() -> List[str]:
     output = check_output(['git', 'ls-files', 'locale'], universal_newlines=True)
     tracked_files = output.split()
@@ -21,6 +22,7 @@ def get_locales() -> List[str]:
 
     return locales
 
+
 def get_translation_stats(resource_path: str) -> Dict[str, int]:
     with open(resource_path) as raw_resource_file:
         raw_info = json.load(raw_resource_file)
@@ -29,6 +31,7 @@ def get_translation_stats(resource_path: str) -> Dict[str, int]:
     not_translated = len([i for i in raw_info.items() if i[1] == ''])
     return {'total': total, 'not_translated': not_translated}
 
+
 translation_stats: Dict[str, Dict[str, int]] = {}
 locale_paths = []  # List[str]
 for locale in get_locales():
diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py
index 5609710ef4..d14e719741 100644
--- a/tools/lib/capitalization.py
+++ b/tools/lib/capitalization.py
@@ -95,11 +95,15 @@ IGNORED_PHRASES = [
     r"user@example.com",
     # Fragments of larger strings
     (r'your subscriptions on your Streams page'),
-    (r'Change notification settings for individual streams on your '
-     '<a href="/#streams">Streams page</a>.'),
-    (r'Looking for our '
-     '<a href="/integrations" target="_blank">Integrations</a> or '
-     '<a href="/api" target="_blank">API</a> documentation?'),
+    (
+        r'Change notification settings for individual streams on your '
+        '<a href="/#streams">Streams page</a>.'
+    ),
+    (
+        r'Looking for our '
+        '<a href="/integrations" target="_blank">Integrations</a> or '
+        '<a href="/api" target="_blank">API</a> documentation?'
+    ),
     r'Most stream administration is done on the <a href="/#streams">Streams page</a>.',
     r"one or more people...",
     r"confirmation email",
@@ -112,7 +116,6 @@ IGNORED_PHRASES = [
     r"an unknown operating system",
     r"Go to Settings",
     r"Like Organization logo",
-
     # SPECIAL CASES
     # Enter is usually capitalized
     r"Press Enter to send",
@@ -137,11 +140,9 @@ IGNORED_PHRASES = [
     r"\bN\b",
     # Capital c feels obtrusive in clear status option
     r"clear",
-
     r"group private messages with __recipient__",
     r"private messages with __recipient__",
     r"private messages with yourself",
-
     # TO CLEAN UP
     # Just want to avoid churning login.html right now
     r"or Choose a user",
@@ -166,8 +167,7 @@ IGNORED_PHRASES.sort(key=lambda regex: len(regex), reverse=True)
 # text using BeautifulSoup and then removes extra whitespaces from
 # it. This step enables us to add HTML in our regexes directly.
 COMPILED_IGNORED_PHRASES = [
-    re.compile(' '.join(BeautifulSoup(regex, 'lxml').text.split()))
-    for regex in IGNORED_PHRASES
+    re.compile(' '.join(BeautifulSoup(regex, 'lxml').text.split())) for regex in IGNORED_PHRASES
 ]
 
 SPLIT_BOUNDARY = '?.!'  # Used to split string into sentences.
@@ -185,6 +185,7 @@ BANNED_WORDS = {
     'realm': 'The term realm should not appear in user-facing strings. Use organization instead.',
 }
 
+
 def get_safe_phrase(phrase: str) -> str:
     """
     Safe phrase is in lower case and doesn't contain characters which can
@@ -194,6 +195,7 @@ def get_safe_phrase(phrase: str) -> str:
     phrase = SPLIT_BOUNDARY_REGEX.sub('_', phrase)
     return phrase.lower()
 
+
 def replace_with_safe_phrase(matchobj: Match[str]) -> str:
     """
     The idea is to convert IGNORED_PHRASES into safe phrases, see
@@ -218,6 +220,7 @@ def replace_with_safe_phrase(matchobj: Match[str]) -> str:
 
     return safe_string
 
+
 def get_safe_text(text: str) -> str:
     """
     This returns text which is rendered by BeautifulSoup and is in the
@@ -230,10 +233,12 @@ def get_safe_text(text: str) -> str:
 
     return text
 
+
 def is_capitalized(safe_text: str) -> bool:
     sentences = SPLIT_BOUNDARY_REGEX.split(safe_text)
     return not any(DISALLOWED_REGEX.search(sentence.strip()) for sentence in sentences)
 
+
 def check_banned_words(text: str) -> List[str]:
     lower_cased_text = text.lower()
     errors = []
@@ -249,6 +254,7 @@ def check_banned_words(text: str) -> List[str]:
 
     return errors
 
+
 def check_capitalization(strings: List[str]) -> Tuple[List[str], List[str], List[str]]:
     errors = []
     ignored = []
diff --git a/tools/lib/gitlint-rules.py b/tools/lib/gitlint-rules.py
index da70b63f11..fe7ed020f1 100644
--- a/tools/lib/gitlint-rules.py
+++ b/tools/lib/gitlint-rules.py
@@ -10,84 +10,253 @@ from gitlint.rules import CommitMessageTitle, LineRule, RuleViolation
 # License: MIT
 # Ref: fit_commit/validators/tense.rb
 WORD_SET = {
-    'adds', 'adding', 'added',
-    'allows', 'allowing', 'allowed',
-    'amends', 'amending', 'amended',
-    'bumps', 'bumping', 'bumped',
-    'calculates', 'calculating', 'calculated',
-    'changes', 'changing', 'changed',
-    'cleans', 'cleaning', 'cleaned',
-    'commits', 'committing', 'committed',
-    'corrects', 'correcting', 'corrected',
-    'creates', 'creating', 'created',
-    'darkens', 'darkening', 'darkened',
-    'disables', 'disabling', 'disabled',
-    'displays', 'displaying', 'displayed',
-    'documents', 'documenting', 'documented',
-    'drys', 'drying', 'dryed',
-    'ends', 'ending', 'ended',
-    'enforces', 'enforcing', 'enforced',
-    'enqueues', 'enqueuing', 'enqueued',
-    'extracts', 'extracting', 'extracted',
-    'finishes', 'finishing', 'finished',
-    'fixes', 'fixing', 'fixed',
-    'formats', 'formatting', 'formatted',
-    'guards', 'guarding', 'guarded',
-    'handles', 'handling', 'handled',
-    'hides', 'hiding', 'hid',
-    'increases', 'increasing', 'increased',
-    'ignores', 'ignoring', 'ignored',
-    'implements', 'implementing', 'implemented',
-    'improves', 'improving', 'improved',
-    'keeps', 'keeping', 'kept',
-    'kills', 'killing', 'killed',
-    'makes', 'making', 'made',
-    'merges', 'merging', 'merged',
-    'moves', 'moving', 'moved',
-    'permits', 'permitting', 'permitted',
-    'prevents', 'preventing', 'prevented',
-    'pushes', 'pushing', 'pushed',
-    'rebases', 'rebasing', 'rebased',
-    'refactors', 'refactoring', 'refactored',
-    'removes', 'removing', 'removed',
-    'renames', 'renaming', 'renamed',
-    'reorders', 'reordering', 'reordered',
-    'replaces', 'replacing', 'replaced',
-    'requires', 'requiring', 'required',
-    'restores', 'restoring', 'restored',
-    'sends', 'sending', 'sent',
-    'sets', 'setting',
-    'separates', 'separating', 'separated',
-    'shows', 'showing', 'showed',
-    'simplifies', 'simplifying', 'simplified',
-    'skips', 'skipping', 'skipped',
-    'sorts', 'sorting',
-    'speeds', 'speeding', 'sped',
-    'starts', 'starting', 'started',
-    'supports', 'supporting', 'supported',
-    'takes', 'taking', 'took',
-    'testing', 'tested',  # 'tests' excluded to reduce false negative
-    'truncates', 'truncating', 'truncated',
-    'updates', 'updating', 'updated',
-    'uses', 'using', 'used',
+    'adds',
+    'adding',
+    'added',
+    'allows',
+    'allowing',
+    'allowed',
+    'amends',
+    'amending',
+    'amended',
+    'bumps',
+    'bumping',
+    'bumped',
+    'calculates',
+    'calculating',
+    'calculated',
+    'changes',
+    'changing',
+    'changed',
+    'cleans',
+    'cleaning',
+    'cleaned',
+    'commits',
+    'committing',
+    'committed',
+    'corrects',
+    'correcting',
+    'corrected',
+    'creates',
+    'creating',
+    'created',
+    'darkens',
+    'darkening',
+    'darkened',
+    'disables',
+    'disabling',
+    'disabled',
+    'displays',
+    'displaying',
+    'displayed',
+    'documents',
+    'documenting',
+    'documented',
+    'drys',
+    'drying',
+    'dryed',
+    'ends',
+    'ending',
+    'ended',
+    'enforces',
+    'enforcing',
+    'enforced',
+    'enqueues',
+    'enqueuing',
+    'enqueued',
+    'extracts',
+    'extracting',
+    'extracted',
+    'finishes',
+    'finishing',
+    'finished',
+    'fixes',
+    'fixing',
+    'fixed',
+    'formats',
+    'formatting',
+    'formatted',
+    'guards',
+    'guarding',
+    'guarded',
+    'handles',
+    'handling',
+    'handled',
+    'hides',
+    'hiding',
+    'hid',
+    'increases',
+    'increasing',
+    'increased',
+    'ignores',
+    'ignoring',
+    'ignored',
+    'implements',
+    'implementing',
+    'implemented',
+    'improves',
+    'improving',
+    'improved',
+    'keeps',
+    'keeping',
+    'kept',
+    'kills',
+    'killing',
+    'killed',
+    'makes',
+    'making',
+    'made',
+    'merges',
+    'merging',
+    'merged',
+    'moves',
+    'moving',
+    'moved',
+    'permits',
+    'permitting',
+    'permitted',
+    'prevents',
+    'preventing',
+    'prevented',
+    'pushes',
+    'pushing',
+    'pushed',
+    'rebases',
+    'rebasing',
+    'rebased',
+    'refactors',
+    'refactoring',
+    'refactored',
+    'removes',
+    'removing',
+    'removed',
+    'renames',
+    'renaming',
+    'renamed',
+    'reorders',
+    'reordering',
+    'reordered',
+    'replaces',
+    'replacing',
+    'replaced',
+    'requires',
+    'requiring',
+    'required',
+    'restores',
+    'restoring',
+    'restored',
+    'sends',
+    'sending',
+    'sent',
+    'sets',
+    'setting',
+    'separates',
+    'separating',
+    'separated',
+    'shows',
+    'showing',
+    'showed',
+    'simplifies',
+    'simplifying',
+    'simplified',
+    'skips',
+    'skipping',
+    'skipped',
+    'sorts',
+    'sorting',
+    'speeds',
+    'speeding',
+    'sped',
+    'starts',
+    'starting',
+    'started',
+    'supports',
+    'supporting',
+    'supported',
+    'takes',
+    'taking',
+    'took',
+    'testing',
+    'tested',  # 'tests' excluded to reduce false negative
+    'truncates',
+    'truncating',
+    'truncated',
+    'updates',
+    'updating',
+    'updated',
+    'uses',
+    'using',
+    'used',
 }
 
 imperative_forms = [
-    'add', 'allow', 'amend', 'bump', 'calculate', 'change', 'clean', 'commit',
-    'correct', 'create', 'darken', 'disable', 'display', 'document', 'dry',
-    'end', 'enforce', 'enqueue', 'extract', 'finish', 'fix', 'format', 'guard',
-    'handle', 'hide', 'ignore', 'implement', 'improve', 'increase', 'keep',
-    'kill', 'make', 'merge', 'move', 'permit', 'prevent', 'push', 'rebase',
-    'refactor', 'remove', 'rename', 'reorder', 'replace', 'require', 'restore',
-    'send', 'separate', 'set', 'show', 'simplify', 'skip', 'sort', 'speed',
-    'start', 'support', 'take', 'test', 'truncate', 'update', 'use',
+    'add',
+    'allow',
+    'amend',
+    'bump',
+    'calculate',
+    'change',
+    'clean',
+    'commit',
+    'correct',
+    'create',
+    'darken',
+    'disable',
+    'display',
+    'document',
+    'dry',
+    'end',
+    'enforce',
+    'enqueue',
+    'extract',
+    'finish',
+    'fix',
+    'format',
+    'guard',
+    'handle',
+    'hide',
+    'ignore',
+    'implement',
+    'improve',
+    'increase',
+    'keep',
+    'kill',
+    'make',
+    'merge',
+    'move',
+    'permit',
+    'prevent',
+    'push',
+    'rebase',
+    'refactor',
+    'remove',
+    'rename',
+    'reorder',
+    'replace',
+    'require',
+    'restore',
+    'send',
+    'separate',
+    'set',
+    'show',
+    'simplify',
+    'skip',
+    'sort',
+    'speed',
+    'start',
+    'support',
+    'take',
+    'test',
+    'truncate',
+    'update',
+    'use',
 ]
 imperative_forms.sort()
 
 
 def head_binary_search(key: str, words: List[str]) -> str:
-    """ Find the imperative mood version of `word` by looking at the first
-    3 characters. """
+    """Find the imperative mood version of `word` by looking at the first
+    3 characters."""
 
     # Edge case: 'disable' and 'display' have the same 3 starting letters.
     if key in ['displays', 'displaying', 'displayed']:
@@ -113,16 +282,18 @@ def head_binary_search(key: str, words: List[str]) -> str:
 
 
 class ImperativeMood(LineRule):
-    """ This rule will enforce that the commit message title uses imperative
+    """This rule will enforce that the commit message title uses imperative
     mood. This is done by checking if the first word is in `WORD_SET`, if so
-    show the word in the correct mood. """
+    show the word in the correct mood."""
 
     name = "title-imperative-mood"
     id = "Z1"
     target = CommitMessageTitle
 
-    error_msg = ('The first word in commit title should be in imperative mood '
-                 '("{word}" -> "{imperative}"): "{title}"')
+    error_msg = (
+        'The first word in commit title should be in imperative mood '
+        '("{word}" -> "{imperative}"): "{title}"'
+    )
 
     def validate(self, line: str, commit: GitCommit) -> List[RuleViolation]:
         violations = []
@@ -133,11 +304,14 @@ class ImperativeMood(LineRule):
 
         if first_word in WORD_SET:
             imperative = head_binary_search(first_word, imperative_forms)
-            violation = RuleViolation(self.id, self.error_msg.format(
-                word=first_word,
-                imperative=imperative,
-                title=commit.message.title,
-            ))
+            violation = RuleViolation(
+                self.id,
+                self.error_msg.format(
+                    word=first_word,
+                    imperative=imperative,
+                    title=commit.message.title,
+                ),
+            )
 
             violations.append(violation)
 
diff --git a/tools/lib/html_branches.py b/tools/lib/html_branches.py
index 226865ba4a..c4f7732acb 100644
--- a/tools/lib/html_branches.py
+++ b/tools/lib/html_branches.py
@@ -151,7 +151,7 @@ def html_branches(text: str, fn: Optional[str] = None) -> List[HtmlTreeBranch]:
     return branches
 
 
-def html_tag_tree(text: str, fn: Optional[str]=None) -> Node:
+def html_tag_tree(text: str, fn: Optional[str] = None) -> Node:
     tokens = tokenize(text)
     top_level = Node(token=None, parent=None)
     stack = [top_level]
@@ -183,9 +183,11 @@ def build_id_dict(templates: List[str]) -> (Dict[str, List[str]]):
         try:
             list_tags = tokenize(text)
         except FormattedException as e:
-            raise Exception(f'''
+            raise Exception(
+                f'''
                 fn: {fn}
-                {e}''')
+                {e}'''
+            )
 
         for tag in list_tags:
             info = get_tag_info(tag)
diff --git a/tools/lib/pretty_print.py b/tools/lib/pretty_print.py
index 6daea1a552..616adc41c6 100644
--- a/tools/lib/pretty_print.py
+++ b/tools/lib/pretty_print.py
@@ -37,27 +37,47 @@ def pretty_print_html(html: str, num_spaces: int = 4) -> str:
     # we proceed, we will push/pop info dictionaries on/off a stack.
     for token in tokens:
 
-        if token.kind in ('html_start', 'handlebars_start', 'handlebars_singleton',
-                          'html_singleton', 'django_start',
-                          'jinja2_whitespace_stripped_type2_start',
-                          'jinja2_whitespace_stripped_start',) and stack[-1]['tag'] != 'pre':
+        if (
+            token.kind
+            in (
+                'html_start',
+                'handlebars_start',
+                'handlebars_singleton',
+                'html_singleton',
+                'django_start',
+                'jinja2_whitespace_stripped_type2_start',
+                'jinja2_whitespace_stripped_start',
+            )
+            and stack[-1]['tag'] != 'pre'
+        ):
             # An HTML start tag should only cause a new indent if we
             # are on a new line.
-            if (token.tag not in ('extends', 'include', 'else', 'elif') and
-                    (is_django_block_tag(token.tag) or
-                        token.kind != 'django_start')):
+            if token.tag not in ('extends', 'include', 'else', 'elif') and (
+                is_django_block_tag(token.tag) or token.kind != 'django_start'
+            ):
                 is_block = token.line > stack[-1]['line']
 
                 if is_block:
-                    if (((token.kind == 'handlebars_start' and
-                            stack[-1]['token_kind'] == 'handlebars_start') or
-                            (token.kind in {'django_start',
-                                            'jinja2_whitespace_stripped_type2_start',
-                                            'jinja2_whitespace_stripped_start'} and
-                             stack[-1]['token_kind'] in {'django_start',
-                                                         'jinja2_whitespace_stripped_type2_start',
-                                                         'jinja2_whitespace_stripped_start'})) and
-                            not stack[-1]['indenting']):
+                    if (
+                        (
+                            token.kind == 'handlebars_start'
+                            and stack[-1]['token_kind'] == 'handlebars_start'
+                        )
+                        or (
+                            token.kind
+                            in {
+                                'django_start',
+                                'jinja2_whitespace_stripped_type2_start',
+                                'jinja2_whitespace_stripped_start',
+                            }
+                            and stack[-1]['token_kind']
+                            in {
+                                'django_start',
+                                'jinja2_whitespace_stripped_type2_start',
+                                'jinja2_whitespace_stripped_start',
+                            }
+                        )
+                    ) and not stack[-1]['indenting']:
                         info = stack.pop()
                         info['depth'] = info['depth'] + 1
                         info['indenting'] = True
@@ -66,7 +86,7 @@ def pretty_print_html(html: str, num_spaces: int = 4) -> str:
                     new_depth = stack[-1]['depth'] + 1
                     extra_indent = stack[-1]['extra_indent']
                     line = lines[token.line - 1]
-                    adjustment = len(line)-len(line.lstrip()) + 1
+                    adjustment = len(line) - len(line.lstrip()) + 1
                     offset = (1 + extra_indent + new_depth * num_spaces) - adjustment
                     info = dict(
                         block=True,
@@ -98,10 +118,18 @@ def pretty_print_html(html: str, num_spaces: int = 4) -> str:
                         ignore_lines=[],
                     )
                 stack.append(info)
-        elif (token.kind in ('html_end', 'handlebars_end', 'html_singleton_end',
-                             'django_end', 'handlebars_singleton_end',
-                             'jinja2_whitespace_stripped_end',) and
-              (stack[-1]['tag'] != 'pre' or token.tag == 'pre')):
+        elif (
+            token.kind
+            in (
+                'html_end',
+                'handlebars_end',
+                'html_singleton_end',
+                'django_end',
+                'handlebars_singleton_end',
+                'jinja2_whitespace_stripped_end',
+            )
+            and (stack[-1]['tag'] != 'pre' or token.tag == 'pre')
+        ):
             info = stack.pop()
             if info['block']:
                 # We are at the end of an indentation block.  We
@@ -118,17 +146,19 @@ def pretty_print_html(html: str, num_spaces: int = 4) -> str:
                 else:
                     offsets[start_line] = info['offset']
                     line = lines[token.line - 1]
-                    adjustment = len(line)-len(line.lstrip()) + 1
+                    adjustment = len(line) - len(line.lstrip()) + 1
                     if adjustment == token.col and token.kind != 'html_singleton_end':
-                        offsets[end_line] = (info['offset'] +
-                                             info['adjustment'] -
-                                             adjustment +
-                                             info['extra_indent'] -
-                                             info['extra_indent_prev'])
-                    elif (start_line + info['line_span'] - 1 == end_line and
-                            info['line_span'] > 1):
-                        offsets[end_line] = (1 + info['extra_indent'] +
-                                             (info['depth'] + 1) * num_spaces) - adjustment
+                        offsets[end_line] = (
+                            info['offset']
+                            + info['adjustment']
+                            - adjustment
+                            + info['extra_indent']
+                            - info['extra_indent_prev']
+                        )
+                    elif start_line + info['line_span'] - 1 == end_line and info['line_span'] > 1:
+                        offsets[end_line] = (
+                            1 + info['extra_indent'] + (info['depth'] + 1) * num_spaces
+                        ) - adjustment
                         # We would like singleton tags and tags which spread over
                         # multiple lines to have 2 space indentation.
                         offsets[end_line] -= 2
@@ -141,22 +171,26 @@ def pretty_print_html(html: str, num_spaces: int = 4) -> str:
                         if line_num not in offsets:
                             line = lines[line_num - 1]
                             new_depth = info['depth'] + 1
-                            if (line.lstrip().startswith('{{else}}') or
-                                    line.lstrip().startswith('{% else %}') or
-                                    line.lstrip().startswith('{% elif')):
+                            if (
+                                line.lstrip().startswith('{{else}}')
+                                or line.lstrip().startswith('{% else %}')
+                                or line.lstrip().startswith('{% elif')
+                            ):
                                 new_depth = info['actual_depth']
                             extra_indent = info['extra_indent']
-                            adjustment = len(line)-len(line.lstrip()) + 1
+                            adjustment = len(line) - len(line.lstrip()) + 1
                             offset = (1 + extra_indent + new_depth * num_spaces) - adjustment
                             if line_num <= start_line + info['line_span'] - 1:
                                 # We would like singleton tags and tags which spread over
                                 # multiple lines to have 2 space indentation.
                                 offset -= 2
                             offsets[line_num] = offset
-                        elif (token.kind in ('handlebars_end', 'django_end') and
-                                info['indenting'] and
-                                line_num < info['adjust_offset_until'] and
-                                line_num not in info['ignore_lines']):
+                        elif (
+                            token.kind in ('handlebars_end', 'django_end')
+                            and info['indenting']
+                            and line_num < info['adjust_offset_until']
+                            and line_num not in info['ignore_lines']
+                        ):
                             offsets[line_num] += num_spaces
                 elif token.tag != 'pre':
                     for line_num in range(start_line + 1, end_line):
@@ -181,7 +215,7 @@ def pretty_print_html(html: str, num_spaces: int = 4) -> str:
             if offset > 0:
                 pretty_line = (' ' * offset) + pretty_line
             elif offset < 0:
-                pretty_line = pretty_line[-1 * offset:]
+                pretty_line = pretty_line[-1 * offset :]
                 assert line.strip() == pretty_line.strip()
         formatted_lines.append(pretty_line)
 
@@ -199,8 +233,11 @@ def validate_indent_html(fn: str, fix: bool) -> int:
                 f.write(phtml)
             # Since we successfully fixed the issues, we exit with status 0
             return 0
-        print('Invalid Indentation detected in file: '
-              f'{fn}\nDiff for the file against expected indented file:', flush=True)
+        print(
+            'Invalid Indentation detected in file: '
+            f'{fn}\nDiff for the file against expected indented file:',
+            flush=True,
+        )
         subprocess.run(['diff', fn, '-'], input=phtml, universal_newlines=True)
         print()
         print("This problem can be fixed with the `--fix` option.")
diff --git a/tools/lib/provision.py b/tools/lib/provision.py
index f8a373aff0..d3ea4d60ab 100755
--- a/tools/lib/provision.py
+++ b/tools/lib/provision.py
@@ -52,8 +52,11 @@ with open("/proc/meminfo") as meminfo:
     ram_size = meminfo.readlines()[0].strip().split(" ")[-2]
 ram_gb = float(ram_size) / 1024.0 / 1024.0
 if ram_gb < 1.5:
-    print("You have insufficient RAM ({} GB) to run the Zulip development environment.".format(
-        round(ram_gb, 2)))
+    print(
+        "You have insufficient RAM ({} GB) to run the Zulip development environment.".format(
+            round(ram_gb, 2)
+        )
+    )
     print("We recommend at least 2 GB of RAM, and require at least 1.5 GB.")
     sys.exit(1)
 
@@ -68,10 +71,14 @@ try:
     )
     os.remove(os.path.join(VAR_DIR_PATH, 'zulip-test-symlink'))
 except OSError:
-    print(FAIL + "Error: Unable to create symlinks."
-          "Make sure you have permission to create symbolic links." + ENDC)
+    print(
+        FAIL + "Error: Unable to create symlinks."
+        "Make sure you have permission to create symbolic links." + ENDC
+    )
     print("See this page for more information:")
-    print("  https://zulip.readthedocs.io/en/latest/development/setup-vagrant.html#os-symlink-error")
+    print(
+        "  https://zulip.readthedocs.io/en/latest/development/setup-vagrant.html#os-symlink-error"
+    )
     sys.exit(1)
 
 if platform.architecture()[0] == '64bit':
@@ -79,7 +86,9 @@ if platform.architecture()[0] == '64bit':
 elif platform.architecture()[0] == '32bit':
     arch = "i386"
 else:
-    logging.critical("Only x86 is supported; ask on chat.zulip.org if you want another architecture.")
+    logging.critical(
+        "Only x86 is supported; ask on chat.zulip.org if you want another architecture."
+    )
     # Note: It's probably actually not hard to add additional
     # architectures.
     sys.exit(1)
@@ -117,15 +126,14 @@ COMMON_DEPENDENCIES = [
     "supervisor",
     "git",
     "wget",
-    "ca-certificates",      # Explicit dependency in case e.g. wget is already installed
-    "puppet",               # Used by lint (`puppet parser validate`)
-    "gettext",              # Used by makemessages i18n
-    "transifex-client",     # Needed to sync translations from transifex
-    "curl",                 # Used for testing our API documentation
-    "moreutils",            # Used for sponge command
-    "unzip",                # Needed for Slack import
-    "crudini",              # Used for shell tooling w/ zulip.conf
-
+    "ca-certificates",  # Explicit dependency in case e.g. wget is already installed
+    "puppet",  # Used by lint (`puppet parser validate`)
+    "gettext",  # Used by makemessages i18n
+    "transifex-client",  # Needed to sync translations from transifex
+    "curl",  # Used for testing our API documentation
+    "moreutils",  # Used for sponge command
+    "unzip",  # Needed for Slack import
+    "crudini",  # Used for shell tooling w/ zulip.conf
     # Puppeteer dependencies from here
     "gconf-service",
     "libgconf-2-4",
@@ -218,6 +226,7 @@ REPO_STOPWORDS_PATH = os.path.join(
     "zulip_english.stop",
 )
 
+
 def install_system_deps() -> None:
 
     # By doing list -> set -> list conversion, we remove duplicates.
@@ -235,6 +244,7 @@ def install_system_deps() -> None:
     if BUILD_PGROONGA_FROM_SOURCE:
         run_as_root(["./scripts/lib/build-pgroonga"])
 
+
 def install_apt_deps(deps_to_install: List[str]) -> None:
     # setup-apt-repo does an `apt-get update` if the sources.list files changed.
     run_as_root(["./scripts/lib/setup-apt-repo"])
@@ -246,11 +256,17 @@ def install_apt_deps(deps_to_install: List[str]) -> None:
     run_as_root(["apt-get", "update"])
     run_as_root(
         [
-            "env", "DEBIAN_FRONTEND=noninteractive",
-            "apt-get", "-y", "install", "--no-install-recommends", *deps_to_install,
+            "env",
+            "DEBIAN_FRONTEND=noninteractive",
+            "apt-get",
+            "-y",
+            "install",
+            "--no-install-recommends",
+            *deps_to_install,
         ]
     )
 
+
 def install_yum_deps(deps_to_install: List[str]) -> None:
     print(WARNING + "RedHat support is still experimental.")
     run_as_root(["./scripts/lib/setup-yum-repo"])
@@ -285,8 +301,7 @@ def install_yum_deps(deps_to_install: List[str]) -> None:
         # Our tooling expects these PostgreSQL scripts to be at
         # well-known paths.  There's an argument for eventually
         # making our tooling auto-detect, but this is simpler.
-        run_as_root(["ln", "-nsf", f"/usr/{postgresql_dir}/bin/{cmd}",
-                     f"/usr/bin/{cmd}"])
+        run_as_root(["ln", "-nsf", f"/usr/{postgresql_dir}/bin/{cmd}", f"/usr/bin/{cmd}"])
 
     # From here, we do the first-time setup/initialization for the PostgreSQL database.
     pg_datadir = f"/var/lib/pgsql/{POSTGRESQL_VERSION}/data"
@@ -299,8 +314,10 @@ def install_yum_deps(deps_to_install: List[str]) -> None:
         # Skip setup if it has been applied previously
         return
 
-    run_as_root([f"/usr/{postgresql_dir}/bin/postgresql-{POSTGRESQL_VERSION}-setup", "initdb"],
-                sudo_args = ['-H'])
+    run_as_root(
+        [f"/usr/{postgresql_dir}/bin/postgresql-{POSTGRESQL_VERSION}-setup", "initdb"],
+        sudo_args=['-H'],
+    )
     # Use vendored pg_hba.conf, which enables password authentication.
     run_as_root(["cp", "-a", "puppet/zulip/files/postgresql/centos_pg_hba.conf", pg_hba_conf])
     # Later steps will ensure PostgreSQL is started
@@ -315,6 +332,7 @@ def install_yum_deps(deps_to_install: List[str]) -> None:
         f"/usr/pgsql-{POSTGRESQL_VERSION}/share/tsearch_data/en_us.affix",
     )
 
+
 def main(options: argparse.Namespace) -> "NoReturn":
 
     # yarn and management commands expect to be run from the root of the
@@ -346,7 +364,7 @@ def main(options: argparse.Namespace) -> "NoReturn":
         hash_file.seek(0)
         last_apt_dependencies_hash = hash_file.read()
 
-    if (new_apt_dependencies_hash != last_apt_dependencies_hash):
+    if new_apt_dependencies_hash != last_apt_dependencies_hash:
         try:
             install_system_deps()
         except subprocess.CalledProcessError:
@@ -365,7 +383,7 @@ def main(options: argparse.Namespace) -> "NoReturn":
         "https_proxy=" + os.environ.get("https_proxy", ""),
         "no_proxy=" + os.environ.get("no_proxy", ""),
     ]
-    run_as_root([*proxy_env, "scripts/lib/install-node"], sudo_args = ['-H'])
+    run_as_root([*proxy_env, "scripts/lib/install-node"], sudo_args=['-H'])
 
     if not os.access(NODE_MODULES_CACHE_PATH, os.W_OK):
         run_as_root(["mkdir", "-p", NODE_MODULES_CACHE_PATH])
@@ -380,9 +398,11 @@ def main(options: argparse.Namespace) -> "NoReturn":
         try:
             setup_node_modules()
         except subprocess.CalledProcessError:
-            print(FAIL +
-                  "`yarn install` is failing; check your network connection (and proxy settings)."
-                  + ENDC)
+            print(
+                FAIL
+                + "`yarn install` is failing; check your network connection (and proxy settings)."
+                + ENDC
+            )
             sys.exit(1)
 
     # Install shellcheck.
@@ -402,9 +422,14 @@ def main(options: argparse.Namespace) -> "NoReturn":
     elif "fedora" in os_families():
         # These platforms don't enable and start services on
         # installing their package, so we do that here.
-        for service in [f"postgresql-{POSTGRESQL_VERSION}", "rabbitmq-server", "memcached", "redis"]:
-            run_as_root(["systemctl", "enable", service], sudo_args = ['-H'])
-            run_as_root(["systemctl", "start", service], sudo_args = ['-H'])
+        for service in [
+            f"postgresql-{POSTGRESQL_VERSION}",
+            "rabbitmq-server",
+            "memcached",
+            "redis",
+        ]:
+            run_as_root(["systemctl", "enable", service], sudo_args=['-H'])
+            run_as_root(["systemctl", "start", service], sudo_args=['-H'])
 
     # If we imported modules after activating the virtualenv in this
     # Python process, they could end up mismatching with modules we’ve
@@ -426,18 +451,27 @@ def main(options: argparse.Namespace) -> "NoReturn":
         ],
     )
 
+
 if __name__ == "__main__":
-    description = ("Provision script to install Zulip")
+    description = "Provision script to install Zulip"
     parser = argparse.ArgumentParser(description=description)
-    parser.add_argument('--force', action='store_true', dest='is_force',
-                        help="Ignore all provisioning optimizations.")
+    parser.add_argument(
+        '--force',
+        action='store_true',
+        dest='is_force',
+        help="Ignore all provisioning optimizations.",
+    )
 
-    parser.add_argument('--build-release-tarball-only', action='store_true',
-                        dest='is_build_release_tarball_only',
-                        help="Provision needed to build release tarball.")
+    parser.add_argument(
+        '--build-release-tarball-only',
+        action='store_true',
+        dest='is_build_release_tarball_only',
+        help="Provision needed to build release tarball.",
+    )
 
-    parser.add_argument('--skip-dev-db-build', action='store_true',
-                        help="Don't run migrations on dev database.")
+    parser.add_argument(
+        '--skip-dev-db-build', action='store_true', help="Don't run migrations on dev database."
+    )
 
     options = parser.parse_args()
     main(options)
diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py
index 540695a757..e77b476f8d 100755
--- a/tools/lib/provision_inner.py
+++ b/tools/lib/provision_inner.py
@@ -26,6 +26,7 @@ from version import PROVISION_VERSION
 VENV_PATH = "/srv/zulip-py3-venv"
 UUID_VAR_PATH = get_dev_uuid_var_path()
 
+
 def create_var_directories() -> None:
     # create var/coverage, var/log, etc.
     var_dir = os.path.join(ZULIP_PATH, 'var')
@@ -41,6 +42,7 @@ def create_var_directories() -> None:
         path = os.path.join(var_dir, sub_dir)
         os.makedirs(path, exist_ok=True)
 
+
 def build_pygments_data_paths() -> List[str]:
     paths = [
         "tools/setup/build_pygments_data",
@@ -48,18 +50,21 @@ def build_pygments_data_paths() -> List[str]:
     ]
     return paths
 
+
 def build_timezones_data_paths() -> List[str]:
     paths = [
         "tools/setup/build_timezone_values",
     ]
     return paths
 
+
 def compilemessages_paths() -> List[str]:
     paths = ['zerver/management/commands/compilemessages.py']
     paths += glob.glob('locale/*/LC_MESSAGES/*.po')
     paths += glob.glob('locale/*/translations.json')
     return paths
 
+
 def inline_email_css_paths() -> List[str]:
     paths = [
         "scripts/setup/inline_email_css.py",
@@ -68,12 +73,14 @@ def inline_email_css_paths() -> List[str]:
     paths += glob.glob('templates/zerver/emails/*.source.html')
     return paths
 
+
 def configure_rabbitmq_paths() -> List[str]:
     paths = [
         "scripts/setup/configure-rabbitmq",
     ]
     return paths
 
+
 def setup_shell_profile(shell_profile: str) -> None:
     shell_profile_path = os.path.expanduser(shell_profile)
 
@@ -93,12 +100,12 @@ def setup_shell_profile(shell_profile: str) -> None:
     if os.path.exists('/srv/zulip'):
         write_command('cd /srv/zulip')
 
+
 def setup_bash_profile() -> None:
     """Select a bash profile file to add setup code to."""
 
     BASH_PROFILES = [
-        os.path.expanduser(p) for p in
-        ("~/.bash_profile", "~/.bash_login", "~/.profile")
+        os.path.expanduser(p) for p in ("~/.bash_profile", "~/.bash_login", "~/.profile")
     ]
 
     def clear_old_profile() -> None:
@@ -131,6 +138,7 @@ def setup_bash_profile() -> None:
         # no existing bash profile found; claim .bash_profile
         setup_shell_profile(BASH_PROFILES[0])
 
+
 def need_to_run_build_pygments_data() -> bool:
     if not os.path.exists("static/generated/pygments_data.json"):
         return True
@@ -141,6 +149,7 @@ def need_to_run_build_pygments_data() -> bool:
         [pygments_version],
     )
 
+
 def need_to_run_build_timezone_data() -> bool:
     if not os.path.exists("static/generated/timezones.json"):
         return True
@@ -151,6 +160,7 @@ def need_to_run_build_timezone_data() -> bool:
         [timezones_version],
     )
 
+
 def need_to_run_compilemessages() -> bool:
     if not os.path.exists('locale/language_name_map.json'):
         # User may have cleaned their git checkout.
@@ -162,6 +172,7 @@ def need_to_run_compilemessages() -> bool:
         compilemessages_paths(),
     )
 
+
 def need_to_run_inline_email_css() -> bool:
     if not os.path.exists('templates/zerver/emails/compiled/'):
         return True
@@ -171,6 +182,7 @@ def need_to_run_inline_email_css() -> bool:
         inline_email_css_paths(),
     )
 
+
 def need_to_run_configure_rabbitmq(settings_list: List[str]) -> bool:
     obsolete = is_digest_obsolete(
         'last_configure_rabbitmq_hash',
@@ -183,6 +195,7 @@ def need_to_run_configure_rabbitmq(settings_list: List[str]) -> bool:
 
     try:
         from zerver.lib.queue import SimpleQueueClient
+
         SimpleQueueClient()
         return False
     except Exception:
@@ -198,10 +211,12 @@ def clean_unused_caches() -> None:
         no_headings=True,
     )
     from scripts.lib import clean_emoji_cache, clean_node_cache, clean_venv_cache
+
     clean_venv_cache.main(args)
     clean_node_cache.main(args)
     clean_emoji_cache.main(args)
 
+
 def main(options: argparse.Namespace) -> int:
     setup_bash_profile()
     setup_shell_profile('~/.zprofile')
@@ -255,6 +270,7 @@ def main(options: argparse.Namespace) -> int:
         # Need to set up Django before using template_status
         os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zproject.settings")
         import django
+
         django.setup()
 
         from django.conf import settings
@@ -265,8 +281,7 @@ def main(options: argparse.Namespace) -> int:
             destroy_leaked_test_databases,
         )
 
-        if options.is_force or need_to_run_configure_rabbitmq(
-                [settings.RABBITMQ_PASSWORD]):
+        if options.is_force or need_to_run_configure_rabbitmq([settings.RABBITMQ_PASSWORD]):
             run(["scripts/setup/configure-rabbitmq"])
             write_new_digest(
                 'last_configure_rabbitmq_hash',
@@ -352,17 +367,26 @@ def main(options: argparse.Namespace) -> int:
     print(OKBLUE + "Zulip development environment setup succeeded!" + ENDC)
     return 0
 
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument('--force', action='store_true', dest='is_force',
-                        help="Ignore all provisioning optimizations.")
+    parser.add_argument(
+        '--force',
+        action='store_true',
+        dest='is_force',
+        help="Ignore all provisioning optimizations.",
+    )
 
-    parser.add_argument('--build-release-tarball-only', action='store_true',
-                        dest='is_build_release_tarball_only',
-                        help="Provision for test suite with production settings.")
+    parser.add_argument(
+        '--build-release-tarball-only',
+        action='store_true',
+        dest='is_build_release_tarball_only',
+        help="Provision for test suite with production settings.",
+    )
 
-    parser.add_argument('--skip-dev-db-build', action='store_true',
-                        help="Don't run migrations on dev database.")
+    parser.add_argument(
+        '--skip-dev-db-build', action='store_true', help="Don't run migrations on dev database."
+    )
 
     options = parser.parse_args()
     sys.exit(main(options))
diff --git a/tools/lib/sanity_check.py b/tools/lib/sanity_check.py
index 113abd8192..7f28155426 100644
--- a/tools/lib/sanity_check.py
+++ b/tools/lib/sanity_check.py
@@ -11,6 +11,8 @@ def check_venv(filename: str) -> None:
         if user_name != 'vagrant' and user_name != 'zulipdev':
             print("If you are using Vagrant, you can `vagrant ssh` to enter the Vagrant guest.")
         else:
-            print("You can `source /srv/zulip-py3-venv/bin/activate` "
-                  "to enter the Zulip development environment.")
+            print(
+                "You can `source /srv/zulip-py3-venv/bin/activate` "
+                "to enter the Zulip development environment."
+            )
         sys.exit(1)
diff --git a/tools/lib/template_parser.py b/tools/lib/template_parser.py
index 64b81707a6..e902cdc783 100644
--- a/tools/lib/template_parser.py
+++ b/tools/lib/template_parser.py
@@ -4,6 +4,7 @@ from typing import Callable, List, Optional
 class FormattedException(Exception):
     pass
 
+
 class TemplateParserException(Exception):
     def __init__(self, message: str) -> None:
         self.message = message
@@ -11,17 +12,20 @@ class TemplateParserException(Exception):
     def __str__(self) -> str:
         return self.message
 
+
 class TokenizationException(Exception):
     def __init__(self, message: str, line_content: Optional[str] = None) -> None:
         self.message = message
         self.line_content = line_content
 
+
 class TokenizerState:
     def __init__(self) -> None:
         self.i = 0
         self.line = 1
         self.col = 1
 
+
 class Token:
     def __init__(self, kind: str, s: str, tag: str, line: int, col: int, line_span: int) -> None:
         self.kind = kind
@@ -31,6 +35,7 @@ class Token:
         self.col = col
         self.line_span = line_span
 
+
 def tokenize(text: str) -> List[Token]:
     def advance(n: int) -> None:
         for _ in range(n):
@@ -42,7 +47,7 @@ def tokenize(text: str) -> List[Token]:
                 state.col += 1
 
     def looking_at(s: str) -> bool:
-        return text[state.i:state.i+len(s)] == s
+        return text[state.i : state.i + len(s)] == s
 
     def looking_at_htmlcomment() -> bool:
         return looking_at("<!--")
@@ -195,7 +200,10 @@ def tokenize(text: str) -> List[Token]:
 
     return tokens
 
-def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent: bool = True) -> None:
+
+def validate(
+    fn: Optional[str] = None, text: Optional[str] = None, check_indent: bool = True
+) -> None:
     assert fn or text
 
     if fn is None:
@@ -208,9 +216,11 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
     try:
         tokens = tokenize(text)
     except FormattedException as e:
-        raise TemplateParserException(f'''
+        raise TemplateParserException(
+            f'''
             fn: {fn}
-            {e}''')
+            {e}'''
+        )
 
     class State:
         def __init__(self, func: Callable[[Token], None]) -> None:
@@ -218,13 +228,15 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
             self.matcher = func
 
     def no_start_tag(token: Token) -> None:
-        raise TemplateParserException(f'''
+        raise TemplateParserException(
+            f'''
             No start tag
             fn: {fn}
             end tag:
                 {token.tag}
                 line {token.line}, col {token.col}
-            ''')
+            '''
+        )
 
     state = State(no_start_tag)
 
@@ -256,7 +268,8 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
                 if end_col != start_col:
                     problem = 'Bad indentation.'
             if problem:
-                raise TemplateParserException(f'''
+                raise TemplateParserException(
+                    f'''
                     fn: {fn}
                     {problem}
                     start:
@@ -265,9 +278,11 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
                     end tag:
                         {end_tag}
                         line {end_line}, col {end_col}
-                    ''')
+                    '''
+                )
             state.matcher = old_matcher
             state.depth -= 1
+
         state.matcher = f
 
     for token in tokens:
@@ -284,8 +299,11 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
         elif kind == 'handlebars_end':
             state.matcher(token)
 
-        elif kind in {'django_start', 'jinja2_whitespace_stripped_start',
-                      'jinja2_whitespace_stripped_type2_start'}:
+        elif kind in {
+            'django_start',
+            'jinja2_whitespace_stripped_start',
+            'jinja2_whitespace_stripped_type2_start',
+        }:
             if is_django_block_tag(tag):
                 start_tag_matcher(token)
         elif kind in {'django_end', 'jinja2_whitespace_stripped_end'}:
@@ -294,9 +312,11 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
     if state.depth != 0:
         raise TemplateParserException('Missing end tag')
 
+
 def is_special_html_tag(s: str, tag: str) -> bool:
     return tag in ['link', 'meta', '!DOCTYPE']
 
+
 OPTIONAL_CLOSING_TAGS = [
     'circle',
     'img',
@@ -306,6 +326,7 @@ OPTIONAL_CLOSING_TAGS = [
     'stop',
 ]
 
+
 def is_self_closing_html_tag(s: str, tag: str) -> bool:
     if s.endswith('/>'):
         if tag in OPTIONAL_CLOSING_TAGS:
@@ -329,6 +350,7 @@ def is_self_closing_html_tag(s: str, tag: str) -> bool:
         return True
     return False
 
+
 def is_django_block_tag(tag: str) -> bool:
     return tag in [
         'autoescape',
@@ -345,26 +367,29 @@ def is_django_block_tag(tag: str) -> bool:
         'with',
     ]
 
+
 def get_handlebars_tag(text: str, i: int) -> str:
     end = i + 2
     while end < len(text) - 1 and text[end] != '}':
         end += 1
-    if text[end] != '}' or text[end+1] != '}':
-        raise TokenizationException('Tag missing "}}"', text[i:end+2])
-    s = text[i:end+2]
+    if text[end] != '}' or text[end + 1] != '}':
+        raise TokenizationException('Tag missing "}}"', text[i : end + 2])
+    s = text[i : end + 2]
     return s
 
+
 def get_django_tag(text: str, i: int, stripped: bool = False) -> str:
     end = i + 2
     if stripped:
         end += 1
     while end < len(text) - 1 and text[end] != '%':
         end += 1
-    if text[end] != '%' or text[end+1] != '}':
-        raise TokenizationException('Tag missing "%}"', text[i:end+2])
-    s = text[i:end+2]
+    if text[end] != '%' or text[end + 1] != '}':
+        raise TokenizationException('Tag missing "%}"', text[i : end + 2])
+    s = text[i : end + 2]
     return s
 
+
 def get_html_tag(text: str, i: int) -> str:
     quote_count = 0
     end = i + 1
@@ -379,50 +404,54 @@ def get_html_tag(text: str, i: int) -> str:
         if unclosed_end:
             raise TokenizationException('Unbalanced Quotes', text[i:unclosed_end])
         else:
-            raise TokenizationException('Unbalanced Quotes', text[i:end+1])
+            raise TokenizationException('Unbalanced Quotes', text[i : end + 1])
     if end == len(text) or text[end] != '>':
-        raise TokenizationException('Tag missing ">"', text[i:end+1])
-    s = text[i:end+1]
+        raise TokenizationException('Tag missing ">"', text[i : end + 1])
+    s = text[i : end + 1]
     return s
 
+
 def get_html_comment(text: str, i: int) -> str:
     end = i + 7
     unclosed_end = 0
     while end <= len(text):
-        if text[end-3:end] == '-->':
+        if text[end - 3 : end] == '-->':
             return text[i:end]
         if not unclosed_end and text[end] == '<':
             unclosed_end = end
         end += 1
     raise TokenizationException('Unclosed comment', text[i:unclosed_end])
 
+
 def get_handlebar_comment(text: str, i: int) -> str:
     end = i + 5
     unclosed_end = 0
     while end <= len(text):
-        if text[end-2:end] == '}}':
+        if text[end - 2 : end] == '}}':
             return text[i:end]
         if not unclosed_end and text[end] == '<':
             unclosed_end = end
         end += 1
     raise TokenizationException('Unclosed comment', text[i:unclosed_end])
 
+
 def get_django_comment(text: str, i: int) -> str:
     end = i + 4
     unclosed_end = 0
     while end <= len(text):
-        if text[end-2:end] == '#}':
+        if text[end - 2 : end] == '#}':
             return text[i:end]
         if not unclosed_end and text[end] == '<':
             unclosed_end = end
         end += 1
     raise TokenizationException('Unclosed comment', text[i:unclosed_end])
 
+
 def get_handlebar_partial(text: str, i: int) -> str:
     end = i + 10
     unclosed_end = 0
     while end <= len(text):
-        if text[end-2:end] == '}}':
+        if text[end - 2 : end] == '}}':
             return text[i:end]
         if not unclosed_end and text[end] == '<':
             unclosed_end = end
diff --git a/tools/lib/test_script.py b/tools/lib/test_script.py
index 68d241ebf8..cad57d89cd 100644
--- a/tools/lib/test_script.py
+++ b/tools/lib/test_script.py
@@ -10,13 +10,16 @@ from version import PROVISION_VERSION
 
 ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+
 def get_major_version(v: str) -> int:
     return int(v.split('.')[0])
 
+
 def get_version_file() -> str:
     uuid_var_path = get_dev_uuid_var_path()
     return os.path.join(uuid_var_path, 'provision_version')
 
+
 PREAMBLE = '''
 Before we run tests, we make sure your provisioning version
 is correct by looking at var/provision_version, which is at
@@ -24,11 +27,13 @@ version {}, and we compare it to the version in source
 control (version.py), which is {}.
 '''
 
+
 def preamble(version: str) -> str:
     text = PREAMBLE.format(version, PROVISION_VERSION)
     text += '\n'
     return text
 
+
 NEED_TO_DOWNGRADE = '''
 It looks like you checked out a branch that expects an older
 version of dependencies than the version you provisioned last.
@@ -46,6 +51,7 @@ is likely to fail until you add dependencies by provisioning.
 Do this: `./tools/provision`
 '''
 
+
 def get_provisioning_status() -> Tuple[bool, Optional[str]]:
     version_file = get_version_file()
     if not os.path.exists(version_file):
@@ -98,6 +104,7 @@ def find_js_test_files(test_dir: str, files: Iterable[str]) -> List[str]:
 
     return test_files
 
+
 def prepare_puppeteer_run() -> None:
     os.chdir(ZULIP_PATH)
     subprocess.check_call(['node', 'node_modules/puppeteer/install.js'])
diff --git a/tools/lib/test_server.py b/tools/lib/test_server.py
index 6ce4aa1a65..b59af81d74 100644
--- a/tools/lib/test_server.py
+++ b/tools/lib/test_server.py
@@ -26,12 +26,12 @@ from zerver.lib.test_fixtures import update_test_databases_if_required
 def set_up_django(external_host: str) -> None:
     os.environ['FULL_STACK_ZULIP_TEST'] = '1'
     os.environ['TEST_EXTERNAL_HOST'] = external_host
-    os.environ["LOCAL_UPLOADS_DIR"] = get_or_create_dev_uuid_var_path(
-        'test-backend/test_uploads')
+    os.environ["LOCAL_UPLOADS_DIR"] = get_or_create_dev_uuid_var_path('test-backend/test_uploads')
     os.environ['DJANGO_SETTINGS_MODULE'] = 'zproject.test_settings'
     django.setup()
     os.environ['PYTHONUNBUFFERED'] = 'y'
 
+
 def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
     """Get the exit code of the server, or None if it is still running."""
     if server.poll() is not None:
@@ -40,6 +40,7 @@ def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[
             message += f'\nSee {log_file}\n'
         raise RuntimeError(message)
 
+
 def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
     assert_server_running(server, log_file)
     try:
@@ -49,10 +50,14 @@ def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) ->
     except requests.RequestException:
         return False
 
+
 @contextmanager
-def test_server_running(force: bool=False, external_host: str='testserver',
-                        log_file: Optional[str]=None, dots: bool=False,
-                        ) -> Iterator[None]:
+def test_server_running(
+    force: bool = False,
+    external_host: str = 'testserver',
+    log_file: Optional[str] = None,
+    dots: bool = False,
+) -> Iterator[None]:
     log = sys.stdout
     if log_file:
         if os.path.exists(log_file) and os.path.getsize(log_file) < 100000:
@@ -69,8 +74,7 @@ def test_server_running(force: bool=False, external_host: str='testserver',
     run_dev_server_command = ['tools/run-dev.py', '--test', '--streamlined']
     if force:
         run_dev_server_command.append('--force')
-    server = subprocess.Popen(run_dev_server_command,
-                              stdout=log, stderr=log)
+    server = subprocess.Popen(run_dev_server_command, stdout=log, stderr=log)
 
     try:
         # Wait for the server to start up.
@@ -95,6 +99,7 @@ def test_server_running(force: bool=False, external_host: str='testserver',
         server.terminate()
         server.wait()
 
+
 if __name__ == '__main__':
     # The code below is for testing this module works
     with test_server_running():
diff --git a/tools/lint b/tools/lint
index 03c1886346..8212173b88 100755
--- a/tools/lint
+++ b/tools/lint
@@ -16,12 +16,8 @@ from linter_lib.custom_check import non_py_rules, python_rules
 
 def run() -> None:
     parser = argparse.ArgumentParser()
-    parser.add_argument('--force',
-                        action="store_true",
-                        help='Run tests despite possible problems.')
-    parser.add_argument('--full',
-                        action='store_true',
-                        help='Check some things we typically ignore')
+    parser.add_argument('--force', action="store_true", help='Run tests despite possible problems.')
+    parser.add_argument('--full', action='store_true', help='Check some things we typically ignore')
     add_default_linter_arguments(parser)
     args = parser.parse_args()
 
@@ -43,73 +39,142 @@ def run() -> None:
 
     linter_config = LinterConfig(args)
 
-    by_lang = linter_config.list_files(groups={
-        'backend': ['py', 'sh', 'pp', 'json', 'md', 'txt', 'text', 'yaml', 'rst', 'yml'],
-        'frontend': ['js', 'ts', 'css', 'hbs', 'html', 'lock'],
-    }, exclude=EXCLUDED_FILES)
+    by_lang = linter_config.list_files(
+        groups={
+            'backend': ['py', 'sh', 'pp', 'json', 'md', 'txt', 'text', 'yaml', 'rst', 'yml'],
+            'frontend': ['js', 'ts', 'css', 'hbs', 'html', 'lock'],
+        },
+        exclude=EXCLUDED_FILES,
+    )
 
-    linter_config.external_linter('css', ['node', 'node_modules/.bin/stylelint'], ['css'],
-                                  fix_arg='--fix',
-                                  description="Standard CSS style and formatting linter (config: stylelint.config.js)")
-    linter_config.external_linter('eslint', ['node', 'node_modules/.bin/eslint',
-                                             '--max-warnings=0', '--cache', '--ext', '.js,.ts'], ['js', 'ts'],
-                                  fix_arg='--fix',
-                                  description="Standard JavaScript style and formatting linter (config: .eslintrc).")
-    linter_config.external_linter('puppet', ['puppet', 'parser', 'validate'], ['pp'],
-                                  description="Runs the puppet parser validator, checking for syntax errors.")
-    linter_config.external_linter('puppet-lint',
-                                  ['puppet-lint', '--fail-on-warnings', *PUPPET_CHECK_RULES_TO_EXCLUDE],
-                                  ['pp'],
-                                  fix_arg='--fix',
-                                  description="Standard puppet linter (config: tools/linter_lib/exclude.py)")
-    linter_config.external_linter('templates', ['tools/check-templates'], ['hbs', 'html'],
-                                  description="Custom linter checks whitespace formatting of HTML templates",
-                                  fix_arg='--fix')
-    linter_config.external_linter('openapi', ['node', 'tools/check-openapi'], ['yaml'],
-                                  description="Validates our OpenAPI/Swagger API documentation "
-                                  "(zerver/openapi/zulip.yaml) ")
-    linter_config.external_linter('shellcheck', ['shellcheck', '-x', '-P', 'SCRIPTDIR'], ['sh'],
-                                  description="Standard shell script linter")
-    linter_config.external_linter('shfmt', ['shfmt'], ['sh'],
-                                  check_arg='-d', fix_arg='-w',
-                                  description="Formats shell scripts")
+    linter_config.external_linter(
+        'css',
+        ['node', 'node_modules/.bin/stylelint'],
+        ['css'],
+        fix_arg='--fix',
+        description="Standard CSS style and formatting linter (config: stylelint.config.js)",
+    )
+    linter_config.external_linter(
+        'eslint',
+        ['node', 'node_modules/.bin/eslint', '--max-warnings=0', '--cache', '--ext', '.js,.ts'],
+        ['js', 'ts'],
+        fix_arg='--fix',
+        description="Standard JavaScript style and formatting linter (config: .eslintrc).",
+    )
+    linter_config.external_linter(
+        'puppet',
+        ['puppet', 'parser', 'validate'],
+        ['pp'],
+        description="Runs the puppet parser validator, checking for syntax errors.",
+    )
+    linter_config.external_linter(
+        'puppet-lint',
+        ['puppet-lint', '--fail-on-warnings', *PUPPET_CHECK_RULES_TO_EXCLUDE],
+        ['pp'],
+        fix_arg='--fix',
+        description="Standard puppet linter (config: tools/linter_lib/exclude.py)",
+    )
+    linter_config.external_linter(
+        'templates',
+        ['tools/check-templates'],
+        ['hbs', 'html'],
+        description="Custom linter checks whitespace formatting of HTML templates",
+        fix_arg='--fix',
+    )
+    linter_config.external_linter(
+        'openapi',
+        ['node', 'tools/check-openapi'],
+        ['yaml'],
+        description="Validates our OpenAPI/Swagger API documentation "
+        "(zerver/openapi/zulip.yaml) ",
+    )
+    linter_config.external_linter(
+        'shellcheck',
+        ['shellcheck', '-x', '-P', 'SCRIPTDIR'],
+        ['sh'],
+        description="Standard shell script linter",
+    )
+    linter_config.external_linter(
+        'shfmt',
+        ['shfmt'],
+        ['sh'],
+        check_arg='-d',
+        fix_arg='-w',
+        description="Formats shell scripts",
+    )
     command = ['tools/run-mypy', '--quiet']
     if args.force:
         command.append('--force')
-    linter_config.external_linter('mypy', command, ['py'], pass_targets=False,
-                                  description="Static type checker for Python (config: mypy.ini)")
-    linter_config.external_linter('tsc', ['tools/run-tsc'], ['ts'], pass_targets=False,
-                                  description="TypeScript compiler (config: tsconfig.json)")
-    linter_config.external_linter('yarn-deduplicate', ['tools/run-yarn-deduplicate'], ['lock'],
-                                  pass_targets=False,
-                                  description="Shares duplicate packages in yarn.lock")
-    linter_config.external_linter('gitlint', ['tools/commit-message-lint'],
-                                  description="Checks commit messages for common formatting errors (config: .gitlint)")
-    linter_config.external_linter('isort', ['isort'], ['py'],
-                                  description="Sorts Python import statements",
-                                  check_arg=['--check-only', '--diff'])
-    linter_config.external_linter('prettier', ['node_modules/.bin/prettier', '--check', '--loglevel=warn'],
-                                  ['css', 'js', 'json', 'ts', 'yaml', 'yml'],
-                                  fix_arg=['--write'],
-                                  description="Formats CSS, JavaScript, YAML")
+    linter_config.external_linter(
+        'mypy',
+        command,
+        ['py'],
+        pass_targets=False,
+        description="Static type checker for Python (config: mypy.ini)",
+    )
+    linter_config.external_linter(
+        'tsc',
+        ['tools/run-tsc'],
+        ['ts'],
+        pass_targets=False,
+        description="TypeScript compiler (config: tsconfig.json)",
+    )
+    linter_config.external_linter(
+        'yarn-deduplicate',
+        ['tools/run-yarn-deduplicate'],
+        ['lock'],
+        pass_targets=False,
+        description="Shares duplicate packages in yarn.lock",
+    )
+    linter_config.external_linter(
+        'gitlint',
+        ['tools/commit-message-lint'],
+        description="Checks commit messages for common formatting errors (config: .gitlint)",
+    )
+    linter_config.external_linter(
+        'isort',
+        ['isort'],
+        ['py'],
+        description="Sorts Python import statements",
+        check_arg=['--check-only', '--diff'],
+    )
+    linter_config.external_linter(
+        'prettier',
+        ['node_modules/.bin/prettier', '--check', '--loglevel=warn'],
+        ['css', 'js', 'json', 'ts', 'yaml', 'yml'],
+        fix_arg=['--write'],
+        description="Formats CSS, JavaScript, YAML",
+    )
 
-    semgrep_command = ["semgrep", "--config=./tools/semgrep.yml", "--error",
-                       "--disable-version-check", "--quiet",
-                       # This option is dangerous in the context of running
-                       # semgrep-as-a-service on untrusted user code, since it
-                       # causes Python code in the rules configuration to be
-                       # executed.  From our standpoint, it is required for
-                       # `pattern-where-python` rules, and there's no real
-                       # security impact, since if you can put arbitrary code
-                       # into zulip.git, you can run arbitrary code in a Zulip
-                       # development environment anyway.
-                       "--dangerously-allow-arbitrary-code-execution-from-rules"]
-    linter_config.external_linter('semgrep-py', [*semgrep_command, "--lang=python"], ['py'],
-                                  fix_arg='--autofix',
-                                  description="Syntactic Grep (semgrep) Code Search Tool (config: ./tools/semgrep.yml)")
+    semgrep_command = [
+        "semgrep",
+        "--config=./tools/semgrep.yml",
+        "--error",
+        "--disable-version-check",
+        "--quiet",
+        # This option is dangerous in the context of running
+        # semgrep-as-a-service on untrusted user code, since it
+        # causes Python code in the rules configuration to be
+        # executed.  From our standpoint, it is required for
+        # `pattern-where-python` rules, and there's no real
+        # security impact, since if you can put arbitrary code
+        # into zulip.git, you can run arbitrary code in a Zulip
+        # development environment anyway.
+        "--dangerously-allow-arbitrary-code-execution-from-rules",
+    ]
+    linter_config.external_linter(
+        'semgrep-py',
+        [*semgrep_command, "--lang=python"],
+        ['py'],
+        fix_arg='--autofix',
+        description="Syntactic Grep (semgrep) Code Search Tool (config: ./tools/semgrep.yml)",
+    )
 
-    linter_config.external_linter('thirdparty', ['tools/check-thirdparty'],
-                                  description="Check docs/THIRDPARTY copyright file syntax")
+    linter_config.external_linter(
+        'thirdparty',
+        ['tools/check-thirdparty'],
+        description="Check docs/THIRDPARTY copyright file syntax",
+    )
 
     @linter_config.lint
     def custom_py() -> int:
@@ -148,5 +213,6 @@ def run() -> None:
 
     linter_config.do_lint()
 
+
 if __name__ == '__main__':
     run()
diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py
index 872cd5a06d..a45ad6f6e3 100644
--- a/tools/linter_lib/custom_check.py
+++ b/tools/linter_lib/custom_check.py
@@ -13,14 +13,11 @@ from zulint.custom_rules import Rule, RuleList
 FILES_WITH_LEGACY_SUBJECT = {
     # This basically requires a big DB migration:
     'zerver/lib/topic.py',
-
     # This is for backward compatibility.
     'zerver/tests/test_legacy_subject.py',
-
     # Other migration-related changes require extreme care.
     'zerver/lib/fix_unreads.py',
     'zerver/tests/test_migrations.py',
-
     # These use subject in the email sense, and will
     # probably always be exempt:
     'zerver/lib/email_mirror.py',
@@ -28,28 +25,32 @@ FILES_WITH_LEGACY_SUBJECT = {
     'zerver/tests/test_new_users.py',
     'zerver/tests/test_email_mirror.py',
     'zerver/tests/test_email_notifications.py',
-
     # These are tied more to our API than our DB model.
     'zerver/openapi/python_examples.py',
     'zerver/tests/test_openapi.py',
-
     # This has lots of query data embedded, so it's hard
     # to fix everything until we migrate the DB to "topic".
     'zerver/tests/test_message_fetch.py',
 }
 
 shebang_rules: List["Rule"] = [
-    {'pattern': '^#!',
-     'description': "zerver library code shouldn't have a shebang line.",
-     'include_only': {'zerver/'}},
+    {
+        'pattern': '^#!',
+        'description': "zerver library code shouldn't have a shebang line.",
+        'include_only': {'zerver/'},
+    },
     # /bin/sh and /usr/bin/env are the only two binaries
     # that NixOS provides at a fixed path (outside a
     # buildFHSUserEnv sandbox).
-    {'pattern': '^#!(?! *(?:/usr/bin/env|/bin/sh)(?: |$))',
-     'description': "Use `#!/usr/bin/env foo` instead of `#!/path/foo`"
-     " for interpreters other than sh."},
-    {'pattern': '^#!/usr/bin/env python$',
-     'description': "Use `#!/usr/bin/env python3` instead of `#!/usr/bin/env python`."},
+    {
+        'pattern': '^#!(?! *(?:/usr/bin/env|/bin/sh)(?: |$))',
+        'description': "Use `#!/usr/bin/env foo` instead of `#!/path/foo`"
+        " for interpreters other than sh.",
+    },
+    {
+        'pattern': '^#!/usr/bin/env python$',
+        'description': "Use `#!/usr/bin/env python3` instead of `#!/usr/bin/env python`.",
+    },
 ]
 
 trailing_whitespace_rule: "Rule" = {
@@ -60,126 +61,177 @@ trailing_whitespace_rule: "Rule" = {
 whitespace_rules: List["Rule"] = [
     # This linter should be first since bash_rules depends on it.
     trailing_whitespace_rule,
-    {'pattern': 'http://zulip.readthedocs.io',
-     'description': 'Use HTTPS when linking to ReadTheDocs',
-     },
-    {'pattern': '\t',
-     'strip': '\n',
-     'exclude': {'tools/ci/success-http-headers.template.txt'},
-     'description': 'Fix tab-based whitespace'},
+    {
+        'pattern': 'http://zulip.readthedocs.io',
+        'description': 'Use HTTPS when linking to ReadTheDocs',
+    },
+    {
+        'pattern': '\t',
+        'strip': '\n',
+        'exclude': {'tools/ci/success-http-headers.template.txt'},
+        'description': 'Fix tab-based whitespace',
+    },
 ]
 comma_whitespace_rule: List["Rule"] = [
-    {'pattern': ', {2,}[^#/ ]',
-     'exclude': {'zerver/tests', 'frontend_tests/node_tests', 'corporate/tests'},
-     'description': "Remove multiple whitespaces after ','",
-     'good_lines': ['foo(1, 2, 3)', 'foo = bar  # some inline comment'],
-     'bad_lines': ['foo(1,  2, 3)', 'foo(1,    2, 3)']},
+    {
+        'pattern': ', {2,}[^#/ ]',
+        'exclude': {'zerver/tests', 'frontend_tests/node_tests', 'corporate/tests'},
+        'description': "Remove multiple whitespaces after ','",
+        'good_lines': ['foo(1, 2, 3)', 'foo = bar  # some inline comment'],
+        'bad_lines': ['foo(1,  2, 3)', 'foo(1,    2, 3)'],
+    },
 ]
 markdown_whitespace_rules: List["Rule"] = [
     *(rule for rule in whitespace_rules if rule['pattern'] != r'\s+$'),
     # Two spaces trailing a line with other content is okay--it's a Markdown line break.
     # This rule finds one space trailing a non-space, three or more trailing spaces, and
     # spaces on an empty line.
-    {'pattern': r'((?<!\s)\s$)|(\s\s\s+$)|(^\s+$)',
-     'strip': '\n',
-     'description': 'Fix trailing whitespace'},
-    {'pattern': '^#+[A-Za-z0-9]',
-     'strip': '\n',
-     'description': 'Missing space after # in heading',
-     'good_lines': ['### some heading', '# another heading'],
-     'bad_lines': ['###some heading', '#another heading']},
+    {
+        'pattern': r'((?<!\s)\s$)|(\s\s\s+$)|(^\s+$)',
+        'strip': '\n',
+        'description': 'Fix trailing whitespace',
+    },
+    {
+        'pattern': '^#+[A-Za-z0-9]',
+        'strip': '\n',
+        'description': 'Missing space after # in heading',
+        'good_lines': ['### some heading', '# another heading'],
+        'bad_lines': ['###some heading', '#another heading'],
+    },
 ]
 
 
 js_rules = RuleList(
     langs=['js'],
     rules=[
-        {'pattern': 'subject|SUBJECT',
-         'exclude': {'static/js/util.js',
-                     'frontend_tests/'},
-         'exclude_pattern': 'emails',
-         'description': 'avoid subject in JS code',
-         'good_lines': ['topic_name'],
-         'bad_lines': ['subject="foo"', ' MAX_SUBJECT_LEN']},
-        {'pattern': 'msgid|MSGID',
-         'description': 'Avoid using "msgid" as a variable name; use "message_id" instead.'},
-        {'pattern': r'.*blueslip.warning\(.*',
-         'description': 'The module blueslip has no function warning, try using blueslip.warn'},
-        {'pattern': r'i18n\.t\([^)]+[^,\{\)]$',
-         'description': 'i18n string should not be a multiline string'},
-        {'pattern': r'''i18n\.t\(['"].+?['"]\s*\+''',
-         'description': 'Do not concatenate arguments within i18n.t()'},
-        {'pattern': r'''i18n\.t\([a-zA-Z]''',
-         'exclude': {'static/js/templates.js'},
-         'description': 'Do not pass a variable into i18n.t; it will not be exported to Transifex for translation.'},
-        {'pattern': r'i18n\.t\(.+\).*\+',
-         'description': 'Do not concatenate i18n strings',
-         'exclude_line': {
-             ('static/js/narrow.js', 'i18n.t("Some common words were excluded from your search.") +'),
-         }},
-        {'pattern': r'\+.*i18n\.t\(.+\)',
-         'description': 'Do not concatenate i18n strings'},
-        {'pattern': '[.]html[(]',
-         'exclude_pattern': r'''\.html\(("|'|render_|html|message\.content|util\.clean_user_content_links|i18n\.t|rendered_|$|\)|error_text|widget_elem|\$error|\$\("<p>"\))''',
-         'exclude': {'static/js/portico', 'static/js/lightbox.js', 'static/js/ui_report.js',
-                     'static/js/confirm_dialog.js',
-                     'frontend_tests/'},
-         'description': 'Setting HTML content with jQuery .html() can lead to XSS security bugs.  Consider .text() or using rendered_foo as a variable name if content comes from handlebars and thus is already sanitized.'},
-        {'pattern': '["\']json/',
-         'description': 'Relative URL for JSON route not supported by i18n'},
+        {
+            'pattern': 'subject|SUBJECT',
+            'exclude': {'static/js/util.js', 'frontend_tests/'},
+            'exclude_pattern': 'emails',
+            'description': 'avoid subject in JS code',
+            'good_lines': ['topic_name'],
+            'bad_lines': ['subject="foo"', ' MAX_SUBJECT_LEN'],
+        },
+        {
+            'pattern': 'msgid|MSGID',
+            'description': 'Avoid using "msgid" as a variable name; use "message_id" instead.',
+        },
+        {
+            'pattern': r'.*blueslip.warning\(.*',
+            'description': 'The module blueslip has no function warning, try using blueslip.warn',
+        },
+        {
+            'pattern': r'i18n\.t\([^)]+[^,\{\)]$',
+            'description': 'i18n string should not be a multiline string',
+        },
+        {
+            'pattern': r'''i18n\.t\(['"].+?['"]\s*\+''',
+            'description': 'Do not concatenate arguments within i18n.t()',
+        },
+        {
+            'pattern': r'''i18n\.t\([a-zA-Z]''',
+            'exclude': {'static/js/templates.js'},
+            'description': 'Do not pass a variable into i18n.t; it will not be exported to Transifex for translation.',
+        },
+        {
+            'pattern': r'i18n\.t\(.+\).*\+',
+            'description': 'Do not concatenate i18n strings',
+            'exclude_line': {
+                (
+                    'static/js/narrow.js',
+                    'i18n.t("Some common words were excluded from your search.") +',
+                ),
+            },
+        },
+        {'pattern': r'\+.*i18n\.t\(.+\)', 'description': 'Do not concatenate i18n strings'},
+        {
+            'pattern': '[.]html[(]',
+            'exclude_pattern': r'''\.html\(("|'|render_|html|message\.content|util\.clean_user_content_links|i18n\.t|rendered_|$|\)|error_text|widget_elem|\$error|\$\("<p>"\))''',
+            'exclude': {
+                'static/js/portico',
+                'static/js/lightbox.js',
+                'static/js/ui_report.js',
+                'static/js/confirm_dialog.js',
+                'frontend_tests/',
+            },
+            'description': 'Setting HTML content with jQuery .html() can lead to XSS security bugs.  Consider .text() or using rendered_foo as a variable name if content comes from handlebars and thus is already sanitized.',
+        },
+        {
+            'pattern': '["\']json/',
+            'description': 'Relative URL for JSON route not supported by i18n',
+        },
         # This rule is constructed with + to avoid triggering on itself
-        {'pattern': '^[ ]*//[A-Za-z0-9]',
-         'description': 'Missing space after // in comment'},
-        {'pattern': r'''[.]text\(["'][a-zA-Z]''',
-         'description': 'Strings passed to $().text should be wrapped in i18n.t() for internationalization',
-         'exclude': {'frontend_tests/node_tests/'}},
-        {'pattern': r'''compose_error\(["']''',
-         'description': 'Argument to compose_error should be a literal string enclosed '
-                        'by i18n.t()'},
-        {'pattern': r'ui.report_success\(',
-         'description': 'Deprecated function, use ui_report.success.'},
-        {'pattern': r'''report.success\(["']''',
-         'description': 'Argument to ui_report.success should be a literal string enclosed '
-                        'by i18n.t()'},
-        {'pattern': r'ui.report_error\(',
-         'description': 'Deprecated function, use ui_report.error.'},
-        {'pattern': r'''report.error\(["'][^'"]''',
-         'description': 'Argument to ui_report.error should be a literal string enclosed '
-                        'by i18n.t()',
-         'good_lines': ['ui_report.error("")', 'ui_report.error(_("text"))'],
-         'bad_lines': ['ui_report.error("test")']},
-        {'pattern': r'''report.client_error\(["'][^'"]''',
-         'description': 'Argument to ui_report.client_error should be a literal string enclosed '
-                        'by i18n.t()',
-         'good_lines': ['ui_report.client_error("")', 'ui_report.client_error(_("text"))'],
-         'bad_lines': ['ui_report.client_error("test")']},
-        {'pattern': r'\$\(document\)\.ready\(',
-         'description': "`Use $(f) rather than `$(document).ready(f)`",
-         'good_lines': ['$(function () {foo();}'],
-         'bad_lines': ['$(document).ready(function () {foo();}']},
-        {'pattern': '[$][.](get|post|patch|delete|ajax)[(]',
-         'description': "Use channel module for AJAX calls",
-         'exclude': {
-             # Internal modules can do direct network calls
-             'static/js/blueslip.js',
-             'static/js/channel.js',
-             # External modules that don't include channel.js
-             'static/js/stats/',
-             'static/js/portico/',
-             'static/js/billing/',
-         },
-         'good_lines': ['channel.get(...)'],
-         'bad_lines': ['$.get()', '$.post()', '$.ajax()']},
-        {'pattern': 'style ?=',
-         'description': "Avoid using the `style=` attribute; we prefer styling in CSS files",
-         'exclude': {
-             'frontend_tests/node_tests/copy_and_paste.js',
-             'frontend_tests/node_tests/upload.js',
-             'static/js/upload.js',
-             'static/js/stream_color.js',
-         },
-         'good_lines': ['#my-style {color: blue;}'],
-         'bad_lines': ['<p style="color: blue;">Foo</p>', 'style = "color: blue;"']},
+        {'pattern': '^[ ]*//[A-Za-z0-9]', 'description': 'Missing space after // in comment'},
+        {
+            'pattern': r'''[.]text\(["'][a-zA-Z]''',
+            'description': 'Strings passed to $().text should be wrapped in i18n.t() for internationalization',
+            'exclude': {'frontend_tests/node_tests/'},
+        },
+        {
+            'pattern': r'''compose_error\(["']''',
+            'description': 'Argument to compose_error should be a literal string enclosed '
+            'by i18n.t()',
+        },
+        {
+            'pattern': r'ui.report_success\(',
+            'description': 'Deprecated function, use ui_report.success.',
+        },
+        {
+            'pattern': r'''report.success\(["']''',
+            'description': 'Argument to ui_report.success should be a literal string enclosed '
+            'by i18n.t()',
+        },
+        {
+            'pattern': r'ui.report_error\(',
+            'description': 'Deprecated function, use ui_report.error.',
+        },
+        {
+            'pattern': r'''report.error\(["'][^'"]''',
+            'description': 'Argument to ui_report.error should be a literal string enclosed '
+            'by i18n.t()',
+            'good_lines': ['ui_report.error("")', 'ui_report.error(_("text"))'],
+            'bad_lines': ['ui_report.error("test")'],
+        },
+        {
+            'pattern': r'''report.client_error\(["'][^'"]''',
+            'description': 'Argument to ui_report.client_error should be a literal string enclosed '
+            'by i18n.t()',
+            'good_lines': ['ui_report.client_error("")', 'ui_report.client_error(_("text"))'],
+            'bad_lines': ['ui_report.client_error("test")'],
+        },
+        {
+            'pattern': r'\$\(document\)\.ready\(',
+            'description': "`Use $(f) rather than `$(document).ready(f)`",
+            'good_lines': ['$(function () {foo();}'],
+            'bad_lines': ['$(document).ready(function () {foo();}'],
+        },
+        {
+            'pattern': '[$][.](get|post|patch|delete|ajax)[(]',
+            'description': "Use channel module for AJAX calls",
+            'exclude': {
+                # Internal modules can do direct network calls
+                'static/js/blueslip.js',
+                'static/js/channel.js',
+                # External modules that don't include channel.js
+                'static/js/stats/',
+                'static/js/portico/',
+                'static/js/billing/',
+            },
+            'good_lines': ['channel.get(...)'],
+            'bad_lines': ['$.get()', '$.post()', '$.ajax()'],
+        },
+        {
+            'pattern': 'style ?=',
+            'description': "Avoid using the `style=` attribute; we prefer styling in CSS files",
+            'exclude': {
+                'frontend_tests/node_tests/copy_and_paste.js',
+                'frontend_tests/node_tests/upload.js',
+                'static/js/upload.js',
+                'static/js/stream_color.js',
+            },
+            'good_lines': ['#my-style {color: blue;}'],
+            'bad_lines': ['<p style="color: blue;">Foo</p>', 'style = "color: blue;"'],
+        },
         *whitespace_rules,
     ],
 )
@@ -187,204 +239,278 @@ js_rules = RuleList(
 python_rules = RuleList(
     langs=['py'],
     rules=[
-        {'pattern': 'subject|SUBJECT',
-         'exclude_pattern': 'subject to the|email|outbox',
-         'description': 'avoid subject as a var',
-         'good_lines': ['topic_name'],
-         'bad_lines': ['subject="foo"', ' MAX_SUBJECT_LEN'],
-         'exclude': FILES_WITH_LEGACY_SUBJECT,
-         'include_only': {
-             'zerver/data_import/',
-             'zerver/lib/',
-             'zerver/tests/',
-             'zerver/views/'}},
-        {'pattern': 'msgid|MSGID',
-         'exclude': {'tools/check-capitalization'},
-         'description': 'Avoid using "msgid" as a variable name; use "message_id" instead.'},
-        {'pattern': '^(?!#)@login_required',
-         'description': '@login_required is unsupported; use @zulip_login_required',
-         'good_lines': ['@zulip_login_required', '# foo @login_required'],
-         'bad_lines': ['@login_required', ' @login_required']},
-        {'pattern': '^user_profile[.]save[(][)]',
-         'description': 'Always pass update_fields when saving user_profile objects',
-         'exclude_line': {
-             ('zerver/lib/actions.py', "user_profile.save()  # Can't use update_fields because of how the foreign key works."),
-         },
-         'exclude': {'zerver/tests', 'zerver/lib/create_user.py'},
-         'good_lines': ['user_profile.save(update_fields=["pointer"])'],
-         'bad_lines': ['user_profile.save()']},
-        {'pattern': 'self: Any',
-         'description': 'you can omit Any annotation for self',
-         'good_lines': ['def foo (self):'],
-         'bad_lines': ['def foo(self: Any):']},
-        {'pattern': r"^\s+#\w",
-         'strip': '\n',
-         'exclude': {'tools/droplets/create.py'},
-         'description': 'Missing whitespace after "#"',
-         'good_lines': ['a = b # some operation', '1+2 #  3 is the result'],
-         'bad_lines': [' #some operation', '  #not valid!!!']},
-        {'pattern': "assertEquals[(]",
-         'description': 'Use assertEqual, not assertEquals (which is deprecated).',
-         'good_lines': ['assertEqual(1, 2)'],
-         'bad_lines': ['assertEquals(1, 2)']},
-        {'pattern': r"#\s*type:\s*ignore(?!\[[^][]+\] +# +\S)",
-         'exclude': {'tools/tests',
-                     'zerver/lib/test_runner.py',
-                     'zerver/tests'},
-         'description': '"type: ignore" should always end with "# type: ignore[code] # explanation for why"',
-         'good_lines': ['foo = bar  # type: ignore[code] # explanation'],
-         'bad_lines': ['foo = bar  # type: ignore',
-                       'foo = bar  # type: ignore[code]',
-                       'foo = bar  # type: ignore # explanation']},
-        {'pattern': r'\b(if|else|while)[(]',
-         'description': 'Put a space between statements like if, else, etc. and (.',
-         'good_lines': ['if (1 == 2):', 'while (foo == bar):'],
-         'bad_lines': ['if(1 == 2):', 'while(foo == bar):']},
-        {'pattern': ", [)]",
-         'description': 'Unnecessary whitespace between "," and ")"',
-         'good_lines': ['foo = (1, 2, 3,)', 'foo(bar, 42)'],
-         'bad_lines': ['foo = (1, 2, 3, )']},
-        {'pattern': r'\bsudo\b',
-         'include_only': {'scripts/'},
-         'exclude': {'scripts/lib/setup_venv.py'},
-         'exclude_line': {
-             ('scripts/lib/zulip_tools.py', 'args = ["sudo", *sudo_args, "--", *args]'),
-         },
-         'description': 'Most scripts are intended to run on systems without sudo.',
-         'good_lines': ['subprocess.check_call(["ls"])'],
-         'bad_lines': ['subprocess.check_call(["sudo", "ls"])']},
-        {'pattern': 'django.utils.translation',
-         'include_only': {'test/', 'zerver/views/development/'},
-         'description': 'Test strings should not be tagged for translation',
-         'good_lines': [''],
-         'bad_lines': ['django.utils.translation']},
-        {'pattern': 'userid',
-         'description': 'We prefer user_id over userid.',
-         'good_lines': ['id = alice.user_id'],
-         'bad_lines': ['id = alice.userid']},
-        {'pattern': r'json_success\({}\)',
-         'description': 'Use json_success() to return nothing',
-         'good_lines': ['return json_success()'],
-         'bad_lines': ['return json_success({})']},
-        {'pattern': r'\Wjson_error\(_\(?\w+\)',
-         'exclude': {'zerver/tests', 'zerver/views/development/'},
-         'description': 'Argument to json_error should be a literal string enclosed by _()',
-         'good_lines': ['return json_error(_("string"))'],
-         'bad_lines': ['return json_error(_variable)', 'return json_error(_(variable))']},
-        {'pattern': r'''\Wjson_error\(['"].+[),]$''',
-         'exclude': {'zerver/tests'},
-         'description': 'Argument to json_error should a literal string enclosed by _()'},
+        {
+            'pattern': 'subject|SUBJECT',
+            'exclude_pattern': 'subject to the|email|outbox',
+            'description': 'avoid subject as a var',
+            'good_lines': ['topic_name'],
+            'bad_lines': ['subject="foo"', ' MAX_SUBJECT_LEN'],
+            'exclude': FILES_WITH_LEGACY_SUBJECT,
+            'include_only': {
+                'zerver/data_import/',
+                'zerver/lib/',
+                'zerver/tests/',
+                'zerver/views/',
+            },
+        },
+        {
+            'pattern': 'msgid|MSGID',
+            'exclude': {'tools/check-capitalization'},
+            'description': 'Avoid using "msgid" as a variable name; use "message_id" instead.',
+        },
+        {
+            'pattern': '^(?!#)@login_required',
+            'description': '@login_required is unsupported; use @zulip_login_required',
+            'good_lines': ['@zulip_login_required', '# foo @login_required'],
+            'bad_lines': ['@login_required', ' @login_required'],
+        },
+        {
+            'pattern': '^user_profile[.]save[(][)]',
+            'description': 'Always pass update_fields when saving user_profile objects',
+            'exclude_line': {
+                (
+                    'zerver/lib/actions.py',
+                    "user_profile.save()  # Can't use update_fields because of how the foreign key works.",
+                ),
+            },
+            'exclude': {'zerver/tests', 'zerver/lib/create_user.py'},
+            'good_lines': ['user_profile.save(update_fields=["pointer"])'],
+            'bad_lines': ['user_profile.save()'],
+        },
+        {
+            'pattern': 'self: Any',
+            'description': 'you can omit Any annotation for self',
+            'good_lines': ['def foo (self):'],
+            'bad_lines': ['def foo(self: Any):'],
+        },
+        {
+            'pattern': r"^\s+#\w",
+            'strip': '\n',
+            'exclude': {'tools/droplets/create.py'},
+            'description': 'Missing whitespace after "#"',
+            'good_lines': ['a = b # some operation', '1+2 #  3 is the result'],
+            'bad_lines': [' #some operation', '  #not valid!!!'],
+        },
+        {
+            'pattern': "assertEquals[(]",
+            'description': 'Use assertEqual, not assertEquals (which is deprecated).',
+            'good_lines': ['assertEqual(1, 2)'],
+            'bad_lines': ['assertEquals(1, 2)'],
+        },
+        {
+            'pattern': r"#\s*type:\s*ignore(?!\[[^][]+\] +# +\S)",
+            'exclude': {'tools/tests', 'zerver/lib/test_runner.py', 'zerver/tests'},
+            'description': '"type: ignore" should always end with "# type: ignore[code] # explanation for why"',
+            'good_lines': ['foo = bar  # type: ignore[code] # explanation'],
+            'bad_lines': [
+                'foo = bar  # type: ignore',
+                'foo = bar  # type: ignore[code]',
+                'foo = bar  # type: ignore # explanation',
+            ],
+        },
+        {
+            'pattern': r'\b(if|else|while)[(]',
+            'description': 'Put a space between statements like if, else, etc. and (.',
+            'good_lines': ['if (1 == 2):', 'while (foo == bar):'],
+            'bad_lines': ['if(1 == 2):', 'while(foo == bar):'],
+        },
+        {
+            'pattern': ", [)]",
+            'description': 'Unnecessary whitespace between "," and ")"',
+            'good_lines': ['foo = (1, 2, 3,)', 'foo(bar, 42)'],
+            'bad_lines': ['foo = (1, 2, 3, )'],
+        },
+        {
+            'pattern': r'\bsudo\b',
+            'include_only': {'scripts/'},
+            'exclude': {'scripts/lib/setup_venv.py'},
+            'exclude_line': {
+                ('scripts/lib/zulip_tools.py', 'args = ["sudo", *sudo_args, "--", *args]'),
+            },
+            'description': 'Most scripts are intended to run on systems without sudo.',
+            'good_lines': ['subprocess.check_call(["ls"])'],
+            'bad_lines': ['subprocess.check_call(["sudo", "ls"])'],
+        },
+        {
+            'pattern': 'django.utils.translation',
+            'include_only': {'test/', 'zerver/views/development/'},
+            'description': 'Test strings should not be tagged for translation',
+            'good_lines': [''],
+            'bad_lines': ['django.utils.translation'],
+        },
+        {
+            'pattern': 'userid',
+            'description': 'We prefer user_id over userid.',
+            'good_lines': ['id = alice.user_id'],
+            'bad_lines': ['id = alice.userid'],
+        },
+        {
+            'pattern': r'json_success\({}\)',
+            'description': 'Use json_success() to return nothing',
+            'good_lines': ['return json_success()'],
+            'bad_lines': ['return json_success({})'],
+        },
+        {
+            'pattern': r'\Wjson_error\(_\(?\w+\)',
+            'exclude': {'zerver/tests', 'zerver/views/development/'},
+            'description': 'Argument to json_error should be a literal string enclosed by _()',
+            'good_lines': ['return json_error(_("string"))'],
+            'bad_lines': ['return json_error(_variable)', 'return json_error(_(variable))'],
+        },
+        {
+            'pattern': r'''\Wjson_error\(['"].+[),]$''',
+            'exclude': {'zerver/tests'},
+            'description': 'Argument to json_error should a literal string enclosed by _()',
+        },
         # To avoid JsonableError(_variable) and JsonableError(_(variable))
-        {'pattern': r'\WJsonableError\(_\(?\w.+\)',
-         'exclude': {'zerver/tests', 'zerver/views/development/'},
-         'description': 'Argument to JsonableError should be a literal string enclosed by _()'},
-        {'pattern': r'''\WJsonableError\(["'].+\)''',
-         'exclude': {'zerver/tests', 'zerver/views/development/'},
-         'description': 'Argument to JsonableError should be a literal string enclosed by _()'},
-        {'pattern': r'''([a-zA-Z0-9_]+)=REQ\(['"]\1['"]''',
-         'description': 'REQ\'s first argument already defaults to parameter name'},
-        {'pattern': r'self\.client\.(get|post|patch|put|delete)',
-         'description': \
-         '''Do not call self.client directly for put/patch/post/get.
+        {
+            'pattern': r'\WJsonableError\(_\(?\w.+\)',
+            'exclude': {'zerver/tests', 'zerver/views/development/'},
+            'description': 'Argument to JsonableError should be a literal string enclosed by _()',
+        },
+        {
+            'pattern': r'''\WJsonableError\(["'].+\)''',
+            'exclude': {'zerver/tests', 'zerver/views/development/'},
+            'description': 'Argument to JsonableError should be a literal string enclosed by _()',
+        },
+        {
+            'pattern': r'''([a-zA-Z0-9_]+)=REQ\(['"]\1['"]''',
+            'description': 'REQ\'s first argument already defaults to parameter name',
+        },
+        {
+            'pattern': r'self\.client\.(get|post|patch|put|delete)',
+            'description': '''Do not call self.client directly for put/patch/post/get.
     See WRAPPER_COMMENT in test_helpers.py for details.
-    '''},
+    ''',
+        },
         # Directly fetching Message objects in e.g. views code is often a security bug.
-        {'pattern': '[^r]Message.objects.get',
-         'exclude': {"zerver/tests",
-                     "zerver/lib/onboarding.py",
-                     "zilencer/management/commands/add_mock_conversation.py",
-                     "zerver/worker/queue_processors.py",
-                     "zerver/management/commands/export.py",
-                     "zerver/lib/export.py"},
-         'description': 'Please use access_message() to fetch Message objects',
-         },
-        {'pattern': 'Stream.objects.get',
-         'include_only': {"zerver/views/"},
-         'description': 'Please use access_stream_by_*() to fetch Stream objects',
-         },
-        {'pattern': 'get_stream[(]',
-         'include_only': {"zerver/views/", "zerver/lib/actions.py"},
-         'exclude_line': {
-             # This one in check_message is kinda terrible, since it's
-             # how most instances are written, but better to exclude something than nothing
-             ('zerver/lib/actions.py', 'stream = get_stream(stream_name, realm)'),
-             ('zerver/lib/actions.py', 'return get_stream("signups", realm)'),
-         },
-         'description': 'Please use access_stream_by_*() to fetch Stream objects',
-         },
-        {'pattern': 'datetime[.](now|utcnow)',
-         'include_only': {"zerver/", "analytics/"},
-         'description': "Don't use datetime in backend code.\n"
-         "See https://zulip.readthedocs.io/en/latest/contributing/code-style.html#naive-datetime-objects",
-         },
-        {'pattern': 'from os.path',
-         'description': "Don't use from when importing from the standard library",
-         },
-        {'pattern': 'import os.path',
-         'description': "Use import os instead of import os.path",
-         },
-        {'pattern': r'(logging|logger)\.warn\W',
-         'description': "Logger.warn is a deprecated alias for Logger.warning; Use 'warning' instead of 'warn'.",
-         'good_lines': ["logging.warning('I am a warning.')", "logger.warning('warning')"],
-         'bad_lines': ["logging.warn('I am a warning.')", "logger.warn('warning')"]},
-        {'pattern': r'\.pk',
-         'exclude_pattern': '[.]_meta[.]pk',
-         'description': "Use `id` instead of `pk`.",
-         'good_lines': ['if my_django_model.id == 42', 'self.user_profile._meta.pk'],
-         'bad_lines': ['if my_django_model.pk == 42']},
-        {'pattern': r'^\s*#\s*type:',
-         'description': 'Comment-style function type annotation. Use Python3 style annotations instead.',
-         },
-        {'pattern': r"\S\s*#\s*type:(?!\s*ignore)",
-         'exclude': {'scripts/lib/hash_reqs.py',
-                     'scripts/lib/setup_venv.py',
-                     'scripts/lib/zulip_tools.py',
-                     'tools/lib/provision.py'},
-         'description': 'Comment-style variable type annotation. Use Python 3.6 style annotations instead.',
-         'good_lines': ['a: List[int] = []'],
-         'bad_lines': ['a = []  # type: List[int]']},
-        {'pattern': r': *(?!Optional)[^ ].*= models[.].*null=True',
-         'include_only': {"zerver/models.py"},
-         'description': 'Model variable with null=true not annotated as Optional.',
-         'good_lines': ['desc: Optional[Text] = models.TextField(null=True)',
-                        'stream: Optional[Stream] = models.ForeignKey(Stream, null=True, on_delete=CASCADE)',
-                        'desc: Text = models.TextField()',
-                        'stream: Stream = models.ForeignKey(Stream, on_delete=CASCADE)'],
-         'bad_lines': ['desc: Text = models.CharField(null=True)',
-                       'stream: Stream = models.ForeignKey(Stream, null=True, on_delete=CASCADE)'],
-         },
-        {'pattern': r': *Optional.*= models[.].*\)',
-         'exclude_pattern': 'null=True',
-         'include_only': {"zerver/models.py"},
-         'description': 'Model variable annotated with Optional but variable does not have null=true.',
-         'good_lines': ['desc: Optional[Text] = models.TextField(null=True)',
-                        'stream: Optional[Stream] = models.ForeignKey(Stream, null=True, on_delete=CASCADE)',
-                        'desc: Text = models.TextField()',
-                        'stream: Stream = models.ForeignKey(Stream, on_delete=CASCADE)'],
-         'bad_lines': ['desc: Optional[Text] = models.TextField()',
-                       'stream: Optional[Stream] = models.ForeignKey(Stream, on_delete=CASCADE)'],
-         },
-        {'pattern': 'exit[(]1[)]',
-         'include_only': {"/management/commands/"},
-         'description': 'Raise CommandError to exit with failure in management commands',
-         },
-        {'pattern': '.is_realm_admin =',
-         'description': 'Use do_change_user_role function rather than setting UserProfile\'s is_realm_admin attribute directly.',
-         'exclude': {
-             'zerver/migrations/0248_userprofile_role_start.py',
-             'zerver/tests/test_users.py',
-         },
-         },
-        {'pattern': '.is_guest =',
-         'description': 'Use do_change_user_role function rather than setting UserProfile\'s is_guest attribute directly.',
-         'exclude': {
-             'zerver/migrations/0248_userprofile_role_start.py',
-             'zerver/tests/test_users.py',
-         },
-         },
-        {'pattern': '\\.(called(_once|_with|_once_with)?|not_called|has_calls|not_called)[(]',
-         'description': 'A mock function is missing a leading "assert_"',
-         },
+        {
+            'pattern': '[^r]Message.objects.get',
+            'exclude': {
+                "zerver/tests",
+                "zerver/lib/onboarding.py",
+                "zilencer/management/commands/add_mock_conversation.py",
+                "zerver/worker/queue_processors.py",
+                "zerver/management/commands/export.py",
+                "zerver/lib/export.py",
+            },
+            'description': 'Please use access_message() to fetch Message objects',
+        },
+        {
+            'pattern': 'Stream.objects.get',
+            'include_only': {"zerver/views/"},
+            'description': 'Please use access_stream_by_*() to fetch Stream objects',
+        },
+        {
+            'pattern': 'get_stream[(]',
+            'include_only': {"zerver/views/", "zerver/lib/actions.py"},
+            'exclude_line': {
+                # This one in check_message is kinda terrible, since it's
+                # how most instances are written, but better to exclude something than nothing
+                ('zerver/lib/actions.py', 'stream = get_stream(stream_name, realm)'),
+                ('zerver/lib/actions.py', 'return get_stream("signups", realm)'),
+            },
+            'description': 'Please use access_stream_by_*() to fetch Stream objects',
+        },
+        {
+            'pattern': 'datetime[.](now|utcnow)',
+            'include_only': {"zerver/", "analytics/"},
+            'description': "Don't use datetime in backend code.\n"
+            "See https://zulip.readthedocs.io/en/latest/contributing/code-style.html#naive-datetime-objects",
+        },
+        {
+            'pattern': 'from os.path',
+            'description': "Don't use from when importing from the standard library",
+        },
+        {
+            'pattern': 'import os.path',
+            'description': "Use import os instead of import os.path",
+        },
+        {
+            'pattern': r'(logging|logger)\.warn\W',
+            'description': "Logger.warn is a deprecated alias for Logger.warning; Use 'warning' instead of 'warn'.",
+            'good_lines': ["logging.warning('I am a warning.')", "logger.warning('warning')"],
+            'bad_lines': ["logging.warn('I am a warning.')", "logger.warn('warning')"],
+        },
+        {
+            'pattern': r'\.pk',
+            'exclude_pattern': '[.]_meta[.]pk',
+            'description': "Use `id` instead of `pk`.",
+            'good_lines': ['if my_django_model.id == 42', 'self.user_profile._meta.pk'],
+            'bad_lines': ['if my_django_model.pk == 42'],
+        },
+        {
+            'pattern': r'^\s*#\s*type:',
+            'description': 'Comment-style function type annotation. Use Python3 style annotations instead.',
+        },
+        {
+            'pattern': r"\S\s*#\s*type:(?!\s*ignore)",
+            'exclude': {
+                'scripts/lib/hash_reqs.py',
+                'scripts/lib/setup_venv.py',
+                'scripts/lib/zulip_tools.py',
+                'tools/lib/provision.py',
+            },
+            'description': 'Comment-style variable type annotation. Use Python 3.6 style annotations instead.',
+            'good_lines': ['a: List[int] = []'],
+            'bad_lines': ['a = []  # type: List[int]'],
+        },
+        {
+            'pattern': r': *(?!Optional)[^ ].*= models[.].*null=True',
+            'include_only': {"zerver/models.py"},
+            'description': 'Model variable with null=true not annotated as Optional.',
+            'good_lines': [
+                'desc: Optional[Text] = models.TextField(null=True)',
+                'stream: Optional[Stream] = models.ForeignKey(Stream, null=True, on_delete=CASCADE)',
+                'desc: Text = models.TextField()',
+                'stream: Stream = models.ForeignKey(Stream, on_delete=CASCADE)',
+            ],
+            'bad_lines': [
+                'desc: Text = models.CharField(null=True)',
+                'stream: Stream = models.ForeignKey(Stream, null=True, on_delete=CASCADE)',
+            ],
+        },
+        {
+            'pattern': r': *Optional.*= models[.].*\)',
+            'exclude_pattern': 'null=True',
+            'include_only': {"zerver/models.py"},
+            'description': 'Model variable annotated with Optional but variable does not have null=true.',
+            'good_lines': [
+                'desc: Optional[Text] = models.TextField(null=True)',
+                'stream: Optional[Stream] = models.ForeignKey(Stream, null=True, on_delete=CASCADE)',
+                'desc: Text = models.TextField()',
+                'stream: Stream = models.ForeignKey(Stream, on_delete=CASCADE)',
+            ],
+            'bad_lines': [
+                'desc: Optional[Text] = models.TextField()',
+                'stream: Optional[Stream] = models.ForeignKey(Stream, on_delete=CASCADE)',
+            ],
+        },
+        {
+            'pattern': 'exit[(]1[)]',
+            'include_only': {"/management/commands/"},
+            'description': 'Raise CommandError to exit with failure in management commands',
+        },
+        {
+            'pattern': '.is_realm_admin =',
+            'description': 'Use do_change_user_role function rather than setting UserProfile\'s is_realm_admin attribute directly.',
+            'exclude': {
+                'zerver/migrations/0248_userprofile_role_start.py',
+                'zerver/tests/test_users.py',
+            },
+        },
+        {
+            'pattern': '.is_guest =',
+            'description': 'Use do_change_user_role function rather than setting UserProfile\'s is_guest attribute directly.',
+            'exclude': {
+                'zerver/migrations/0248_userprofile_role_start.py',
+                'zerver/tests/test_users.py',
+            },
+        },
+        {
+            'pattern': '\\.(called(_once|_with|_once_with)?|not_called|has_calls|not_called)[(]',
+            'description': 'A mock function is missing a leading "assert_"',
+        },
         *whitespace_rules,
         *comma_whitespace_rule,
     ],
@@ -395,16 +521,20 @@ python_rules = RuleList(
 bash_rules = RuleList(
     langs=['bash'],
     rules=[
-        {'pattern': '#!.*sh [-xe]',
-         'description': 'Fix shebang line with proper call to /usr/bin/env for Bash path, change -x|-e switches'
-                        ' to set -x|set -e'},
-        {'pattern': 'sudo',
-         'description': 'Most scripts are intended to work on systems without sudo',
-         'include_only': {'scripts/'},
-         'exclude': {
-             'scripts/lib/install',
-             'scripts/setup/configure-rabbitmq',
-         }},
+        {
+            'pattern': '#!.*sh [-xe]',
+            'description': 'Fix shebang line with proper call to /usr/bin/env for Bash path, change -x|-e switches'
+            ' to set -x|set -e',
+        },
+        {
+            'pattern': 'sudo',
+            'description': 'Most scripts are intended to work on systems without sudo',
+            'include_only': {'scripts/'},
+            'exclude': {
+                'scripts/lib/install',
+                'scripts/setup/configure-rabbitmq',
+            },
+        },
         *whitespace_rules[0:1],
     ],
     shebang_rules=shebang_rules,
@@ -418,178 +548,247 @@ css_rules = RuleList(
 )
 
 prose_style_rules: List["Rule"] = [
-    {'pattern': r'^[^{].*?[^\/\#\-"]([jJ]avascript)',  # exclude usage in hrefs/divs/custom-markdown
-     'exclude': {"docs/documentation/api.md"},
-     'description': "javascript should be spelled JavaScript"},
-    {'pattern': r'''[^\/\-\."'\_\=\>]([gG]ithub)[^\.\-\_"\<]''',  # exclude usage in hrefs/divs
-     'description': "github should be spelled GitHub"},
-    {'pattern': '[oO]rganisation',  # exclude usage in hrefs/divs
-     'description': "Organization is spelled with a z",
-     'exclude_line': {('docs/translating/french.md', '* organization - **organisation**')}},
-    {'pattern': '!!! warning',
-     'description': "!!! warning is invalid; it's spelled '!!! warn'"},
-    {'pattern': 'Terms of service',
-     'description': "The S in Terms of Service is capitalized"},
-    {'pattern': '[^-_p]botserver(?!rc)|bot server',
-     'description': "Use Botserver instead of botserver or bot server."},
+    {
+        'pattern': r'^[^{].*?[^\/\#\-"]([jJ]avascript)',  # exclude usage in hrefs/divs/custom-markdown
+        'exclude': {"docs/documentation/api.md"},
+        'description': "javascript should be spelled JavaScript",
+    },
+    {
+        'pattern': r'''[^\/\-\."'\_\=\>]([gG]ithub)[^\.\-\_"\<]''',  # exclude usage in hrefs/divs
+        'description': "github should be spelled GitHub",
+    },
+    {
+        'pattern': '[oO]rganisation',  # exclude usage in hrefs/divs
+        'description': "Organization is spelled with a z",
+        'exclude_line': {('docs/translating/french.md', '* organization - **organisation**')},
+    },
+    {'pattern': '!!! warning', 'description': "!!! warning is invalid; it's spelled '!!! warn'"},
+    {'pattern': 'Terms of service', 'description': "The S in Terms of Service is capitalized"},
+    {
+        'pattern': '[^-_p]botserver(?!rc)|bot server',
+        'description': "Use Botserver instead of botserver or bot server.",
+    },
     *comma_whitespace_rule,
 ]
 html_rules: List["Rule"] = [
     *whitespace_rules,
     *prose_style_rules,
-    {'pattern': 'subject|SUBJECT',
-     'exclude': {'templates/zerver/email.html'},
-     'exclude_pattern': 'email subject',
-     'description': 'avoid subject in templates',
-     'good_lines': ['topic_name'],
-     'bad_lines': ['subject="foo"', ' MAX_SUBJECT_LEN']},
-    {'pattern': r'placeholder="[^{#](?:(?!\.com).)+$',
-     'description': "`placeholder` value should be translatable.",
-     'exclude_line': {('templates/zerver/register.html', 'placeholder="acme"'),
-                      ('templates/zerver/register.html', 'placeholder="Acme or Ακμή"')},
-     'exclude': {"templates/analytics/support.html"},
-     'good_lines': ['<input class="stream-list-filter" type="text" placeholder="{{ _(\'Search streams\') }}" />'],
-     'bad_lines': ['<input placeholder="foo">']},
-    {'pattern': '={',
-     'description': "Likely missing quoting in HTML attribute",
-     'good_lines': ['<a href="{{variable}}">'],
-     'bad_lines': ['<a href={{variable}}>']},
-    {'pattern': " '}}",
-     'description': "Likely misplaced quoting in translation tags",
-     'good_lines': ["{{t 'translateable string' }}"],
-     'bad_lines': ["{{t 'translateable string '}}"]},
-    {'pattern': "placeholder='[^{]",
-     'description': "`placeholder` value should be translatable.",
-     'good_lines': ['<input class="stream-list-filter" type="text" placeholder="{{ _(\'Search streams\') }}" />'],
-     'bad_lines': ["<input placeholder='foo'>"]},
-    {'pattern': "aria-label='[^{]",
-     'description': "`aria-label` value should be translatable.",
-     'good_lines': ['<button type="button" class="close close-alert-word-status" aria-label="{{t \'Close\' }}">'],
-     'bad_lines': ["<button aria-label='foo'></button>"]},
-    {'pattern': 'aria-label="[^{]',
-     'description': "`aria-label` value should be translatable.",
-     'good_lines': ['<button type="button" class="close close-alert-word-status" aria-label="{{t \'Close\' }}">'],
-     'bad_lines': ['<button aria-label="foo"></button>']},
-    {'pattern': 'script src="http',
-     'description': "Don't directly load dependencies from CDNs.  See docs/subsystems/html-css.md",
-     'exclude': {"templates/corporate/billing.html", "templates/zerver/hello.html",
-                 "templates/corporate/upgrade.html"},
-     'good_lines': ["{{ render_entrypoint('landing-page') }}"],
-     'bad_lines': ['<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>']},
-    {'pattern': "title='[^{]",
-     'description': "`title` value should be translatable.",
-     'good_lines': ['<link rel="author" title="{{ _(\'About these documents\') }}" />'],
-     'bad_lines': ["<p title='foo'></p>"]},
-    {'pattern': r'title="[^{\:]',
-     'exclude_line': {
-         ('templates/zerver/app/markdown_help.html',
-             '<td class="rendered_markdown"><img alt=":heart:" class="emoji" src="/static/generated/emoji/images/emoji/heart.png" title=":heart:" /></td>'),
-     },
-     'exclude': {"templates/zerver/emails", "templates/analytics/realm_details.html", "templates/analytics/support.html"},
-     'description': "`title` value should be translatable."},
-    {'pattern': r'''\Walt=["'][^{"']''',
-     'description': "alt argument should be enclosed by _() or it should be an empty string.",
-     'exclude': {'static/templates/settings/display_settings.hbs',
-                 'templates/zerver/app/keyboard_shortcuts.html',
-                 'templates/zerver/app/markdown_help.html'},
-     'good_lines': ['<img src="{{source_url}}" alt="{{ _(name) }}" />', '<img alg="" />'],
-     'bad_lines': ['<img alt="Foo Image" />']},
-    {'pattern': r'''\Walt=["']{{ ?["']''',
-     'description': "alt argument should be enclosed by _().",
-     'good_lines': ['<img src="{{source_url}}" alt="{{ _(name) }}" />'],
-     'bad_lines': ['<img alt="{{ " />']},
-    {'pattern': r'\bon\w+ ?=',
-     'description': "Don't use inline event handlers (onclick=, etc. attributes) in HTML. Instead,"
-     "attach a jQuery event handler ($('#foo').on('click', function () {...})) when "
-     "the DOM is ready (inside a $(function () {...}) block).",
-     'exclude': {'templates/zerver/dev_login.html', 'templates/corporate/upgrade.html'},
-     'good_lines': ["($('#foo').on('click', function () {}"],
-     'bad_lines': ["<button id='foo' onclick='myFunction()'>Foo</button>", "<input onchange='myFunction()'>"]},
-    {'pattern': 'style ?=',
-     'description': "Avoid using the `style=` attribute; we prefer styling in CSS files",
-     'exclude_pattern': r'.*style ?=["' + "'" + '](display: ?none|background: {{|color: {{|background-color: {{).*',
-     'exclude': {
-         # KaTeX output uses style attribute
-         'templates/zerver/app/markdown_help.html',
-         # 5xx page doesn't have external CSS
-         'static/html/5xx.html',
-
-         # exclude_pattern above handles color, but have other issues:
-         'static/templates/draft.hbs',
-         'static/templates/subscription.hbs',
-         'static/templates/single_message.hbs',
-
-         # Old-style email templates need to use inline style
-         # attributes; it should be possible to clean these up
-         # when we convert these templates to use premailer.
-         'templates/zerver/emails/email_base_messages.html',
-
-         # Email log templates; should clean up.
-         'templates/zerver/email.html',
-         'templates/zerver/email_log.html',
-
-         # Social backend logos are dynamically loaded
-         'templates/zerver/accounts_home.html',
-         'templates/zerver/login.html',
-
-         # Probably just needs to be changed to display: none so the exclude works
-         'templates/zerver/app/navbar.html',
-
-         # Needs the width cleaned up; display: none is fine
-         'static/templates/settings/account_settings.hbs',
-
-         # background image property is dynamically generated
-         'static/templates/user_profile_modal.hbs',
-         'static/templates/pm_list_item.hbs',
-
-         # Inline styling for an svg; could be moved to CSS files?
-         'templates/zerver/landing_nav.html',
-         'templates/zerver/billing_nav.html',
-         'templates/zerver/app/home.html',
-         'templates/zerver/features.html',
-         'templates/zerver/portico-header.html',
-         'templates/corporate/billing.html',
-         'templates/corporate/upgrade.html',
-
-         # Miscellaneous violations to be cleaned up
-         'static/templates/user_info_popover_title.hbs',
-         'static/templates/subscription_invites_warning_modal.hbs',
-         'templates/zerver/reset_confirm.html',
-         'templates/zerver/config_error.html',
-         'templates/zerver/dev_env_email_access_details.html',
-         'templates/zerver/confirm_continue_registration.html',
-         'templates/zerver/register.html',
-         'templates/zerver/accounts_send_confirm.html',
-         'templates/zerver/integrations/index.html',
-         'templates/zerver/documentation_main.html',
-         'templates/analytics/realm_summary_table.html',
-         'templates/corporate/zephyr.html',
-         'templates/corporate/zephyr-mirror.html',
-     },
-     'good_lines': ['#my-style {color: blue;}', 'style="display: none"', "style='display: none"],
-     'bad_lines': ['<p style="color: blue;">Foo</p>', 'style = "color: blue;"']},
+    {
+        'pattern': 'subject|SUBJECT',
+        'exclude': {'templates/zerver/email.html'},
+        'exclude_pattern': 'email subject',
+        'description': 'avoid subject in templates',
+        'good_lines': ['topic_name'],
+        'bad_lines': ['subject="foo"', ' MAX_SUBJECT_LEN'],
+    },
+    {
+        'pattern': r'placeholder="[^{#](?:(?!\.com).)+$',
+        'description': "`placeholder` value should be translatable.",
+        'exclude_line': {
+            ('templates/zerver/register.html', 'placeholder="acme"'),
+            ('templates/zerver/register.html', 'placeholder="Acme or Ακμή"'),
+        },
+        'exclude': {"templates/analytics/support.html"},
+        'good_lines': [
+            '<input class="stream-list-filter" type="text" placeholder="{{ _(\'Search streams\') }}" />'
+        ],
+        'bad_lines': ['<input placeholder="foo">'],
+    },
+    {
+        'pattern': '={',
+        'description': "Likely missing quoting in HTML attribute",
+        'good_lines': ['<a href="{{variable}}">'],
+        'bad_lines': ['<a href={{variable}}>'],
+    },
+    {
+        'pattern': " '}}",
+        'description': "Likely misplaced quoting in translation tags",
+        'good_lines': ["{{t 'translateable string' }}"],
+        'bad_lines': ["{{t 'translateable string '}}"],
+    },
+    {
+        'pattern': "placeholder='[^{]",
+        'description': "`placeholder` value should be translatable.",
+        'good_lines': [
+            '<input class="stream-list-filter" type="text" placeholder="{{ _(\'Search streams\') }}" />'
+        ],
+        'bad_lines': ["<input placeholder='foo'>"],
+    },
+    {
+        'pattern': "aria-label='[^{]",
+        'description': "`aria-label` value should be translatable.",
+        'good_lines': [
+            '<button type="button" class="close close-alert-word-status" aria-label="{{t \'Close\' }}">'
+        ],
+        'bad_lines': ["<button aria-label='foo'></button>"],
+    },
+    {
+        'pattern': 'aria-label="[^{]',
+        'description': "`aria-label` value should be translatable.",
+        'good_lines': [
+            '<button type="button" class="close close-alert-word-status" aria-label="{{t \'Close\' }}">'
+        ],
+        'bad_lines': ['<button aria-label="foo"></button>'],
+    },
+    {
+        'pattern': 'script src="http',
+        'description': "Don't directly load dependencies from CDNs.  See docs/subsystems/html-css.md",
+        'exclude': {
+            "templates/corporate/billing.html",
+            "templates/zerver/hello.html",
+            "templates/corporate/upgrade.html",
+        },
+        'good_lines': ["{{ render_entrypoint('landing-page') }}"],
+        'bad_lines': [
+            '<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>'
+        ],
+    },
+    {
+        'pattern': "title='[^{]",
+        'description': "`title` value should be translatable.",
+        'good_lines': ['<link rel="author" title="{{ _(\'About these documents\') }}" />'],
+        'bad_lines': ["<p title='foo'></p>"],
+    },
+    {
+        'pattern': r'title="[^{\:]',
+        'exclude_line': {
+            (
+                'templates/zerver/app/markdown_help.html',
+                '<td class="rendered_markdown"><img alt=":heart:" class="emoji" src="/static/generated/emoji/images/emoji/heart.png" title=":heart:" /></td>',
+            ),
+        },
+        'exclude': {
+            "templates/zerver/emails",
+            "templates/analytics/realm_details.html",
+            "templates/analytics/support.html",
+        },
+        'description': "`title` value should be translatable.",
+    },
+    {
+        'pattern': r'''\Walt=["'][^{"']''',
+        'description': "alt argument should be enclosed by _() or it should be an empty string.",
+        'exclude': {
+            'static/templates/settings/display_settings.hbs',
+            'templates/zerver/app/keyboard_shortcuts.html',
+            'templates/zerver/app/markdown_help.html',
+        },
+        'good_lines': ['<img src="{{source_url}}" alt="{{ _(name) }}" />', '<img alg="" />'],
+        'bad_lines': ['<img alt="Foo Image" />'],
+    },
+    {
+        'pattern': r'''\Walt=["']{{ ?["']''',
+        'description': "alt argument should be enclosed by _().",
+        'good_lines': ['<img src="{{source_url}}" alt="{{ _(name) }}" />'],
+        'bad_lines': ['<img alt="{{ " />'],
+    },
+    {
+        'pattern': r'\bon\w+ ?=',
+        'description': "Don't use inline event handlers (onclick=, etc. attributes) in HTML. Instead,"
+        "attach a jQuery event handler ($('#foo').on('click', function () {...})) when "
+        "the DOM is ready (inside a $(function () {...}) block).",
+        'exclude': {'templates/zerver/dev_login.html', 'templates/corporate/upgrade.html'},
+        'good_lines': ["($('#foo').on('click', function () {}"],
+        'bad_lines': [
+            "<button id='foo' onclick='myFunction()'>Foo</button>",
+            "<input onchange='myFunction()'>",
+        ],
+    },
+    {
+        'pattern': 'style ?=',
+        'description': "Avoid using the `style=` attribute; we prefer styling in CSS files",
+        'exclude_pattern': r'.*style ?=["'
+        + "'"
+        + '](display: ?none|background: {{|color: {{|background-color: {{).*',
+        'exclude': {
+            # KaTeX output uses style attribute
+            'templates/zerver/app/markdown_help.html',
+            # 5xx page doesn't have external CSS
+            'static/html/5xx.html',
+            # exclude_pattern above handles color, but have other issues:
+            'static/templates/draft.hbs',
+            'static/templates/subscription.hbs',
+            'static/templates/single_message.hbs',
+            # Old-style email templates need to use inline style
+            # attributes; it should be possible to clean these up
+            # when we convert these templates to use premailer.
+            'templates/zerver/emails/email_base_messages.html',
+            # Email log templates; should clean up.
+            'templates/zerver/email.html',
+            'templates/zerver/email_log.html',
+            # Social backend logos are dynamically loaded
+            'templates/zerver/accounts_home.html',
+            'templates/zerver/login.html',
+            # Probably just needs to be changed to display: none so the exclude works
+            'templates/zerver/app/navbar.html',
+            # Needs the width cleaned up; display: none is fine
+            'static/templates/settings/account_settings.hbs',
+            # background image property is dynamically generated
+            'static/templates/user_profile_modal.hbs',
+            'static/templates/pm_list_item.hbs',
+            # Inline styling for an svg; could be moved to CSS files?
+            'templates/zerver/landing_nav.html',
+            'templates/zerver/billing_nav.html',
+            'templates/zerver/app/home.html',
+            'templates/zerver/features.html',
+            'templates/zerver/portico-header.html',
+            'templates/corporate/billing.html',
+            'templates/corporate/upgrade.html',
+            # Miscellaneous violations to be cleaned up
+            'static/templates/user_info_popover_title.hbs',
+            'static/templates/subscription_invites_warning_modal.hbs',
+            'templates/zerver/reset_confirm.html',
+            'templates/zerver/config_error.html',
+            'templates/zerver/dev_env_email_access_details.html',
+            'templates/zerver/confirm_continue_registration.html',
+            'templates/zerver/register.html',
+            'templates/zerver/accounts_send_confirm.html',
+            'templates/zerver/integrations/index.html',
+            'templates/zerver/documentation_main.html',
+            'templates/analytics/realm_summary_table.html',
+            'templates/corporate/zephyr.html',
+            'templates/corporate/zephyr-mirror.html',
+        },
+        'good_lines': ['#my-style {color: blue;}', 'style="display: none"', "style='display: none"],
+        'bad_lines': ['<p style="color: blue;">Foo</p>', 'style = "color: blue;"'],
+    },
 ]
 
 handlebars_rules = RuleList(
     langs=['hbs'],
     rules=[
         *html_rules,
-        {'pattern': "[<]script",
-         'description': "Do not use inline <script> tags here; put JavaScript in static/js instead."},
-        {'pattern': '{{ t ("|\')',
-         'description': 'There should be no spaces before the "t" in a translation tag.'},
-        {'pattern': r"{{t '.*' }}[\.\?!]",
-         'description': "Period should be part of the translatable string."},
-        {'pattern': r'{{t ".*" }}[\.\?!]',
-         'description': "Period should be part of the translatable string."},
-        {'pattern': r"{{/tr}}[\.\?!]",
-         'description': "Period should be part of the translatable string."},
-        {'pattern': '{{t ("|\') ',
-         'description': 'Translatable strings should not have leading spaces.'},
-        {'pattern': "{{t '[^']+ ' }}",
-         'description': 'Translatable strings should not have trailing spaces.'},
-        {'pattern': '{{t "[^"]+ " }}',
-         'description': 'Translatable strings should not have trailing spaces.'},
+        {
+            'pattern': "[<]script",
+            'description': "Do not use inline <script> tags here; put JavaScript in static/js instead.",
+        },
+        {
+            'pattern': '{{ t ("|\')',
+            'description': 'There should be no spaces before the "t" in a translation tag.',
+        },
+        {
+            'pattern': r"{{t '.*' }}[\.\?!]",
+            'description': "Period should be part of the translatable string.",
+        },
+        {
+            'pattern': r'{{t ".*" }}[\.\?!]',
+            'description': "Period should be part of the translatable string.",
+        },
+        {
+            'pattern': r"{{/tr}}[\.\?!]",
+            'description': "Period should be part of the translatable string.",
+        },
+        {
+            'pattern': '{{t ("|\') ',
+            'description': 'Translatable strings should not have leading spaces.',
+        },
+        {
+            'pattern': "{{t '[^']+ ' }}",
+            'description': 'Translatable strings should not have trailing spaces.',
+        },
+        {
+            'pattern': '{{t "[^"]+ " }}',
+            'description': 'Translatable strings should not have trailing spaces.',
+        },
     ],
 )
 
@@ -597,10 +796,14 @@ jinja2_rules = RuleList(
     langs=['html'],
     rules=[
         *html_rules,
-        {'pattern': r"{% endtrans %}[\.\?!]",
-         'description': "Period should be part of the translatable string."},
-        {'pattern': r"{{ _(.+) }}[\.\?!]",
-         'description': "Period should be part of the translatable string."},
+        {
+            'pattern': r"{% endtrans %}[\.\?!]",
+            'description': "Period should be part of the translatable string.",
+        },
+        {
+            'pattern': r"{{ _(.+) }}[\.\?!]",
+            'description': "Period should be part of the translatable string.",
+        },
     ],
 )
 
@@ -615,13 +818,17 @@ json_rules = RuleList(
         # exclude in whitespace_rules, since we only want to ignore
         # JSON files with tab-based whitespace, not webhook code).
         trailing_whitespace_rule,
-        {'pattern': '\t',
-         'strip': '\n',
-         'exclude': {'zerver/webhooks/'},
-         'description': 'Fix tab-based whitespace'},
-        {'pattern': r'":["\[\{]',
-         'exclude': {'zerver/webhooks/', 'zerver/tests/fixtures/'},
-         'description': 'Require space after : in JSON'},
+        {
+            'pattern': '\t',
+            'strip': '\n',
+            'exclude': {'zerver/webhooks/'},
+            'description': 'Fix tab-based whitespace',
+        },
+        {
+            'pattern': r'":["\[\{]',
+            'exclude': {'zerver/webhooks/', 'zerver/tests/fixtures/'},
+            'description': 'Require space after : in JSON',
+        },
     ],
 )
 
@@ -652,25 +859,36 @@ markdown_rules = RuleList(
     rules=[
         *markdown_whitespace_rules,
         *prose_style_rules,
-        {'pattern': r'\[(?P<url>[^\]]+)\]\((?P=url)\)',
-         'description': 'Linkified Markdown URLs should use cleaner <http://example.com> syntax.'},
-        {'pattern': 'https://zulip.readthedocs.io/en/latest/[a-zA-Z0-9]',
-         'exclude': {'docs/overview/contributing.md', 'docs/overview/readme.md', 'docs/README.md', 'docs/subsystems/email.md'},
-         'include_only': {'docs/'},
-         'description': "Use relative links (../foo/bar.html) to other documents in docs/",
-         },
-        {'pattern': "su zulip -c [^']",
-         'include_only': {'docs/'},
-         'description': "Always quote arguments using `su zulip -c '` to avoid confusion about how su works.",
-         },
-        {'pattern': r'\][(][^#h]',
-         'include_only': {'README.md', 'CONTRIBUTING.md'},
-         'description': "Use absolute links from docs served by GitHub",
-         },
-        {'pattern': r"\.(py|js)#L\d+",
-         'include_only': {'docs/'},
-         'description': "Don't link directly to line numbers",
-         },
+        {
+            'pattern': r'\[(?P<url>[^\]]+)\]\((?P=url)\)',
+            'description': 'Linkified Markdown URLs should use cleaner <http://example.com> syntax.',
+        },
+        {
+            'pattern': 'https://zulip.readthedocs.io/en/latest/[a-zA-Z0-9]',
+            'exclude': {
+                'docs/overview/contributing.md',
+                'docs/overview/readme.md',
+                'docs/README.md',
+                'docs/subsystems/email.md',
+            },
+            'include_only': {'docs/'},
+            'description': "Use relative links (../foo/bar.html) to other documents in docs/",
+        },
+        {
+            'pattern': "su zulip -c [^']",
+            'include_only': {'docs/'},
+            'description': "Always quote arguments using `su zulip -c '` to avoid confusion about how su works.",
+        },
+        {
+            'pattern': r'\][(][^#h]',
+            'include_only': {'README.md', 'CONTRIBUTING.md'},
+            'description': "Use absolute links from docs served by GitHub",
+        },
+        {
+            'pattern': r"\.(py|js)#L\d+",
+            'include_only': {'docs/'},
+            'description': "Don't link directly to line numbers",
+        },
     ],
     max_length=120,
     length_exclude=markdown_docs_length_exclude,
@@ -681,16 +899,19 @@ help_markdown_rules = RuleList(
     langs=['md'],
     rules=[
         *markdown_rules.rules,
-        {'pattern': '[a-z][.][A-Z]',
-         'description': "Likely missing space after end of sentence",
-         'include_only': {'templates/zerver/help/'},
-         },
-        {'pattern': r'\b[rR]ealm[s]?\b',
-         'include_only': {'templates/zerver/help/'},
-         'exclude': {'templates/zerver/help/change-organization-url.md'},
-         'good_lines': ['Organization', 'deactivate_realm', 'realm_filter'],
-         'bad_lines': ['Users are in a realm', 'Realm is the best model'],
-         'description': "Realms are referred to as Organizations in user-facing docs."},
+        {
+            'pattern': '[a-z][.][A-Z]',
+            'description': "Likely missing space after end of sentence",
+            'include_only': {'templates/zerver/help/'},
+        },
+        {
+            'pattern': r'\b[rR]ealm[s]?\b',
+            'include_only': {'templates/zerver/help/'},
+            'exclude': {'templates/zerver/help/change-organization-url.md'},
+            'good_lines': ['Organization', 'deactivate_realm', 'realm_filter'],
+            'bad_lines': ['Users are in a realm', 'Realm is the best model'],
+            'description': "Realms are referred to as Organizations in user-facing docs.",
+        },
     ],
     length_exclude=markdown_docs_length_exclude,
 )
@@ -698,21 +919,23 @@ help_markdown_rules = RuleList(
 puppet_rules = RuleList(
     langs=['pp'],
     rules=[
-        {'pattern': r'(include\s+|\$)zulip::(profile|base)\b',
-         'exclude': {
-             'puppet/zulip/manifests/profile/',
-             'puppet/zulip_ops/manifests/',
-             'puppet/zulip/manifests/dockervoyager.pp',
-         },
-         'description': 'Abstraction layering violation; only profiles should reference profiles or zulip::base',
-         },
-        {'pattern': r'(include\s+|\$)zulip_ops::(profile|base)\b',
-         'exclude': {
-             'puppet/zulip/manifests/',
-             'puppet/zulip_ops/manifests/profile/',
-         },
-         'description': 'Abstraction layering violation; only profiles should reference profiles or zulip_ops::base',
-         },
+        {
+            'pattern': r'(include\s+|\$)zulip::(profile|base)\b',
+            'exclude': {
+                'puppet/zulip/manifests/profile/',
+                'puppet/zulip_ops/manifests/',
+                'puppet/zulip/manifests/dockervoyager.pp',
+            },
+            'description': 'Abstraction layering violation; only profiles should reference profiles or zulip::base',
+        },
+        {
+            'pattern': r'(include\s+|\$)zulip_ops::(profile|base)\b',
+            'exclude': {
+                'puppet/zulip/manifests/',
+                'puppet/zulip_ops/manifests/profile/',
+            },
+            'description': 'Abstraction layering violation; only profiles should reference profiles or zulip_ops::base',
+        },
     ],
 )
 
diff --git a/tools/linter_lib/pyflakes.py b/tools/linter_lib/pyflakes.py
index 1861b81a10..af87c9ec0e 100644
--- a/tools/linter_lib/pyflakes.py
+++ b/tools/linter_lib/pyflakes.py
@@ -7,17 +7,19 @@ from zulint.linters import run_pyflakes
 def check_pyflakes(files: List[str], options: argparse.Namespace) -> bool:
     suppress_patterns = [
         ("scripts/lib/pythonrc.py", "imported but unused"),
-
         # Our ipython startup pythonrc file intentionally imports *
-        ("scripts/lib/pythonrc.py",
-         " import *' used; unable to detect undefined names"),
-
-        ("zerver/views/realm.py", "local variable 'message_retention_days' is assigned to but never used"),
+        ("scripts/lib/pythonrc.py", " import *' used; unable to detect undefined names"),
+        (
+            "zerver/views/realm.py",
+            "local variable 'message_retention_days' is assigned to but never used",
+        ),
         ("settings.py", "settings import *' used; unable to detect undefined names"),
-        ("settings.py", "'from .prod_settings_template import *' used; unable to detect undefined names"),
+        (
+            "settings.py",
+            "'from .prod_settings_template import *' used; unable to detect undefined names",
+        ),
         ("settings.py", "settings.*' imported but unused"),
         ("settings.py", "'.prod_settings_template.*' imported but unused"),
-
         # Sphinx adds `tags` specially to the environment when running conf.py.
         ("docs/conf.py", "undefined name 'tags'"),
     ]
diff --git a/tools/pretty-print-html b/tools/pretty-print-html
index c275c0440f..fda63af79f 100755
--- a/tools/pretty-print-html
+++ b/tools/pretty-print-html
@@ -14,6 +14,7 @@ def clean_html(filenames: List[str]) -> None:
         with open(fn, 'w') as f:
             f.write(phtml)
 
+
 if __name__ == '__main__':
     # If command arguments are provided, we only check those filenames.
     # Otherwise, we display a message
diff --git a/tools/renumber-migrations b/tools/renumber-migrations
index b8b8be2d0d..9e785bbe91 100755
--- a/tools/renumber-migrations
+++ b/tools/renumber-migrations
@@ -17,28 +17,31 @@ def validate_order(order: List[int], length: int) -> None:
             print("Incorrect input")
             sys.exit(1)
 
+
 def renumber_migration(conflicts: List[str], order: List[int], last_correct_migration: str) -> None:
     stack: List[str] = []
     for i in order:
-        if conflicts[i-1][0:4] not in stack:
-            stack.append(conflicts[i-1][0:4])
+        if conflicts[i - 1][0:4] not in stack:
+            stack.append(conflicts[i - 1][0:4])
         else:
             # Replace dependencies with the last correct migration
-            file = fileinput.FileInput('zerver/migrations/' + conflicts[i-1], inplace=True)
+            file = fileinput.FileInput('zerver/migrations/' + conflicts[i - 1], inplace=True)
             for line in file:
                 print(re.sub(r'[\d]+(_[a-z0-9]+)+', last_correct_migration, line), end='')
 
             # Rename the migration indexing at the end
-            new_name = conflicts[i-1].replace(conflicts[i-1][0:4],
-                                              f'{int(last_correct_migration[0:4]) + 1:04}')
-            os.rename('zerver/migrations/' + conflicts[i-1], 'zerver/migrations/' + new_name)
+            new_name = conflicts[i - 1].replace(
+                conflicts[i - 1][0:4], f'{int(last_correct_migration[0:4]) + 1:04}'
+            )
+            os.rename('zerver/migrations/' + conflicts[i - 1], 'zerver/migrations/' + new_name)
 
             last_correct_migration = new_name.replace('.py', '')
 
+
 def resolve_conflicts(conflicts: List[str], files_list: List[str]) -> None:
     print("Conflicting migrations:")
     for i in range(0, len(conflicts)):
-        print(str(i+1) + '. ' + conflicts[i])
+        print(str(i + 1) + '. ' + conflicts[i])
 
     order_input = input("Enter the order in which these migrations should be arranged: ")
     order = list(map(int, order_input.split()))
@@ -49,6 +52,7 @@ def resolve_conflicts(conflicts: List[str], files_list: List[str]) -> None:
     last_correct_migration = last_correct_migration.replace('.py', '')
     renumber_migration(conflicts, order, last_correct_migration)
 
+
 if __name__ == '__main__':
 
     MIGRATIONS_TO_SKIP = {'0209', '0261'}
@@ -69,7 +73,11 @@ if __name__ == '__main__':
                 # migrations graph structure, not the IDs, is what
                 # matters).
                 if migration_number not in MIGRATIONS_TO_SKIP:
-                    conflicts += [file_name for file_name in files_list if file_name.startswith(migration_number)]
+                    conflicts += [
+                        file_name
+                        for file_name in files_list
+                        if file_name.startswith(migration_number)
+                    ]
                     stack.append(migration_number)
 
         if len(conflicts) > 0:
diff --git a/tools/review b/tools/review
index 2d564e7dc7..b93afd55e6 100755
--- a/tools/review
+++ b/tools/review
@@ -10,24 +10,29 @@ def exit(message: str) -> None:
     print(message)
     sys.exit(1)
 
+
 def run(command: List[str]) -> None:
     print('\n>>> ' + ' '.join(map(shlex.quote, command)))
     subprocess.check_call(command)
 
+
 def check_output(command: List[str]) -> str:
     return subprocess.check_output(command, universal_newlines=True)
 
+
 def get_git_branch() -> str:
     command = ['git', 'rev-parse', '--abbrev-ref', 'HEAD']
     output = check_output(command)
     return output.strip()
 
+
 def check_git_pristine() -> None:
     command = ['git', 'status', '--porcelain']
     output = check_output(command)
     if output.strip():
         exit('Git is not pristine:\n' + output)
 
+
 def ensure_on_clean_master() -> None:
     branch = get_git_branch()
     if branch != 'master':
@@ -36,6 +41,7 @@ def ensure_on_clean_master() -> None:
     run(['git', 'fetch', 'upstream', 'master'])
     run(['git', 'rebase', 'upstream/master'])
 
+
 def create_pull_branch(pull_id: int) -> None:
     run(['git', 'fetch', 'upstream', f'pull/{pull_id}/head'])
     run(['git', 'checkout', '-B', f'review-{pull_id}', 'FETCH_HEAD'])
@@ -45,8 +51,8 @@ def create_pull_branch(pull_id: int) -> None:
 
     print()
     print(f'PR: {pull_id}')
-    print(subprocess.check_output(['git', 'log', 'HEAD~..',
-                                   '--pretty=format:Author: %an']))
+    print(subprocess.check_output(['git', 'log', 'HEAD~..', '--pretty=format:Author: %an']))
+
 
 def review_pr() -> None:
     try:
@@ -57,5 +63,6 @@ def review_pr() -> None:
     ensure_on_clean_master()
     create_pull_branch(pull_id)
 
+
 if __name__ == '__main__':
     review_pr()
diff --git a/tools/run-dev.py b/tools/run-dev.py
index fc80b955b0..8b55dd2d6b 100755
--- a/tools/run-dev.py
+++ b/tools/run-dev.py
@@ -37,29 +37,26 @@ behavior, the reverse proxy itself does *not* automatically restart on changes
 to this file.
 '''
 
-parser = argparse.ArgumentParser(description=DESCRIPTION,
-                                 formatter_class=argparse.RawTextHelpFormatter)
+parser = argparse.ArgumentParser(
+    description=DESCRIPTION, formatter_class=argparse.RawTextHelpFormatter
+)
 
-parser.add_argument('--test',
-                    action='store_true',
-                    help='Use the testing database and ports')
-parser.add_argument('--minify',
-                    action='store_true',
-                    help='Minifies assets for testing in dev')
-parser.add_argument('--interface',
-                    help='Set the IP or hostname for the proxy to listen on')
-parser.add_argument('--no-clear-memcached',
-                    action='store_false', dest='clear_memcached',
-                    help='Do not clear memcached on startup')
-parser.add_argument('--streamlined',
-                    action="store_true",
-                    help='Avoid thumbor, etc.')
-parser.add_argument('--force',
-                    action="store_true",
-                    help='Run command despite possible problems.')
-parser.add_argument('--enable-tornado-logging',
-                    action="store_true",
-                    help='Enable access logs from tornado proxy server.')
+parser.add_argument('--test', action='store_true', help='Use the testing database and ports')
+parser.add_argument('--minify', action='store_true', help='Minifies assets for testing in dev')
+parser.add_argument('--interface', help='Set the IP or hostname for the proxy to listen on')
+parser.add_argument(
+    '--no-clear-memcached',
+    action='store_false',
+    dest='clear_memcached',
+    help='Do not clear memcached on startup',
+)
+parser.add_argument('--streamlined', action="store_true", help='Avoid thumbor, etc.')
+parser.add_argument('--force', action="store_true", help='Run command despite possible problems.')
+parser.add_argument(
+    '--enable-tornado-logging',
+    action="store_true",
+    help='Enable access logs from tornado proxy server.',
+)
 options = parser.parse_args()
 
 assert_provisioning_status_ok(options.force)
@@ -130,12 +127,24 @@ if not os.path.exists(os.path.dirname(pid_file_path)):
 with open(pid_file_path, 'w+') as f:
     f.write(str(os.getpgrp()) + "\n")
 
+
 def server_processes() -> List[List[str]]:
     main_cmds = [
-        ['./manage.py', 'rundjangoserver',
-         *manage_args, *runserver_args, f'127.0.0.1:{django_port}'],
-        ['env', 'PYTHONUNBUFFERED=1', './manage.py', 'runtornado',
-         *manage_args, f'127.0.0.1:{tornado_port}'],
+        [
+            './manage.py',
+            'rundjangoserver',
+            *manage_args,
+            *runserver_args,
+            f'127.0.0.1:{django_port}',
+        ],
+        [
+            'env',
+            'PYTHONUNBUFFERED=1',
+            './manage.py',
+            'runtornado',
+            *manage_args,
+            f'127.0.0.1:{tornado_port}',
+        ],
     ]
 
     if options.streamlined:
@@ -145,16 +154,24 @@ def server_processes() -> List[List[str]]:
 
     other_cmds = [
         ['./manage.py', 'process_queue', '--all', *manage_args],
-        ['env', 'PGHOST=127.0.0.1',  # Force password authentication using .pgpass
-         './puppet/zulip/files/postgresql/process_fts_updates', '--quiet'],
+        [
+            'env',
+            'PGHOST=127.0.0.1',  # Force password authentication using .pgpass
+            './puppet/zulip/files/postgresql/process_fts_updates',
+            '--quiet',
+        ],
         ['./manage.py', 'deliver_scheduled_messages'],
-        ['/srv/zulip-thumbor-venv/bin/thumbor', '--conf=./zthumbor/thumbor_settings.py',
-         f'--port={thumbor_port}'],
+        [
+            '/srv/zulip-thumbor-venv/bin/thumbor',
+            '--conf=./zthumbor/thumbor_settings.py',
+            f'--port={thumbor_port}',
+        ],
     ]
 
     # NORMAL (but slower) operation:
     return main_cmds + other_cmds
 
+
 def do_one_time_webpack_compile() -> None:
     # We just need to compile webpack assets once at startup, not run a daemon,
     # in test mode.  Additionally, webpack-dev-server doesn't support running 2
@@ -162,6 +179,7 @@ def do_one_time_webpack_compile() -> None:
     # with a running development server.
     subprocess.check_call(['./tools/webpack', '--quiet', '--test'])
 
+
 def start_webpack_watcher() -> "subprocess.Popen[bytes]":
     webpack_cmd = ['./tools/webpack', '--watch', f'--port={webpack_port}']
     if options.minify:
@@ -176,18 +194,22 @@ def start_webpack_watcher() -> "subprocess.Popen[bytes]":
         webpack_cmd.append("--host=0.0.0.0")
     return subprocess.Popen(webpack_cmd)
 
+
 def transform_url(protocol: str, path: str, query: str, target_port: int, target_host: str) -> str:
     # generate url with target host
     host = ":".join((target_host, str(target_port)))
     # Here we are going to rewrite the path a bit so that it is in parity with
     # what we will have for production
     if path.startswith('/thumbor'):
-        path = path[len('/thumbor'):]
+        path = path[len('/thumbor') :]
     newpath = urlunparse((protocol, host, path, '', query, ''))
     return newpath
 
+
 @gen.engine
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
+def fetch_request(
+    url: str, callback: Any, **kwargs: Any
+) -> "Generator[Callable[..., Any], Any, None]":
     # use large timeouts to handle polling requests
     req = httpclient.HTTPRequest(
         url,
@@ -209,7 +231,8 @@ class BaseHandler(web.RequestHandler):
     target_port: int
 
     def _add_request_headers(
-        self, exclude_lower_headers_list: Sequence[str] = [],
+        self,
+        exclude_lower_headers_list: Sequence[str] = [],
     ) -> httputil.HTTPHeaders:
         headers = httputil.HTTPHeaders()
         for header, v in self.request.headers.get_all():
@@ -309,9 +332,11 @@ class ErrorHandler(BaseHandler):
         self.write('path not supported')
         self.finish()
 
+
 def using_thumbor() -> bool:
     return not options.streamlined
 
+
 class Application(web.Application):
     def __init__(self, enable_logging: bool = False) -> None:
         handlers = [
@@ -339,6 +364,7 @@ def shutdown_handler(*args: Any, **kwargs: Any) -> None:
     else:
         io_loop.stop()
 
+
 def print_listeners() -> None:
     external_host = os.getenv('EXTERNAL_HOST', f'localhost:{proxy_port}')
     print(f"\nStarting Zulip on:\n\n\t{CYAN}http://{external_host}/{ENDC}\n\nInternal ports:")
@@ -358,6 +384,7 @@ def print_listeners() -> None:
         print(f'   {port}: {label}')
     print()
 
+
 children = []
 
 try:
diff --git a/tools/run-mypy b/tools/run-mypy
index a4c33f06cb..8ee8a0abd9 100755
--- a/tools/run-mypy
+++ b/tools/run-mypy
@@ -18,20 +18,19 @@ stubs/
 """.split()
 
 parser = argparse.ArgumentParser(description="Run mypy on files tracked by git.")
-parser.add_argument('targets', nargs='*',
-                    help="files and directories to check (default: .)")
-parser.add_argument('--version', action='store_true',
-                    help="show mypy version information and exit")
-parser.add_argument('-m', '--modified', action='store_true',
-                    help="check only modified files")
-parser.add_argument('--scripts-only', action='store_true',
-                    help="only check extensionless python scripts")
-parser.add_argument('-a', '--all', action='store_true',
-                    help="check all files, bypassing the default exclude list")
-parser.add_argument('--force', action="store_true",
-                    help="run tests despite possible provisioning problems")
-parser.add_argument("--quiet", action="store_true",
-                    help="suppress mypy summary output")
+parser.add_argument('targets', nargs='*', help="files and directories to check (default: .)")
+parser.add_argument('--version', action='store_true', help="show mypy version information and exit")
+parser.add_argument('-m', '--modified', action='store_true', help="check only modified files")
+parser.add_argument(
+    '--scripts-only', action='store_true', help="only check extensionless python scripts"
+)
+parser.add_argument(
+    '-a', '--all', action='store_true', help="check all files, bypassing the default exclude list"
+)
+parser.add_argument(
+    '--force', action="store_true", help="run tests despite possible provisioning problems"
+)
+parser.add_argument("--quiet", action="store_true", help="suppress mypy summary output")
 args = parser.parse_args()
 
 assert_provisioning_status_ok(args.force)
@@ -55,14 +54,18 @@ if args.all:
 
 # find all non-excluded files in current directory
 files_dict = lister.list_files(
-    targets=args.targets, ftypes=['py', 'pyi'],
-    use_shebang=True, modified_only=args.modified,
-    exclude=exclude, group_by_ftype=True,
+    targets=args.targets,
+    ftypes=['py', 'pyi'],
+    use_shebang=True,
+    modified_only=args.modified,
+    exclude=exclude,
+    group_by_ftype=True,
     extless_only=args.scripts_only,
 )
 pyi_files = list(files_dict['pyi'])
-python_files = [fpath for fpath in files_dict['py']
-                if not fpath.endswith('.py') or fpath + 'i' not in pyi_files]
+python_files = [
+    fpath for fpath in files_dict['py'] if not fpath.endswith('.py') or fpath + 'i' not in pyi_files
+]
 if not python_files and not pyi_files:
     print("There are no files to run mypy on.")
     sys.exit(0)
diff --git a/tools/setup/emoji/build_emoji b/tools/setup/emoji/build_emoji
index 33b7ab558d..3291470a24 100755
--- a/tools/setup/emoji/build_emoji
+++ b/tools/setup/emoji/build_emoji
@@ -78,6 +78,7 @@ EMOJI_POS_INFO_TEMPLATE = """\
 # change directory
 os.chdir(EMOJI_SCRIPT_DIR_PATH)
 
+
 def main() -> None:
     if not os.access(EMOJI_CACHE_PATH, os.W_OK):
         # Note: In production, this block will fail, since we don't
@@ -112,14 +113,17 @@ def main() -> None:
     for filename in to_remove:
         os.remove(os.path.join(TARGET_EMOJI_STYLES, filename))
 
+
 def percent(f: float) -> str:
     return f'{f * 100:0.3f}%'
 
+
 def get_square_size(emoji_data: List[Dict[str, Any]]) -> int:
     """
     Spritesheets are usually NxN squares, and we have to
     infer N from the sheet_x/sheet_y values of emojis.
     """
+
     def get_offsets(emoji_data: List[Dict[str, Any]]) -> Iterator[int]:
         for emoji_dict in emoji_data:
             yield emoji_dict['sheet_x']
@@ -132,10 +136,10 @@ def get_square_size(emoji_data: List[Dict[str, Any]]) -> int:
     n = max(get_offsets(emoji_data)) + 1
     return n
 
-def generate_sprite_css_files(cache_path: str,
-                              emoji_data: List[Dict[str, Any]],
-                              emojiset: str,
-                              alt_name: str) -> None:
+
+def generate_sprite_css_files(
+    cache_path: str, emoji_data: List[Dict[str, Any]], emojiset: str, alt_name: str
+) -> None:
     """
     Spritesheets are usually NxN squares.
     """
@@ -224,10 +228,11 @@ def generate_sprite_css_files(cache_path: str,
             ),
         )
 
+
 def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None:
-    def ensure_emoji_image(emoji_dict: Dict[str, Any],
-                           src_emoji_farm: str,
-                           target_emoji_farm: str) -> None:
+    def ensure_emoji_image(
+        emoji_dict: Dict[str, Any], src_emoji_farm: str, target_emoji_farm: str
+    ) -> None:
         # We use individual images from emoji farm for rendering emojis
         # in notification messages. We have a custom emoji formatter in
         # notifications processing code that converts `span` tags to
@@ -239,9 +244,9 @@ def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None
         dst_file = os.path.join(target_emoji_farm, img_file_name)
         shutil.copy2(src_file, dst_file)
 
-    def setup_emoji_farm(emojiset: str,
-                         emoji_data: List[Dict[str, Any]],
-                         alt_name: Optional[str]=None) -> None:
+    def setup_emoji_farm(
+        emojiset: str, emoji_data: List[Dict[str, Any]], alt_name: Optional[str] = None
+    ) -> None:
         # `alt_name` is an optional parameter that we use to avoid duplicating below
         # code. It is only used while setting up google-blob emojiset as it is just
         # a wrapper for an older version of emoji-datasource package due to which we
@@ -251,7 +256,8 @@ def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None
 
         # Copy individual emoji images from npm packages.
         src_emoji_farm = os.path.join(
-            NODE_MODULES_PATH, 'emoji-datasource-' + emojiset, 'img', alt_name, '64')
+            NODE_MODULES_PATH, 'emoji-datasource-' + emojiset, 'img', alt_name, '64'
+        )
         target_emoji_farm = os.path.join(cache_path, 'images-' + emojiset + '-64')
         os.makedirs(target_emoji_farm, exist_ok=True)
         print("Copying individual image files...")
@@ -281,16 +287,17 @@ def setup_emoji_farms(cache_path: str, emoji_data: List[Dict[str, Any]]) -> None
         setup_emoji_farm(emojiset, emoji_data)
 
     # Set up old Google "blobs" emojiset.
-    GOOGLE_BLOB_EMOJI_DATA_PATH = os.path.join(NODE_MODULES_PATH,
-                                               'emoji-datasource-google-blob',
-                                               'emoji.json')
+    GOOGLE_BLOB_EMOJI_DATA_PATH = os.path.join(
+        NODE_MODULES_PATH, 'emoji-datasource-google-blob', 'emoji.json'
+    )
     with open(GOOGLE_BLOB_EMOJI_DATA_PATH, "rb") as fp:
         blob_emoji_data = orjson.loads(fp.read())
     setup_emoji_farm('google-blob', blob_emoji_data, 'google')
 
-def setup_old_emoji_farm(cache_path: str,
-                         emoji_map: Dict[str, str],
-                         emoji_data: List[Dict[str, Any]]) -> None:
+
+def setup_old_emoji_farm(
+    cache_path: str, emoji_map: Dict[str, str], emoji_data: List[Dict[str, Any]]
+) -> None:
     # Code for setting up old emoji farm.
     os.chdir(cache_path)
     emoji_cache_path = os.path.join(cache_path, 'images', 'emoji')
@@ -320,6 +327,7 @@ def setup_old_emoji_farm(cache_path: str,
         except FileExistsError:
             pass
 
+
 def generate_map_files(cache_path: str, emoji_catalog: Dict[str, List[str]]) -> None:
     # This function generates the main data file about emoji that are
     # consumed by the webapp, mobile apps, Markdown processor, etc.
@@ -329,13 +337,18 @@ def generate_map_files(cache_path: str, emoji_catalog: Dict[str, List[str]]) ->
 
     EMOJI_CODES_FILE_PATH = os.path.join(cache_path, 'emoji_codes.json')
     with open(EMOJI_CODES_FILE_PATH, 'wb') as emoji_codes_file:
-        emoji_codes_file.write(orjson.dumps({
-            'names': names,
-            'name_to_codepoint': name_to_codepoint,
-            'codepoint_to_name': codepoint_to_name,
-            'emoji_catalog': emoji_catalog,
-            'emoticon_conversions': EMOTICON_CONVERSIONS,
-        }))
+        emoji_codes_file.write(
+            orjson.dumps(
+                {
+                    'names': names,
+                    'name_to_codepoint': name_to_codepoint,
+                    'codepoint_to_name': codepoint_to_name,
+                    'emoji_catalog': emoji_catalog,
+                    'emoticon_conversions': EMOTICON_CONVERSIONS,
+                }
+            )
+        )
+
 
 def dump_emojis(cache_path: str) -> None:
     with open('emoji_map.json', "rb") as emoji_map_file:
@@ -357,5 +370,6 @@ def dump_emojis(cache_path: str) -> None:
     # Generate various map files.
     generate_map_files(cache_path, emoji_catalog)
 
+
 if __name__ == "__main__":
     main()
diff --git a/tools/setup/emoji/emoji_names.py b/tools/setup/emoji/emoji_names.py
index 6b52e10db4..4c32e9f380 100644
--- a/tools/setup/emoji/emoji_names.py
+++ b/tools/setup/emoji/emoji_names.py
@@ -114,7 +114,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     # zip_it from https://mashable.com/2015/10/23/ios-9-1-emoji-guide/,
     # lips_sealed from https://emojipedia.org/zipper-mouth-face/, rest seemed
     # like reasonable additions
-    '1f910': {'canonical_name': 'silence', 'aliases': ['quiet', 'hush', 'zip_it', 'lips_are_sealed']},
+    '1f910': {
+        'canonical_name': 'silence',
+        'aliases': ['quiet', 'hush', 'zip_it', 'lips_are_sealed'],
+    },
     # queasy seemed like a natural addition
     '1f922': {'canonical_name': 'nauseated', 'aliases': ['queasy']},
     '1f927': {'canonical_name': 'sneezing', 'aliases': []},
@@ -123,14 +126,20 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     # flu from https://mashable.com/2015/10/23/ios-9-1-emoji-guide/, sick from
     # https://emojipedia.org/face-with-thermometer/, face_with_thermometer so
     # it shows up in typeahead (thermometer taken by Objects/82)
-    '1f912': {'canonical_name': 'sick', 'aliases': ['flu', 'face_with_thermometer', 'ill', 'fever']},
+    '1f912': {
+        'canonical_name': 'sick',
+        'aliases': ['flu', 'face_with_thermometer', 'ill', 'fever'],
+    },
     # hurt and injured from https://beebom.com/emoji-meanings/. Chose hurt as
     # primary since I think it can cover a wider set of things (e.g. emotional
     # hurt)
     '1f915': {'canonical_name': 'hurt', 'aliases': ['head_bandage', 'injured']},
     # devil from https://emojipedia.org/smiling-face-with-horns/,
     # smiling_face_with_horns from gemoji/Unicode
-    '1f608': {'canonical_name': 'smiling_devil', 'aliases': ['smiling_imp', 'smiling_face_with_horns']},
+    '1f608': {
+        'canonical_name': 'smiling_devil',
+        'aliases': ['smiling_imp', 'smiling_face_with_horns'],
+    },
     # angry_devil from https://beebom.com/emoji-meanings/
     '1f47f': {'canonical_name': 'devil', 'aliases': ['imp', 'angry_devil']},
     '1f479': {'canonical_name': 'ogre', 'aliases': []},
@@ -141,7 +150,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f47b': {'canonical_name': 'ghost', 'aliases': ['boo', 'spooky', 'haunted']},
     '1f480': {'canonical_name': 'skull', 'aliases': []},
     # alternates seemed like reasonable additions
-    '2620': {'canonical_name': 'skull_and_crossbones', 'aliases': ['pirate', 'death', 'hazard', 'toxic', 'poison']},
+    '2620': {
+        'canonical_name': 'skull_and_crossbones',
+        'aliases': ['pirate', 'death', 'hazard', 'toxic', 'poison'],
+    },
     # ufo seemed like a natural addition
     '1f47d': {'canonical_name': 'alien', 'aliases': ['ufo']},
     '1f47e': {'canonical_name': 'space_invader', 'aliases': []},
@@ -195,7 +207,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f447': {'canonical_name': 'point_down', 'aliases': []},
     # People/114 is point_up. These seemed better than naming it point_up_2,
     # and point_of_information means it will come up in typeahead for 'point'
-    '261d': {'canonical_name': 'wait_one_second', 'aliases': ['point_of_information', 'asking_a_question']},
+    '261d': {
+        'canonical_name': 'wait_one_second',
+        'aliases': ['point_of_information', 'asking_a_question'],
+    },
     '270b': {'canonical_name': 'hand', 'aliases': ['raised_hand']},
     # seems like best emoji for stop, raised_back_of_hand doesn't seem that
     # useful
@@ -327,7 +342,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     # safety and invincibility inspired by
     # https://mashable.com/2015/10/23/ios-9-1-emoji-guide/. hard_hat and
     # rescue_worker seem like good additions
-    '26d1': {'canonical_name': 'helmet', 'aliases': ['hard_hat', 'rescue_worker', 'safety_first', 'invincible']},
+    '26d1': {
+        'canonical_name': 'helmet',
+        'aliases': ['hard_hat', 'rescue_worker', 'safety_first', 'invincible'],
+    },
     # backpack from gemoji, dominates satchel on Google Trends
     '1f392': {'canonical_name': 'backpack', 'aliases': ['satchel']},
     '1f45d': {'canonical_name': 'pouch', 'aliases': []},
@@ -529,7 +547,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '26c5': {'canonical_name': 'partly_sunny', 'aliases': ['partly_cloudy']},
     '1f325': {'canonical_name': 'cloudy', 'aliases': []},
     # sunshowers seems like a more fun term
-    '1f326': {'canonical_name': 'sunshowers', 'aliases': ['sun_and_rain', 'partly_sunny_with_rain']},
+    '1f326': {
+        'canonical_name': 'sunshowers',
+        'aliases': ['sun_and_rain', 'partly_sunny_with_rain'],
+    },
     # pride and lgbtq seem like reasonable additions
     '1f308': {'canonical_name': 'rainbow', 'aliases': ['pride', 'lgbtq']},
     # overcast seems like a good addition
@@ -622,7 +643,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f354': {'canonical_name': 'hamburger', 'aliases': []},
     '1f35f': {'canonical_name': 'fries', 'aliases': []},
     # https://emojipedia.org/stuffed-flatbread/
-    '1f959': {'canonical_name': 'doner_kebab', 'aliases': ['shawarma', 'souvlaki', 'stuffed_flatbread']},
+    '1f959': {
+        'canonical_name': 'doner_kebab',
+        'aliases': ['shawarma', 'souvlaki', 'stuffed_flatbread'],
+    },
     '1f32e': {'canonical_name': 'taco', 'aliases': []},
     '1f32f': {'canonical_name': 'burrito', 'aliases': []},
     '1f957': {'canonical_name': 'salad', 'aliases': []},
@@ -689,7 +713,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     # Seems like the best emoji for hungry and meal. fork_and_knife_and_plate
     # is from gemoji/Unicode, and I think is better than the shorter iamcal
     # version in this case. The rest just seemed like good additions.
-    '1f37d': {'canonical_name': 'hungry', 'aliases': ['meal', 'table_setting', 'fork_and_knife_with_plate', 'lets_eat']},
+    '1f37d': {
+        'canonical_name': 'hungry',
+        'aliases': ['meal', 'table_setting', 'fork_and_knife_with_plate', 'lets_eat'],
+    },
     # most people interested in this sport call it football
     '26bd': {'canonical_name': 'football', 'aliases': ['soccer']},
     '1f3c0': {'canonical_name': 'basketball', 'aliases': []},
@@ -831,7 +858,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     # the iamcal names
     '1f69a': {'canonical_name': 'moving_truck', 'aliases': []},
     # see Places/11 for truck. Rest seem reasonable additions.
-    '1f69b': {'canonical_name': 'truck', 'aliases': ['tractor-trailer', 'big_rig', 'semi_truck', 'transport_truck']},
+    '1f69b': {
+        'canonical_name': 'truck',
+        'aliases': ['tractor-trailer', 'big_rig', 'semi_truck', 'transport_truck'],
+    },
     '1f69c': {'canonical_name': 'tractor', 'aliases': []},
     # kick_scooter and scooter seem better for Places/14 and Places /16 than
     # scooter and motor_scooter.
@@ -873,7 +903,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f687': {'canonical_name': 'subway', 'aliases': []},
     # all the glyphs of oncoming vehicles have names like oncoming_*. The
     # alternate names are to parallel the alternates to Places/27.
-    '1f68a': {'canonical_name': 'oncoming_tram', 'aliases': ['oncoming_streetcar', 'oncoming_trolley']},
+    '1f68a': {
+        'canonical_name': 'oncoming_tram',
+        'aliases': ['oncoming_streetcar', 'oncoming_trolley'],
+    },
     '1f689': {'canonical_name': 'station', 'aliases': []},
     '1f681': {'canonical_name': 'helicopter', 'aliases': []},
     '1f6e9': {'canonical_name': 'small_airplane', 'aliases': []},
@@ -1067,7 +1100,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f6e2': {'canonical_name': 'oil_drum', 'aliases': ['commodities']},
     # losing money from https://emojipedia.org/money-with-wings/,
     # easy_come_easy_go seems like a reasonable addition
-    '1f4b8': {'canonical_name': 'losing_money', 'aliases': ['easy_come_easy_go', 'money_with_wings']},
+    '1f4b8': {
+        'canonical_name': 'losing_money',
+        'aliases': ['easy_come_easy_go', 'money_with_wings'],
+    },
     # I think the _bills, _banknotes etc versions of these are arguably more
     # fun to use in chat, and certainly match the glyphs better
     '1f4b5': {'canonical_name': 'dollar_bills', 'aliases': []},
@@ -1130,9 +1166,15 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f511': {'canonical_name': 'key', 'aliases': []},
     # encrypted from https://www.iemoji.com/view/emoji/1081/objects/old-key,
     # secret from https://mashable.com/2015/10/23/ios-9-1-emoji-guide/
-    '1f5dd': {'canonical_name': 'secret', 'aliases': ['dungeon', 'old_key', 'encrypted', 'clue', 'hint']},
+    '1f5dd': {
+        'canonical_name': 'secret',
+        'aliases': ['dungeon', 'old_key', 'encrypted', 'clue', 'hint'],
+    },
     '1f6aa': {'canonical_name': 'door', 'aliases': []},
-    '1f6cb': {'canonical_name': 'living_room', 'aliases': ['furniture', 'couch_and_lamp', 'lifestyles']},
+    '1f6cb': {
+        'canonical_name': 'living_room',
+        'aliases': ['furniture', 'couch_and_lamp', 'lifestyles'],
+    },
     '1f6cf': {'canonical_name': 'bed', 'aliases': ['bedroom']},
     # guestrooms from iemoji, would add hotel but taken by Places/94
     '1f6cc': {'canonical_name': 'in_bed', 'aliases': ['accommodations', 'guestrooms']},
@@ -1226,8 +1268,14 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f50d': {'canonical_name': 'search', 'aliases': ['find', 'magnifying_glass']},
     # '1f50e': {'canonical_name': 'X', 'aliases': ['mag_right']},
     # https://emojipedia.org/lock-with-ink-pen/
-    '1f50f': {'canonical_name': 'privacy', 'aliases': ['key_signing', 'digital_security', 'protected']},
-    '1f510': {'canonical_name': 'secure', 'aliases': ['lock_with_key', 'safe', 'commitment', 'loyalty']},
+    '1f50f': {
+        'canonical_name': 'privacy',
+        'aliases': ['key_signing', 'digital_security', 'protected'],
+    },
+    '1f510': {
+        'canonical_name': 'secure',
+        'aliases': ['lock_with_key', 'safe', 'commitment', 'loyalty'],
+    },
     '1f512': {'canonical_name': 'locked', 'aliases': []},
     '1f513': {'canonical_name': 'unlocked', 'aliases': []},
     # seems the best glyph for love and love_you
@@ -1329,7 +1377,10 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     '1f506': {'canonical_name': 'brightness', 'aliases': ['high_brightness']},
     '303d': {'canonical_name': 'part_alternation', 'aliases': []},
     '26a0': {'canonical_name': 'warning', 'aliases': ['caution', 'danger']},
-    '1f6b8': {'canonical_name': 'children_crossing', 'aliases': ['school_crossing', 'drive_with_care']},
+    '1f6b8': {
+        'canonical_name': 'children_crossing',
+        'aliases': ['school_crossing', 'drive_with_care'],
+    },
     '1f531': {'canonical_name': 'trident', 'aliases': []},
     '269c': {'canonical_name': 'fleur_de_lis', 'aliases': []},
     '1f530': {'canonical_name': 'beginner', 'aliases': []},
diff --git a/tools/setup/emoji/emoji_setup_utils.py b/tools/setup/emoji/emoji_setup_utils.py
index c629b8b28d..f09e9200a0 100644
--- a/tools/setup/emoji/emoji_setup_utils.py
+++ b/tools/setup/emoji/emoji_setup_utils.py
@@ -10,27 +10,27 @@ EMOJISETS = ['google', 'twitter']
 # farm. `remapped_emojis` is a map that contains a mapping of their name in the old
 # emoji farm to their name in the new emoji farm.
 REMAPPED_EMOJIS = {
-    "0023": "0023-20e3",         # Hash
-    "0030": "0030-20e3",         # Zero
-    "0031": "0031-20e3",         # One
-    "0032": "0032-20e3",         # Two
-    "0033": "0033-20e3",         # Three
-    "0034": "0034-20e3",         # Four
-    "0035": "0035-20e3",         # Five
-    "0036": "0036-20e3",         # Six
-    "0037": "0037-20e3",         # Seven
-    "0038": "0038-20e3",         # Eight
-    "0039": "0039-20e3",         # Nine
-    "1f1e8": "1f1e8-1f1f3",      # cn
-    "1f1e9": "1f1e9-1f1ea",      # de
-    "1f1ea": "1f1ea-1f1f8",      # es
-    "1f1eb": "1f1eb-1f1f7",      # fr
-    "1f1ec": "1f1ec-1f1e7",      # gb/us
-    "1f1ee": "1f1ee-1f1f9",      # it
-    "1f1ef": "1f1ef-1f1f5",      # jp
-    "1f1f0": "1f1f0-1f1f7",      # kr
-    "1f1f7": "1f1f7-1f1fa",      # ru
-    "1f1fa": "1f1fa-1f1f8",      # us
+    "0023": "0023-20e3",  # Hash
+    "0030": "0030-20e3",  # Zero
+    "0031": "0031-20e3",  # One
+    "0032": "0032-20e3",  # Two
+    "0033": "0033-20e3",  # Three
+    "0034": "0034-20e3",  # Four
+    "0035": "0035-20e3",  # Five
+    "0036": "0036-20e3",  # Six
+    "0037": "0037-20e3",  # Seven
+    "0038": "0038-20e3",  # Eight
+    "0039": "0039-20e3",  # Nine
+    "1f1e8": "1f1e8-1f1f3",  # cn
+    "1f1e9": "1f1e9-1f1ea",  # de
+    "1f1ea": "1f1ea-1f1f8",  # es
+    "1f1eb": "1f1eb-1f1f7",  # fr
+    "1f1ec": "1f1ec-1f1e7",  # gb/us
+    "1f1ee": "1f1ee-1f1f9",  # it
+    "1f1ef": "1f1ef-1f1f5",  # jp
+    "1f1f0": "1f1f0-1f1f7",  # kr
+    "1f1f7": "1f1f7-1f1fa",  # ru
+    "1f1fa": "1f1fa-1f1f8",  # us
 }
 
 # Emoticons and which emoji they should become. Duplicate emoji are allowed.
@@ -50,6 +50,7 @@ EMOTICON_CONVERSIONS = {
     ':P': ':stuck_out_tongue:',
 }
 
+
 def emoji_names_for_picker(emoji_name_maps: Dict[str, Dict[str, Any]]) -> List[str]:
     emoji_names: List[str] = []
     for emoji_code, name_info in emoji_name_maps.items():
@@ -58,6 +59,7 @@ def emoji_names_for_picker(emoji_name_maps: Dict[str, Dict[str, Any]]) -> List[s
 
     return sorted(emoji_names)
 
+
 def get_emoji_code(emoji_dict: Dict[str, Any]) -> str:
     # Starting from version 4.0.0, `emoji_datasource` package has started to
     # add an emoji presentation variation selector for certain emojis which
@@ -72,11 +74,13 @@ def get_emoji_code(emoji_dict: Dict[str, Any]) -> str:
     emoji_code = emoji_dict.get("non_qualified") or emoji_dict["unified"]
     return emoji_code.lower()
 
+
 # Returns a dict from categories to list of codepoints. The list of
 # codepoints are sorted according to the `sort_order` as defined in
 # `emoji_data`.
-def generate_emoji_catalog(emoji_data: List[Dict[str, Any]],
-                           emoji_name_maps: Dict[str, Dict[str, Any]]) -> Dict[str, List[str]]:
+def generate_emoji_catalog(
+    emoji_data: List[Dict[str, Any]], emoji_name_maps: Dict[str, Dict[str, Any]]
+) -> Dict[str, List[str]]:
     sort_order: Dict[str, int] = {}
     emoji_catalog: Dict[str, List[str]] = defaultdict(list)
 
@@ -95,6 +99,7 @@ def generate_emoji_catalog(emoji_data: List[Dict[str, Any]],
 
     return dict(emoji_catalog)
 
+
 # Use only those names for which images are present in all
 # the emoji sets so that we can switch emoji sets seamlessly.
 def emoji_is_universal(emoji_dict: Dict[str, Any]) -> bool:
@@ -103,12 +108,14 @@ def emoji_is_universal(emoji_dict: Dict[str, Any]) -> bool:
             return False
     return True
 
+
 def generate_codepoint_to_name_map(emoji_name_maps: Dict[str, Dict[str, Any]]) -> Dict[str, str]:
     codepoint_to_name: Dict[str, str] = {}
     for emoji_code, name_info in emoji_name_maps.items():
         codepoint_to_name[emoji_code] = name_info["canonical_name"]
     return codepoint_to_name
 
+
 def generate_name_to_codepoint_map(emoji_name_maps: Dict[str, Dict[str, Any]]) -> Dict[str, str]:
     name_to_codepoint = {}
     for emoji_code, name_info in emoji_name_maps.items():
diff --git a/tools/setup/emoji/export_emoji_names_to_csv b/tools/setup/emoji/export_emoji_names_to_csv
index 0adc447729..7c96900781 100755
--- a/tools/setup/emoji/export_emoji_names_to_csv
+++ b/tools/setup/emoji/export_emoji_names_to_csv
@@ -41,11 +41,14 @@ category_index = {
     'Skin Tones': '9',
 }
 
-name_entry_regex = re.compile(r"'(?P<emoji_code>[a-z0-9-]+)': "
-                              r"{'canonical_name': '(?P<canonical_name>[+-]?[a-z0-9_X-]+)',[\n ]+"
-                              r"'aliases': \[(?P<aliases>('([+-]?[a-z0-9_, X-]+)'[, ]{0,2})*)\]},")
+name_entry_regex = re.compile(
+    r"'(?P<emoji_code>[a-z0-9-]+)': "
+    r"{'canonical_name': '(?P<canonical_name>[+-]?[a-z0-9_X-]+)',[\n ]+"
+    r"'aliases': \[(?P<aliases>('([+-]?[a-z0-9_, X-]+)'[, ]{0,2})*)\]},"
+)
 explanation_regex = re.compile(r"    # (?P<explanation_line>[^\r\n\t]+)")
 
+
 def prepare_sorting_info() -> None:
     emoji_data: List[Dict[str, Any]] = []
     with open(EMOJI_DATA_PATH, "rb") as fp:
@@ -59,33 +62,45 @@ def prepare_sorting_info() -> None:
             'sort_order': sort_order.rjust(3, '0'),
         }
 
+
 def get_sorting_info(emoji_code: str) -> str:
     category = sorting_info[emoji_code]['category']
     category = category_index[category] + '-' + category
     sort_order = sorting_info[emoji_code]['sort_order']
     return ' '.join([category, sort_order])
 
+
 def prepare_explanation(explanation_lines: List[str]) -> str:
     return ' '.join(explanation_lines)
 
+
 def prepare_aliases(captured_aliases: str) -> str:
     aliases = []
     for alias in captured_aliases.split(', '):
         aliases.append(alias.strip("'"))
     return ', '.join(aliases)
 
+
 def main() -> None:
-    description = ("This script is used for exporting `emoji_names.py` to comma separated file. It "
-                   "takes the path of output csv file and path to `emoji_names.py` as arguments.")
+    description = (
+        "This script is used for exporting `emoji_names.py` to comma separated file. It "
+        "takes the path of output csv file and path to `emoji_names.py` as arguments."
+    )
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument(
-        "--input-file", dest="input_file_path", metavar="<path>",
+        "--input-file",
+        dest="input_file_path",
+        metavar="<path>",
         default=os.path.join(TOOLS_DIR_PATH, "setup", "emoji", "emoji_names.py"),
-        help="Path to the file from which data is to be read.")
+        help="Path to the file from which data is to be read.",
+    )
     parser.add_argument(
-        "--output-file", dest="output_file_path", metavar="<path>",
+        "--output-file",
+        dest="output_file_path",
+        metavar="<path>",
         default=os.path.join(TOOLS_DIR_PATH, "setup", "emoji", "emoji_names.csv"),
-        help="Path to the output csv file.")
+        help="Path to the output csv file.",
+    )
 
     args = parser.parse_args()
     prepare_sorting_info()
@@ -100,13 +115,15 @@ def main() -> None:
                 canonical_name = match.group('canonical_name')
                 aliases = prepare_aliases(match.group('aliases'))
                 explanation = prepare_explanation(explanation_lines)
-                output_data.append([
-                    emoji_code,
-                    sort_info,
-                    canonical_name,
-                    aliases,
-                    explanation,
-                ])
+                output_data.append(
+                    [
+                        emoji_code,
+                        sort_info,
+                        canonical_name,
+                        aliases,
+                        explanation,
+                    ]
+                )
                 explanation_lines = []
                 continue
 
@@ -125,5 +142,6 @@ def main() -> None:
     fp.truncate(fp.tell() - line_sep_len)
     fp.close()
 
+
 if __name__ == "__main__":
     main()
diff --git a/tools/setup/emoji/generate_emoji_names_table b/tools/setup/emoji/generate_emoji_names_table
index 2dee0c6c28..c36d48b43a 100755
--- a/tools/setup/emoji/generate_emoji_names_table
+++ b/tools/setup/emoji/generate_emoji_names_table
@@ -16,7 +16,9 @@ from emoji_setup_utils import EMOJISETS, emoji_is_universal, get_emoji_code
 TOOLS_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 ZULIP_PATH = os.path.dirname(TOOLS_DIR)
 EMOJI_MAP_FILE = os.path.join(TOOLS_DIR, 'setup', 'emoji', 'emoji_map.json')
-UNIFIED_REACTIONS_FILE = os.path.join(ZULIP_PATH, 'zerver', 'management', 'data', 'unified_reactions.json')
+UNIFIED_REACTIONS_FILE = os.path.join(
+    ZULIP_PATH, 'zerver', 'management', 'data', 'unified_reactions.json'
+)
 EMOJI_DATA_FILE = os.path.join(ZULIP_PATH, 'node_modules', 'emoji-datasource-google', 'emoji.json')
 EMOJI_CACHE = os.path.join(ZULIP_PATH, 'static', 'generated', 'emoji')
 OUTPUT_FILE = os.path.join(EMOJI_CACHE, 'emoji_names_table.html')
@@ -124,6 +126,7 @@ emoji_code_to_iamcal_names: Dict[str, str] = {}
 emoji_code_to_gemoji_names: Dict[str, str] = {}
 emoji_collection: Dict[str, List[Dict[str, Any]]] = {category: [] for category in SORTED_CATEGORIES}
 
+
 def generate_emoji_code_to_emoji_names_maps() -> None:
     # Prepare gemoji names map.
     reverse_unified_reactions_map: Dict[str, List[str]] = {}
@@ -135,7 +138,9 @@ def generate_emoji_code_to_emoji_names_maps() -> None:
             reverse_unified_reactions_map[emoji_code] = [name]
 
     for emoji_code in reverse_unified_reactions_map:
-        emoji_code_to_gemoji_names[emoji_code] = ", ".join(reverse_unified_reactions_map[emoji_code])
+        emoji_code_to_gemoji_names[emoji_code] = ", ".join(
+            reverse_unified_reactions_map[emoji_code]
+        )
 
     # Prepare iamcal names map.
     for emoji_dict in EMOJI_DATA:
@@ -150,9 +155,11 @@ def generate_emoji_code_to_emoji_names_maps() -> None:
         names.extend(aliases)
         emoji_code_to_zulip_names[emoji_code] = ", ".join(names)
 
+
 def get_sorting_info(category: str, sort_order: int) -> str:
     return " ".join([category, str(sort_order)])
 
+
 def get_images_html(emoji_code: str) -> str:
     images_html = ''
     for emojiset in EMOJISETS:
@@ -163,6 +170,7 @@ def get_images_html(emoji_code: str) -> str:
 
     return images_html
 
+
 def generate_emoji_collection() -> None:
     generate_emoji_code_to_emoji_names_maps()
     # Prepare `emoji_collection`.
@@ -172,22 +180,25 @@ def generate_emoji_collection() -> None:
         category = emoji_dict["category"]
         emoji_code = get_emoji_code(emoji_dict)
         sort_order = emoji_dict["sort_order"]
-        emoji_collection[category].append({
-            "category": category,
-            "emoji_code": emoji_code,
-            "images_html": get_images_html(emoji_code),
-            "gemoji_names": emoji_code_to_gemoji_names.get(emoji_code, ""),
-            "iamcal_names": emoji_code_to_iamcal_names.get(emoji_code, ""),
-            "zulip_names": emoji_code_to_zulip_names.get(emoji_code, ""),
-            "unicode_name": (emoji_dict["name"] or "").lower(),
-            "sort_order": sort_order,
-            "sorting_info": get_sorting_info(category, sort_order),
-        })
+        emoji_collection[category].append(
+            {
+                "category": category,
+                "emoji_code": emoji_code,
+                "images_html": get_images_html(emoji_code),
+                "gemoji_names": emoji_code_to_gemoji_names.get(emoji_code, ""),
+                "iamcal_names": emoji_code_to_iamcal_names.get(emoji_code, ""),
+                "zulip_names": emoji_code_to_zulip_names.get(emoji_code, ""),
+                "unicode_name": (emoji_dict["name"] or "").lower(),
+                "sort_order": sort_order,
+                "sorting_info": get_sorting_info(category, sort_order),
+            }
+        )
 
     # Sort `emoji_collection`.
     for category in SORTED_CATEGORIES:
         emoji_collection[category].sort(key=lambda x: x['sort_order'])
 
+
 def main() -> None:
     generate_emoji_collection()
 
@@ -197,13 +208,18 @@ def main() -> None:
             tbody += TABLE_ROW_TEMPLATE.format(**emoji_entry)
 
     with open(OUTPUT_FILE, 'w') as fp:
-        fp.write(EMOJI_LISTING_TEMPLATE.format(
-            tbody=tbody,
-            table_css=TABLE_CSS,
-        ))
+        fp.write(
+            EMOJI_LISTING_TEMPLATE.format(
+                tbody=tbody,
+                table_css=TABLE_CSS,
+            )
+        )
+
+    print(
+        "Done! Open http://localhost:9991/static/generated/emoji/emoji_names_table.html "
+        "to view(after starting the dev server)."
+    )
 
-    print("Done! Open http://localhost:9991/static/generated/emoji/emoji_names_table.html "
-          "to view(after starting the dev server).")
 
 if __name__ == "__main__":
     main()
diff --git a/tools/setup/emoji/import_emoji_names_from_csv b/tools/setup/emoji/import_emoji_names_from_csv
index 5f8c2f92ce..49395444ae 100755
--- a/tools/setup/emoji/import_emoji_names_from_csv
+++ b/tools/setup/emoji/import_emoji_names_from_csv
@@ -36,6 +36,7 @@ FILE_TEMPLATE = (
 
 emoji_names: Set[str] = set()
 
+
 def load_data(data_file: str) -> List[List[str]]:
     emoji_name_data: List[List[str]] = []
     with open(data_file, newline='') as fp:
@@ -44,15 +45,18 @@ def load_data(data_file: str) -> List[List[str]]:
             emoji_name_data.append(row)
     return emoji_name_data[1:]
 
+
 def check_uniqueness(emoji_name: str) -> None:
     if emoji_name in emoji_names:
         raise Exception(f"Duplicate emoji name: {emoji_name}")
     emoji_names.add(emoji_name)
 
+
 def check_valid_emoji_name(emoji_name: str) -> None:
     if re.fullmatch("[+-]?[a-z0-9_-]+", emoji_name) is None:
         raise Exception(f"Invalid emoji name: {emoji_name}")
 
+
 def check_emoji_names(canonical_name: str, aliases: List[str]) -> None:
     if canonical_name == 'X':
         return
@@ -61,6 +65,7 @@ def check_emoji_names(canonical_name: str, aliases: List[str]) -> None:
         check_valid_emoji_name(name)
         check_uniqueness(name)
 
+
 def prepare_explanation(explanation: str) -> str:
     if explanation == '':
         return ''
@@ -75,24 +80,34 @@ def prepare_explanation(explanation: str) -> str:
     wrapped_lines = textwrap.wrap(explanation.strip(), **wrapper_config)
     return ''.join(wrapped_lines)
 
+
 def prepare_aliases(aliases: str) -> List[str]:
     if aliases == '':
         return []
     return [alias.strip() for alias in aliases.split(',')]
 
+
 def main() -> None:
-    description = ("This script is used for generating `emoji_names.py`. It takes the "
-                   "path of an csv file containing the required data and optional output "
-                   "file path.")
+    description = (
+        "This script is used for generating `emoji_names.py`. It takes the "
+        "path of an csv file containing the required data and optional output "
+        "file path."
+    )
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument(
-        "--input-file", dest="input_file_path", metavar="<path>",
+        "--input-file",
+        dest="input_file_path",
+        metavar="<path>",
         default=os.path.join(EMOJI_DIR_PATH, "emoji_names.csv"),
-        help="Path to the csv file from which data is to be read.")
+        help="Path to the csv file from which data is to be read.",
+    )
     parser.add_argument(
-        "--output-file", dest="output_file_path", metavar="<path>",
+        "--output-file",
+        dest="output_file_path",
+        metavar="<path>",
         default=os.path.join(EMOJI_DIR_PATH, "emoji_names.py"),
-        help="Path to the output file.")
+        help="Path to the output file.",
+    )
 
     args = parser.parse_args()
     emoji_name_data = load_data(args.input_file_path)
@@ -125,5 +140,6 @@ def main() -> None:
     with open(args.output_file_path, 'w') as fp:
         fp.write(FILE_TEMPLATE % {'emoji_entries': emoji_entries})
 
+
 if __name__ == '__main__':
     main()
diff --git a/tools/setup/emoji/test-emoji-name-scripts b/tools/setup/emoji/test-emoji-name-scripts
index 1aaadcd7cf..bcd87c6db0 100755
--- a/tools/setup/emoji/test-emoji-name-scripts
+++ b/tools/setup/emoji/test-emoji-name-scripts
@@ -9,6 +9,7 @@ import tempfile
 
 TOOLS_DIR = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
 
+
 def generate_files(source_file: str, tmp_dir: str) -> None:
     # Copy the source CSV file to out temporary test directory.
     input_file_path = source_file
@@ -18,23 +19,39 @@ def generate_files(source_file: str, tmp_dir: str) -> None:
     # Generate the name map file in the temporary directory.
     input_file_path = output_file_path
     output_file_path = os.path.join(tmp_dir, 'NAME_MAP_A')
-    subprocess.check_call([os.path.join(TOOLS_DIR, 'setup', 'emoji', 'import_emoji_names_from_csv'),
-                           f'--input-file={input_file_path}', f'--output-file={output_file_path}'],
-                          stdout=subprocess.DEVNULL)
+    subprocess.check_call(
+        [
+            os.path.join(TOOLS_DIR, 'setup', 'emoji', 'import_emoji_names_from_csv'),
+            f'--input-file={input_file_path}',
+            f'--output-file={output_file_path}',
+        ],
+        stdout=subprocess.DEVNULL,
+    )
 
     # Regenerate the CSV file from name map.
     input_file_path = output_file_path
     output_file_path = os.path.join(tmp_dir, 'CSV_B')
-    subprocess.check_call([os.path.join(TOOLS_DIR, 'setup', 'emoji', 'export_emoji_names_to_csv'),
-                           f'--input-file={input_file_path}', f'--output-file={output_file_path}'],
-                          stdout=subprocess.DEVNULL)
+    subprocess.check_call(
+        [
+            os.path.join(TOOLS_DIR, 'setup', 'emoji', 'export_emoji_names_to_csv'),
+            f'--input-file={input_file_path}',
+            f'--output-file={output_file_path}',
+        ],
+        stdout=subprocess.DEVNULL,
+    )
 
     # Regenerate the name map file from the regenerated CSV file.
     input_file_path = output_file_path
     output_file_path = os.path.join(tmp_dir, 'NAME_MAP_B')
-    subprocess.check_call([os.path.join(TOOLS_DIR, 'setup', 'emoji', 'import_emoji_names_from_csv'),
-                           f'--input-file={input_file_path}', f'--output-file={output_file_path}'],
-                          stdout=subprocess.DEVNULL)
+    subprocess.check_call(
+        [
+            os.path.join(TOOLS_DIR, 'setup', 'emoji', 'import_emoji_names_from_csv'),
+            f'--input-file={input_file_path}',
+            f'--output-file={output_file_path}',
+        ],
+        stdout=subprocess.DEVNULL,
+    )
+
 
 def print_diff(path_file1: str, path_file2: str) -> None:
     with open(path_file1) as file1:
@@ -48,6 +65,7 @@ def print_diff(path_file1: str, path_file2: str) -> None:
     for line in diff:
         print(line)
 
+
 def compare_files(first_file: str, second_file: str) -> None:
     same = True
     same = same and filecmp.cmp(first_file, second_file, shallow=False)
@@ -55,6 +73,7 @@ def compare_files(first_file: str, second_file: str) -> None:
         print_diff(first_file, second_file)
         raise Exception("Round trip conversion failed!!")
 
+
 def check_files(tmp_dir: str) -> None:
     # Compare the original and regenerated CSV files.
     first_file = os.path.join(tmp_dir, 'CSV_A')
@@ -66,20 +85,27 @@ def check_files(tmp_dir: str) -> None:
     second_file = os.path.join(tmp_dir, 'NAME_MAP_B')
     compare_files(first_file, second_file)
 
+
 def main() -> None:
-    description = ("This tool is used test the emoji tooling that we use to import/export "
-                   "naming related data. This works by doing a round-trip conversion of "
-                   "and then verifying that no changes were made in the process.")
+    description = (
+        "This tool is used test the emoji tooling that we use to import/export "
+        "naming related data. This works by doing a round-trip conversion of "
+        "and then verifying that no changes were made in the process."
+    )
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument(
-        "--input-file", dest="input_file_path", metavar="<path>",
+        "--input-file",
+        dest="input_file_path",
+        metavar="<path>",
         default=os.path.join(TOOLS_DIR, "setup", "emoji", "emoji_names.csv"),
-        help="Path to the CSV file to be used for round-trip conversion.")
+        help="Path to the CSV file to be used for round-trip conversion.",
+    )
 
     args = parser.parse_args()
     with tempfile.TemporaryDirectory() as tmp_dir:
         generate_files(args.input_file_path, tmp_dir)
         check_files(tmp_dir)
 
+
 if __name__ == "__main__":
     main()
diff --git a/tools/setup/generate_integration_bots_avatars.py b/tools/setup/generate_integration_bots_avatars.py
index 91e205a133..9ad1d3fb29 100755
--- a/tools/setup/generate_integration_bots_avatars.py
+++ b/tools/setup/generate_integration_bots_avatars.py
@@ -38,10 +38,12 @@ def create_square_image(png: bytes) -> bytes:
     new_img.save(out, format='png')
     return out.getvalue()
 
+
 def create_integration_bot_avatar(logo_path: str, bot_avatar_path: str) -> None:
     if logo_path.endswith('.svg'):
         avatar = cairosvg.svg2png(
-            url=logo_path, output_width=DEFAULT_AVATAR_SIZE, output_height=DEFAULT_AVATAR_SIZE)
+            url=logo_path, output_width=DEFAULT_AVATAR_SIZE, output_height=DEFAULT_AVATAR_SIZE
+        )
     else:
         with open(logo_path, 'rb') as f:
             image = f.read()
@@ -52,7 +54,8 @@ def create_integration_bot_avatar(logo_path: str, bot_avatar_path: str) -> None:
     with open(bot_avatar_path, 'wb') as f:
         f.write(avatar)
 
-def generate_integration_bots_avatars(check_missing: bool=False) -> None:
+
+def generate_integration_bots_avatars(check_missing: bool = False) -> None:
     missing = set()
     for webhook in WEBHOOK_INTEGRATIONS:
         if not webhook.logo_path:
@@ -70,12 +73,15 @@ def generate_integration_bots_avatars(check_missing: bool=False) -> None:
             create_integration_bot_avatar(static_path(webhook.logo_path), bot_avatar_path)
 
     if missing:
-        print('ERROR: Bot avatars are missing for these webhooks: {}.\n'
-              'ERROR: Run ./tools/setup/generate_integration_bots_avatars.py '
-              'to generate them.\nERROR: Commit the newly generated avatars to '
-              'the repository.'.format(', '.join(missing)))
+        print(
+            'ERROR: Bot avatars are missing for these webhooks: {}.\n'
+            'ERROR: Run ./tools/setup/generate_integration_bots_avatars.py '
+            'to generate them.\nERROR: Commit the newly generated avatars to '
+            'the repository.'.format(', '.join(missing))
+        )
         sys.exit(1)
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--check-missing', action='store_true')
diff --git a/tools/setup/generate_zulip_bots_static_files.py b/tools/setup/generate_zulip_bots_static_files.py
index 17ba1f3d1d..f074c7e31d 100755
--- a/tools/setup/generate_zulip_bots_static_files.py
+++ b/tools/setup/generate_zulip_bots_static_files.py
@@ -44,5 +44,6 @@ def generate_zulip_bots_static_files() -> None:
     docs = glob.glob(doc_glob_pattern)
     copyfiles(docs)
 
+
 if __name__ == "__main__":
     generate_zulip_bots_static_files()
diff --git a/tools/setup/setup_venvs.py b/tools/setup/setup_venvs.py
index 9c2ed68114..7682a6a0d1 100755
--- a/tools/setup/setup_venvs.py
+++ b/tools/setup/setup_venvs.py
@@ -15,12 +15,12 @@ VENV_PATH = "/srv/zulip-py3-venv"
 DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "dev.txt")
 THUMBOR_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "thumbor-dev.txt")
 
+
 def main() -> None:
-    setup_virtualenv("/srv/zulip-thumbor-venv", THUMBOR_REQS_FILE,
-                     patch_activate_script=True)
-    cached_venv_path = setup_virtualenv(
-        VENV_PATH, DEV_REQS_FILE, patch_activate_script=True)
+    setup_virtualenv("/srv/zulip-thumbor-venv", THUMBOR_REQS_FILE, patch_activate_script=True)
+    cached_venv_path = setup_virtualenv(VENV_PATH, DEV_REQS_FILE, patch_activate_script=True)
     overwrite_symlink(cached_venv_path, os.path.join(ZULIP_PATH, "zulip-py3-venv"))
 
+
 if __name__ == "__main__":
     main()
diff --git a/tools/show-profile-results b/tools/show-profile-results
index fb6aa1ce0f..2c591f651e 100755
--- a/tools/show-profile-results
+++ b/tools/show-profile-results
@@ -12,10 +12,12 @@ can find more advanced tools for showing profiler results.
 try:
     fn = sys.argv[1]
 except IndexError:
-    print('''
+    print(
+        '''
     Please supply a filename.  (If you use the profiled decorator,
     the file will have a suffix of ".profile".)
-    ''')
+    '''
+    )
     sys.exit(1)
 
 p = pstats.Stats(fn)
diff --git a/tools/test-api b/tools/test-api
index b405922ae2..3a0bdc0fda 100755
--- a/tools/test-api
+++ b/tools/test-api
@@ -21,9 +21,9 @@ from tools.lib.test_server import test_server_running
 
 usage = """test-api [options]"""
 parser = argparse.ArgumentParser(usage)
-parser.add_argument('--force',
-                    action="store_true",
-                    help='Run tests despite possible provisioning problems.')
+parser.add_argument(
+    '--force', action="store_true", help='Run tests despite possible provisioning problems.'
+)
 options = parser.parse_args()
 
 assert_provisioning_status_ok(options.force)
@@ -92,7 +92,7 @@ with test_server_running(force=options.force, external_host='zulipdev.com:9981')
     # Test error payloads
     client = Client(
         email=email,
-        api_key='X'*32,
+        api_key='X' * 32,
         site=site,
     )
     test_invalid_api_key(client)
diff --git a/tools/test-backend b/tools/test-backend
index 8e5353d32d..96ab1828a8 100755
--- a/tools/test-backend
+++ b/tools/test-backend
@@ -143,6 +143,7 @@ enforce_fully_covered = sorted(
 
 FAILED_TEST_PATH = 'var/last_test_failure.json'
 
+
 def get_failed_tests() -> List[str]:
     try:
         with open(FAILED_TEST_PATH, "rb") as f:
@@ -151,11 +152,13 @@ def get_failed_tests() -> List[str]:
         print("var/last_test_failure.json doesn't exist; running all tests.")
         return []
 
+
 def write_failed_tests(failed_tests: List[str]) -> None:
     if failed_tests:
         with open(FAILED_TEST_PATH, 'wb') as f:
             f.write(orjson.dumps(failed_tests))
 
+
 @contextlib.contextmanager
 def block_internet() -> Iterator[None]:
     # Monkey-patching - responses library raises requests.ConnectionError when access to an unregistered URL
@@ -166,6 +169,7 @@ def block_internet() -> Iterator[None]:
         with responses.RequestsMock():
             yield
 
+
 class ZulipInternetBlockedError(Exception):
     def __init__(self, original_msg: str) -> None:
         zulip_msg = (
@@ -176,6 +180,7 @@ class ZulipInternetBlockedError(Exception):
         msg = f"{zulip_msg}\nResponses library error message: {original_msg}"
         super().__init__(msg)
 
+
 def main() -> None:
     TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
     os.chdir(os.path.dirname(TOOLS_DIR))
@@ -207,55 +212,65 @@ def main() -> None:
     test-backend zerver.tests.test_markdown.MarkdownTest.test_inline_youtube # run a single test
     test-backend MarkdownTest.test_inline_youtube # run a single test"""
 
-    parser = argparse.ArgumentParser(description=usage,
-                                     formatter_class=argparse.RawTextHelpFormatter)
+    parser = argparse.ArgumentParser(
+        description=usage, formatter_class=argparse.RawTextHelpFormatter
+    )
 
-    parser.add_argument('--nonfatal-errors', action="store_false",
-                        dest="fatal_errors", help="Continue past test failures to run all tests")
-    parser.add_argument('--coverage',
-                        action="store_true",
-                        help='Compute test coverage.')
-    parser.add_argument('--verbose-coverage',
-                        action="store_true",
-                        help='Enable verbose print of coverage report.')
-    parser.add_argument('--no-cov-cleanup',
-                        action='store_true',
-                        help="Do not clean generated coverage files.")
+    parser.add_argument(
+        '--nonfatal-errors',
+        action="store_false",
+        dest="fatal_errors",
+        help="Continue past test failures to run all tests",
+    )
+    parser.add_argument('--coverage', action="store_true", help='Compute test coverage.')
+    parser.add_argument(
+        '--verbose-coverage', action="store_true", help='Enable verbose print of coverage report.'
+    )
+    parser.add_argument(
+        '--no-cov-cleanup', action='store_true', help="Do not clean generated coverage files."
+    )
 
-    parser.add_argument('--parallel', dest='processes',
-                        type=int,
-                        default=default_parallel,
-                        help='Specify the number of processes to run the '
-                             'tests in. Default is the number of logical CPUs')
-    parser.add_argument('--profile',
-                        action="store_true",
-                        help='Profile test runtime.')
-    parser.add_argument('--force',
-                        action="store_true",
-                        help='Run tests despite possible problems.')
-    parser.add_argument('--no-shallow',
-                        action="store_true",
-                        help="Don't allow shallow testing of templates (deprecated)")
-    parser.add_argument('--verbose',
-                        action="store_true",
-                        help="Show detailed output")
-    parser.add_argument('--reverse',
-                        action="store_true",
-                        help="Run tests in reverse order.")
-    parser.add_argument('--rerun',
-                        action="store_true",
-                        help=("Run the tests which failed the last time "
-                              "test-backend was run.  Implies --nonfatal-errors."))
-    parser.add_argument('--include-webhooks',
-                        action="store_true",
-                        help=("Include webhook tests.  By default, they are skipped for performance."))
-    parser.add_argument('--generate-stripe-fixtures',
-                        action="store_true",
-                        help=("Generate Stripe test fixtures by making requests to Stripe test network"))
+    parser.add_argument(
+        '--parallel',
+        dest='processes',
+        type=int,
+        default=default_parallel,
+        help='Specify the number of processes to run the '
+        'tests in. Default is the number of logical CPUs',
+    )
+    parser.add_argument('--profile', action="store_true", help='Profile test runtime.')
+    parser.add_argument('--force', action="store_true", help='Run tests despite possible problems.')
+    parser.add_argument(
+        '--no-shallow',
+        action="store_true",
+        help="Don't allow shallow testing of templates (deprecated)",
+    )
+    parser.add_argument('--verbose', action="store_true", help="Show detailed output")
+    parser.add_argument('--reverse', action="store_true", help="Run tests in reverse order.")
+    parser.add_argument(
+        '--rerun',
+        action="store_true",
+        help=(
+            "Run the tests which failed the last time "
+            "test-backend was run.  Implies --nonfatal-errors."
+        ),
+    )
+    parser.add_argument(
+        '--include-webhooks',
+        action="store_true",
+        help=("Include webhook tests.  By default, they are skipped for performance."),
+    )
+    parser.add_argument(
+        '--generate-stripe-fixtures',
+        action="store_true",
+        help=("Generate Stripe test fixtures by making requests to Stripe test network"),
+    )
     parser.add_argument('args', nargs='*')
-    parser.add_argument('--ban-console-output',
-                        action="store_true",
-                        help='Require stdout and stderr to be clean of unexpected output.')
+    parser.add_argument(
+        '--ban-console-output',
+        action="store_true",
+        help='Require stdout and stderr to be clean of unexpected output.',
+    )
 
     options = parser.parse_args()
     if options.ban_console_output:
@@ -266,8 +281,7 @@ def main() -> None:
     include_webhooks = options.coverage or options.include_webhooks
 
     if parallel < 1:
-        raise argparse.ArgumentTypeError(
-            "option processes: Only positive integers are allowed.")
+        raise argparse.ArgumentTypeError("option processes: Only positive integers are allowed.")
 
     zerver_test_dir = 'zerver/tests/'
 
@@ -355,14 +369,19 @@ def main() -> None:
 
     if options.coverage:
         import coverage
-        cov = coverage.Coverage(data_suffix="", config_file="tools/coveragerc", concurrency='multiprocessing')
+
+        cov = coverage.Coverage(
+            data_suffix="", config_file="tools/coveragerc", concurrency='multiprocessing'
+        )
         # Do not clean .coverage file in CircleCi job so that coverage data can be uploaded.
         if not options.no_cov_cleanup:
             import atexit
+
             atexit.register(lambda: cov.erase())  # Ensure the data file gets cleaned up at the end.
         cov.start()
     if options.profile:
         import cProfile
+
         prof = cProfile.Profile()
         prof.enable()
 
@@ -387,11 +406,16 @@ def main() -> None:
         print("-- Running tests in serial mode.", flush=True)
 
     with block_internet():
-        test_runner = TestRunner(failfast=options.fatal_errors, verbosity=2,
-                                 parallel=parallel, reverse=options.reverse,
-                                 keepdb=True)
-        failures, failed_tests = test_runner.run_tests(suites, full_suite=full_suite,
-                                                       include_webhooks=include_webhooks)
+        test_runner = TestRunner(
+            failfast=options.fatal_errors,
+            verbosity=2,
+            parallel=parallel,
+            reverse=options.reverse,
+            keepdb=True,
+        )
+        failures, failed_tests = test_runner.run_tests(
+            suites, full_suite=full_suite, include_webhooks=include_webhooks
+        )
     write_failed_tests(failed_tests)
 
     templates_not_rendered = test_runner.get_shallow_tested_templates()
@@ -434,13 +458,17 @@ def main() -> None:
             try:
                 missing_lines = cov.analysis2(path)[3]
                 if len(missing_lines) == 0 and path != "zerver/lib/migrate.py":
-                    print(f"ERROR: {path} has complete backend test coverage but is still in not_yet_fully_covered.")
+                    print(
+                        f"ERROR: {path} has complete backend test coverage but is still in not_yet_fully_covered."
+                    )
                     ok = False
             except coverage.misc.NoSource:
                 continue
         if not ok:
             print()
-            print("There are one or more fully covered files that are still in not_yet_fully_covered.")
+            print(
+                "There are one or more fully covered files that are still in not_yet_fully_covered."
+            )
             print("Remove the file(s) from not_yet_fully_covered in `tools/test-backend`.")
             failures = True
     if options.profile:
@@ -465,5 +493,6 @@ def main() -> None:
     # We'll have printed whether tests passed or failed above
     sys.exit(bool(failures))
 
+
 if __name__ == "__main__":
     main()
diff --git a/tools/test-help-documentation b/tools/test-help-documentation
index fe9a19d285..c8829a88cb 100755
--- a/tools/test-help-documentation
+++ b/tools/test-help-documentation
@@ -14,13 +14,13 @@ from lib import sanity_check
 sanity_check.check_venv(__file__)
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--force',
-                    action="store_true",
-                    help='Run tests despite possible problems.')
-parser.add_argument('--skip-external-links',
-                    dest="skip_external_link_check",
-                    action="store_true",
-                    help='Skip checking of external links.')
+parser.add_argument('--force', action="store_true", help='Run tests despite possible problems.')
+parser.add_argument(
+    '--skip-external-links',
+    dest="skip_external_link_check",
+    action="store_true",
+    help='Skip checking of external links.',
+)
 options = parser.parse_args()
 
 os.chdir(ZULIP_PATH)
@@ -37,33 +37,39 @@ extra_args = ['-a', 'validate_html=set']
 if options.skip_external_link_check:
     extra_args += ['-a', 'skip_external=set']
 
+
 @contextlib.contextmanager
 def vnu_servlet() -> Iterator[None]:
-    with subprocess.Popen([
-        'java', '-cp',
-        os.path.join(
-            os.path.dirname(__file__),
-            '../node_modules/vnu-jar/build/dist/vnu.jar',
-        ),
-        '-Dnu.validator.servlet.bind-address=127.0.0.1',
-        'nu.validator.servlet.Main',
-        '9988',
-    ]) as proc:
+    with subprocess.Popen(
+        [
+            'java',
+            '-cp',
+            os.path.join(
+                os.path.dirname(__file__),
+                '../node_modules/vnu-jar/build/dist/vnu.jar',
+            ),
+            '-Dnu.validator.servlet.bind-address=127.0.0.1',
+            'nu.validator.servlet.Main',
+            '9988',
+        ]
+    ) as proc:
         yield
         proc.terminate()
 
-with vnu_servlet(), \
-    test_server_running(options.force, external_host, log_file=LOG_FILE,
-                        dots=True):
-    ret_help_doc = subprocess.call(['scrapy', 'crawl_with_status', *extra_args,
-                                    'help_documentation_crawler'],
-                                   cwd='tools/documentation_crawler')
-    ret_api_doc = subprocess.call(['scrapy', 'crawl_with_status', *extra_args,
-                                   'api_documentation_crawler'],
-                                  cwd='tools/documentation_crawler')
-    ret_portico_doc = subprocess.call(['scrapy', 'crawl_with_status', *extra_args,
-                                       'portico_documentation_crawler'],
-                                      cwd='tools/documentation_crawler')
+
+with vnu_servlet(), test_server_running(options.force, external_host, log_file=LOG_FILE, dots=True):
+    ret_help_doc = subprocess.call(
+        ['scrapy', 'crawl_with_status', *extra_args, 'help_documentation_crawler'],
+        cwd='tools/documentation_crawler',
+    )
+    ret_api_doc = subprocess.call(
+        ['scrapy', 'crawl_with_status', *extra_args, 'api_documentation_crawler'],
+        cwd='tools/documentation_crawler',
+    )
+    ret_portico_doc = subprocess.call(
+        ['scrapy', 'crawl_with_status', *extra_args, 'portico_documentation_crawler'],
+        cwd='tools/documentation_crawler',
+    )
 
 if ret_help_doc != 0 or ret_api_doc != 0 or ret_portico_doc != 0:
     print("\033[0;91m")
diff --git a/tools/test-js-with-node b/tools/test-js-with-node
index 0e3b004939..548fef7812 100755
--- a/tools/test-js-with-node
+++ b/tools/test-js-with-node
@@ -167,12 +167,8 @@ EXEMPT_FILES = {
 }
 
 parser = argparse.ArgumentParser(USAGE)
-parser.add_argument('--coverage',
-                    action="store_true",
-                    help='Get coverage report')
-parser.add_argument('--force',
-                    action="store_true",
-                    help='Run tests despite possible problems.')
+parser.add_argument('--coverage', action="store_true", help='Get coverage report')
+parser.add_argument('--force', action="store_true", help='Run tests despite possible problems.')
 parser.add_argument('args', nargs=argparse.REMAINDER)
 options = parser.parse_args()
 individual_files = options.args
@@ -181,6 +177,7 @@ from tools.lib.test_script import assert_provisioning_status_ok
 
 assert_provisioning_status_ok(options.force)
 
+
 def get_dev_host() -> str:
     # See similar code in dev_settings.py.  We only use
     # this to report where you can find coverage reports.
@@ -203,9 +200,11 @@ def get_dev_host() -> str:
         # default, via the "zulipdev.com" hostname.
         return 'zulipdev.com:9991'
 
+
 def print_error(msg: str) -> None:
     print(BOLDRED + 'ERROR:' + ENDC + ' ' + msg)
 
+
 def clean_file(orig_fn: str) -> str:
     fn = orig_fn
     if not fn.endswith(".js"):
@@ -218,10 +217,12 @@ def clean_file(orig_fn: str) -> str:
         sys.exit(1)
     return fn
 
+
 def clean_files(fns: List[str]) -> List[str]:
     cleaned_files = [clean_file(fn) for fn in fns]
     return cleaned_files
 
+
 def run_tests_via_node_js() -> int:
     os.environ['TZ'] = 'UTC'
 
@@ -264,7 +265,10 @@ def run_tests_via_node_js() -> int:
         sys.exit(1)
     return ret
 
-def check_line_coverage(fn: str, line_coverage: Dict[Any, Any], line_mapping: Dict[Any, Any], log: bool = True) -> bool:
+
+def check_line_coverage(
+    fn: str, line_coverage: Dict[Any, Any], line_mapping: Dict[Any, Any], log: bool = True
+) -> bool:
     missing_lines = []
     for line in line_coverage:
         if line_coverage[line] == 0:
@@ -278,6 +282,7 @@ def check_line_coverage(fn: str, line_coverage: Dict[Any, Any], line_mapping: Di
         return False
     return True
 
+
 def read_coverage() -> Any:
     coverage_json = None
     try:
@@ -288,13 +293,14 @@ def read_coverage() -> Any:
         raise
     return coverage_json
 
+
 def enforce_proper_coverage(coverage_json: Any) -> bool:
     all_js_files = set(
-        glob.glob('static/js/*.js') +
-        glob.glob('static/js/*.ts') +
-        glob.glob('static/shared/js/*.js') +
-        glob.glob('static/shared/js/*.ts') +
-        glob.glob('static/js/billing/*.js'),
+        glob.glob('static/js/*.js')
+        + glob.glob('static/js/*.ts')
+        + glob.glob('static/shared/js/*.js')
+        + glob.glob('static/shared/js/*.ts')
+        + glob.glob('static/js/billing/*.js'),
     )
     enforce_fully_covered = all_js_files - EXEMPT_FILES
 
@@ -332,9 +338,10 @@ def enforce_proper_coverage(coverage_json: Any) -> bool:
         print("One or more fully covered files are miscategorized.")
         print("Remove the file(s) from EXEMPT_FILES in `tools/test-js-with-node`.")
 
-    problems_encountered = (coverage_lost or coverage_not_enforced)
+    problems_encountered = coverage_lost or coverage_not_enforced
     return problems_encountered
 
+
 ret = run_tests_via_node_js()
 
 if options.coverage and ret == 0:
diff --git a/tools/test-js-with-puppeteer b/tools/test-js-with-puppeteer
index ebd32580cb..9de6ee9545 100755
--- a/tools/test-js-with-puppeteer
+++ b/tools/test-js-with-puppeteer
@@ -27,14 +27,11 @@ usage = """test-js-with-puppeteer [options]
     test-js-with-puppeteer 01 03 # Run a few test files, 01-login.js and 03-narrow.js here"""
 parser = argparse.ArgumentParser(usage)
 
-parser.add_argument('--interactive',
-                    action="store_true",
-                    help='Run tests interactively')
-parser.add_argument('--force',
-                    action="store_true",
-                    help='Run tests despite possible problems.')
-parser.add_argument('tests', nargs=argparse.REMAINDER,
-                    help='Specific tests to run; by default, runs all tests')
+parser.add_argument('--interactive', action="store_true", help='Run tests interactively')
+parser.add_argument('--force', action="store_true", help='Run tests despite possible problems.')
+parser.add_argument(
+    'tests', nargs=argparse.REMAINDER, help='Specific tests to run; by default, runs all tests'
+)
 
 options = parser.parse_args()
 
@@ -59,13 +56,18 @@ def run_tests(files: Iterable[str], external_host: str) -> None:
     test_dir = os.path.join(ZULIP_PATH, 'frontend_tests/puppeteer_tests')
     test_files = find_js_test_files(test_dir, files)
 
-    def run_tests(test_number: int=0) -> Tuple[int, int]:
+    def run_tests(test_number: int = 0) -> Tuple[int, int]:
         ret = 1
         current_test_num = test_number
         for test_file in test_files[test_number:]:
             test_name = os.path.basename(test_file)
             cmd = ["node", test_file]
-            print("\n\n===================== {}\nRunning {}\n\n".format(test_name, " ".join(map(shlex.quote, cmd))), flush=True)
+            print(
+                "\n\n===================== {}\nRunning {}\n\n".format(
+                    test_name, " ".join(map(shlex.quote, cmd))
+                ),
+                flush=True,
+            )
             ret = subprocess.call(cmd)
             if ret != 0:
                 return ret, current_test_num
@@ -88,19 +90,28 @@ def run_tests(files: Iterable[str], external_host: str) -> None:
             ret = 1
             ret = run_tests()[0]
     if ret != 0:
-        print(f"""
+        print(
+            f"""
 {FAIL}The Puppeteer frontend tests failed!{ENDC}
 For help debugging, read:
   https://zulip.readthedocs.io/en/latest/testing/testing-with-puppeteer.html
-or report and ask for help in chat.zulip.org""", file=sys.stderr)
+or report and ask for help in chat.zulip.org""",
+            file=sys.stderr,
+        )
         if os.environ.get("CIRCLECI"):
             print("", file=sys.stderr)
-            print("In CircleCI, the Artifacts tab contains screenshots of the failure.", file=sys.stderr)
+            print(
+                "In CircleCI, the Artifacts tab contains screenshots of the failure.",
+                file=sys.stderr,
+            )
             print("", file=sys.stderr)
         else:
-            print("It's also worthy to see screenshots generated on failure stored under var/puppeteer/*.png")
+            print(
+                "It's also worthy to see screenshots generated on failure stored under var/puppeteer/*.png"
+            )
         sys.exit(ret)
 
+
 external_host = "zulipdev.com:9981"
 assert_provisioning_status_ok(options.force)
 prepare_puppeteer_run()
diff --git a/tools/test-locked-requirements b/tools/test-locked-requirements
index 7172f68e2f..780888387d 100755
--- a/tools/test-locked-requirements
+++ b/tools/test-locked-requirements
@@ -18,6 +18,7 @@ REQS_DIR = os.path.join(ZULIP_PATH, 'requirements')
 CACHE_DIR = os.path.join(ZULIP_PATH, 'var', 'tmp')
 CACHE_FILE = os.path.join(CACHE_DIR, 'requirements_hashes')
 
+
 def print_diff(path_file1: str, path_file2: str) -> None:
     with open(path_file1) as file1:
         with open(path_file2) as file2:
@@ -29,6 +30,7 @@ def print_diff(path_file1: str, path_file2: str) -> None:
             )
     sys.stdout.writelines(diff)
 
+
 def test_locked_requirements(tmp_dir: str) -> bool:
     # `pip-compile` tries to avoid unnecessarily updating recursive dependencies
     # if lock files are present already. If we don't copy these files to the tmp
@@ -39,7 +41,9 @@ def test_locked_requirements(tmp_dir: str) -> bool:
         locked_file = os.path.join(REQS_DIR, fn)
         test_locked_file = os.path.join(tmp_dir, fn)
         shutil.copyfile(locked_file, test_locked_file)
-    subprocess.check_call([os.path.join(TOOLS_DIR, 'update-locked-requirements'), '--output-dir', tmp_dir])
+    subprocess.check_call(
+        [os.path.join(TOOLS_DIR, 'update-locked-requirements'), '--output-dir', tmp_dir]
+    )
 
     same = True
     for test_locked_file in glob.glob(os.path.join(tmp_dir, "*.txt")):
@@ -49,6 +53,7 @@ def test_locked_requirements(tmp_dir: str) -> bool:
 
     return same
 
+
 def get_requirements_hash(tmp_dir: str, use_test_lock_files: bool = False) -> str:
     sha1 = hashlib.sha1()
     reqs_files = sorted(glob.glob(os.path.join(REQS_DIR, "*.in")))
@@ -61,17 +66,20 @@ def get_requirements_hash(tmp_dir: str, use_test_lock_files: bool = False) -> st
             sha1.update(fp.read())
     return sha1.hexdigest()
 
+
 def may_be_setup_cache() -> None:
     os.makedirs(CACHE_DIR, exist_ok=True)
     if not os.path.exists(CACHE_FILE):
         with open(CACHE_FILE, 'wb') as fp:
             fp.write(orjson.dumps([]))
 
+
 def load_cache() -> List[str]:
     with open(CACHE_FILE, "rb") as fp:
         hash_list = orjson.loads(fp.read())
     return hash_list
 
+
 def update_cache(hash_list: List[str]) -> None:
     # We store last 100 hash entries. Aggressive caching is
     # not a problem as it is cheap to do.
@@ -80,6 +88,7 @@ def update_cache(hash_list: List[str]) -> None:
     with open(CACHE_FILE, 'wb') as fp:
         fp.write(orjson.dumps(hash_list))
 
+
 def main() -> None:
     may_be_setup_cache()
     hash_list = load_cache()
@@ -105,10 +114,13 @@ def main() -> None:
             print_diff(locked_file, test_locked_file)
         # Flush the output to ensure we print the error at the end.
         sys.stdout.flush()
-        raise Exception("It looks like you have updated some python dependencies but haven't "
-                        "updated locked requirements files. Please update them by running "
-                        "`tools/update-locked-requirements`. For more information please "
-                        "refer to `requirements/README.md`.")
+        raise Exception(
+            "It looks like you have updated some python dependencies but haven't "
+            "updated locked requirements files. Please update them by running "
+            "`tools/update-locked-requirements`. For more information please "
+            "refer to `requirements/README.md`."
+        )
+
 
 if __name__ == '__main__':
     main()
diff --git a/tools/test-queue-worker-reload b/tools/test-queue-worker-reload
index db0650c2c1..c217b3a2a9 100755
--- a/tools/test-queue-worker-reload
+++ b/tools/test-queue-worker-reload
@@ -15,6 +15,7 @@ sanity_check.check_venv(__file__)
 TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
 successful_worker_launch = '[process_queue] 15 queue worker threads were launched\n'
 
+
 def check_worker_launch(run_dev: "subprocess.Popen[str]") -> bool:
     failed = False
     i = 0
@@ -53,14 +54,17 @@ def check_worker_launch(run_dev: "subprocess.Popen[str]") -> bool:
 
     return failed
 
+
 if __name__ == '__main__':
     print('\nStarting Development Server')
     args = [f"{TOOLS_DIR}/run-dev.py"]
     run_dev = subprocess.Popen(
         args,
         bufsize=1,  # line buffered
-        stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-        universal_newlines=True)
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        universal_newlines=True,
+    )
     failed = check_worker_launch(run_dev)
 
     if failed:
diff --git a/tools/test-run-dev b/tools/test-run-dev
index 7c1f17296d..6238cf390a 100755
--- a/tools/test-run-dev
+++ b/tools/test-run-dev
@@ -12,6 +12,7 @@ sanity_check.check_venv(__file__)
 
 TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
 
+
 def start_server(logfile_name: str) -> Tuple[bool, str]:
     failure = True
     key = "Quit the server with CTRL-C."
@@ -30,14 +31,15 @@ def start_server(logfile_name: str) -> Tuple[bool, str]:
 
     return failure, ''.join(datalog)
 
+
 if __name__ == '__main__':
     print("Testing development server start!")
 
     logfile_name = '/tmp/run-dev-output'
     with open(logfile_name, 'wb', buffering=0) as logfile:
         run_dev = subprocess.Popen(
-            [os.path.join(TOOLS_DIR, "run-dev.py")],
-            stdout=logfile, stderr=subprocess.STDOUT)
+            [os.path.join(TOOLS_DIR, "run-dev.py")], stdout=logfile, stderr=subprocess.STDOUT
+        )
         failure, log = start_server(logfile_name)
 
     run_dev.send_signal(signal.SIGINT)
diff --git a/tools/test-tools b/tools/test-tools
index ef22e1f81e..ecc9751b1b 100755
--- a/tools/test-tools
+++ b/tools/test-tools
@@ -11,9 +11,7 @@ sanity_check.check_venv(__file__)
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('--coverage',
-                        action="store_true",
-                        help='compute test coverage')
+    parser.add_argument('--coverage', action="store_true", help='compute test coverage')
     args = parser.parse_args()
 
     def dir_join(dir1: str, dir2: str) -> str:
@@ -29,7 +27,10 @@ if __name__ == '__main__':
 
     if args.coverage:
         import coverage
-        cov = coverage.Coverage(branch=True, omit=["*/zulip-venv-cache/*", dir_join(tools_test_dir, "*")])
+
+        cov = coverage.Coverage(
+            branch=True, omit=["*/zulip-venv-cache/*", dir_join(tools_test_dir, "*")]
+        )
         cov.start()
 
     suite = loader.discover(start_dir=tools_test_dir, top_level_dir=root_dir)
diff --git a/tools/tests/test_capitalization_checker.py b/tools/tests/test_capitalization_checker.py
index 24a92bade8..ecc18b4628 100644
--- a/tools/tests/test_capitalization_checker.py
+++ b/tools/tests/test_capitalization_checker.py
@@ -7,9 +7,11 @@ from tools.lib.capitalization import check_capitalization, get_safe_text, is_cap
 
 class GetSafeTextTestCase(TestCase):
     def test_get_safe_text(self) -> None:
-        string = ('Messages in __page_params.product_name__ go to a stream and have a topic.')
+        string = 'Messages in __page_params.product_name__ go to a stream and have a topic.'
         safe_text = get_safe_text(string)
-        self.assertEqual(safe_text, 'Messages in __page_params_product_name__ go to a stream and have a topic.')
+        self.assertEqual(
+            safe_text, 'Messages in __page_params_product_name__ go to a stream and have a topic.'
+        )
 
         string = "Zulip Zulip. Zulip some text!"
         safe_text = get_safe_text(string)
@@ -68,6 +70,7 @@ class GetSafeTextTestCase(TestCase):
         safe_text = get_safe_text(string)
         self.assertEqual(safe_text, 'One two etc_ three. four')
 
+
 class IsCapitalizedTestCase(TestCase):
     def test_process_text(self) -> None:
         string = "Zulip zulip. Zulip some text!"
@@ -118,43 +121,57 @@ class IsCapitalizedTestCase(TestCase):
         capitalized = is_capitalized(string)
         self.assertTrue(capitalized)
 
+
 class CheckCapitalizationTestCase(TestCase):
     def test_check_capitalization(self) -> None:
-        strings = ["Zulip Zulip. Zulip some text!",
-                   "Zulip Zulip? Zulip some text!",
-                   "Zulip Zulip! Zulip some text!",
-                   "Zulip Zulip, Zulip some text!",
-                   "Some number 25MiB",
-                   "Not Ignored Phrase",
-                   "Not ignored phrase",
-                   "Some text with realm in it",
-                   "Realm in capital case",
-                   ('<p class="bot-settings-note padded-container"> Looking for our '
-                    '<a href="/integrations" target="_blank">Integrations</a> or '
-                    '<a href="/api" target="_blank">API</a> '
-                    'documentation? </p>'),
-                   ]
+        strings = [
+            "Zulip Zulip. Zulip some text!",
+            "Zulip Zulip? Zulip some text!",
+            "Zulip Zulip! Zulip some text!",
+            "Zulip Zulip, Zulip some text!",
+            "Some number 25MiB",
+            "Not Ignored Phrase",
+            "Not ignored phrase",
+            "Some text with realm in it",
+            "Realm in capital case",
+            (
+                '<p class="bot-settings-note padded-container"> Looking for our '
+                '<a href="/integrations" target="_blank">Integrations</a> or '
+                '<a href="/api" target="_blank">API</a> '
+                'documentation? </p>'
+            ),
+        ]
         errored, ignored, banned = check_capitalization(strings)
         self.assertEqual(errored, ['Not Ignored Phrase'])
         self.assertEqual(
             ignored,
-            sorted(["Zulip Zulip. Zulip some text!",
+            sorted(
+                [
+                    "Zulip Zulip. Zulip some text!",
                     "Zulip Zulip? Zulip some text!",
                     "Zulip Zulip! Zulip some text!",
                     "Zulip Zulip, Zulip some text!",
                     "Some number 25MiB",
-                    ('<p class="bot-settings-note padded-container"> Looking '
-                     'for our <a href="/integrations" target="_blank">'
-                     'Integrations</a> or <a href="/api" '
-                     'target="_blank">API</a> documentation? </p>'),
-                    ]))
+                    (
+                        '<p class="bot-settings-note padded-container"> Looking '
+                        'for our <a href="/integrations" target="_blank">'
+                        'Integrations</a> or <a href="/api" '
+                        'target="_blank">API</a> documentation? </p>'
+                    ),
+                ]
+            ),
+        )
 
-        self.assertEqual(banned,
-                         sorted(["realm found in 'Some text with realm in it'. "
-                                 "The term realm should not appear in user-facing "
-                                 "strings. Use organization instead.",
-
-                                 "realm found in 'Realm in capital case'. "
-                                 "The term realm should not appear in user-facing "
-                                 "strings. Use organization instead.",
-                                 ]))
+        self.assertEqual(
+            banned,
+            sorted(
+                [
+                    "realm found in 'Some text with realm in it'. "
+                    "The term realm should not appear in user-facing "
+                    "strings. Use organization instead.",
+                    "realm found in 'Realm in capital case'. "
+                    "The term realm should not appear in user-facing "
+                    "strings. Use organization instead.",
+                ]
+            ),
+        )
diff --git a/tools/tests/test_check_rabbitmq_queue.py b/tools/tests/test_check_rabbitmq_queue.py
index daf9d910c5..6dd023b3fb 100644
--- a/tools/tests/test_check_rabbitmq_queue.py
+++ b/tools/tests/test_check_rabbitmq_queue.py
@@ -21,39 +21,68 @@ class AnalyzeQueueStatsTests(TestCase):
         We just started processing a burst of events, and haven't processed enough
         to log productivity statistics yet.
         """
-        result = analyze_queue_stats('name', {'update_time': time.time(),
-                                              'current_queue_size': 10000,
-                                              'recent_average_consume_time': None}, 10000)
+        result = analyze_queue_stats(
+            'name',
+            {
+                'update_time': time.time(),
+                'current_queue_size': 10000,
+                'recent_average_consume_time': None,
+            },
+            10000,
+        )
         self.assertEqual(result['status'], OK)
 
     def test_queue_normal(self) -> None:
         """10000 events and each takes a second => it'll take a long time to empty."""
-        result = analyze_queue_stats('name', {'update_time': time.time(),
-                                              'current_queue_size': 10000,
-                                              'queue_last_emptied_timestamp': time.time() - 10000,
-                                              'recent_average_consume_time': 1}, 10000)
+        result = analyze_queue_stats(
+            'name',
+            {
+                'update_time': time.time(),
+                'current_queue_size': 10000,
+                'queue_last_emptied_timestamp': time.time() - 10000,
+                'recent_average_consume_time': 1,
+            },
+            10000,
+        )
         self.assertEqual(result['status'], CRITICAL)
         self.assertIn('clearing the backlog', result['message'])
 
         # If we're doing 10K/sec, it's OK.
-        result = analyze_queue_stats('name', {'update_time': time.time(),
-                                              'current_queue_size': 10000,
-                                              'queue_last_emptied_timestamp': time.time() - 10000,
-                                              'recent_average_consume_time': 0.0001}, 10000)
+        result = analyze_queue_stats(
+            'name',
+            {
+                'update_time': time.time(),
+                'current_queue_size': 10000,
+                'queue_last_emptied_timestamp': time.time() - 10000,
+                'recent_average_consume_time': 0.0001,
+            },
+            10000,
+        )
         self.assertEqual(result['status'], OK)
 
         # Verify logic around whether it'll take MAX_SECONDS_TO_CLEAR to clear queue.
-        with mock.patch.dict('scripts.lib.check_rabbitmq_queue.MAX_SECONDS_TO_CLEAR',
-                             {'name': 10}):
-            result = analyze_queue_stats('name', {'update_time': time.time(),
-                                                  'current_queue_size': 11,
-                                                  'queue_last_emptied_timestamp': time.time() - 10000,
-                                                  'recent_average_consume_time': 1}, 11)
+        with mock.patch.dict('scripts.lib.check_rabbitmq_queue.MAX_SECONDS_TO_CLEAR', {'name': 10}):
+            result = analyze_queue_stats(
+                'name',
+                {
+                    'update_time': time.time(),
+                    'current_queue_size': 11,
+                    'queue_last_emptied_timestamp': time.time() - 10000,
+                    'recent_average_consume_time': 1,
+                },
+                11,
+            )
             self.assertEqual(result['status'], WARNING)
             self.assertIn('clearing the backlog', result['message'])
 
-            result = analyze_queue_stats('name', {'update_time': time.time(),
-                                                  'current_queue_size': 9,
-                                                  'queue_last_emptied_timestamp': time.time() - 10000,
-                                                  'recent_average_consume_time': 1}, 9)
+            result = analyze_queue_stats(
+                'name',
+                {
+                    'update_time': time.time(),
+                    'current_queue_size': 9,
+                    'queue_last_emptied_timestamp': time.time() - 10000,
+                    'recent_average_consume_time': 1,
+                },
+                9,
+            )
             self.assertEqual(result['status'], OK)
diff --git a/tools/tests/test_hash_reqs.py b/tools/tests/test_hash_reqs.py
index 9d9482c239..dd505d4be6 100644
--- a/tools/tests/test_hash_reqs.py
+++ b/tools/tests/test_hash_reqs.py
@@ -6,7 +6,6 @@ from tools.setup.setup_venvs import DEV_REQS_FILE
 
 
 class TestHashCreation(unittest.TestCase):
-
     def test_diff_hash_for_diff_python_version(self) -> None:
         with mock.patch('scripts.lib.hash_reqs.python_version', return_value='Python 3.6.9'):
             deps = expand_reqs(DEV_REQS_FILE)
diff --git a/tools/tests/test_html_branches.py b/tools/tests/test_html_branches.py
index 957412f292..32c571bbc0 100644
--- a/tools/tests/test_html_branches.py
+++ b/tools/tests/test_html_branches.py
@@ -13,8 +13,8 @@ from tools.lib.html_branches import (
 ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 TEST_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_template_data")
 
-class TestHtmlBranches(unittest.TestCase):
 
+class TestHtmlBranches(unittest.TestCase):
     def test_get_tag_info(self) -> None:
         html = """
             <p id="test" class="test1 test2">foo</p>
@@ -70,7 +70,9 @@ class TestHtmlBranches(unittest.TestCase):
         self.assertEqual(tree.children[0].children[1].children[0].token.tag, 'p')
 
         assert tree.children[0].children[1].children[0].children[0].token is not None
-        self.assertEqual(tree.children[0].children[1].children[0].children[0].token.kind, 'html_singleton')
+        self.assertEqual(
+            tree.children[0].children[1].children[0].children[0].token.kind, 'html_singleton'
+        )
         self.assertEqual(tree.children[0].children[1].children[0].children[0].token.tag, 'br')
 
         assert tree.children[0].children[1].children[1].token is not None
@@ -102,8 +104,13 @@ class TestHtmlBranches(unittest.TestCase):
         self.assertEqual(branches[1].text(), 'html body p br')
         self.assertEqual(branches[2].text(), 'html body p')
 
-        self.assertEqual(branches[0].staircase_text(), '\n    html\n        head\n            title\n')
-        self.assertEqual(branches[1].staircase_text(), '\n    html\n        body\n            p\n                br\n')
+        self.assertEqual(
+            branches[0].staircase_text(), '\n    html\n        head\n            title\n'
+        )
+        self.assertEqual(
+            branches[1].staircase_text(),
+            '\n    html\n        body\n            p\n                br\n',
+        )
         self.assertEqual(branches[2].staircase_text(), '\n    html\n        body\n            p\n')
 
     def test_build_id_dict(self) -> None:
@@ -112,16 +119,28 @@ class TestHtmlBranches(unittest.TestCase):
 
         template_id_dict = build_id_dict(templates)
 
-        self.assertEqual(set(template_id_dict.keys()), {'below_navbar', 'hello_{{ message }}', 'intro'})
-        self.assertEqual(template_id_dict['hello_{{ message }}'], [
-                         f'Line 12:{ZULIP_PATH}/tools/tests/test_template_data/test_template1.html',
-                         f'Line 12:{ZULIP_PATH}/tools/tests/test_template_data/test_template2.html'])
-        self.assertEqual(template_id_dict['intro'], [
-                         f'Line 10:{ZULIP_PATH}/tools/tests/test_template_data/test_template1.html',
-                         f'Line 11:{ZULIP_PATH}/tools/tests/test_template_data/test_template1.html',
-                         f'Line 11:{ZULIP_PATH}/tools/tests/test_template_data/test_template2.html'])
-        self.assertEqual(template_id_dict['below_navbar'], [
-                         f'Line 10:{ZULIP_PATH}/tools/tests/test_template_data/test_template2.html'])
+        self.assertEqual(
+            set(template_id_dict.keys()), {'below_navbar', 'hello_{{ message }}', 'intro'}
+        )
+        self.assertEqual(
+            template_id_dict['hello_{{ message }}'],
+            [
+                f'Line 12:{ZULIP_PATH}/tools/tests/test_template_data/test_template1.html',
+                f'Line 12:{ZULIP_PATH}/tools/tests/test_template_data/test_template2.html',
+            ],
+        )
+        self.assertEqual(
+            template_id_dict['intro'],
+            [
+                f'Line 10:{ZULIP_PATH}/tools/tests/test_template_data/test_template1.html',
+                f'Line 11:{ZULIP_PATH}/tools/tests/test_template_data/test_template1.html',
+                f'Line 11:{ZULIP_PATH}/tools/tests/test_template_data/test_template2.html',
+            ],
+        )
+        self.assertEqual(
+            template_id_dict['below_navbar'],
+            [f'Line 10:{ZULIP_PATH}/tools/tests/test_template_data/test_template2.html'],
+        )
 
     def test_split_for_id_and_class(self) -> None:
         id1 = "{{ red|blue }}"
diff --git a/tools/tests/test_pretty_print.py b/tools/tests/test_pretty_print.py
index efc250af12..f058fe4fc8 100644
--- a/tools/tests/test_pretty_print.py
+++ b/tools/tests/test_pretty_print.py
@@ -468,6 +468,7 @@ GOOD_HTML17 = """
 </div>
 """
 
+
 class TestPrettyPrinter(unittest.TestCase):
     def compare(self, a: str, b: str) -> None:
         self.assertEqual(a.split('\n'), b.split('\n'))
diff --git a/tools/tests/test_template_parser.py b/tools/tests/test_template_parser.py
index 421a10a1a3..baaf274ea1 100644
--- a/tools/tests/test_template_parser.py
+++ b/tools/tests/test_template_parser.py
@@ -13,9 +13,15 @@ except ImportError:
     print('ERROR!!! You need to run this via tools/test-tools.')
     sys.exit(1)
 
+
 class ParserTest(unittest.TestCase):
-    def _assert_validate_error(self, error: str, fn: Optional[str]=None,
-                               text: Optional[str]=None, check_indent: bool=True) -> None:
+    def _assert_validate_error(
+        self,
+        error: str,
+        fn: Optional[str] = None,
+        text: Optional[str] = None,
+        check_indent: bool = True,
+    ) -> None:
         with self.assertRaisesRegex(TemplateParserException, error):
             validate(fn=fn, text=text, check_indent=check_indent)
 
@@ -24,10 +30,10 @@ class ParserTest(unittest.TestCase):
         self.assertFalse(is_django_block_tag('not a django tag'))
 
     def test_validate_vanilla_html(self) -> None:
-        '''
+        """
         Verify that validate() does not raise errors for
         well-formed HTML.
-        '''
+        """
         my_html = '''
             <table>
                 <tr>
@@ -99,8 +105,11 @@ class ParserTest(unittest.TestCase):
         my_html = '''
             {{# foo
         '''
-        self._assert_validate_error('''Tag missing "}}" at Line 2 Col 13:"{{# foo
-        "''', text=my_html)
+        self._assert_validate_error(
+            '''Tag missing "}}" at Line 2 Col 13:"{{# foo
+        "''',
+            text=my_html,
+        )
 
     def test_validate_incomplete_handlebars_tag_2(self) -> None:
         my_html = '''
@@ -112,8 +121,11 @@ class ParserTest(unittest.TestCase):
         my_html = '''
             {% foo
         '''
-        self._assert_validate_error('''Tag missing "%}" at Line 2 Col 13:"{% foo
-        "''', text=my_html)
+        self._assert_validate_error(
+            '''Tag missing "%}" at Line 2 Col 13:"{% foo
+        "''',
+            text=my_html,
+        )
 
     def test_validate_incomplete_django_tag_2(self) -> None:
         my_html = '''
@@ -125,8 +137,11 @@ class ParserTest(unittest.TestCase):
         my_html = '''
             <b
         '''
-        self._assert_validate_error('''Tag missing ">" at Line 2 Col 13:"<b
-        "''', text=my_html)
+        self._assert_validate_error(
+            '''Tag missing ">" at Line 2 Col 13:"<b
+        "''',
+            text=my_html,
+        )
 
     def test_validate_incomplete_html_tag_2(self) -> None:
         my_html = '''
@@ -135,10 +150,16 @@ class ParserTest(unittest.TestCase):
         my_html1 = '''
             <a href=""
         '''
-        self._assert_validate_error('''Tag missing ">" at Line 2 Col 13:"<a href=""
-        "''', text=my_html1)
-        self._assert_validate_error('''Unbalanced Quotes at Line 2 Col 13:"<a href="
-        "''', text=my_html)
+        self._assert_validate_error(
+            '''Tag missing ">" at Line 2 Col 13:"<a href=""
+        "''',
+            text=my_html1,
+        )
+        self._assert_validate_error(
+            '''Unbalanced Quotes at Line 2 Col 13:"<a href="
+        "''',
+            text=my_html,
+        )
 
     def test_validate_empty_html_tag(self) -> None:
         my_html = '''
diff --git a/tools/tests/test_zulint_custom_rules.py b/tools/tests/test_zulint_custom_rules.py
index f858e8de60..d5652ddfc0 100644
--- a/tools/tests/test_zulint_custom_rules.py
+++ b/tools/tests/test_zulint_custom_rules.py
@@ -10,8 +10,8 @@ from linter_lib.custom_check import non_py_rules, python_rules
 ROOT_DIR = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
 CHECK_MESSAGE = "Fix the corresponding rule in `tools/linter_lib/custom_check.py`."
 
-class TestRuleList(TestCase):
 
+class TestRuleList(TestCase):
     def setUp(self) -> None:
         self.all_rules = python_rules.rules
         for rule in non_py_rules:
@@ -22,35 +22,53 @@ class TestRuleList(TestCase):
         for rule in self.all_rules:
             for path in rule.get('exclude', {}):
                 abs_path = os.path.abspath(os.path.join(ROOT_DIR, path))
-                self.assertTrue(os.path.exists(abs_path),
-                                f"'{path}' is neither an existing file, nor a directory. {CHECK_MESSAGE}")
+                self.assertTrue(
+                    os.path.exists(abs_path),
+                    f"'{path}' is neither an existing file, nor a directory. {CHECK_MESSAGE}",
+                )
 
             for line_tuple in rule.get('exclude_line', {}):
                 path = line_tuple[0]
                 abs_path = os.path.abspath(os.path.join(ROOT_DIR, path))
-                self.assertTrue(os.path.isfile(abs_path),
-                                f"The file '{path}' doesn't exist. {CHECK_MESSAGE}")
+                self.assertTrue(
+                    os.path.isfile(abs_path), f"The file '{path}' doesn't exist. {CHECK_MESSAGE}"
+                )
 
             for path in rule.get('include_only', {}):
                 if not os.path.splitext(path)[1]:
-                    self.assertTrue(path.endswith('/'),
-                                    f"The path '{path}' should end with '/'. {CHECK_MESSAGE}")
+                    self.assertTrue(
+                        path.endswith('/'),
+                        f"The path '{path}' should end with '/'. {CHECK_MESSAGE}",
+                    )
 
     def test_rule_patterns(self) -> None:
         """Verifies that the search regex specified in a custom rule actually matches
-           the expectation and doesn't throw false positives."""
+        the expectation and doesn't throw false positives."""
         for rule in self.all_rules:
             pattern = rule['pattern']
             for line in rule.get('good_lines', []):
                 # create=True is superfluous when mocking built-ins in Python >= 3.5
-                with patch('builtins.open', return_value=StringIO(line + '\n\n'), create=True, autospec=True):
-                    self.assertFalse(RuleList([], [rule]).custom_check_file('foo.bar', 'baz', ''),
-                                     f"The pattern '{pattern}' matched the line '{line}' while it shouldn't.")
+                with patch(
+                    'builtins.open',
+                    return_value=StringIO(line + '\n\n'),
+                    create=True,
+                    autospec=True,
+                ):
+                    self.assertFalse(
+                        RuleList([], [rule]).custom_check_file('foo.bar', 'baz', ''),
+                        f"The pattern '{pattern}' matched the line '{line}' while it shouldn't.",
+                    )
 
             for line in rule.get('bad_lines', []):
                 # create=True is superfluous when mocking built-ins in Python >= 3.5
-                with patch('builtins.open',
-                           return_value=StringIO(line + '\n\n'), create=True, autospec=True), patch('builtins.print'):
+                with patch(
+                    'builtins.open',
+                    return_value=StringIO(line + '\n\n'),
+                    create=True,
+                    autospec=True,
+                ), patch('builtins.print'):
                     filename = list(rule.get('include_only', {'foo.bar'}))[0]
-                    self.assertTrue(RuleList([], [rule]).custom_check_file(filename, 'baz', ''),
-                                    f"The pattern '{pattern}' didn't match the line '{line}' while it should.")
+                    self.assertTrue(
+                        RuleList([], [rule]).custom_check_file(filename, 'baz', ''),
+                        f"The pattern '{pattern}' didn't match the line '{line}' while it should.",
+                    )
diff --git a/tools/update-prod-static b/tools/update-prod-static
index 4d354fb68c..efd7a2ec20 100755
--- a/tools/update-prod-static
+++ b/tools/update-prod-static
@@ -22,8 +22,9 @@ from scripts.lib.zulip_tools import run
 sanity_check.check_venv(__file__)
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--prev-deploy', metavar='DIR',
-                    help='a previous deploy from which to reuse files if possible')
+parser.add_argument(
+    '--prev-deploy', metavar='DIR', help='a previous deploy from which to reuse files if possible'
+)
 args = parser.parse_args()
 prev_deploy = args.prev_deploy
 
@@ -51,17 +52,21 @@ run(['./tools/setup/build_timezone_values'])
 run(['./tools/webpack', '--quiet'])
 
 # Collect the files that we're going to serve; this creates prod-static/serve.
-run([
-    './manage.py', 'collectstatic', '--no-default-ignore',
-    '-v0',
-    '--noinput',
-    '--ignore=assets',
-    '--ignore=emoji-styles',
-    '--ignore=html',
-    '--ignore=js',
-    '--ignore=styles',
-    '--ignore=templates',
-])
+run(
+    [
+        './manage.py',
+        'collectstatic',
+        '--no-default-ignore',
+        '-v0',
+        '--noinput',
+        '--ignore=assets',
+        '--ignore=emoji-styles',
+        '--ignore=html',
+        '--ignore=js',
+        '--ignore=styles',
+        '--ignore=templates',
+    ]
+)
 
 # Compile translation strings to generate `.mo` files.
 run(['./manage.py', 'compilemessages', '-v0'])
diff --git a/tools/update-zuliprc-api-field b/tools/update-zuliprc-api-field
index 2c82756d69..bf8903f269 100755
--- a/tools/update-zuliprc-api-field
+++ b/tools/update-zuliprc-api-field
@@ -20,8 +20,9 @@ sys.path.insert(0, ZULIP_PATH)
 from scripts.lib.zulip_tools import is_vagrant_env_host
 
 parser = argparse.ArgumentParser(description=__doc__)
-parser.add_argument('path', metavar='FILE', nargs='+',
-                    help='config file of dummy users in development server')
+parser.add_argument(
+    'path', metavar='FILE', nargs='+', help='config file of dummy users in development server'
+)
 args = parser.parse_args()
 
 zuliprc_paths_list = args.path
@@ -50,14 +51,20 @@ for zuliprc_path in zuliprc_paths_list:
         os.chdir(ZULIP_PATH)
 
         if is_vagrant_env_host(ZULIP_PATH):
-            arguments = ['vagrant', 'ssh', '--command',
-                         './manage.py print_initial_password ' + shlex.quote(email)]
+            arguments = [
+                'vagrant',
+                'ssh',
+                '--command',
+                './manage.py print_initial_password ' + shlex.quote(email),
+            ]
         else:
             # Support users who don't have vagrant based setup
             arguments = ['./manage.py', 'print_initial_password', email]
         # We redirect 'stderr' to 'stdout' to avoid 'Connection to 127.0.0.1 closed'
         # appearing after this script finishes.
-        output = subprocess.check_output(arguments, stderr=subprocess.STDOUT, universal_newlines=True)
+        output = subprocess.check_output(
+            arguments, stderr=subprocess.STDOUT, universal_newlines=True
+        )
         new_key = output.split()[6]
 
         if new_key != key:
diff --git a/tools/webpack b/tools/webpack
index 7a4c9618b4..4da9b3aea8 100755
--- a/tools/webpack
+++ b/tools/webpack
@@ -17,6 +17,7 @@ def build_for_prod_or_puppeteer(quiet: bool) -> NoReturn:
         webpack_args.append('--display=errors-only')
     os.execvp(webpack_args[0], webpack_args)
 
+
 def build_for_dev_server(host: str, port: str, minify: bool, disable_host_check: bool) -> None:
     """watches and rebuilds on changes, serving files from memory via webpack-dev-server"""
 
@@ -56,6 +57,7 @@ def build_for_dev_server(host: str, port: str, minify: bool, disable_host_check:
     # TODO: This process should also fall back to periodic polling if
     # inotify_broken.
     import pyinotify
+
     try:
         webpack_process = subprocess.Popen(webpack_args)
 
@@ -77,6 +79,7 @@ def build_for_dev_server(host: str, port: str, minify: bool, disable_host_check:
         webpack_process.terminate()
         webpack_process.wait()
 
+
 def build_for_most_tests() -> None:
     """Generates a stub asset stat file for django so backend test can render a page"""
 
@@ -91,11 +94,13 @@ def build_for_most_tests() -> None:
     entries = {}
     with open('tools/webpack.assets.json') as json_data:
         for entry in json.load(json_data).keys():
-            entries[entry] = [{
-                "name": f"{entry}.js",
-                "publicPath": f"http://localhost:3000/webpack-stub/{entry}-stubentry.js",
-                "path": f"/stubfolder/{entry}-stubfile.js",
-            }]
+            entries[entry] = [
+                {
+                    "name": f"{entry}.js",
+                    "publicPath": f"http://localhost:3000/webpack-stub/{entry}-stubentry.js",
+                    "path": f"/stubfolder/{entry}-stubfile.js",
+                }
+            ]
     stat_data = {
         "status": "done",
         "chunks": entries,
@@ -109,25 +114,25 @@ def build_for_most_tests() -> None:
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--test',
-                    action='store_true',
-                    help='generate a stub webpack-stats.json file (for backend testing)')
-parser.add_argument('--quiet',
-                    action='store_true',
-                    help='Minimizes webpack output while running')
-parser.add_argument('--watch',
-                    action='store_true',
-                    help='watch for changes to source files (for development)')
-parser.add_argument('--host',
-                    default='127.0.0.1', help='set the host for the webpack server to run on')
-parser.add_argument('--port',
-                    default='9994', help='set the port for the webpack server to run on')
-parser.add_argument('--minify',
-                    action='store_true',
-                    help='Minify and optimize the assets (for development)')
-parser.add_argument('--disable-host-check',
-                    action='store_true',
-                    help='Disable host check for webpack-dev-server')
+parser.add_argument(
+    '--test',
+    action='store_true',
+    help='generate a stub webpack-stats.json file (for backend testing)',
+)
+parser.add_argument('--quiet', action='store_true', help='Minimizes webpack output while running')
+parser.add_argument(
+    '--watch', action='store_true', help='watch for changes to source files (for development)'
+)
+parser.add_argument(
+    '--host', default='127.0.0.1', help='set the host for the webpack server to run on'
+)
+parser.add_argument('--port', default='9994', help='set the port for the webpack server to run on')
+parser.add_argument(
+    '--minify', action='store_true', help='Minify and optimize the assets (for development)'
+)
+parser.add_argument(
+    '--disable-host-check', action='store_true', help='Disable host check for webpack-dev-server'
+)
 
 args = parser.parse_args()
 if "PUPPETEER_TESTS" in os.environ:
diff --git a/tools/zulip-export/zulip-export b/tools/zulip-export/zulip-export
index fcc1b2e6de..7a0ab38ac8 100755
--- a/tools/zulip-export/zulip-export
+++ b/tools/zulip-export/zulip-export
@@ -51,8 +51,7 @@ request = {
     'anchor': 0,
     'num_before': 0,
     'num_after': max_id,
-    'narrow': [{'operator': 'stream',
-                'operand': options.stream}],
+    'narrow': [{'operator': 'stream', 'operand': options.stream}],
     'apply_markdown': False,
 }
 
@@ -71,9 +70,18 @@ for msg in result['messages']:
     if msg['type'] != 'stream':
         continue
     # Remove extraneous metadata
-    for k in ['flags', 'edit_history', 'topic_links',
-              'avatar_url', 'recipient_id',
-              'content_type', 'client', 'sender_realm_str', 'id', 'type']:
+    for k in [
+        'flags',
+        'edit_history',
+        'topic_links',
+        'avatar_url',
+        'recipient_id',
+        'content_type',
+        'client',
+        'sender_realm_str',
+        'id',
+        'type',
+    ]:
         msg.pop(k, None)
     messages.append(msg)
 
diff --git a/version.py b/version.py
index 184a8bc0c3..2bca3c75b5 100644
--- a/version.py
+++ b/version.py
@@ -2,7 +2,9 @@ import os
 
 ZULIP_VERSION = "4.0-dev+git"
 # Add information on number of commits and commit hash to version, if available
-zulip_git_version_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'zulip-git-version')
+zulip_git_version_file = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), 'zulip-git-version'
+)
 if os.path.exists(zulip_git_version_file):
     with open(zulip_git_version_file) as f:
         version = f.read().strip()
diff --git a/zerver/apps.py b/zerver/apps.py
index 4d6d355daf..587eb08403 100644
--- a/zerver/apps.py
+++ b/zerver/apps.py
@@ -22,6 +22,7 @@ class ZerverConfig(AppConfig):
         # running that code too early in Django's setup process, but
         # in any case, this is an intentionally unused import.
         import zerver.signals
+
         zerver.signals
 
         if settings.POST_MIGRATION_CACHE_FLUSHING:
diff --git a/zerver/context_processors.py b/zerver/context_processors.py
index 17761742b7..ee86b9a6ab 100644
--- a/zerver/context_processors.py
+++ b/zerver/context_processors.py
@@ -42,6 +42,7 @@ def common_context(user: UserProfile) -> Dict[str, Any]:
         'user_name': user.full_name,
     }
 
+
 def get_realm_from_request(request: HttpRequest) -> Optional[Realm]:
     if hasattr(request, "user") and hasattr(request.user, "realm"):
         return request.user.realm
@@ -57,12 +58,14 @@ def get_realm_from_request(request: HttpRequest) -> Optional[Realm]:
             request.realm = None
     return request.realm
 
+
 def get_valid_realm_from_request(request: HttpRequest) -> Realm:
     realm = get_realm_from_request(request)
     if realm is None:
         raise InvalidSubdomainError()
     return realm
 
+
 def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
     """Context available to all Zulip Jinja2 templates that have a request
     passed in.  Designed to provide the long list of variables at the
@@ -88,8 +91,10 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
     find_team_link_disabled = settings.FIND_TEAM_LINK_DISABLED
     allow_search_engine_indexing = False
 
-    if (settings.ROOT_DOMAIN_LANDING_PAGE
-            and get_subdomain(request) == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN):
+    if (
+        settings.ROOT_DOMAIN_LANDING_PAGE
+        and get_subdomain(request) == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
+    ):
         register_link_disabled = True
         login_link_disabled = True
         find_team_link_disabled = False
@@ -115,7 +120,9 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
         settings_comments_path = "/etc/zulip/settings.py"
 
     support_email = FromAddress.SUPPORT
-    support_email_html_tag = SafeString(f'<a href="mailto:{escape(support_email)}">{escape(support_email)}</a>')
+    support_email_html_tag = SafeString(
+        f'<a href="mailto:{escape(support_email)}">{escape(support_email)}</a>'
+    )
 
     # We can't use request.client here because we might not be using
     # an auth decorator that sets it, but we can call its helper to
@@ -162,6 +169,7 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
 
     return context
 
+
 def login_context(request: HttpRequest) -> Dict[str, Any]:
     realm = get_realm_from_request(request)
 
@@ -202,13 +210,14 @@ def login_context(request: HttpRequest) -> Dict[str, Any]:
     # by the desktop client. We expand it with IDs of the <button> elements corresponding
     # to the authentication methods.
     context['page_params'] = dict(
-        external_authentication_methods = get_external_method_dicts(realm),
+        external_authentication_methods=get_external_method_dicts(realm),
     )
     for auth_dict in context['page_params']['external_authentication_methods']:
         auth_dict['button_id_suffix'] = "auth_button_{}".format(auth_dict['name'])
 
     return context
 
+
 def latest_info_context() -> Dict[str, str]:
     context = {
         'latest_release_version': LATEST_RELEASE_VERSION,
diff --git a/zerver/data_import/gitter.py b/zerver/data_import/gitter.py
index f89f52ee1f..24ea17b6be 100644
--- a/zerver/data_import/gitter.py
+++ b/zerver/data_import/gitter.py
@@ -32,11 +32,10 @@ GitterDataT = List[Dict[str, Any]]
 
 realm_id = 0
 
-def gitter_workspace_to_realm(domain_name: str, gitter_data: GitterDataT,
-                              realm_subdomain: str) -> Tuple[ZerverFieldsT,
-                                                             List[ZerverFieldsT],
-                                                             Dict[str, int],
-                                                             Dict[str, int]]:
+
+def gitter_workspace_to_realm(
+    domain_name: str, gitter_data: GitterDataT, realm_subdomain: str
+) -> Tuple[ZerverFieldsT, List[ZerverFieldsT], Dict[str, int], Dict[str, int]]:
     """
     Returns:
     1. realm, converted realm data
@@ -51,7 +50,8 @@ def gitter_workspace_to_realm(domain_name: str, gitter_data: GitterDataT,
     zerver_userprofile, avatars, user_map = build_userprofile(int(NOW), domain_name, gitter_data)
     zerver_stream, zerver_defaultstream, stream_map = build_stream_map(int(NOW), gitter_data)
     zerver_recipient, zerver_subscription = build_recipient_and_subscription(
-        zerver_userprofile, zerver_stream)
+        zerver_userprofile, zerver_stream
+    )
 
     realm['zerver_userprofile'] = zerver_userprofile
     realm['zerver_stream'] = zerver_stream
@@ -61,10 +61,10 @@ def gitter_workspace_to_realm(domain_name: str, gitter_data: GitterDataT,
 
     return realm, avatars, user_map, stream_map
 
-def build_userprofile(timestamp: Any, domain_name: str,
-                      gitter_data: GitterDataT) -> Tuple[List[ZerverFieldsT],
-                                                         List[ZerverFieldsT],
-                                                         Dict[str, int]]:
+
+def build_userprofile(
+    timestamp: Any, domain_name: str, gitter_data: GitterDataT
+) -> Tuple[List[ZerverFieldsT], List[ZerverFieldsT], Dict[str, int]]:
     """
     Returns:
     1. zerver_userprofile, which is a list of user profile
@@ -83,8 +83,7 @@ def build_userprofile(timestamp: Any, domain_name: str,
             user_map[user_data['id']] = user_id
 
             email = get_user_email(user_data, domain_name)
-            build_avatar(user_id, realm_id, email, user_data['avatarUrl'],
-                         timestamp, avatar_list)
+            build_avatar(user_id, realm_id, email, user_data['avatarUrl'], timestamp, avatar_list)
 
             # Build userprofile object
             userprofile = UserProfile(
@@ -94,7 +93,8 @@ def build_userprofile(timestamp: Any, domain_name: str,
                 delivery_email=email,
                 avatar_source='U',
                 date_joined=timestamp,
-                last_login=timestamp)
+                last_login=timestamp,
+            )
             userprofile_dict = model_to_dict(userprofile)
             # Set realm id separately as the corresponding realm is not yet a Realm model
             # instance
@@ -109,15 +109,16 @@ def build_userprofile(timestamp: Any, domain_name: str,
     logging.info('######### IMPORTING USERS FINISHED #########\n')
     return zerver_userprofile, avatar_list, user_map
 
+
 def get_user_email(user_data: ZerverFieldsT, domain_name: str) -> str:
     # TODO Get user email from github
-    email = ("{}@users.noreply.github.com".format(user_data['username']))
+    email = "{}@users.noreply.github.com".format(user_data['username'])
     return email
 
-def build_stream_map(timestamp: Any,
-                     gitter_data: GitterDataT) -> Tuple[List[ZerverFieldsT],
-                                                        List[ZerverFieldsT],
-                                                        Dict[str, int]]:
+
+def build_stream_map(
+    timestamp: Any, gitter_data: GitterDataT
+) -> Tuple[List[ZerverFieldsT], List[ZerverFieldsT], Dict[str, int]]:
     """
     Returns:
     1. stream, which is the list of streams
@@ -129,28 +130,31 @@ def build_stream_map(timestamp: Any,
     stream: List[ZerverFieldsT] = []
 
     # Default stream when no "room" field is present
-    stream.append(build_stream(timestamp, realm_id, 'from gitter',
-                               "Imported from Gitter", stream_id))
-    defaultstream = build_defaultstream(realm_id=realm_id, stream_id=stream_id,
-                                        defaultstream_id=0)
+    stream.append(
+        build_stream(timestamp, realm_id, 'from gitter', "Imported from Gitter", stream_id)
+    )
+    defaultstream = build_defaultstream(realm_id=realm_id, stream_id=stream_id, defaultstream_id=0)
     stream_id += 1
 
     # Gathering streams from gitter_data
     stream_map: Dict[str, int] = {}
     for data in gitter_data:
         if 'room' in data and data['room'] not in stream_map:
-            stream.append(build_stream(timestamp, realm_id, data['room'],
-                                       f'Gitter room {data["room"]}', stream_id))
+            stream.append(
+                build_stream(
+                    timestamp, realm_id, data['room'], f'Gitter room {data["room"]}', stream_id
+                )
+            )
             stream_map[data['room']] = stream_id
             stream_id += 1
     logging.info('######### IMPORTING STREAMS FINISHED #########\n')
 
     return stream, [defaultstream], stream_map
 
+
 def build_recipient_and_subscription(
-    zerver_userprofile: List[ZerverFieldsT],
-    zerver_stream: List[ZerverFieldsT]) -> Tuple[List[ZerverFieldsT],
-                                                 List[ZerverFieldsT]]:
+    zerver_userprofile: List[ZerverFieldsT], zerver_stream: List[ZerverFieldsT]
+) -> Tuple[List[ZerverFieldsT], List[ZerverFieldsT]]:
     """
     Assumes that there is at least one stream with 'stream_id' = 0,
       and that this stream is the only defaultstream, with 'defaultstream_id' = 0
@@ -185,17 +189,23 @@ def build_recipient_and_subscription(
     # based either on Gitter API data or who sent messages where.
     for user in zerver_userprofile:
         for stream in zerver_stream:
-            zerver_subscription.append(build_subscription(stream['id'], user['id'], subscription_id))
+            zerver_subscription.append(
+                build_subscription(stream['id'], user['id'], subscription_id)
+            )
             subscription_id += 1
 
     return zerver_recipient, zerver_subscription
 
-def convert_gitter_workspace_messages(gitter_data: GitterDataT, output_dir: str,
-                                      subscriber_map: Dict[int, Set[int]],
-                                      user_map: Dict[str, int],
-                                      stream_map: Dict[str, int],
-                                      user_short_name_to_full_name: Dict[str, str],
-                                      chunk_size: int=MESSAGE_BATCH_CHUNK_SIZE) -> None:
+
+def convert_gitter_workspace_messages(
+    gitter_data: GitterDataT,
+    output_dir: str,
+    subscriber_map: Dict[int, Set[int]],
+    user_map: Dict[str, int],
+    stream_map: Dict[str, int],
+    user_short_name_to_full_name: Dict[str, str],
+    chunk_size: int = MESSAGE_BATCH_CHUNK_SIZE,
+) -> None:
     """
     Messages are stored in batches
     """
@@ -210,19 +220,27 @@ def convert_gitter_workspace_messages(gitter_data: GitterDataT, output_dir: str,
         message_json = {}
         zerver_message = []
         zerver_usermessage: List[ZerverFieldsT] = []
-        message_data = gitter_data[low_index: upper_index]
+        message_data = gitter_data[low_index:upper_index]
         if len(message_data) == 0:
             break
         for message in message_data:
             message_time = dateutil.parser.parse(message['sent']).timestamp()
-            mentioned_user_ids = get_usermentions(message, user_map,
-                                                  user_short_name_to_full_name)
+            mentioned_user_ids = get_usermentions(message, user_map, user_short_name_to_full_name)
             rendered_content = None
-            topic_name = 'imported from Gitter' + (f' room {message["room"]}' if 'room' in message else '')
+            topic_name = 'imported from Gitter' + (
+                f' room {message["room"]}' if 'room' in message else ''
+            )
             user_id = user_map[message['fromUser']['id']]
             recipient_id = stream_map[message['room']] if 'room' in message else 0
-            zulip_message = build_message(topic_name, float(message_time), message_id, message['text'],
-                                          rendered_content, user_id, recipient_id)
+            zulip_message = build_message(
+                topic_name,
+                float(message_time),
+                message_id,
+                message['text'],
+                rendered_content,
+                user_id,
+                recipient_id,
+            )
             zerver_message.append(zulip_message)
 
             build_usermessages(
@@ -248,26 +266,31 @@ def convert_gitter_workspace_messages(gitter_data: GitterDataT, output_dir: str,
 
     logging.info('######### IMPORTING MESSAGES FINISHED #########\n')
 
-def get_usermentions(message: Dict[str, Any], user_map: Dict[str, int],
-                     user_short_name_to_full_name: Dict[str, str]) -> List[int]:
+
+def get_usermentions(
+    message: Dict[str, Any], user_map: Dict[str, int], user_short_name_to_full_name: Dict[str, str]
+) -> List[int]:
     mentioned_user_ids = []
     if 'mentions' in message:
         for mention in message['mentions']:
             if mention.get('userId') in user_map:
                 gitter_mention = '@{}'.format(mention['screenName'])
                 if mention['screenName'] not in user_short_name_to_full_name:
-                    logging.info("Mentioned user %s never sent any messages, so has no full name data",
-                                 mention['screenName'])
+                    logging.info(
+                        "Mentioned user %s never sent any messages, so has no full name data",
+                        mention['screenName'],
+                    )
                     full_name = mention['screenName']
                 else:
                     full_name = user_short_name_to_full_name[mention['screenName']]
-                zulip_mention = (f'@**{full_name}**')
+                zulip_mention = f'@**{full_name}**'
                 message['text'] = message['text'].replace(gitter_mention, zulip_mention)
 
                 mentioned_user_ids.append(user_map[mention['userId']])
     return mentioned_user_ids
 
-def do_convert_data(gitter_data_file: str, output_dir: str, threads: int=6) -> None:
+
+def do_convert_data(gitter_data_file: str, output_dir: str, threads: int = 6) -> None:
     #  Subdomain is set by the user while running the import commands
     realm_subdomain = ""
     domain_name = settings.EXTERNAL_HOST
@@ -282,7 +305,8 @@ def do_convert_data(gitter_data_file: str, output_dir: str, threads: int=6) -> N
         gitter_data = orjson.loads(fp.read())
 
     realm, avatar_list, user_map, stream_map = gitter_workspace_to_realm(
-        domain_name, gitter_data, realm_subdomain)
+        domain_name, gitter_data, realm_subdomain
+    )
 
     subscriber_map = make_subscriber_map(
         zerver_subscription=realm['zerver_subscription'],
@@ -294,8 +318,8 @@ def do_convert_data(gitter_data_file: str, output_dir: str, threads: int=6) -> N
         user_short_name_to_full_name[userprofile['short_name']] = userprofile['full_name']
 
     convert_gitter_workspace_messages(
-        gitter_data, output_dir, subscriber_map, user_map, stream_map,
-        user_short_name_to_full_name)
+        gitter_data, output_dir, subscriber_map, user_map, stream_map, user_short_name_to_full_name
+    )
 
     avatar_folder = os.path.join(output_dir, 'avatars')
     avatar_realm_folder = os.path.join(avatar_folder, str(realm_id))
@@ -320,6 +344,7 @@ def do_convert_data(gitter_data_file: str, output_dir: str, threads: int=6) -> N
     logging.info('######### DATA CONVERSION FINISHED #########\n')
     logging.info("Zulip data dump created at %s", output_dir)
 
+
 def write_data_to_file(output_file: str, data: Any) -> None:
     with open(output_file, "wb") as f:
         f.write(orjson.dumps(data, option=orjson.OPT_INDENT_2))
diff --git a/zerver/data_import/import_util.py b/zerver/data_import/import_util.py
index e844ebe269..2bc8fbe9de 100644
--- a/zerver/data_import/import_util.py
+++ b/zerver/data_import/import_util.py
@@ -28,16 +28,18 @@ from zerver.models import (
 # stubs
 ZerverFieldsT = Dict[str, Any]
 
+
 class SubscriberHandler:
     def __init__(self) -> None:
         self.stream_info: Dict[int, Set[int]] = {}
         self.huddle_info: Dict[int, Set[int]] = {}
 
-    def set_info(self,
-                 users: Set[int],
-                 stream_id: Optional[int]=None,
-                 huddle_id: Optional[int]=None,
-                 ) -> None:
+    def set_info(
+        self,
+        users: Set[int],
+        stream_id: Optional[int] = None,
+        huddle_id: Optional[int] = None,
+    ) -> None:
         if stream_id is not None:
             self.stream_info[stream_id] = users
         elif huddle_id is not None:
@@ -45,9 +47,9 @@ class SubscriberHandler:
         else:
             raise AssertionError("stream_id or huddle_id is required")
 
-    def get_users(self,
-                  stream_id: Optional[int]=None,
-                  huddle_id: Optional[int]=None) -> Set[int]:
+    def get_users(
+        self, stream_id: Optional[int] = None, huddle_id: Optional[int] = None
+    ) -> Set[int]:
         if stream_id is not None:
             return self.stream_info[stream_id]
         elif huddle_id is not None:
@@ -55,28 +57,37 @@ class SubscriberHandler:
         else:
             raise AssertionError("stream_id or huddle_id is required")
 
-def build_zerver_realm(realm_id: int, realm_subdomain: str, time: float,
-                       other_product: str) -> List[ZerverFieldsT]:
-    realm = Realm(id=realm_id, date_created=time,
-                  name=realm_subdomain, string_id=realm_subdomain,
-                  description=f"Organization imported from {other_product}!")
+
+def build_zerver_realm(
+    realm_id: int, realm_subdomain: str, time: float, other_product: str
+) -> List[ZerverFieldsT]:
+    realm = Realm(
+        id=realm_id,
+        date_created=time,
+        name=realm_subdomain,
+        string_id=realm_subdomain,
+        description=f"Organization imported from {other_product}!",
+    )
     auth_methods = [[flag[0], flag[1]] for flag in realm.authentication_methods]
     realm_dict = model_to_dict(realm, exclude='authentication_methods')
     realm_dict['authentication_methods'] = auth_methods
-    return[realm_dict]
+    return [realm_dict]
 
-def build_user_profile(avatar_source: str,
-                       date_joined: Any,
-                       delivery_email: str,
-                       email: str,
-                       full_name: str,
-                       id: int,
-                       is_active: bool,
-                       role: int,
-                       is_mirror_dummy: bool,
-                       realm_id: int,
-                       short_name: str,
-                       timezone: Optional[str]) -> ZerverFieldsT:
+
+def build_user_profile(
+    avatar_source: str,
+    date_joined: Any,
+    delivery_email: str,
+    email: str,
+    full_name: str,
+    id: int,
+    is_active: bool,
+    role: int,
+    is_mirror_dummy: bool,
+    realm_id: int,
+    short_name: str,
+    timezone: Optional[str],
+) -> ZerverFieldsT:
     obj = UserProfile(
         avatar_source=avatar_source,
         date_joined=date_joined,
@@ -100,8 +111,15 @@ def build_user_profile(avatar_source: str,
     dct['short_name'] = short_name
     return dct
 
-def build_avatar(zulip_user_id: int, realm_id: int, email: str, avatar_url: str,
-                 timestamp: Any, avatar_list: List[ZerverFieldsT]) -> None:
+
+def build_avatar(
+    zulip_user_id: int,
+    realm_id: int,
+    email: str,
+    avatar_url: str,
+    timestamp: Any,
+    avatar_list: List[ZerverFieldsT],
+) -> None:
     avatar = dict(
         path=avatar_url,  # Save original avatar URL here, which is downloaded later
         realm_id=realm_id,
@@ -110,14 +128,16 @@ def build_avatar(zulip_user_id: int, realm_id: int, email: str, avatar_url: str,
         last_modified=timestamp,
         user_profile_email=email,
         s3_path="",
-        size="")
+        size="",
+    )
     avatar_list.append(avatar)
 
+
 def make_subscriber_map(zerver_subscription: List[ZerverFieldsT]) -> Dict[int, Set[int]]:
-    '''
+    """
     This can be convenient for building up UserMessage
     rows.
-    '''
+    """
     subscriber_map: Dict[int, Set[int]] = {}
     for sub in zerver_subscription:
         user_id = sub['user_profile']
@@ -128,10 +148,13 @@ def make_subscriber_map(zerver_subscription: List[ZerverFieldsT]) -> Dict[int, S
 
     return subscriber_map
 
-def make_user_messages(zerver_message: List[ZerverFieldsT],
-                       subscriber_map: Dict[int, Set[int]],
-                       is_pm_data: bool,
-                       mention_map: Dict[int, Set[int]]) -> List[ZerverFieldsT]:
+
+def make_user_messages(
+    zerver_message: List[ZerverFieldsT],
+    subscriber_map: Dict[int, Set[int]],
+    is_pm_data: bool,
+    mention_map: Dict[int, Set[int]],
+) -> List[ZerverFieldsT]:
 
     zerver_usermessage = []
 
@@ -155,46 +178,38 @@ def make_user_messages(zerver_message: List[ZerverFieldsT],
 
     return zerver_usermessage
 
-def build_subscription(recipient_id: int, user_id: int,
-                       subscription_id: int) -> ZerverFieldsT:
-    subscription = Subscription(
-        color=random.choice(stream_colors),
-        id=subscription_id)
+
+def build_subscription(recipient_id: int, user_id: int, subscription_id: int) -> ZerverFieldsT:
+    subscription = Subscription(color=random.choice(stream_colors), id=subscription_id)
     subscription_dict = model_to_dict(subscription, exclude=['user_profile', 'recipient_id'])
     subscription_dict['user_profile'] = user_id
     subscription_dict['recipient'] = recipient_id
     return subscription_dict
 
+
 def build_public_stream_subscriptions(
-        zerver_userprofile: List[ZerverFieldsT],
-        zerver_recipient: List[ZerverFieldsT],
-        zerver_stream: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
-    '''
+    zerver_userprofile: List[ZerverFieldsT],
+    zerver_recipient: List[ZerverFieldsT],
+    zerver_stream: List[ZerverFieldsT],
+) -> List[ZerverFieldsT]:
+    """
     This function was only used for HipChat, but it may apply to
     future conversions.  We often did't get full subscriber data in
     the HipChat export, so this function just autosubscribes all
     users to every public stream.  This returns a list of Subscription
     dicts.
-    '''
+    """
     subscriptions: List[ZerverFieldsT] = []
 
-    public_stream_ids = {
-        stream['id']
-        for stream in zerver_stream
-        if not stream['invite_only']
-    }
+    public_stream_ids = {stream['id'] for stream in zerver_stream if not stream['invite_only']}
 
     public_stream_recipient_ids = {
         recipient['id']
         for recipient in zerver_recipient
-        if recipient['type'] == Recipient.STREAM
-        and recipient['type_id'] in public_stream_ids
+        if recipient['type'] == Recipient.STREAM and recipient['type_id'] in public_stream_ids
     }
 
-    user_ids = [
-        user['id']
-        for user in zerver_userprofile
-    ]
+    user_ids = [user['id'] for user in zerver_userprofile]
 
     for recipient_id in public_stream_recipient_ids:
         for user_id in user_ids:
@@ -207,10 +222,12 @@ def build_public_stream_subscriptions(
 
     return subscriptions
 
+
 def build_stream_subscriptions(
-        get_users: Callable[..., Set[int]],
-        zerver_recipient: List[ZerverFieldsT],
-        zerver_stream: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
+    get_users: Callable[..., Set[int]],
+    zerver_recipient: List[ZerverFieldsT],
+    zerver_stream: List[ZerverFieldsT],
+) -> List[ZerverFieldsT]:
 
     subscriptions: List[ZerverFieldsT] = []
 
@@ -219,8 +236,7 @@ def build_stream_subscriptions(
     recipient_map = {
         recipient['id']: recipient['type_id']  # recipient_id -> stream_id
         for recipient in zerver_recipient
-        if recipient['type'] == Recipient.STREAM
-        and recipient['type_id'] in stream_ids
+        if recipient['type'] == Recipient.STREAM and recipient['type_id'] in stream_ids
     }
 
     for recipient_id, stream_id in recipient_map.items():
@@ -235,10 +251,12 @@ def build_stream_subscriptions(
 
     return subscriptions
 
+
 def build_huddle_subscriptions(
-        get_users: Callable[..., Set[int]],
-        zerver_recipient: List[ZerverFieldsT],
-        zerver_huddle: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
+    get_users: Callable[..., Set[int]],
+    zerver_recipient: List[ZerverFieldsT],
+    zerver_huddle: List[ZerverFieldsT],
+) -> List[ZerverFieldsT]:
 
     subscriptions: List[ZerverFieldsT] = []
 
@@ -247,8 +265,7 @@ def build_huddle_subscriptions(
     recipient_map = {
         recipient['id']: recipient['type_id']  # recipient_id -> stream_id
         for recipient in zerver_recipient
-        if recipient['type'] == Recipient.HUDDLE
-        and recipient['type_id'] in huddle_ids
+        if recipient['type'] == Recipient.HUDDLE and recipient['type_id'] in huddle_ids
     }
 
     for recipient_id, huddle_id in recipient_map.items():
@@ -263,14 +280,13 @@ def build_huddle_subscriptions(
 
     return subscriptions
 
+
 def build_personal_subscriptions(zerver_recipient: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
 
     subscriptions: List[ZerverFieldsT] = []
 
     personal_recipients = [
-        recipient
-        for recipient in zerver_recipient
-        if recipient['type'] == Recipient.PERSONAL
+        recipient for recipient in zerver_recipient if recipient['type'] == Recipient.PERSONAL
     ]
 
     for recipient in personal_recipients:
@@ -285,6 +301,7 @@ def build_personal_subscriptions(zerver_recipient: List[ZerverFieldsT]) -> List[
 
     return subscriptions
 
+
 def build_recipient(type_id: int, recipient_id: int, type: int) -> ZerverFieldsT:
     recipient = Recipient(
         type_id=type_id,  # stream id
@@ -294,14 +311,17 @@ def build_recipient(type_id: int, recipient_id: int, type: int) -> ZerverFieldsT
     recipient_dict = model_to_dict(recipient)
     return recipient_dict
 
-def build_recipients(zerver_userprofile: Iterable[ZerverFieldsT],
-                     zerver_stream: Iterable[ZerverFieldsT],
-                     zerver_huddle: Iterable[ZerverFieldsT] = []) -> List[ZerverFieldsT]:
-    '''
+
+def build_recipients(
+    zerver_userprofile: Iterable[ZerverFieldsT],
+    zerver_stream: Iterable[ZerverFieldsT],
+    zerver_huddle: Iterable[ZerverFieldsT] = [],
+) -> List[ZerverFieldsT]:
+    """
     This function was only used HipChat import, this function may be
     required for future conversions. The Slack and Gitter conversions do it more
     tightly integrated with creating other objects.
-    '''
+    """
 
     recipients = []
 
@@ -339,36 +359,44 @@ def build_recipients(zerver_userprofile: Iterable[ZerverFieldsT],
         recipients.append(recipient_dict)
     return recipients
 
-def build_realm(zerver_realm: List[ZerverFieldsT], realm_id: int,
-                domain_name: str) -> ZerverFieldsT:
-    realm = dict(zerver_client=[{"name": "populate_db", "id": 1},
-                                {"name": "website", "id": 2},
-                                {"name": "API", "id": 3}],
-                 zerver_customprofilefield=[],
-                 zerver_customprofilefieldvalue=[],
-                 zerver_userpresence=[],  # shows last logged in data, which is not available
-                 zerver_userprofile_mirrordummy=[],
-                 zerver_realmdomain=[{"realm": realm_id,
-                                      "allow_subdomains": False,
-                                      "domain": domain_name,
-                                      "id": realm_id}],
-                 zerver_useractivity=[],
-                 zerver_realm=zerver_realm,
-                 zerver_huddle=[],
-                 zerver_userprofile_crossrealm=[],
-                 zerver_useractivityinterval=[],
-                 zerver_reaction=[],
-                 zerver_realmemoji=[],
-                 zerver_realmfilter=[])
+
+def build_realm(
+    zerver_realm: List[ZerverFieldsT], realm_id: int, domain_name: str
+) -> ZerverFieldsT:
+    realm = dict(
+        zerver_client=[
+            {"name": "populate_db", "id": 1},
+            {"name": "website", "id": 2},
+            {"name": "API", "id": 3},
+        ],
+        zerver_customprofilefield=[],
+        zerver_customprofilefieldvalue=[],
+        zerver_userpresence=[],  # shows last logged in data, which is not available
+        zerver_userprofile_mirrordummy=[],
+        zerver_realmdomain=[
+            {"realm": realm_id, "allow_subdomains": False, "domain": domain_name, "id": realm_id}
+        ],
+        zerver_useractivity=[],
+        zerver_realm=zerver_realm,
+        zerver_huddle=[],
+        zerver_userprofile_crossrealm=[],
+        zerver_useractivityinterval=[],
+        zerver_reaction=[],
+        zerver_realmemoji=[],
+        zerver_realmfilter=[],
+    )
     return realm
 
-def build_usermessages(zerver_usermessage: List[ZerverFieldsT],
-                       subscriber_map: Dict[int, Set[int]],
-                       recipient_id: int,
-                       mentioned_user_ids: List[int],
-                       message_id: int,
-                       is_private: bool,
-                       long_term_idle: AbstractSet[int] = set()) -> Tuple[int, int]:
+
+def build_usermessages(
+    zerver_usermessage: List[ZerverFieldsT],
+    subscriber_map: Dict[int, Set[int]],
+    recipient_id: int,
+    mentioned_user_ids: List[int],
+    message_id: int,
+    is_private: bool,
+    long_term_idle: AbstractSet[int] = set(),
+) -> Tuple[int, int]:
     user_ids = subscriber_map.get(recipient_id, set())
 
     user_messages_created = 0
@@ -393,10 +421,10 @@ def build_usermessages(zerver_usermessage: List[ZerverFieldsT],
             zerver_usermessage.append(usermessage)
     return (user_messages_created, user_messages_skipped)
 
-def build_user_message(user_id: int,
-                       message_id: int,
-                       is_private: bool,
-                       is_mentioned: bool) -> ZerverFieldsT:
+
+def build_user_message(
+    user_id: int, message_id: int, is_private: bool, is_mentioned: bool
+) -> ZerverFieldsT:
     flags_mask = 1  # For read
     if is_mentioned:
         flags_mask += 8  # For mentioned
@@ -413,17 +441,21 @@ def build_user_message(user_id: int,
     )
     return usermessage
 
-def build_defaultstream(realm_id: int, stream_id: int,
-                        defaultstream_id: int) -> ZerverFieldsT:
-    defaultstream = dict(
-        stream=stream_id,
-        realm=realm_id,
-        id=defaultstream_id)
+
+def build_defaultstream(realm_id: int, stream_id: int, defaultstream_id: int) -> ZerverFieldsT:
+    defaultstream = dict(stream=stream_id, realm=realm_id, id=defaultstream_id)
     return defaultstream
 
-def build_stream(date_created: Any, realm_id: int, name: str,
-                 description: str, stream_id: int, deactivated: bool=False,
-                 invite_only: bool=False) -> ZerverFieldsT:
+
+def build_stream(
+    date_created: Any,
+    realm_id: int,
+    name: str,
+    description: str,
+    stream_id: int,
+    deactivated: bool = False,
+    invite_only: bool = False,
+) -> ZerverFieldsT:
     stream = Stream(
         name=name,
         deactivated=deactivated,
@@ -431,22 +463,32 @@ def build_stream(date_created: Any, realm_id: int, name: str,
         # We don't set rendered_description here; it'll be added on import
         date_created=date_created,
         invite_only=invite_only,
-        id=stream_id)
-    stream_dict = model_to_dict(stream,
-                                exclude=['realm'])
+        id=stream_id,
+    )
+    stream_dict = model_to_dict(stream, exclude=['realm'])
     stream_dict['realm'] = realm_id
     return stream_dict
 
+
 def build_huddle(huddle_id: int) -> ZerverFieldsT:
     huddle = Huddle(
         id=huddle_id,
     )
     return model_to_dict(huddle)
 
-def build_message(topic_name: str, date_sent: float, message_id: int, content: str,
-                  rendered_content: Optional[str], user_id: int, recipient_id: int,
-                  has_image: bool=False, has_link: bool=False,
-                  has_attachment: bool=True) -> ZerverFieldsT:
+
+def build_message(
+    topic_name: str,
+    date_sent: float,
+    message_id: int,
+    content: str,
+    rendered_content: Optional[str],
+    user_id: int,
+    recipient_id: int,
+    has_image: bool = False,
+    has_link: bool = False,
+    has_attachment: bool = True,
+) -> ZerverFieldsT:
     zulip_message = Message(
         rendered_content_version=1,  # this is Zulip specific
         date_sent=date_sent,
@@ -455,19 +497,27 @@ def build_message(topic_name: str, date_sent: float, message_id: int, content: s
         rendered_content=rendered_content,
         has_image=has_image,
         has_attachment=has_attachment,
-        has_link=has_link)
+        has_link=has_link,
+    )
     zulip_message.set_topic_name(topic_name)
-    zulip_message_dict = model_to_dict(zulip_message,
-                                       exclude=['recipient', 'sender', 'sending_client'])
+    zulip_message_dict = model_to_dict(
+        zulip_message, exclude=['recipient', 'sender', 'sending_client']
+    )
     zulip_message_dict['sender'] = user_id
     zulip_message_dict['sending_client'] = 1
     zulip_message_dict['recipient'] = recipient_id
 
     return zulip_message_dict
 
-def build_attachment(realm_id: int, message_ids: Set[int],
-                     user_id: int, fileinfo: ZerverFieldsT, s3_path: str,
-                     zerver_attachment: List[ZerverFieldsT]) -> None:
+
+def build_attachment(
+    realm_id: int,
+    message_ids: Set[int],
+    user_id: int,
+    fileinfo: ZerverFieldsT,
+    s3_path: str,
+    zerver_attachment: List[ZerverFieldsT],
+) -> None:
     """
     This function should be passed a 'fileinfo' dictionary, which contains
     information about 'size', 'created' (created time) and ['name'] (filename).
@@ -480,16 +530,17 @@ def build_attachment(realm_id: int, message_ids: Set[int],
         create_time=fileinfo['created'],
         is_realm_public=True,
         path_id=s3_path,
-        file_name=fileinfo['name'])
+        file_name=fileinfo['name'],
+    )
 
-    attachment_dict = model_to_dict(attachment,
-                                    exclude=['owner', 'messages', 'realm'])
+    attachment_dict = model_to_dict(attachment, exclude=['owner', 'messages', 'realm'])
     attachment_dict['owner'] = user_id
     attachment_dict['messages'] = list(message_ids)
     attachment_dict['realm'] = realm_id
 
     zerver_attachment.append(attachment_dict)
 
+
 def get_avatar(avatar_dir: str, size_url_suffix: str, avatar_upload_item: List[str]) -> None:
     avatar_url = avatar_upload_item[0]
 
@@ -501,8 +552,14 @@ def get_avatar(avatar_dir: str, size_url_suffix: str, avatar_upload_item: List[s
         shutil.copyfileobj(response.raw, image_file)
     shutil.copy(image_path, original_image_path)
 
-def process_avatars(avatar_list: List[ZerverFieldsT], avatar_dir: str, realm_id: int,
-                    threads: int, size_url_suffix: str='') -> List[ZerverFieldsT]:
+
+def process_avatars(
+    avatar_list: List[ZerverFieldsT],
+    avatar_dir: str,
+    realm_id: int,
+    threads: int,
+    size_url_suffix: str = '',
+) -> List[ZerverFieldsT]:
     """
     This function gets the avatar of the user and saves it in the
     user's avatar directory with both the extensions '.png' and '.original'
@@ -540,21 +597,21 @@ def process_avatars(avatar_list: List[ZerverFieldsT], avatar_dir: str, realm_id:
         avatar_original_list.append(avatar_original)
 
     # Run downloads in parallel
-    run_parallel_wrapper(partial(get_avatar, avatar_dir, size_url_suffix), avatar_upload_list, threads=threads)
+    run_parallel_wrapper(
+        partial(get_avatar, avatar_dir, size_url_suffix), avatar_upload_list, threads=threads
+    )
 
     logging.info('######### GETTING AVATARS FINISHED #########\n')
     return avatar_list + avatar_original_list
 
-def write_avatar_png(avatar_folder: str,
-                     realm_id: int,
-                     user_id: int,
-                     bits: bytes) -> ZerverFieldsT:
-    '''
+
+def write_avatar_png(avatar_folder: str, realm_id: int, user_id: int, bits: bytes) -> ZerverFieldsT:
+    """
     Use this function for conversions like HipChat where
     the bits for the .png file come in something like
     a users.json file, and where we don't have to
     fetch avatar images externally.
-    '''
+    """
     avatar_hash = user_avatar_path_from_ids(
         user_profile_id=user_id,
         realm_id=realm_id,
@@ -578,15 +635,20 @@ def write_avatar_png(avatar_folder: str,
 
     return metadata
 
+
 ListJobData = TypeVar('ListJobData')
+
+
 def wrapping_function(f: Callable[[ListJobData], None], item: ListJobData) -> None:
     try:
         f(item)
     except Exception:
         logging.exception("Error processing item: %s", item, stack_info=True)
 
-def run_parallel_wrapper(f: Callable[[ListJobData], None], full_items: List[ListJobData],
-                         threads: int=6) -> None:
+
+def run_parallel_wrapper(
+    f: Callable[[ListJobData], None], full_items: List[ListJobData], threads: int = 6
+) -> None:
     logging.info("Distributing %s items across %s threads", len(full_items), threads)
 
     with multiprocessing.Pool(threads) as p:
@@ -596,6 +658,7 @@ def run_parallel_wrapper(f: Callable[[ListJobData], None], full_items: List[List
             if count % 1000 == 0:
                 logging.info("Finished %s items", count)
 
+
 def get_uploads(upload_dir: str, upload: List[str]) -> None:
     upload_url = upload[0]
     upload_path = upload[1]
@@ -606,8 +669,10 @@ def get_uploads(upload_dir: str, upload: List[str]) -> None:
     with open(upload_path, 'wb') as upload_file:
         shutil.copyfileobj(response.raw, upload_file)
 
-def process_uploads(upload_list: List[ZerverFieldsT], upload_dir: str,
-                    threads: int) -> List[ZerverFieldsT]:
+
+def process_uploads(
+    upload_list: List[ZerverFieldsT], upload_dir: str, threads: int
+) -> List[ZerverFieldsT]:
     """
     This function downloads the uploads and saves it in the realm's upload directory.
     Required parameters:
@@ -630,10 +695,8 @@ def process_uploads(upload_list: List[ZerverFieldsT], upload_dir: str,
     logging.info('######### GETTING ATTACHMENTS FINISHED #########\n')
     return upload_list
 
-def build_realm_emoji(realm_id: int,
-                      name: str,
-                      id: int,
-                      file_name: str) -> ZerverFieldsT:
+
+def build_realm_emoji(realm_id: int, name: str, id: int, file_name: str) -> ZerverFieldsT:
     return model_to_dict(
         RealmEmoji(
             realm_id=realm_id,
@@ -643,6 +706,7 @@ def build_realm_emoji(realm_id: int,
         ),
     )
 
+
 def get_emojis(emoji_dir: str, upload: List[str]) -> None:
     emoji_url = upload[0]
     emoji_path = upload[1]
@@ -653,8 +717,13 @@ def get_emojis(emoji_dir: str, upload: List[str]) -> None:
     with open(upload_emoji_path, 'wb') as emoji_file:
         shutil.copyfileobj(response.raw, emoji_file)
 
-def process_emojis(zerver_realmemoji: List[ZerverFieldsT], emoji_dir: str,
-                   emoji_url_map: ZerverFieldsT, threads: int) -> List[ZerverFieldsT]:
+
+def process_emojis(
+    zerver_realmemoji: List[ZerverFieldsT],
+    emoji_dir: str,
+    emoji_url_map: ZerverFieldsT,
+    threads: int,
+) -> List[ZerverFieldsT]:
     """
     This function downloads the custom emojis and saves in the output emoji folder.
     Required parameters:
@@ -670,8 +739,8 @@ def process_emojis(zerver_realmemoji: List[ZerverFieldsT], emoji_dir: str,
     for emoji in zerver_realmemoji:
         emoji_url = emoji_url_map[emoji['name']]
         emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
-            realm_id=emoji['realm'],
-            emoji_file_name=emoji['name'])
+            realm_id=emoji['realm'], emoji_file_name=emoji['name']
+        )
 
         upload_emoji_list.append([emoji_url, emoji_path])
 
@@ -689,6 +758,7 @@ def process_emojis(zerver_realmemoji: List[ZerverFieldsT], emoji_dir: str,
     logging.info('######### GETTING EMOJIS FINISHED #########\n')
     return emoji_records
 
+
 def create_converted_data_files(data: Any, output_dir: str, file_path: str) -> None:
     output_file = output_dir + file_path
     os.makedirs(os.path.dirname(output_file), exist_ok=True)
diff --git a/zerver/data_import/mattermost.py b/zerver/data_import/mattermost.py
index 2de37af3f5..522388de48 100644
--- a/zerver/data_import/mattermost.py
+++ b/zerver/data_import/mattermost.py
@@ -53,8 +53,10 @@ def make_realm(realm_id: int, team: Dict[str, Any]) -> ZerverFieldsT:
 
     return realm
 
-def process_user(user_dict: Dict[str, Any], realm_id: int, team_name: str,
-                 user_id_mapper: IdMapper) -> ZerverFieldsT:
+
+def process_user(
+    user_dict: Dict[str, Any], realm_id: int, team_name: str, user_id_mapper: IdMapper
+) -> ZerverFieldsT:
     def is_team_admin(user_dict: Dict[str, Any]) -> bool:
         if user_dict["teams"] is None:
             return False
@@ -104,11 +106,14 @@ def process_user(user_dict: Dict[str, Any], realm_id: int, team_name: str,
         timezone=timezone,
     )
 
-def convert_user_data(user_handler: UserHandler,
-                      user_id_mapper: IdMapper,
-                      user_data_map: Dict[str, Dict[str, Any]],
-                      realm_id: int,
-                      team_name: str) -> None:
+
+def convert_user_data(
+    user_handler: UserHandler,
+    user_id_mapper: IdMapper,
+    user_data_map: Dict[str, Dict[str, Any]],
+    realm_id: int,
+    team_name: str,
+) -> None:
 
     user_data_list = []
     for username in user_data_map:
@@ -120,18 +125,17 @@ def convert_user_data(user_handler: UserHandler,
         user = process_user(raw_item, realm_id, team_name, user_id_mapper)
         user_handler.add_user(user)
 
-def convert_channel_data(channel_data: List[ZerverFieldsT],
-                         user_data_map: Dict[str, Dict[str, Any]],
-                         subscriber_handler: SubscriberHandler,
-                         stream_id_mapper: IdMapper,
-                         user_id_mapper: IdMapper,
-                         realm_id: int,
-                         team_name: str) -> List[ZerverFieldsT]:
-    channel_data_list = [
-        d
-        for d in channel_data
-        if d['team'] == team_name
-    ]
+
+def convert_channel_data(
+    channel_data: List[ZerverFieldsT],
+    user_data_map: Dict[str, Dict[str, Any]],
+    subscriber_handler: SubscriberHandler,
+    stream_id_mapper: IdMapper,
+    user_id_mapper: IdMapper,
+    realm_id: int,
+    team_name: str,
+) -> List[ZerverFieldsT]:
+    channel_data_list = [d for d in channel_data if d['team'] == team_name]
 
     channel_members_map: Dict[str, List[str]] = {}
     channel_admins_map: Dict[str, List[str]] = {}
@@ -211,20 +215,25 @@ def convert_channel_data(channel_data: List[ZerverFieldsT],
         streams.append(stream)
     return streams
 
+
 def generate_huddle_name(huddle_members: List[str]) -> str:
     # Simple hash function to generate a unique hash key for the
     # members of a huddle.  Needs to be consistent only within the
     # lifetime of export tool run, as it doesn't appear in the output.
     import hashlib
+
     return hashlib.md5(''.join(sorted(huddle_members)).encode('utf-8')).hexdigest()
 
-def convert_huddle_data(huddle_data: List[ZerverFieldsT],
-                        user_data_map: Dict[str, Dict[str, Any]],
-                        subscriber_handler: SubscriberHandler,
-                        huddle_id_mapper: IdMapper,
-                        user_id_mapper: IdMapper,
-                        realm_id: int,
-                        team_name: str) -> List[ZerverFieldsT]:
+
+def convert_huddle_data(
+    huddle_data: List[ZerverFieldsT],
+    user_data_map: Dict[str, Dict[str, Any]],
+    subscriber_handler: SubscriberHandler,
+    huddle_id_mapper: IdMapper,
+    user_id_mapper: IdMapper,
+    realm_id: int,
+    team_name: str,
+) -> List[ZerverFieldsT]:
 
     zerver_huddle = []
     for huddle in huddle_data:
@@ -242,9 +251,15 @@ def convert_huddle_data(huddle_data: List[ZerverFieldsT],
             zerver_huddle.append(huddle_dict)
     return zerver_huddle
 
-def build_reactions(realm_id: int, total_reactions: List[ZerverFieldsT], reactions: List[ZerverFieldsT],
-                    message_id: int,
-                    user_id_mapper: IdMapper, zerver_realmemoji: List[ZerverFieldsT]) -> None:
+
+def build_reactions(
+    realm_id: int,
+    total_reactions: List[ZerverFieldsT],
+    reactions: List[ZerverFieldsT],
+    message_id: int,
+    user_id_mapper: IdMapper,
+    zerver_realmemoji: List[ZerverFieldsT],
+) -> None:
     realmemoji = {}
     for realm_emoji in zerver_realmemoji:
         realmemoji[realm_emoji['name']] = realm_emoji['id']
@@ -273,13 +288,15 @@ def build_reactions(realm_id: int, total_reactions: List[ZerverFieldsT], reactio
             id=reaction_id,
             emoji_code=emoji_code,
             emoji_name=emoji_name,
-            reaction_type=reaction_type)
+            reaction_type=reaction_type,
+        )
 
         reaction_dict = model_to_dict(reaction, exclude=['message', 'user_profile'])
         reaction_dict['message'] = message_id
         reaction_dict['user_profile'] = user_id_mapper.get(username)
         total_reactions.append(reaction_dict)
 
+
 def get_mentioned_user_ids(raw_message: Dict[str, Any], user_id_mapper: IdMapper) -> Set[int]:
     user_ids = set()
     content = raw_message["content"]
@@ -293,18 +310,19 @@ def get_mentioned_user_ids(raw_message: Dict[str, Any], user_id_mapper: IdMapper
             user_ids.add(user_id_mapper.get(possible_username))
     return user_ids
 
-def process_raw_message_batch(realm_id: int,
-                              raw_messages: List[Dict[str, Any]],
-                              subscriber_map: Dict[int, Set[int]],
-                              user_id_mapper: IdMapper,
-                              user_handler: UserHandler,
-                              get_recipient_id_from_receiver_name: Callable[[str, int], int],
-                              is_pm_data: bool,
-                              output_dir: str,
-                              zerver_realmemoji: List[Dict[str, Any]],
-                              total_reactions: List[Dict[str, Any]],
-                              ) -> None:
 
+def process_raw_message_batch(
+    realm_id: int,
+    raw_messages: List[Dict[str, Any]],
+    subscriber_map: Dict[int, Set[int]],
+    user_id_mapper: IdMapper,
+    user_handler: UserHandler,
+    get_recipient_id_from_receiver_name: Callable[[str, int], int],
+    is_pm_data: bool,
+    output_dir: str,
+    zerver_realmemoji: List[Dict[str, Any]],
+    total_reactions: List[Dict[str, Any]],
+) -> None:
     def fix_mentions(content: str, mention_user_ids: Set[int]) -> str:
         for user_id in mention_user_ids:
             user = user_handler.get_user(user_id=user_id)
@@ -323,6 +341,7 @@ def process_raw_message_batch(realm_id: int,
     zerver_message = []
 
     import html2text
+
     h = html2text.HTML2Text()
 
     pm_members = {}
@@ -345,9 +364,13 @@ def process_raw_message_batch(realm_id: int,
         date_sent = raw_message['date_sent']
         sender_user_id = raw_message['sender_id']
         if "channel_name" in raw_message:
-            recipient_id = get_recipient_id_from_receiver_name(raw_message["channel_name"], Recipient.STREAM)
+            recipient_id = get_recipient_id_from_receiver_name(
+                raw_message["channel_name"], Recipient.STREAM
+            )
         elif "huddle_name" in raw_message:
-            recipient_id = get_recipient_id_from_receiver_name(raw_message["huddle_name"], Recipient.HUDDLE)
+            recipient_id = get_recipient_id_from_receiver_name(
+                raw_message["huddle_name"], Recipient.HUDDLE
+            )
         elif "pm_members" in raw_message:
             members = raw_message["pm_members"]
             member_ids = {user_id_mapper.get(member) for member in members}
@@ -374,8 +397,14 @@ def process_raw_message_batch(realm_id: int,
             has_attachment=False,
         )
         zerver_message.append(message)
-        build_reactions(realm_id, total_reactions, raw_message["reactions"], message_id,
-                        user_id_mapper, zerver_realmemoji)
+        build_reactions(
+            realm_id,
+            total_reactions,
+            raw_message["reactions"],
+            message_id,
+            user_id_mapper,
+            zerver_realmemoji,
+        )
 
     zerver_usermessage = make_user_messages(
         zerver_message=zerver_message,
@@ -393,20 +422,23 @@ def process_raw_message_batch(realm_id: int,
     message_file = f"/messages-{dump_file_id:06}.json"
     create_converted_data_files(message_json, output_dir, message_file)
 
-def process_posts(num_teams: int,
-                  team_name: str,
-                  realm_id: int,
-                  post_data: List[Dict[str, Any]],
-                  get_recipient_id_from_receiver_name: Callable[[str, int], int],
-                  subscriber_map: Dict[int, Set[int]],
-                  output_dir: str,
-                  is_pm_data: bool,
-                  masking_content: bool,
-                  user_id_mapper: IdMapper,
-                  user_handler: UserHandler,
-                  username_to_user: Dict[str, Dict[str, Any]],
-                  zerver_realmemoji: List[Dict[str, Any]],
-                  total_reactions: List[Dict[str, Any]]) -> None:
+
+def process_posts(
+    num_teams: int,
+    team_name: str,
+    realm_id: int,
+    post_data: List[Dict[str, Any]],
+    get_recipient_id_from_receiver_name: Callable[[str, int], int],
+    subscriber_map: Dict[int, Set[int]],
+    output_dir: str,
+    is_pm_data: bool,
+    masking_content: bool,
+    user_id_mapper: IdMapper,
+    user_handler: UserHandler,
+    username_to_user: Dict[str, Dict[str, Any]],
+    zerver_realmemoji: List[Dict[str, Any]],
+    total_reactions: List[Dict[str, Any]],
+) -> None:
 
     post_data_list = []
     for post in post_data:
@@ -492,21 +524,24 @@ def process_posts(num_teams: int,
         process_batch=process_batch,
     )
 
-def write_message_data(num_teams: int,
-                       team_name: str,
-                       realm_id: int,
-                       post_data: Dict[str, List[Dict[str, Any]]],
-                       zerver_recipient: List[ZerverFieldsT],
-                       subscriber_map: Dict[int, Set[int]],
-                       output_dir: str,
-                       masking_content: bool,
-                       stream_id_mapper: IdMapper,
-                       huddle_id_mapper: IdMapper,
-                       user_id_mapper: IdMapper,
-                       user_handler: UserHandler,
-                       username_to_user: Dict[str, Dict[str, Any]],
-                       zerver_realmemoji: List[Dict[str, Any]],
-                       total_reactions: List[Dict[str, Any]]) -> None:
+
+def write_message_data(
+    num_teams: int,
+    team_name: str,
+    realm_id: int,
+    post_data: Dict[str, List[Dict[str, Any]]],
+    zerver_recipient: List[ZerverFieldsT],
+    subscriber_map: Dict[int, Set[int]],
+    output_dir: str,
+    masking_content: bool,
+    stream_id_mapper: IdMapper,
+    huddle_id_mapper: IdMapper,
+    user_id_mapper: IdMapper,
+    user_handler: UserHandler,
+    username_to_user: Dict[str, Dict[str, Any]],
+    zerver_realmemoji: List[Dict[str, Any]],
+    total_reactions: List[Dict[str, Any]],
+) -> None:
     stream_id_to_recipient_id = {}
     huddle_id_to_recipient_id = {}
     user_id_to_recipient_id = {}
@@ -537,7 +572,9 @@ def write_message_data(num_teams: int,
         post_types = ["channel_post", "direct_post"]
     else:
         post_types = ["channel_post"]
-        logging.warning("Skipping importing huddles and PMs since there are multiple teams in the export")
+        logging.warning(
+            "Skipping importing huddles and PMs since there are multiple teams in the export"
+        )
 
     for post_type in post_types:
         process_posts(
@@ -557,11 +594,11 @@ def write_message_data(num_teams: int,
             total_reactions=total_reactions,
         )
 
-def write_emoticon_data(realm_id: int,
-                        custom_emoji_data: List[Dict[str, Any]],
-                        data_dir: str,
-                        output_dir: str) -> List[ZerverFieldsT]:
-    '''
+
+def write_emoticon_data(
+    realm_id: int, custom_emoji_data: List[Dict[str, Any]], data_dir: str, output_dir: str
+) -> List[ZerverFieldsT]:
+    """
     This function does most of the work for processing emoticons, the bulk
     of which is copying files.  We also write a json file with metadata.
     Finally, we return a list of RealmEmoji dicts to our caller.
@@ -584,7 +621,7 @@ def write_emoticon_data(realm_id: int,
 
     We move all the relevant files to Zulip's more nested
     directory structure.
-    '''
+    """
 
     logging.info('Starting to process emoticons')
 
@@ -641,12 +678,16 @@ def write_emoticon_data(realm_id: int,
 
     return realmemoji
 
-def create_username_to_user_mapping(user_data_list: List[Dict[str, Any]]) -> Dict[str, Dict[str, Any]]:
+
+def create_username_to_user_mapping(
+    user_data_list: List[Dict[str, Any]]
+) -> Dict[str, Dict[str, Any]]:
     username_to_user = {}
     for user in user_data_list:
         username_to_user[user["username"]] = user
     return username_to_user
 
+
 def check_user_in_team(user: Dict[str, Any], team_name: str) -> bool:
     if user["teams"] is None:
         # This is null for users not on any team
@@ -656,8 +697,13 @@ def check_user_in_team(user: Dict[str, Any], team_name: str) -> bool:
             return True
     return False
 
-def label_mirror_dummy_users(num_teams: int, team_name: str, mattermost_data: Dict[str, Any],
-                             username_to_user: Dict[str, Dict[str, Any]]) -> None:
+
+def label_mirror_dummy_users(
+    num_teams: int,
+    team_name: str,
+    mattermost_data: Dict[str, Any],
+    username_to_user: Dict[str, Dict[str, Any]],
+) -> None:
     # This function might looks like a great place to label admin users. But
     # that won't be fully correct since we are iterating only though posts and
     # it covers only users that have sent at least one message.
@@ -670,16 +716,18 @@ def label_mirror_dummy_users(num_teams: int, team_name: str, mattermost_data: Di
 
     if num_teams == 1:
         for post in mattermost_data["post"]["direct_post"]:
-            assert("team" not in post)
+            assert "team" not in post
             user = username_to_user[post["user"]]
             if not check_user_in_team(user, team_name):
                 user["is_mirror_dummy"] = True
 
+
 def reset_mirror_dummy_users(username_to_user: Dict[str, Dict[str, Any]]) -> None:
     for username in username_to_user:
         user = username_to_user[username]
         user["is_mirror_dummy"] = False
 
+
 def mattermost_data_file_to_dict(mattermost_data_file: str) -> Dict[str, Any]:
     mattermost_data: Dict[str, Any] = {}
     mattermost_data["version"] = []
@@ -702,6 +750,7 @@ def mattermost_data_file_to_dict(mattermost_data_file: str) -> Dict[str, Any]:
                 mattermost_data[data_type].append(row[data_type])
     return mattermost_data
 
+
 def do_convert_data(mattermost_data_dir: str, output_dir: str, masking_content: bool) -> None:
     username_to_user: Dict[str, Dict[str, Any]] = {}
 
@@ -729,7 +778,9 @@ def do_convert_data(mattermost_data_dir: str, output_dir: str, masking_content:
         realm_output_dir = os.path.join(output_dir, team_name)
 
         reset_mirror_dummy_users(username_to_user)
-        label_mirror_dummy_users(len(mattermost_data["team"]), team_name, mattermost_data, username_to_user)
+        label_mirror_dummy_users(
+            len(mattermost_data["team"]), team_name, mattermost_data, username_to_user
+        )
 
         convert_user_data(
             user_handler=user_handler,
diff --git a/zerver/data_import/mattermost_user.py b/zerver/data_import/mattermost_user.py
index 3c3f9e40cc..597d186123 100644
--- a/zerver/data_import/mattermost_user.py
+++ b/zerver/data_import/mattermost_user.py
@@ -2,14 +2,14 @@ from typing import Any, Dict, List
 
 
 class UserHandler:
-    '''
+    """
     Our UserHandler class is a glorified wrapper
     around the data that eventually goes into
     zerver_userprofile.
 
     The class helps us do things like map ids
     to names for mentions.
-    '''
+    """
 
     def __init__(self) -> None:
         self.id_to_user_map: Dict[int, Dict[str, Any]] = {}
diff --git a/zerver/data_import/sequencer.py b/zerver/data_import/sequencer.py
index c82b58ddff..fc67f8e889 100644
--- a/zerver/data_import/sequencer.py
+++ b/zerver/data_import/sequencer.py
@@ -11,6 +11,7 @@ for data imports that's usually easy to
 manage.
 '''
 
+
 def _seq() -> Callable[[], int]:
     i = 0
 
@@ -21,13 +22,14 @@ def _seq() -> Callable[[], int]:
 
     return next_one
 
-def sequencer() -> Callable[[str], int]:
-    '''
-        Use like this:
 
-        NEXT_ID = sequencer()
-        message_id = NEXT_ID('message')
-    '''
+def sequencer() -> Callable[[str], int]:
+    """
+    Use like this:
+
+    NEXT_ID = sequencer()
+    message_id = NEXT_ID('message')
+    """
     seq_dict: Dict[str, Callable[[], int]] = {}
 
     def next_one(name: str) -> int:
@@ -38,6 +40,7 @@ def sequencer() -> Callable[[str], int]:
 
     return next_one
 
+
 '''
 NEXT_ID is a singleton used by an entire process, which is
 almost always reasonable.  If you want to have two parallel
@@ -49,6 +52,7 @@ import of the file.
 
 NEXT_ID = sequencer()
 
+
 def is_int(key: Any) -> bool:
     try:
         n = int(key)
@@ -57,6 +61,7 @@ def is_int(key: Any) -> bool:
 
     return n <= 999999999
 
+
 class IdMapper:
     def __init__(self) -> None:
         self.map: Dict[Any, int] = {}
diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py
index 1fd4b517da..fc0f010f19 100755
--- a/zerver/data_import/slack.py
+++ b/zerver/data_import/slack.py
@@ -56,20 +56,29 @@ AddedMPIMsT = Dict[str, Tuple[str, int]]
 DMMembersT = Dict[str, Tuple[str, str]]
 SlackToZulipRecipientT = Dict[str, int]
 
+
 def rm_tree(path: str) -> None:
     if os.path.exists(path):
         shutil.rmtree(path)
 
-def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[ZerverFieldsT],
-                             realm_subdomain: str, slack_data_dir: str,
-                             custom_emoji_list: ZerverFieldsT) -> Tuple[ZerverFieldsT,
-                                                                        SlackToZulipUserIDT,
-                                                                        SlackToZulipRecipientT,
-                                                                        AddedChannelsT,
-                                                                        AddedMPIMsT,
-                                                                        DMMembersT,
-                                                                        List[ZerverFieldsT],
-                                                                        ZerverFieldsT]:
+
+def slack_workspace_to_realm(
+    domain_name: str,
+    realm_id: int,
+    user_list: List[ZerverFieldsT],
+    realm_subdomain: str,
+    slack_data_dir: str,
+    custom_emoji_list: ZerverFieldsT,
+) -> Tuple[
+    ZerverFieldsT,
+    SlackToZulipUserIDT,
+    SlackToZulipRecipientT,
+    AddedChannelsT,
+    AddedMPIMsT,
+    DMMembersT,
+    List[ZerverFieldsT],
+    ZerverFieldsT,
+]:
     """
     Returns:
     1. realm, converted realm data
@@ -87,12 +96,22 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
     zerver_realm: List[ZerverFieldsT] = build_zerver_realm(realm_id, realm_subdomain, NOW, 'Slack')
     realm = build_realm(zerver_realm, realm_id, domain_name)
 
-    zerver_userprofile, avatars, slack_user_id_to_zulip_user_id, zerver_customprofilefield, \
-        zerver_customprofilefield_value = users_to_zerver_userprofile(slack_data_dir, user_list,
-                                                                      realm_id, int(NOW), domain_name)
-    realm, added_channels, added_mpims, dm_members, slack_recipient_name_to_zulip_recipient_id = \
-        channels_to_zerver_stream(slack_data_dir, realm_id, realm, slack_user_id_to_zulip_user_id,
-                                  zerver_userprofile)
+    (
+        zerver_userprofile,
+        avatars,
+        slack_user_id_to_zulip_user_id,
+        zerver_customprofilefield,
+        zerver_customprofilefield_value,
+    ) = users_to_zerver_userprofile(slack_data_dir, user_list, realm_id, int(NOW), domain_name)
+    (
+        realm,
+        added_channels,
+        added_mpims,
+        dm_members,
+        slack_recipient_name_to_zulip_recipient_id,
+    ) = channels_to_zerver_stream(
+        slack_data_dir, realm_id, realm, slack_user_id_to_zulip_user_id, zerver_userprofile
+    )
 
     zerver_realmemoji, emoji_url_map = build_realmemoji(custom_emoji_list, realm_id)
     realm['zerver_realmemoji'] = zerver_realmemoji
@@ -104,12 +123,21 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze
     realm['zerver_customprofilefield'] = zerver_customprofilefield
     realm['zerver_customprofilefieldvalue'] = zerver_customprofilefield_value
 
-    return realm, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id, \
-        added_channels, added_mpims, dm_members, avatars, emoji_url_map
+    return (
+        realm,
+        slack_user_id_to_zulip_user_id,
+        slack_recipient_name_to_zulip_recipient_id,
+        added_channels,
+        added_mpims,
+        dm_members,
+        avatars,
+        emoji_url_map,
+    )
 
-def build_realmemoji(custom_emoji_list: ZerverFieldsT,
-                     realm_id: int) -> Tuple[List[ZerverFieldsT],
-                                             ZerverFieldsT]:
+
+def build_realmemoji(
+    custom_emoji_list: ZerverFieldsT, realm_id: int
+) -> Tuple[List[ZerverFieldsT], ZerverFieldsT]:
     zerver_realmemoji = []
     emoji_url_map = {}
     emoji_id = 0
@@ -118,10 +146,8 @@ def build_realmemoji(custom_emoji_list: ZerverFieldsT,
             # Some of the emojis we get from the API have invalid links
             # this is to prevent errors related to them
             realmemoji = RealmEmoji(
-                name=emoji_name,
-                id=emoji_id,
-                file_name=os.path.basename(url),
-                deactivated=False)
+                name=emoji_name, id=emoji_id, file_name=os.path.basename(url), deactivated=False
+            )
 
             realmemoji_dict = model_to_dict(realmemoji, exclude=['realm', 'author'])
             realmemoji_dict['author'] = None
@@ -132,12 +158,16 @@ def build_realmemoji(custom_emoji_list: ZerverFieldsT,
             emoji_id += 1
     return zerver_realmemoji, emoji_url_map
 
-def users_to_zerver_userprofile(slack_data_dir: str, users: List[ZerverFieldsT], realm_id: int,
-                                timestamp: Any, domain_name: str) -> Tuple[List[ZerverFieldsT],
-                                                                           List[ZerverFieldsT],
-                                                                           SlackToZulipUserIDT,
-                                                                           List[ZerverFieldsT],
-                                                                           List[ZerverFieldsT]]:
+
+def users_to_zerver_userprofile(
+    slack_data_dir: str, users: List[ZerverFieldsT], realm_id: int, timestamp: Any, domain_name: str
+) -> Tuple[
+    List[ZerverFieldsT],
+    List[ZerverFieldsT],
+    SlackToZulipUserIDT,
+    List[ZerverFieldsT],
+    List[ZerverFieldsT],
+]:
     """
     Returns:
     1. zerver_userprofile, which is a list of user profile
@@ -181,8 +211,9 @@ def users_to_zerver_userprofile(slack_data_dir: str, users: List[ZerverFieldsT],
 
         email = get_user_email(user, domain_name)
         # ref: https://zulip.com/help/change-your-profile-picture
-        avatar_url = build_avatar_url(slack_user_id, user['team_id'],
-                                      user['profile']['avatar_hash'])
+        avatar_url = build_avatar_url(
+            slack_user_id, user['team_id'], user['profile']['avatar_hash']
+        )
         build_avatar(user_id, realm_id, email, avatar_url, timestamp, avatar_list)
         role = UserProfile.ROLE_MEMBER
         if get_owner(user):
@@ -194,15 +225,23 @@ def users_to_zerver_userprofile(slack_data_dir: str, users: List[ZerverFieldsT],
         timezone = get_user_timezone(user)
 
         if slack_user_id in slack_user_id_to_custom_profile_fields:
-            slack_custom_field_name_to_zulip_custom_field_id, custom_profile_field_id_count = \
-                build_customprofile_field(zerver_customprofilefield,
-                                          slack_user_id_to_custom_profile_fields[slack_user_id],
-                                          custom_profile_field_id_count, realm_id,
-                                          slack_custom_field_name_to_zulip_custom_field_id)
+            (
+                slack_custom_field_name_to_zulip_custom_field_id,
+                custom_profile_field_id_count,
+            ) = build_customprofile_field(
+                zerver_customprofilefield,
+                slack_user_id_to_custom_profile_fields[slack_user_id],
+                custom_profile_field_id_count,
+                realm_id,
+                slack_custom_field_name_to_zulip_custom_field_id,
+            )
             custom_profile_field_value_id_count = build_customprofilefields_values(
                 slack_custom_field_name_to_zulip_custom_field_id,
-                slack_user_id_to_custom_profile_fields[slack_user_id], user_id,
-                custom_profile_field_value_id_count, zerver_customprofilefield_values)
+                slack_user_id_to_custom_profile_fields[slack_user_id],
+                user_id,
+                custom_profile_field_value_id_count,
+                zerver_customprofilefield_values,
+            )
 
         userprofile = UserProfile(
             full_name=get_user_full_name(user),
@@ -217,7 +256,8 @@ def users_to_zerver_userprofile(slack_data_dir: str, users: List[ZerverFieldsT],
             bot_type=1 if user.get('is_bot', False) else None,
             date_joined=timestamp,
             timezone=timezone,
-            last_login=timestamp)
+            last_login=timestamp,
+        )
         userprofile_dict = model_to_dict(userprofile)
         # Set realm id separately as the corresponding realm is not yet a Realm model instance
         userprofile_dict['realm'] = realm_id
@@ -231,13 +271,22 @@ def users_to_zerver_userprofile(slack_data_dir: str, users: List[ZerverFieldsT],
 
     process_customprofilefields(zerver_customprofilefield, zerver_customprofilefield_values)
     logging.info('######### IMPORTING USERS FINISHED #########\n')
-    return zerver_userprofile, avatar_list, slack_user_id_to_zulip_user_id, zerver_customprofilefield, \
-        zerver_customprofilefield_values
+    return (
+        zerver_userprofile,
+        avatar_list,
+        slack_user_id_to_zulip_user_id,
+        zerver_customprofilefield,
+        zerver_customprofilefield_values,
+    )
 
-def build_customprofile_field(customprofile_field: List[ZerverFieldsT], fields: ZerverFieldsT,
-                              custom_profile_field_id: int, realm_id: int,
-                              slack_custom_field_name_to_zulip_custom_field_id: ZerverFieldsT) \
-        -> Tuple[ZerverFieldsT, int]:
+
+def build_customprofile_field(
+    customprofile_field: List[ZerverFieldsT],
+    fields: ZerverFieldsT,
+    custom_profile_field_id: int,
+    realm_id: int,
+    slack_custom_field_name_to_zulip_custom_field_id: ZerverFieldsT,
+) -> Tuple[ZerverFieldsT, int]:
     # The name of the custom profile field is not provided in the Slack data
     # Hash keys of the fields are provided
     # Reference: https://api.slack.com/methods/users.profile.set
@@ -252,11 +301,10 @@ def build_customprofile_field(customprofile_field: List[ZerverFieldsT], fields:
                 id=custom_profile_field_id,
                 name=field_name,
                 field_type=1,  # For now this is defaulted to 'SHORT_TEXT'
-                               # Processing is done in the function 'process_customprofilefields'
+                # Processing is done in the function 'process_customprofilefields'
             )
 
-            customprofilefield_dict = model_to_dict(customprofilefield,
-                                                    exclude=['realm'])
+            customprofilefield_dict = model_to_dict(customprofilefield, exclude=['realm'])
             customprofilefield_dict['realm'] = realm_id
 
             slack_custom_field_name_to_zulip_custom_field_id[field] = custom_profile_field_id
@@ -264,8 +312,10 @@ def build_customprofile_field(customprofile_field: List[ZerverFieldsT], fields:
             customprofile_field.append(customprofilefield_dict)
     return slack_custom_field_name_to_zulip_custom_field_id, custom_profile_field_id
 
-def process_slack_custom_fields(user: ZerverFieldsT,
-                                slack_user_id_to_custom_profile_fields: ZerverFieldsT) -> None:
+
+def process_slack_custom_fields(
+    user: ZerverFieldsT, slack_user_id_to_custom_profile_fields: ZerverFieldsT
+) -> None:
     slack_user_id_to_custom_profile_fields[user['id']] = {}
     if user['profile'].get('fields'):
         slack_user_id_to_custom_profile_fields[user['id']] = user['profile']['fields']
@@ -273,20 +323,26 @@ def process_slack_custom_fields(user: ZerverFieldsT,
     slack_custom_fields = ['phone', 'skype']
     for field in slack_custom_fields:
         if field in user['profile']:
-            slack_user_id_to_custom_profile_fields[user['id']][field] = {'value': user['profile'][field]}
+            slack_user_id_to_custom_profile_fields[user['id']][field] = {
+                'value': user['profile'][field]
+            }
 
-def build_customprofilefields_values(slack_custom_field_name_to_zulip_custom_field_id: ZerverFieldsT,
-                                     fields: ZerverFieldsT, user_id: int, custom_field_id: int,
-                                     custom_field_values: List[ZerverFieldsT]) -> int:
+
+def build_customprofilefields_values(
+    slack_custom_field_name_to_zulip_custom_field_id: ZerverFieldsT,
+    fields: ZerverFieldsT,
+    user_id: int,
+    custom_field_id: int,
+    custom_field_values: List[ZerverFieldsT],
+) -> int:
     for field, value in fields.items():
         if value['value'] == "":
             continue
-        custom_field_value = CustomProfileFieldValue(
-            id=custom_field_id,
-            value=value['value'])
+        custom_field_value = CustomProfileFieldValue(id=custom_field_id, value=value['value'])
 
-        custom_field_value_dict = model_to_dict(custom_field_value,
-                                                exclude=['user_profile', 'field'])
+        custom_field_value_dict = model_to_dict(
+            custom_field_value, exclude=['user_profile', 'field']
+        )
         custom_field_value_dict['user_profile'] = user_id
         custom_field_value_dict['field'] = slack_custom_field_name_to_zulip_custom_field_id[field]
 
@@ -294,14 +350,17 @@ def build_customprofilefields_values(slack_custom_field_name_to_zulip_custom_fie
         custom_field_id += 1
     return custom_field_id
 
-def process_customprofilefields(customprofilefield: List[ZerverFieldsT],
-                                customprofilefield_value: List[ZerverFieldsT]) -> None:
+
+def process_customprofilefields(
+    customprofilefield: List[ZerverFieldsT], customprofilefield_value: List[ZerverFieldsT]
+) -> None:
     for field in customprofilefield:
         for field_value in customprofilefield_value:
             if field_value['field'] == field['id'] and len(field_value['value']) > 50:
                 field['field_type'] = 2  # corresponding to Long text
                 break
 
+
 def get_user_email(user: ZerverFieldsT, domain_name: str) -> str:
     if 'email' in user['profile']:
         return user['profile']['email']
@@ -319,20 +378,24 @@ def get_user_email(user: ZerverFieldsT, domain_name: str) -> str:
         return f"imported-slackbot-bot@{domain_name}"
     raise AssertionError(f"Could not find email address for Slack user {user}")
 
+
 def build_avatar_url(slack_user_id: str, team_id: str, avatar_hash: str) -> str:
     avatar_url = f"https://ca.slack-edge.com/{team_id}-{slack_user_id}-{avatar_hash}"
     return avatar_url
 
+
 def get_owner(user: ZerverFieldsT) -> bool:
     owner = user.get('is_owner', False)
     primary_owner = user.get('is_primary_owner', False)
 
     return primary_owner or owner
 
+
 def get_admin(user: ZerverFieldsT) -> bool:
     admin = user.get('is_admin', False)
     return admin
 
+
 def get_guest(user: ZerverFieldsT) -> bool:
     restricted_user = user.get('is_restricted', False)
     ultra_restricted_user = user.get('is_ultra_restricted', False)
@@ -343,6 +406,7 @@ def get_guest(user: ZerverFieldsT) -> bool:
     # is_restricted is set to True.
     return restricted_user or ultra_restricted_user
 
+
 def get_user_timezone(user: ZerverFieldsT) -> str:
     _default_timezone = "America/New_York"
     timezone = user.get("tz", _default_timezone)
@@ -350,12 +414,16 @@ def get_user_timezone(user: ZerverFieldsT) -> str:
         timezone = _default_timezone
     return timezone
 
-def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
-                              realm: Dict[str, Any],
-                              slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
-                              zerver_userprofile: List[ZerverFieldsT]) \
-        -> Tuple[Dict[str, List[ZerverFieldsT]], AddedChannelsT, AddedMPIMsT,
-                 DMMembersT, SlackToZulipRecipientT]:
+
+def channels_to_zerver_stream(
+    slack_data_dir: str,
+    realm_id: int,
+    realm: Dict[str, Any],
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    zerver_userprofile: List[ZerverFieldsT],
+) -> Tuple[
+    Dict[str, List[ZerverFieldsT]], AddedChannelsT, AddedMPIMsT, DMMembersT, SlackToZulipRecipientT
+]:
     """
     Returns:
     1. realm, converted realm data
@@ -382,7 +450,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
     stream_id_count = defaultstream_id = 0
     huddle_id_count = 0
 
-    def process_channels(channels: List[Dict[str, Any]], invite_only: bool=False) -> None:
+    def process_channels(channels: List[Dict[str, Any]], invite_only: bool = False) -> None:
         nonlocal stream_id_count
         nonlocal recipient_id_count
         nonlocal defaultstream_id
@@ -396,14 +464,20 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
             stream_id = stream_id_count
             recipient_id = recipient_id_count
 
-            stream = build_stream(float(channel["created"]), realm_id, channel["name"],
-                                  description, stream_id, channel["is_archived"], invite_only)
+            stream = build_stream(
+                float(channel["created"]),
+                realm_id,
+                channel["name"],
+                description,
+                stream_id,
+                channel["is_archived"],
+                invite_only,
+            )
             realm["zerver_stream"].append(stream)
 
             slack_default_channels = ['general', 'random']
             if channel['name'] in slack_default_channels and not stream['deactivated']:
-                defaultstream = build_defaultstream(realm_id, stream_id,
-                                                    defaultstream_id)
+                defaultstream = build_defaultstream(realm_id, stream_id, defaultstream_id)
                 realm["zerver_defaultstream"].append(defaultstream)
                 defaultstream_id += 1
 
@@ -413,9 +487,13 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
             realm["zerver_recipient"].append(recipient)
             slack_recipient_name_to_zulip_recipient_id[stream['name']] = recipient_id
 
-            subscription_id_count = get_subscription(channel['members'], realm["zerver_subscription"],
-                                                     recipient_id, slack_user_id_to_zulip_user_id,
-                                                     subscription_id_count)
+            subscription_id_count = get_subscription(
+                channel['members'],
+                realm["zerver_subscription"],
+                recipient_id,
+                slack_user_id_to_zulip_user_id,
+                subscription_id_count,
+            )
 
             stream_id_count += 1
             recipient_id_count += 1
@@ -459,9 +537,13 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
             realm["zerver_recipient"].append(recipient)
             slack_recipient_name_to_zulip_recipient_id[mpim['name']] = recipient_id_count
 
-            subscription_id_count = get_subscription(mpim['members'], realm["zerver_subscription"],
-                                                     recipient_id_count, slack_user_id_to_zulip_user_id,
-                                                     subscription_id_count)
+            subscription_id_count = get_subscription(
+                mpim['members'],
+                realm["zerver_subscription"],
+                recipient_id_count,
+                slack_user_id_to_zulip_user_id,
+                subscription_id_count,
+            )
 
             huddle_id_count += 1
             recipient_id_count += 1
@@ -495,23 +577,40 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int,
     process_dms(dms)
 
     logging.info('######### IMPORTING STREAMS FINISHED #########\n')
-    return realm, added_channels, added_mpims, dm_members, slack_recipient_name_to_zulip_recipient_id
+    return (
+        realm,
+        added_channels,
+        added_mpims,
+        dm_members,
+        slack_recipient_name_to_zulip_recipient_id,
+    )
 
-def get_subscription(channel_members: List[str], zerver_subscription: List[ZerverFieldsT],
-                     recipient_id: int, slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
-                     subscription_id: int) -> int:
+
+def get_subscription(
+    channel_members: List[str],
+    zerver_subscription: List[ZerverFieldsT],
+    recipient_id: int,
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    subscription_id: int,
+) -> int:
     for slack_user_id in channel_members:
-        sub = build_subscription(recipient_id, slack_user_id_to_zulip_user_id[slack_user_id],
-                                 subscription_id)
+        sub = build_subscription(
+            recipient_id, slack_user_id_to_zulip_user_id[slack_user_id], subscription_id
+        )
         zerver_subscription.append(sub)
         subscription_id += 1
     return subscription_id
 
-def process_long_term_idle_users(slack_data_dir: str, users: List[ZerverFieldsT],
-                                 slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
-                                 added_channels: AddedChannelsT,
-                                 added_mpims: AddedMPIMsT, dm_members: DMMembersT,
-                                 zerver_userprofile: List[ZerverFieldsT]) -> Set[int]:
+
+def process_long_term_idle_users(
+    slack_data_dir: str,
+    users: List[ZerverFieldsT],
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    added_channels: AddedChannelsT,
+    added_mpims: AddedMPIMsT,
+    dm_members: DMMembersT,
+    zerver_userprofile: List[ZerverFieldsT],
+) -> Set[int]:
     """Algorithmically, we treat users who have sent at least 10 messages
     or have sent a message within the last 60 days as active.
     Everyone else is treated as long-term idle, which means they will
@@ -558,19 +657,23 @@ def process_long_term_idle_users(slack_data_dir: str, users: List[ZerverFieldsT]
 
     return long_term_idle
 
-def convert_slack_workspace_messages(slack_data_dir: str, users: List[ZerverFieldsT], realm_id: int,
-                                     slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
-                                     slack_recipient_name_to_zulip_recipient_id: SlackToZulipRecipientT,
-                                     added_channels: AddedChannelsT,
-                                     added_mpims: AddedMPIMsT,
-                                     dm_members: DMMembersT,
-                                     realm: ZerverFieldsT,
-                                     zerver_userprofile: List[ZerverFieldsT],
-                                     zerver_realmemoji: List[ZerverFieldsT], domain_name: str,
-                                     output_dir: str,
-                                     chunk_size: int=MESSAGE_BATCH_CHUNK_SIZE) -> Tuple[List[ZerverFieldsT],
-                                                                                        List[ZerverFieldsT],
-                                                                                        List[ZerverFieldsT]]:
+
+def convert_slack_workspace_messages(
+    slack_data_dir: str,
+    users: List[ZerverFieldsT],
+    realm_id: int,
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    slack_recipient_name_to_zulip_recipient_id: SlackToZulipRecipientT,
+    added_channels: AddedChannelsT,
+    added_mpims: AddedMPIMsT,
+    dm_members: DMMembersT,
+    realm: ZerverFieldsT,
+    zerver_userprofile: List[ZerverFieldsT],
+    zerver_realmemoji: List[ZerverFieldsT],
+    domain_name: str,
+    output_dir: str,
+    chunk_size: int = MESSAGE_BATCH_CHUNK_SIZE,
+) -> Tuple[List[ZerverFieldsT], List[ZerverFieldsT], List[ZerverFieldsT]]:
     """
     Returns:
     1. reactions, which is a list of the reactions
@@ -578,9 +681,15 @@ def convert_slack_workspace_messages(slack_data_dir: str, users: List[ZerverFiel
     3. attachment, which is a list of the attachments
     """
 
-    long_term_idle = process_long_term_idle_users(slack_data_dir, users, slack_user_id_to_zulip_user_id,
-                                                  added_channels, added_mpims, dm_members,
-                                                  zerver_userprofile)
+    long_term_idle = process_long_term_idle_users(
+        slack_data_dir,
+        users,
+        slack_user_id_to_zulip_user_id,
+        added_channels,
+        added_mpims,
+        dm_members,
+        zerver_userprofile,
+    )
 
     all_messages = get_messages_iterator(slack_data_dir, added_channels, added_mpims, dm_members)
     logging.info('######### IMPORTING MESSAGES STARTED #########\n')
@@ -606,15 +715,27 @@ def convert_slack_workspace_messages(slack_data_dir: str, users: List[ZerverFiel
         if len(message_data) == 0:
             break
 
-        zerver_message, zerver_usermessage, attachment, uploads, reactions = \
-            channel_message_to_zerver_message(
-                realm_id, users, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id,
-                message_data, zerver_realmemoji, subscriber_map, added_channels, dm_members,
-                domain_name, long_term_idle)
+        (
+            zerver_message,
+            zerver_usermessage,
+            attachment,
+            uploads,
+            reactions,
+        ) = channel_message_to_zerver_message(
+            realm_id,
+            users,
+            slack_user_id_to_zulip_user_id,
+            slack_recipient_name_to_zulip_recipient_id,
+            message_data,
+            zerver_realmemoji,
+            subscriber_map,
+            added_channels,
+            dm_members,
+            domain_name,
+            long_term_idle,
+        )
 
-        message_json = dict(
-            zerver_message=zerver_message,
-            zerver_usermessage=zerver_usermessage)
+        message_json = dict(zerver_message=zerver_message, zerver_usermessage=zerver_usermessage)
 
         message_file = f"/messages-{dump_file_id:06}.json"
         logging.info("Writing Messages to %s\n", output_dir + message_file)
@@ -629,12 +750,17 @@ def convert_slack_workspace_messages(slack_data_dir: str, users: List[ZerverFiel
     logging.info('######### IMPORTING MESSAGES FINISHED #########\n')
     return total_reactions, total_uploads, total_attachments
 
-def get_messages_iterator(slack_data_dir: str, added_channels: Dict[str, Any],
-                          added_mpims: AddedMPIMsT, dm_members: DMMembersT) -> Iterator[ZerverFieldsT]:
+
+def get_messages_iterator(
+    slack_data_dir: str,
+    added_channels: Dict[str, Any],
+    added_mpims: AddedMPIMsT,
+    dm_members: DMMembersT,
+) -> Iterator[ZerverFieldsT]:
     """This function is an iterator that returns all the messages across
-       all Slack channels, in order by timestamp.  It's important to
-       not read all the messages into memory at once, because for
-       large imports that can OOM kill."""
+    all Slack channels, in order by timestamp.  It's important to
+    not read all the messages into memory at once, because for
+    large imports that can OOM kill."""
 
     dir_names = list(added_channels.keys()) + list(added_mpims.keys()) + list(dm_members.keys())
     all_json_names: Dict[str, List[str]] = defaultdict(list)
@@ -673,21 +799,26 @@ def get_messages_iterator(slack_data_dir: str, added_channels: Dict[str, Any],
         # the proper date order
         yield from sorted(messages_for_one_day, key=lambda m: m['ts'])
 
-def channel_message_to_zerver_message(realm_id: int,
-                                      users: List[ZerverFieldsT],
-                                      slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
-                                      slack_recipient_name_to_zulip_recipient_id: SlackToZulipRecipientT,
-                                      all_messages: List[ZerverFieldsT],
-                                      zerver_realmemoji: List[ZerverFieldsT],
-                                      subscriber_map: Dict[int, Set[int]],
-                                      added_channels: AddedChannelsT,
-                                      dm_members: DMMembersT,
-                                      domain_name: str,
-                                      long_term_idle: Set[int]) -> Tuple[List[ZerverFieldsT],
-                                                                         List[ZerverFieldsT],
-                                                                         List[ZerverFieldsT],
-                                                                         List[ZerverFieldsT],
-                                                                         List[ZerverFieldsT]]:
+
+def channel_message_to_zerver_message(
+    realm_id: int,
+    users: List[ZerverFieldsT],
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    slack_recipient_name_to_zulip_recipient_id: SlackToZulipRecipientT,
+    all_messages: List[ZerverFieldsT],
+    zerver_realmemoji: List[ZerverFieldsT],
+    subscriber_map: Dict[int, Set[int]],
+    added_channels: AddedChannelsT,
+    dm_members: DMMembersT,
+    domain_name: str,
+    long_term_idle: Set[int],
+) -> Tuple[
+    List[ZerverFieldsT],
+    List[ZerverFieldsT],
+    List[ZerverFieldsT],
+    List[ZerverFieldsT],
+    List[ZerverFieldsT],
+]:
     """
     Returns:
     1. zerver_message, which is a list of the messages
@@ -713,19 +844,20 @@ def channel_message_to_zerver_message(realm_id: int,
 
         subtype = message.get('subtype', False)
         if subtype in [
-                # Zulip doesn't have a pinned_item concept
-                "pinned_item",
-                "unpinned_item",
-                # Slack's channel join/leave notices are spammy
-                "channel_join",
-                "channel_leave",
-                "channel_name",
+            # Zulip doesn't have a pinned_item concept
+            "pinned_item",
+            "unpinned_item",
+            # Slack's channel join/leave notices are spammy
+            "channel_join",
+            "channel_leave",
+            "channel_name",
         ]:
             continue
 
         try:
             content, mentioned_user_ids, has_link = convert_to_zulip_markdown(
-                message['text'], users, added_channels, slack_user_id_to_zulip_user_id)
+                message['text'], users, added_channels, slack_user_id_to_zulip_user_id
+            )
         except Exception:
             print("Slack message unexpectedly missing text representation:")
             print(orjson.dumps(message, option=orjson.OPT_INDENT_2).decode())
@@ -752,8 +884,13 @@ def channel_message_to_zerver_message(realm_id: int,
         message_id = NEXT_ID('message')
 
         if 'reactions' in message.keys():
-            build_reactions(reaction_list, message['reactions'], slack_user_id_to_zulip_user_id,
-                            message_id, zerver_realmemoji)
+            build_reactions(
+                reaction_list,
+                message['reactions'],
+                slack_user_id_to_zulip_user_id,
+                message_id,
+                zerver_realmemoji,
+            )
 
         # Process different subtypes of slack messages
 
@@ -788,9 +925,18 @@ def channel_message_to_zerver_message(realm_id: int,
 
         topic_name = 'imported from Slack'
 
-        zulip_message = build_message(topic_name, float(message['ts']), message_id, content,
-                                      rendered_content, slack_user_id_to_zulip_user_id[slack_user_id],
-                                      recipient_id, has_image, has_link, has_attachment)
+        zulip_message = build_message(
+            topic_name,
+            float(message['ts']),
+            message_id,
+            content,
+            rendered_content,
+            slack_user_id_to_zulip_user_id[slack_user_id],
+            recipient_id,
+            has_image,
+            has_link,
+            has_attachment,
+        )
         zerver_message.append(zulip_message)
 
         (num_created, num_skipped) = build_usermessages(
@@ -820,20 +966,23 @@ def channel_message_to_zerver_message(realm_id: int,
 
     logging.debug(
         "Created %s UserMessages; deferred %s due to long-term idle",
-        total_user_messages, total_skipped_user_messages,
+        total_user_messages,
+        total_skipped_user_messages,
     )
-    return zerver_message, zerver_usermessage, zerver_attachment, uploads_list, \
-        reaction_list
+    return zerver_message, zerver_usermessage, zerver_attachment, uploads_list, reaction_list
 
-def process_message_files(message: ZerverFieldsT,
-                          domain_name: str,
-                          realm_id: int,
-                          message_id: int,
-                          slack_user_id: str,
-                          users: List[ZerverFieldsT],
-                          slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
-                          zerver_attachment: List[ZerverFieldsT],
-                          uploads_list: List[ZerverFieldsT]) -> Dict[str, Any]:
+
+def process_message_files(
+    message: ZerverFieldsT,
+    domain_name: str,
+    realm_id: int,
+    message_id: int,
+    slack_user_id: str,
+    users: List[ZerverFieldsT],
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    zerver_attachment: List[ZerverFieldsT],
+    uploads_list: List[ZerverFieldsT],
+) -> Dict[str, Any]:
     has_attachment = False
     has_image = False
     has_link = False
@@ -865,17 +1014,31 @@ def process_message_files(message: ZerverFieldsT,
             has_link = True
             has_image = True if 'image' in fileinfo['mimetype'] else False
 
-            file_user = [iterate_user for iterate_user in users if message['user'] == iterate_user['id']]
+            file_user = [
+                iterate_user for iterate_user in users if message['user'] == iterate_user['id']
+            ]
             file_user_email = get_user_email(file_user[0], domain_name)
 
             s3_path, content_for_link = get_attachment_path_and_content(fileinfo, realm_id)
             markdown_links.append(content_for_link)
 
-            build_uploads(slack_user_id_to_zulip_user_id[slack_user_id], realm_id, file_user_email,
-                          fileinfo, s3_path, uploads_list)
+            build_uploads(
+                slack_user_id_to_zulip_user_id[slack_user_id],
+                realm_id,
+                file_user_email,
+                fileinfo,
+                s3_path,
+                uploads_list,
+            )
 
-            build_attachment(realm_id, {message_id}, slack_user_id_to_zulip_user_id[slack_user_id],
-                             fileinfo, s3_path, zerver_attachment)
+            build_attachment(
+                realm_id,
+                {message_id},
+                slack_user_id_to_zulip_user_id[slack_user_id],
+                fileinfo,
+                s3_path,
+                zerver_attachment,
+            )
         else:
             # For attachments with link not from Slack
             # Example: Google drive integration
@@ -895,26 +1058,33 @@ def process_message_files(message: ZerverFieldsT,
         has_link=has_link,
     )
 
-def get_attachment_path_and_content(fileinfo: ZerverFieldsT, realm_id: int) -> Tuple[str,
-                                                                                     str]:
+
+def get_attachment_path_and_content(fileinfo: ZerverFieldsT, realm_id: int) -> Tuple[str, str]:
     # Should be kept in sync with its equivalent in zerver/lib/uploads in the function
     # 'upload_message_file'
-    s3_path = "/".join([
-        str(realm_id),
-        'SlackImportAttachment',  # This is a special placeholder which should be kept
-                                  # in sync with 'exports.py' function 'import_message_data'
-        format(random.randint(0, 255), 'x'),
-        secrets.token_urlsafe(18),
-        sanitize_name(fileinfo['name']),
-    ])
+    s3_path = "/".join(
+        [
+            str(realm_id),
+            'SlackImportAttachment',  # This is a special placeholder which should be kept
+            # in sync with 'exports.py' function 'import_message_data'
+            format(random.randint(0, 255), 'x'),
+            secrets.token_urlsafe(18),
+            sanitize_name(fileinfo['name']),
+        ]
+    )
     attachment_path = f'/user_uploads/{s3_path}'
     content = '[{}]({})'.format(fileinfo['title'], attachment_path)
 
     return s3_path, content
 
-def build_reactions(reaction_list: List[ZerverFieldsT], reactions: List[ZerverFieldsT],
-                    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT, message_id: int,
-                    zerver_realmemoji: List[ZerverFieldsT]) -> None:
+
+def build_reactions(
+    reaction_list: List[ZerverFieldsT],
+    reactions: List[ZerverFieldsT],
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+    message_id: int,
+    zerver_realmemoji: List[ZerverFieldsT],
+) -> None:
     realmemoji = {}
     for realm_emoji in zerver_realmemoji:
         realmemoji[realm_emoji['name']] = realm_emoji['id']
@@ -938,17 +1108,24 @@ def build_reactions(reaction_list: List[ZerverFieldsT], reactions: List[ZerverFi
                 id=reaction_id,
                 emoji_code=emoji_code,
                 emoji_name=emoji_name,
-                reaction_type=reaction_type)
+                reaction_type=reaction_type,
+            )
 
-            reaction_dict = model_to_dict(reaction,
-                                          exclude=['message', 'user_profile'])
+            reaction_dict = model_to_dict(reaction, exclude=['message', 'user_profile'])
             reaction_dict['message'] = message_id
             reaction_dict['user_profile'] = slack_user_id_to_zulip_user_id[slack_user_id]
 
             reaction_list.append(reaction_dict)
 
-def build_uploads(user_id: int, realm_id: int, email: str, fileinfo: ZerverFieldsT, s3_path: str,
-                  uploads_list: List[ZerverFieldsT]) -> None:
+
+def build_uploads(
+    user_id: int,
+    realm_id: int,
+    email: str,
+    fileinfo: ZerverFieldsT,
+    s3_path: str,
+    uploads_list: List[ZerverFieldsT],
+) -> None:
     upload = dict(
         path=fileinfo['url_private'],  # Save Slack's URL here, which is used later while processing
         realm_id=realm_id,
@@ -957,9 +1134,11 @@ def build_uploads(user_id: int, realm_id: int, email: str, fileinfo: ZerverField
         last_modified=fileinfo['timestamp'],
         user_profile_email=email,
         s3_path=s3_path,
-        size=fileinfo['size'])
+        size=fileinfo['size'],
+    )
     uploads_list.append(upload)
 
+
 def get_message_sending_user(message: ZerverFieldsT) -> Optional[str]:
     if 'user' in message:
         return message['user']
@@ -967,7 +1146,10 @@ def get_message_sending_user(message: ZerverFieldsT) -> Optional[str]:
         return message['file'].get('user')
     return None
 
-def fetch_shared_channel_users(user_list: List[ZerverFieldsT], slack_data_dir: str, token: str) -> None:
+
+def fetch_shared_channel_users(
+    user_list: List[ZerverFieldsT], slack_data_dir: str, token: str
+) -> None:
     normal_user_ids = set()
     mirror_dummy_user_ids = set()
     added_channels = {}
@@ -997,25 +1179,35 @@ def fetch_shared_channel_users(user_list: List[ZerverFieldsT], slack_data_dir: s
     # Fetch data on the mirror_dummy_user_ids from the Slack API (it's
     # not included in the data export file).
     for user_id in mirror_dummy_user_ids:
-        user = get_slack_api_data("https://slack.com/api/users.info", "user", token=token, user=user_id)
+        user = get_slack_api_data(
+            "https://slack.com/api/users.info", "user", token=token, user=user_id
+        )
         team_id = user["team_id"]
         if team_id not in team_id_to_domain:
-            team = get_slack_api_data("https://slack.com/api/team.info", "team", token=token, team=team_id)
+            team = get_slack_api_data(
+                "https://slack.com/api/team.info", "team", token=token, team=team_id
+            )
             team_id_to_domain[team_id] = team["domain"]
         user["team_domain"] = team_id_to_domain[team_id]
         user["is_mirror_dummy"] = True
         user_list.append(user)
 
-def fetch_team_icons(zerver_realm: Dict[str, Any], team_info_dict: Dict[str, Any],
-                     output_dir: str) -> List[Dict[str, Any]]:
+
+def fetch_team_icons(
+    zerver_realm: Dict[str, Any], team_info_dict: Dict[str, Any], output_dir: str
+) -> List[Dict[str, Any]]:
     records = []
 
     team_icons_dict = team_info_dict["icon"]
     if "image_default" in team_icons_dict and team_icons_dict["image_default"]:
         return []
 
-    icon_url = team_icons_dict.get("image_original", None) or team_icons_dict.get("image_230", None) or \
-        team_icons_dict.get("image_132", None) or team_icons_dict.get("image_102", None)
+    icon_url = (
+        team_icons_dict.get("image_original", None)
+        or team_icons_dict.get("image_230", None)
+        or team_icons_dict.get("image_132", None)
+        or team_icons_dict.get("image_102", None)
+    )
     if icon_url is None:
         return []
 
@@ -1028,28 +1220,33 @@ def fetch_team_icons(zerver_realm: Dict[str, Any], team_info_dict: Dict[str, Any
     original_icon_output_path = os.path.join(output_dir, str(realm_id), "icon.original")
     with open(original_icon_output_path, 'wb') as output_file:
         shutil.copyfileobj(response_raw, output_file)
-    records.append({
-        "realm_id": realm_id,
-        "path": os.path.join(str(realm_id), "icon.original"),
-        "s3_path": os.path.join(str(realm_id), "icon.original"),
-    })
+    records.append(
+        {
+            "realm_id": realm_id,
+            "path": os.path.join(str(realm_id), "icon.original"),
+            "s3_path": os.path.join(str(realm_id), "icon.original"),
+        }
+    )
 
     resized_icon_output_path = os.path.join(output_dir, str(realm_id), "icon.png")
     with open(resized_icon_output_path, 'wb') as output_file:
         with open(original_icon_output_path, 'rb') as original_file:
             resized_data = resize_logo(original_file.read())
             output_file.write(resized_data)
-    records.append({
-        "realm_id": realm_id,
-        "path": os.path.join(str(realm_id), "icon.png"),
-        "s3_path": os.path.join(str(realm_id), "icon.png"),
-    })
+    records.append(
+        {
+            "realm_id": realm_id,
+            "path": os.path.join(str(realm_id), "icon.png"),
+            "s3_path": os.path.join(str(realm_id), "icon.png"),
+        }
+    )
 
     zerver_realm["icon_source"] = Realm.ICON_UPLOADED
 
     return records
 
-def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: int=6) -> None:
+
+def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: int = 6) -> None:
     # Subdomain is set by the user while running the import command
     realm_subdomain = ""
     realm_id = 0
@@ -1074,16 +1271,34 @@ def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: i
 
     custom_emoji_list = get_slack_api_data("https://slack.com/api/emoji.list", "emoji", token=token)
 
-    realm, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id, \
-        added_channels, added_mpims, dm_members, avatar_list, \
-        emoji_url_map = slack_workspace_to_realm(domain_name, realm_id, user_list,
-                                                 realm_subdomain, slack_data_dir,
-                                                 custom_emoji_list)
+    (
+        realm,
+        slack_user_id_to_zulip_user_id,
+        slack_recipient_name_to_zulip_recipient_id,
+        added_channels,
+        added_mpims,
+        dm_members,
+        avatar_list,
+        emoji_url_map,
+    ) = slack_workspace_to_realm(
+        domain_name, realm_id, user_list, realm_subdomain, slack_data_dir, custom_emoji_list
+    )
 
     reactions, uploads_list, zerver_attachment = convert_slack_workspace_messages(
-        slack_data_dir, user_list, realm_id, slack_user_id_to_zulip_user_id,
-        slack_recipient_name_to_zulip_recipient_id, added_channels, added_mpims, dm_members, realm,
-        realm['zerver_userprofile'], realm['zerver_realmemoji'], domain_name, output_dir)
+        slack_data_dir,
+        user_list,
+        realm_id,
+        slack_user_id_to_zulip_user_id,
+        slack_recipient_name_to_zulip_recipient_id,
+        added_channels,
+        added_mpims,
+        dm_members,
+        realm,
+        realm['zerver_userprofile'],
+        realm['zerver_realmemoji'],
+        domain_name,
+        output_dir,
+    )
 
     # Move zerver_reactions to realm.json file
     realm['zerver_reaction'] = reactions
@@ -1095,7 +1310,9 @@ def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: i
     avatar_folder = os.path.join(output_dir, 'avatars')
     avatar_realm_folder = os.path.join(avatar_folder, str(realm_id))
     os.makedirs(avatar_realm_folder, exist_ok=True)
-    avatar_records = process_avatars(avatar_list, avatar_folder, realm_id, threads, size_url_suffix='-512')
+    avatar_records = process_avatars(
+        avatar_list, avatar_folder, realm_id, threads, size_url_suffix='-512'
+    )
 
     uploads_folder = os.path.join(output_dir, 'uploads')
     os.makedirs(os.path.join(uploads_folder, str(realm_id)), exist_ok=True)
@@ -1104,7 +1321,9 @@ def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: i
 
     team_info_dict = get_slack_api_data("https://slack.com/api/team.info", "team", token=token)
     realm_icons_folder = os.path.join(output_dir, 'realm_icons')
-    realm_icon_records = fetch_team_icons(realm["zerver_realm"][0], team_info_dict, realm_icons_folder)
+    realm_icon_records = fetch_team_icons(
+        realm["zerver_realm"][0], team_info_dict, realm_icons_folder
+    )
 
     create_converted_data_files(realm, output_dir, '/realm.json')
     create_converted_data_files(emoji_records, output_dir, '/emoji/records.json')
@@ -1119,11 +1338,13 @@ def do_convert_data(slack_zip_file: str, output_dir: str, token: str, threads: i
     logging.info('######### DATA CONVERSION FINISHED #########\n')
     logging.info("Zulip data dump created at %s", output_dir)
 
+
 def get_data_file(path: str) -> Any:
     with open(path, "rb") as fp:
         data = orjson.loads(fp.read())
         return data
 
+
 def check_token_access(token: str) -> None:
     if token.startswith("xoxp-"):
         logging.info('This is a Slack user token, which grants all rights the user has!')
@@ -1133,7 +1354,11 @@ def check_token_access(token: str) -> None:
         required_scopes = set(['emoji:read', 'users:read', 'users:read.email', 'team:read'])
         missing_scopes = required_scopes - has_scopes
         if missing_scopes:
-            raise ValueError("Slack token is missing the following required scopes: {}".format(sorted(missing_scopes)))
+            raise ValueError(
+                "Slack token is missing the following required scopes: {}".format(
+                    sorted(missing_scopes)
+                )
+            )
     else:
         raise Exception("Unknown token type -- must start with xoxb- or xoxp-")
 
diff --git a/zerver/data_import/slack_message_conversion.py b/zerver/data_import/slack_message_conversion.py
index 93bfd5b468..8471796b24 100644
--- a/zerver/data_import/slack_message_conversion.py
+++ b/zerver/data_import/slack_message_conversion.py
@@ -56,6 +56,7 @@ SLACK_BOLD_REGEX = r"""
                     ($|[ -']|[+-/]|[:-?]|\}|\)|\]|\_|\||\^|~)
                     """
 
+
 def get_user_full_name(user: ZerverFieldsT) -> str:
     if "deleted" in user and user['deleted'] is False:
         return user['real_name'] or user['name']
@@ -64,11 +65,14 @@ def get_user_full_name(user: ZerverFieldsT) -> str:
     else:
         return user['name']
 
+
 # Markdown mapping
-def convert_to_zulip_markdown(text: str, users: List[ZerverFieldsT],
-                              added_channels: AddedChannelsT,
-                              slack_user_id_to_zulip_user_id: SlackToZulipUserIDT) -> \
-        Tuple[str, List[int], bool]:
+def convert_to_zulip_markdown(
+    text: str,
+    users: List[ZerverFieldsT],
+    added_channels: AddedChannelsT,
+    slack_user_id_to_zulip_user_id: SlackToZulipUserIDT,
+) -> Tuple[str, List[int], bool]:
     mentioned_users_id = []
     text = convert_markdown_syntax(text, SLACK_BOLD_REGEX, "**")
     text = convert_markdown_syntax(text, SLACK_STRIKETHROUGH_REGEX, "~~")
@@ -92,9 +96,10 @@ def convert_to_zulip_markdown(text: str, users: List[ZerverFieldsT],
 
         # Check user mentions and change mention format from
         # '<@slack_id|short_name>' to '@**full_name**'
-        if (re.findall(SLACK_USERMENTION_REGEX, tokens[iterator], re.VERBOSE)):
-            tokens[iterator], user_id = get_user_mentions(tokens[iterator], users,
-                                                          slack_user_id_to_zulip_user_id)
+        if re.findall(SLACK_USERMENTION_REGEX, tokens[iterator], re.VERBOSE):
+            tokens[iterator], user_id = get_user_mentions(
+                tokens[iterator], users, slack_user_id_to_zulip_user_id
+            )
             if user_id is not None:
                 mentioned_users_id.append(user_id)
 
@@ -112,15 +117,18 @@ def convert_to_zulip_markdown(text: str, users: List[ZerverFieldsT],
 
     return text, mentioned_users_id, message_has_link
 
-def get_user_mentions(token: str, users: List[ZerverFieldsT],
-                      slack_user_id_to_zulip_user_id: SlackToZulipUserIDT) -> Tuple[str, Optional[int]]:
+
+def get_user_mentions(
+    token: str, users: List[ZerverFieldsT], slack_user_id_to_zulip_user_id: SlackToZulipUserIDT
+) -> Tuple[str, Optional[int]]:
     slack_usermention_match = re.search(SLACK_USERMENTION_REGEX, token, re.VERBOSE)
     assert slack_usermention_match is not None
     short_name = slack_usermention_match.group(4)
     slack_id = slack_usermention_match.group(2)
     for user in users:
-        if (user['id'] == slack_id and user['name'] == short_name and short_name) or \
-           (user['id'] == slack_id and short_name is None):
+        if (user['id'] == slack_id and user['name'] == short_name and short_name) or (
+            user['id'] == slack_id and short_name is None
+        ):
             full_name = get_user_full_name(user)
             user_id = slack_user_id_to_zulip_user_id[slack_id]
             mention = "@**" + full_name + "**"
@@ -128,6 +136,7 @@ def get_user_mentions(token: str, users: List[ZerverFieldsT],
             return token, user_id
     return token, None
 
+
 # Map italic, bold and strikethrough Markdown
 def convert_markdown_syntax(text: str, regex: str, zulip_keyword: str) -> str:
     """
@@ -137,11 +146,18 @@ def convert_markdown_syntax(text: str, regex: str, zulip_keyword: str) -> str:
     3. For italic formatting: This maps Slack's '_italic_' to Zulip's '*italic*'
     """
     for match in re.finditer(regex, text, re.VERBOSE):
-        converted_token = (match.group(1) + zulip_keyword + match.group(3)
-                           + match.group(4) + zulip_keyword + match.group(6))
+        converted_token = (
+            match.group(1)
+            + zulip_keyword
+            + match.group(3)
+            + match.group(4)
+            + zulip_keyword
+            + match.group(6)
+        )
         text = text.replace(match.group(0), converted_token)
     return text
 
+
 def convert_link_format(text: str) -> Tuple[str, bool]:
     """
     1. Converts '<https://foo.com>' to 'https://foo.com'
@@ -154,6 +170,7 @@ def convert_link_format(text: str) -> Tuple[str, bool]:
         text = text.replace(match.group(0), converted_text)
     return text, has_link
 
+
 def convert_mailto_format(text: str) -> Tuple[str, bool]:
     """
     1. Converts '<mailto:foo@foo.com>' to 'mailto:foo@foo.com'
diff --git a/zerver/decorator.py b/zerver/decorator.py
index cb69c55f1b..9417db7182 100644
--- a/zerver/decorator.py
+++ b/zerver/decorator.py
@@ -53,6 +53,7 @@ webhook_unsupported_events_logger = logging.getLogger("zulip.zerver.webhooks.uns
 
 FuncT = TypeVar('FuncT', bound=Callable[..., object])
 
+
 def cachify(method: FuncT) -> FuncT:
     dct: Dict[Tuple[object, ...], object] = {}
 
@@ -63,10 +64,13 @@ def cachify(method: FuncT) -> FuncT:
         result = method(*args)
         dct[tup] = result
         return result
+
     return cast(FuncT, cache_wrapper)  # https://github.com/python/mypy/issues/1927
 
-def update_user_activity(request: HttpRequest, user_profile: UserProfile,
-                         query: Optional[str]) -> None:
+
+def update_user_activity(
+    request: HttpRequest, user_profile: UserProfile, query: Optional[str]
+) -> None:
     # update_active_status also pushes to RabbitMQ, and it seems
     # redundant to log that here as well.
     if request.META["PATH_INFO"] == '/json/users/me/presence':
@@ -79,59 +83,86 @@ def update_user_activity(request: HttpRequest, user_profile: UserProfile,
     else:
         query = request.META['PATH_INFO']
 
-    event = {'query': query,
-             'user_profile_id': user_profile.id,
-             'time': datetime_to_timestamp(timezone_now()),
-             'client_id': request.client.id}
+    event = {
+        'query': query,
+        'user_profile_id': user_profile.id,
+        'time': datetime_to_timestamp(timezone_now()),
+        'client_id': request.client.id,
+    }
     queue_json_publish("user_activity", event, lambda event: None)
 
+
 # Based on django.views.decorators.http.require_http_methods
 def require_post(func: ViewFuncT) -> ViewFuncT:
     @wraps(func)
     def wrapper(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
         if request.method != "POST":
             err_method = request.method
-            logging.warning('Method Not Allowed (%s): %s', err_method, request.path,
-                            extra={'status_code': 405, 'request': request})
+            logging.warning(
+                'Method Not Allowed (%s): %s',
+                err_method,
+                request.path,
+                extra={'status_code': 405, 'request': request},
+            )
             if request.error_format == 'JSON':
                 return json_method_not_allowed(["POST"])
             else:
-                return TemplateResponse(request, "404.html", context={'status_code': 405}, status=405)
+                return TemplateResponse(
+                    request, "404.html", context={'status_code': 405}, status=405
+                )
         return func(request, *args, **kwargs)
+
     return cast(ViewFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 def require_realm_owner(func: ViewFuncT) -> ViewFuncT:
     @wraps(func)
-    def wrapper(request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object) -> HttpResponse:
+    def wrapper(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if not user_profile.is_realm_owner:
             raise OrganizationOwnerRequired()
         return func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 def require_realm_admin(func: ViewFuncT) -> ViewFuncT:
     @wraps(func)
-    def wrapper(request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object) -> HttpResponse:
+    def wrapper(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if not user_profile.is_realm_admin:
             raise OrganizationAdministratorRequired()
         return func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 def require_organization_member(func: ViewFuncT) -> ViewFuncT:
     @wraps(func)
-    def wrapper(request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object) -> HttpResponse:
+    def wrapper(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if user_profile.role > UserProfile.ROLE_MEMBER:
             raise OrganizationMemberRequired()
         return func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 def require_billing_access(func: ViewFuncT) -> ViewFuncT:
     @wraps(func)
-    def wrapper(request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object) -> HttpResponse:
+    def wrapper(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if not user_profile.has_billing_access:
             raise JsonableError(_("Must be a billing administrator or an organization owner"))
         return func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 def get_client_name(request: HttpRequest) -> str:
     # If the API request specified a client in the request content,
     # that has priority.  Otherwise, extract the client from the
@@ -152,11 +183,16 @@ def get_client_name(request: HttpRequest) -> str:
     # in logs and figure out the extent of the problem
     return "Unspecified"
 
-def process_client(request: HttpRequest, user_profile: UserProfile,
-                   *, is_browser_view: bool=False,
-                   client_name: Optional[str]=None,
-                   skip_update_user_activity: bool=False,
-                   query: Optional[str]=None) -> None:
+
+def process_client(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    *,
+    is_browser_view: bool = False,
+    client_name: Optional[str] = None,
+    skip_update_user_activity: bool = False,
+    query: Optional[str] = None,
+) -> None:
     if client_name is None:
         client_name = get_client_name(request)
 
@@ -172,6 +208,7 @@ def process_client(request: HttpRequest, user_profile: UserProfile,
     if not skip_update_user_activity and user_profile.is_authenticated:
         update_user_activity(request, user_profile, query)
 
+
 class InvalidZulipServerError(JsonableError):
     code = ErrorCode.INVALID_ZULIP_SERVER
     data_fields = ['role']
@@ -183,14 +220,20 @@ class InvalidZulipServerError(JsonableError):
     def msg_format() -> str:
         return "Zulip server auth failure: {role} is not registered"
 
+
 class InvalidZulipServerKeyError(InvalidZulipServerError):
     @staticmethod
     def msg_format() -> str:
         return "Zulip server auth failure: key does not match role {role}"
 
-def validate_api_key(request: HttpRequest, role: Optional[str],
-                     api_key: str, allow_webhook_access: bool=False,
-                     client_name: Optional[str]=None) -> Union[UserProfile, "RemoteZulipServer"]:
+
+def validate_api_key(
+    request: HttpRequest,
+    role: Optional[str],
+    api_key: str,
+    allow_webhook_access: bool = False,
+    client_name: Optional[str] = None,
+) -> Union[UserProfile, "RemoteZulipServer"]:
     # Remove whitespace to protect users from trivial errors.
     api_key = api_key.strip()
     if role is not None:
@@ -222,6 +265,7 @@ def validate_api_key(request: HttpRequest, role: Optional[str],
 
     return user_profile
 
+
 def validate_account_and_subdomain(request: HttpRequest, user_profile: UserProfile) -> None:
     if user_profile.realm.deactivated:
         raise JsonableError(_("This organization has been deactivated"))
@@ -230,17 +274,23 @@ def validate_account_and_subdomain(request: HttpRequest, user_profile: UserProfi
 
     # Either the subdomain matches, or we're accessing Tornado from
     # and to localhost (aka spoofing a request as the user).
-    if (not user_matches_subdomain(get_subdomain(request), user_profile) and
-        not (settings.RUNNING_INSIDE_TORNADO and
-             request.META["SERVER_NAME"] == "127.0.0.1" and
-             request.META["REMOTE_ADDR"] == "127.0.0.1")):
+    if not user_matches_subdomain(get_subdomain(request), user_profile) and not (
+        settings.RUNNING_INSIDE_TORNADO
+        and request.META["SERVER_NAME"] == "127.0.0.1"
+        and request.META["REMOTE_ADDR"] == "127.0.0.1"
+    ):
         logging.warning(
             "User %s (%s) attempted to access API on wrong subdomain (%s)",
-            user_profile.delivery_email, user_profile.realm.subdomain, get_subdomain(request),
+            user_profile.delivery_email,
+            user_profile.realm.subdomain,
+            get_subdomain(request),
         )
         raise JsonableError(_("Account is not associated with this subdomain"))
 
-def access_user_by_api_key(request: HttpRequest, api_key: str, email: Optional[str]=None) -> UserProfile:
+
+def access_user_by_api_key(
+    request: HttpRequest, api_key: str, email: Optional[str] = None
+) -> UserProfile:
     if not has_api_key_format(api_key):
         raise InvalidAPIKeyFormatError()
 
@@ -258,6 +308,7 @@ def access_user_by_api_key(request: HttpRequest, api_key: str, email: Optional[s
 
     return user_profile
 
+
 def log_exception_to_webhook_logger(
     summary: str,
     unsupported_event: bool,
@@ -267,15 +318,17 @@ def log_exception_to_webhook_logger(
     else:
         webhook_logger.exception(summary, stack_info=True)
 
-def full_webhook_client_name(raw_client_name: Optional[str]=None) -> Optional[str]:
+
+def full_webhook_client_name(raw_client_name: Optional[str] = None) -> Optional[str]:
     if raw_client_name is None:
         return None
     return f"Zulip{raw_client_name}Webhook"
 
+
 # Use this for webhook views that don't get an email passed in.
 def webhook_view(
-        webhook_client_name: str,
-        notify_bot_owner_on_invalid_json: bool=True,
+    webhook_client_name: str,
+    notify_bot_owner_on_invalid_json: bool = True,
 ) -> Callable[[Callable[..., HttpResponse]], Callable[..., HttpResponse]]:
     # Unfortunately, callback protocols are insufficient for this:
     # https://mypy.readthedocs.io/en/stable/protocols.html#callback-protocols
@@ -284,10 +337,16 @@ def webhook_view(
         @csrf_exempt
         @has_request_variables
         @wraps(view_func)
-        def _wrapped_func_arguments(request: HttpRequest, api_key: str=REQ(),
-                                    *args: object, **kwargs: object) -> HttpResponse:
-            user_profile = validate_api_key(request, None, api_key, allow_webhook_access=True,
-                                            client_name=full_webhook_client_name(webhook_client_name))
+        def _wrapped_func_arguments(
+            request: HttpRequest, api_key: str = REQ(), *args: object, **kwargs: object
+        ) -> HttpResponse:
+            user_profile = validate_api_key(
+                request,
+                None,
+                api_key,
+                allow_webhook_access=True,
+                client_name=full_webhook_client_name(webhook_client_name),
+            )
 
             if settings.RATE_LIMITING:
                 rate_limit_user(request, user_profile, domain='api_by_user')
@@ -299,8 +358,11 @@ def webhook_view(
                     # cyclic import; correct fix is probably to move
                     # notify_bot_owner_about_invalid_json to a smaller file.
                     from zerver.lib.webhooks.common import notify_bot_owner_about_invalid_json
+
                     notify_bot_owner_about_invalid_json(user_profile, webhook_client_name)
-                elif isinstance(err, JsonableError) and not isinstance(err, UnsupportedWebhookEventType):
+                elif isinstance(err, JsonableError) and not isinstance(
+                    err, UnsupportedWebhookEventType
+                ):
                     pass
                 else:
                     if isinstance(err, UnsupportedWebhookEventType):
@@ -312,20 +374,26 @@ def webhook_view(
                 raise err
 
         return _wrapped_func_arguments
+
     return _wrapped_view_func
 
+
 # From Django 2.2, modified to pass the request rather than just the
 # user into test_func; this is useful so that we can revalidate the
 # subdomain matches the user's realm.  It is likely that we could make
 # the subdomain validation happen elsewhere and switch to using the
 # stock Django version.
-def user_passes_test(test_func: Callable[[HttpResponse], bool], login_url: Optional[str]=None,
-                     redirect_field_name: str=REDIRECT_FIELD_NAME) -> Callable[[ViewFuncT], ViewFuncT]:
+def user_passes_test(
+    test_func: Callable[[HttpResponse], bool],
+    login_url: Optional[str] = None,
+    redirect_field_name: str = REDIRECT_FIELD_NAME,
+) -> Callable[[ViewFuncT], ViewFuncT]:
     """
     Decorator for views that checks that the user passes the given test,
     redirecting to the log-in page if necessary. The test should be a callable
     that takes the user object and returns True if the user passes.
     """
+
     def decorator(view_func: ViewFuncT) -> ViewFuncT:
         @wraps(view_func)
         def _wrapped_view(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
@@ -337,8 +405,9 @@ def user_passes_test(test_func: Callable[[HttpResponse], bool], login_url: Optio
             # use the path as the "next" url.
             login_scheme, login_netloc = urllib.parse.urlparse(resolved_login_url)[:2]
             current_scheme, current_netloc = urllib.parse.urlparse(path)[:2]
-            if ((not login_scheme or login_scheme == current_scheme) and
-                    (not login_netloc or login_netloc == current_netloc)):
+            if (not login_scheme or login_scheme == current_scheme) and (
+                not login_netloc or login_netloc == current_netloc
+            ):
                 path = request.get_full_path()
 
             # TODO: Restore testing for this case; it was removed when
@@ -346,11 +415,13 @@ def user_passes_test(test_func: Callable[[HttpResponse], bool], login_url: Optio
             if path == "/":  # nocoverage
                 # Don't add ?next=/, to keep our URLs clean
                 return HttpResponseRedirect(resolved_login_url)
-            return redirect_to_login(
-                path, resolved_login_url, redirect_field_name)
+            return redirect_to_login(path, resolved_login_url, redirect_field_name)
+
         return cast(ViewFuncT, _wrapped_view)  # https://github.com/python/mypy/issues/1927
+
     return decorator
 
+
 def logged_in_and_active(request: HttpRequest) -> bool:
     if not request.user.is_authenticated:
         return False
@@ -360,11 +431,13 @@ def logged_in_and_active(request: HttpRequest) -> bool:
         return False
     return user_matches_subdomain(get_subdomain(request), request.user)
 
+
 def do_two_factor_login(request: HttpRequest, user_profile: UserProfile) -> None:
     device = default_device(user_profile)
     if device:
         django_otp.login(request, device)
 
+
 def do_login(request: HttpRequest, user_profile: UserProfile) -> None:
     """Creates a session, logging in the user, using the Django method,
     and also adds helpful data needed by our server logs.
@@ -376,34 +449,40 @@ def do_login(request: HttpRequest, user_profile: UserProfile) -> None:
         # Login with two factor authentication as well.
         do_two_factor_login(request, user_profile)
 
+
 def log_view_func(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
         request._query = view_func.__name__
         return view_func(request, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def add_logging_data(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
-        process_client(request, request.user, is_browser_view=True,
-                       query=view_func.__name__)
+        process_client(request, request.user, is_browser_view=True, query=view_func.__name__)
         return rate_limit()(view_func)(request, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def human_users_only(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
         if request.user.is_bot:
             return json_error(_("This endpoint does not accept bot requests."))
         return view_func(request, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 # Based on Django 1.8's @login_required
 def zulip_login_required(
-        function: Optional[ViewFuncT]=None,
-        redirect_field_name: str=REDIRECT_FIELD_NAME,
-        login_url: str=settings.HOME_NOT_LOGGED_IN,
+    function: Optional[ViewFuncT] = None,
+    redirect_field_name: str = REDIRECT_FIELD_NAME,
+    login_url: str = settings.HOME_NOT_LOGGED_IN,
 ) -> Union[Callable[[ViewFuncT], ViewFuncT], ViewFuncT]:
     actual_decorator = lambda function: user_passes_test(
         logged_in_and_active,
@@ -411,7 +490,8 @@ def zulip_login_required(
         redirect_field_name=redirect_field_name,
     )(
         zulip_otp_required(
-            redirect_field_name=redirect_field_name, login_url=login_url,
+            redirect_field_name=redirect_field_name,
+            login_url=login_url,
         )(add_logging_data(function))
     )
 
@@ -419,10 +499,11 @@ def zulip_login_required(
         return actual_decorator(function)
     return actual_decorator  # nocoverage # We don't use this without a function
 
+
 def web_public_view(
-        view_func: ViewFuncT,
-        redirect_field_name: str=REDIRECT_FIELD_NAME,
-        login_url: str=settings.HOME_NOT_LOGGED_IN,
+    view_func: ViewFuncT,
+    redirect_field_name: str = REDIRECT_FIELD_NAME,
+    login_url: str = settings.HOME_NOT_LOGGED_IN,
 ) -> Union[Callable[[ViewFuncT], ViewFuncT], ViewFuncT]:
     """
     This wrapper adds client info for unauthenticated users but
@@ -437,10 +518,12 @@ def web_public_view(
         return zulip_login_required(view_func, redirect_field_name, login_url)  # nocoverage
 
     actual_decorator = lambda view_func: zulip_otp_required(
-        redirect_field_name=redirect_field_name, login_url=login_url)(add_logging_data(view_func))
+        redirect_field_name=redirect_field_name, login_url=login_url
+    )(add_logging_data(view_func))
 
     return actual_decorator(view_func)
 
+
 def require_server_admin(view_func: ViewFuncT) -> ViewFuncT:
     @zulip_login_required
     @wraps(view_func)
@@ -449,50 +532,66 @@ def require_server_admin(view_func: ViewFuncT) -> ViewFuncT:
             return HttpResponseRedirect(settings.HOME_NOT_LOGGED_IN)
 
         return add_logging_data(view_func)(request, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def require_server_admin_api(view_func: ViewFuncT) -> ViewFuncT:
     @zulip_login_required
     @wraps(view_func)
-    def _wrapped_view_func(request: HttpRequest, user_profile: UserProfile, *args: object,
-                           **kwargs: object) -> HttpResponse:
+    def _wrapped_view_func(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if not user_profile.is_staff:
             raise JsonableError(_("Must be an server administrator"))
         return view_func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def require_non_guest_user(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
-    def _wrapped_view_func(request: HttpRequest, user_profile: UserProfile, *args: object,
-                           **kwargs: object) -> HttpResponse:
+    def _wrapped_view_func(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if user_profile.is_guest:
             raise JsonableError(_("Not allowed for guest users"))
         return view_func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def require_member_or_admin(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
-    def _wrapped_view_func(request: HttpRequest, user_profile: UserProfile, *args: object,
-                           **kwargs: object) -> HttpResponse:
+    def _wrapped_view_func(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         if user_profile.is_guest:
             raise JsonableError(_("Not allowed for guest users"))
         if user_profile.is_bot:
             return json_error(_("This endpoint does not accept bot requests."))
         return view_func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def require_user_group_edit_permission(view_func: ViewFuncT) -> ViewFuncT:
     @require_member_or_admin
     @wraps(view_func)
-    def _wrapped_view_func(request: HttpRequest, user_profile: UserProfile,
-                           *args: object, **kwargs: object) -> HttpResponse:
+    def _wrapped_view_func(
+        request: HttpRequest, user_profile: UserProfile, *args: object, **kwargs: object
+    ) -> HttpResponse:
         realm = user_profile.realm
-        if realm.user_group_edit_policy != Realm.USER_GROUP_EDIT_POLICY_MEMBERS and \
-                not user_profile.is_realm_admin:
+        if (
+            realm.user_group_edit_policy != Realm.USER_GROUP_EDIT_POLICY_MEMBERS
+            and not user_profile.is_realm_admin
+        ):
             raise OrganizationAdministratorRequired()
         return view_func(request, user_profile, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 # This API endpoint is used only for the mobile apps.  It is part of a
 # workaround for the fact that React Native doesn't support setting
 # HTTP basic authentication headers.
@@ -503,18 +602,21 @@ def authenticated_uploads_api_view(
         @csrf_exempt
         @has_request_variables
         @wraps(view_func)
-        def _wrapped_func_arguments(request: HttpRequest,
-                                    api_key: str=REQ(),
-                                    *args: object, **kwargs: object) -> HttpResponse:
+        def _wrapped_func_arguments(
+            request: HttpRequest, api_key: str = REQ(), *args: object, **kwargs: object
+        ) -> HttpResponse:
             user_profile = validate_api_key(request, None, api_key, False)
             if not skip_rate_limiting:
                 limited_func = rate_limit()(view_func)
             else:
                 limited_func = view_func
             return limited_func(request, user_profile, *args, **kwargs)
+
         return _wrapped_func_arguments
+
     return _wrapped_view_func
 
+
 # A more REST-y authentication decorator, using, in particular, HTTP basic
 # authentication.
 #
@@ -532,7 +634,9 @@ def authenticated_rest_api_view(
     def _wrapped_view_func(view_func: Callable[..., HttpResponse]) -> Callable[..., HttpResponse]:
         @csrf_exempt
         @wraps(view_func)
-        def _wrapped_func_arguments(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
+        def _wrapped_func_arguments(
+            request: HttpRequest, *args: object, **kwargs: object
+        ) -> HttpResponse:
             # First try block attempts to get the credentials we need to do authentication
             try:
                 # Grab the base64-encoded authentication string, decode it, and split it into
@@ -550,9 +654,13 @@ def authenticated_rest_api_view(
             # Now we try to do authentication or die
             try:
                 # profile is a Union[UserProfile, RemoteZulipServer]
-                profile = validate_api_key(request, role, api_key,
-                                           allow_webhook_access=allow_webhook_access,
-                                           client_name=full_webhook_client_name(webhook_client_name))
+                profile = validate_api_key(
+                    request,
+                    role,
+                    api_key,
+                    allow_webhook_access=allow_webhook_access,
+                    client_name=full_webhook_client_name(webhook_client_name),
+                )
             except JsonableError as e:
                 return json_unauthorized(e.msg)
             try:
@@ -565,7 +673,9 @@ def authenticated_rest_api_view(
             except Exception as err:
                 if not webhook_client_name:
                     raise err
-                if isinstance(err, JsonableError) and not isinstance(err, UnsupportedWebhookEventType):  # nocoverage
+                if isinstance(err, JsonableError) and not isinstance(
+                    err, UnsupportedWebhookEventType
+                ):  # nocoverage
                     raise err
 
                 if isinstance(err, UnsupportedWebhookEventType):
@@ -575,9 +685,12 @@ def authenticated_rest_api_view(
                     unsupported_event=isinstance(err, UnsupportedWebhookEventType),
                 )
                 raise err
+
         return _wrapped_func_arguments
+
     return _wrapped_view_func
 
+
 def process_as_post(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
@@ -608,6 +721,7 @@ def process_as_post(view_func: ViewFuncT) -> ViewFuncT:
 
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def authenticate_log_and_execute_json(
     request: HttpRequest,
     view_func: ViewFuncT,
@@ -625,9 +739,13 @@ def authenticate_log_and_execute_json(
         if not allow_unauthenticated:
             return json_unauthorized()
 
-        process_client(request, request.user, is_browser_view=True,
-                       skip_update_user_activity=True,
-                       query=view_func.__name__)
+        process_client(
+            request,
+            request.user,
+            is_browser_view=True,
+            skip_update_user_activity=True,
+            query=view_func.__name__,
+        )
         return limited_view_func(request, request.user, *args, **kwargs)
 
     user_profile = request.user
@@ -636,10 +754,10 @@ def authenticate_log_and_execute_json(
     if user_profile.is_incoming_webhook:
         raise JsonableError(_("Webhook bots can only access webhooks"))
 
-    process_client(request, user_profile, is_browser_view=True,
-                   query=view_func.__name__)
+    process_client(request, user_profile, is_browser_view=True, query=view_func.__name__)
     return limited_view_func(request, user_profile, *args, **kwargs)
 
+
 # Checks if the user is logged in.  If not, return an error (the
 # @login_required behavior of redirecting to a login page doesn't make
 # sense for json views)
@@ -649,8 +767,7 @@ def authenticated_json_view(
     allow_unauthenticated: bool = False,
 ) -> Callable[..., HttpResponse]:
     @wraps(view_func)
-    def _wrapped_view_func(request: HttpRequest,
-                           *args: object, **kwargs: object) -> HttpResponse:
+    def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
         return authenticate_log_and_execute_json(
             request,
             view_func,
@@ -659,25 +776,32 @@ def authenticated_json_view(
             allow_unauthenticated=allow_unauthenticated,
             **kwargs,
         )
+
     return _wrapped_view_func
 
+
 def is_local_addr(addr: str) -> bool:
     return addr in ('127.0.0.1', '::1')
 
+
 # These views are used by the main Django server to notify the Tornado server
 # of events.  We protect them from the outside world by checking a shared
 # secret, and also the originating IP (for now).
 def authenticate_notify(request: HttpRequest) -> bool:
-    return (is_local_addr(request.META['REMOTE_ADDR']) and
-            request.POST.get('secret') == settings.SHARED_SECRET)
+    return (
+        is_local_addr(request.META['REMOTE_ADDR'])
+        and request.POST.get('secret') == settings.SHARED_SECRET
+    )
+
 
 def client_is_exempt_from_rate_limiting(request: HttpRequest) -> bool:
 
     # Don't rate limit requests from Django that come from our own servers,
     # and don't rate-limit dev instances
-    return ((request.client and request.client.name.lower() == 'internal') and
-            (is_local_addr(request.META['REMOTE_ADDR']) or
-             settings.DEBUG_RATE_LIMITING))
+    return (request.client and request.client.name.lower() == 'internal') and (
+        is_local_addr(request.META['REMOTE_ADDR']) or settings.DEBUG_RATE_LIMITING
+    )
+
 
 def internal_notify_view(is_tornado_view: bool) -> Callable[[ViewFuncT], ViewFuncT]:
     # The typing here could be improved by using the Extended Callable types:
@@ -685,11 +809,14 @@ def internal_notify_view(is_tornado_view: bool) -> Callable[[ViewFuncT], ViewFun
     """Used for situations where something running on the Zulip server
     needs to make a request to the (other) Django/Tornado processes running on
     the server."""
+
     def _wrapped_view_func(view_func: ViewFuncT) -> ViewFuncT:
         @csrf_exempt
         @require_post
         @wraps(view_func)
-        def _wrapped_func_arguments(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
+        def _wrapped_func_arguments(
+            request: HttpRequest, *args: object, **kwargs: object
+        ) -> HttpResponse:
             if not authenticate_notify(request):
                 return json_error(_('Access denied'), status=403)
             is_tornado_request = hasattr(request, '_tornado_handler')
@@ -701,26 +828,34 @@ def internal_notify_view(is_tornado_view: bool) -> Callable[[ViewFuncT], ViewFun
                 raise RuntimeError('Django notify view called with Tornado handler')
             request._requestor_for_logs = "internal"
             return view_func(request, *args, **kwargs)
+
         return _wrapped_func_arguments
+
     return _wrapped_view_func
 
+
 def to_utc_datetime(timestamp: str) -> datetime.datetime:
     return timestamp_to_datetime(float(timestamp))
 
-def statsd_increment(counter: str, val: int=1) -> Callable[[FuncT], FuncT]:
+
+def statsd_increment(counter: str, val: int = 1) -> Callable[[FuncT], FuncT]:
     """Increments a statsd counter on completion of the
     decorated function.
 
     Pass the name of the counter to this decorator-returning function."""
+
     def wrapper(func: FuncT) -> FuncT:
         @wraps(func)
         def wrapped_func(*args: object, **kwargs: object) -> object:
             ret = func(*args, **kwargs)
             statsd.incr(counter, val)
             return ret
+
         return cast(FuncT, wrapped_func)  # https://github.com/python/mypy/issues/1927
+
     return wrapper
 
+
 def rate_limit_user(request: HttpRequest, user: UserProfile, domain: str) -> None:
     """Returns whether or not a user was rate limited. Will raise a RateLimited exception
     if the user has been rate limited, otherwise returns and modifies request to contain
@@ -728,11 +863,13 @@ def rate_limit_user(request: HttpRequest, user: UserProfile, domain: str) -> Non
 
     RateLimitedUser(user, domain=domain).rate_limit_request(request)
 
-def rate_limit(domain: str='api_by_user') -> Callable[[ViewFuncT], ViewFuncT]:
+
+def rate_limit(domain: str = 'api_by_user') -> Callable[[ViewFuncT], ViewFuncT]:
     """Rate-limits a view. Takes an optional 'domain' param if you wish to
     rate limit different types of API calls independently.
 
     Returns a decorator"""
+
     def wrapper(func: ViewFuncT) -> ViewFuncT:
         @wraps(func)
         def wrapped_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
@@ -748,8 +885,9 @@ def rate_limit(domain: str='api_by_user') -> Callable[[ViewFuncT], ViewFuncT]:
 
             user = request.user
 
-            if isinstance(user, AnonymousUser) or (settings.ZILENCER_ENABLED and
-                                                   isinstance(user, RemoteZulipServer)):
+            if isinstance(user, AnonymousUser) or (
+                settings.ZILENCER_ENABLED and isinstance(user, RemoteZulipServer)
+            ):
                 # We can only rate-limit logged-in users for now.
                 # We also only support rate-limiting authenticated
                 # views right now.
@@ -760,20 +898,25 @@ def rate_limit(domain: str='api_by_user') -> Callable[[ViewFuncT], ViewFuncT]:
             rate_limit_user(request, user, domain)
 
             return func(request, *args, **kwargs)
+
         return cast(ViewFuncT, wrapped_func)  # https://github.com/python/mypy/issues/1927
+
     return wrapper
 
+
 def return_success_on_head_request(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
         if request.method == 'HEAD':
             return json_success()
         return view_func(request, *args, **kwargs)
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 def zulip_otp_required(
-    redirect_field_name: str='next',
-    login_url: str=settings.HOME_NOT_LOGGED_IN,
+    redirect_field_name: str = 'next',
+    login_url: str = settings.HOME_NOT_LOGGED_IN,
 ) -> Callable[[ViewFuncT], ViewFuncT]:
     """
     The reason we need to create this function is that the stock
@@ -816,18 +959,20 @@ def zulip_otp_required(
         # fails the test (and we should redirect to the 2FA view).
         return False
 
-    decorator = django_user_passes_test(test,
-                                        login_url=login_url,
-                                        redirect_field_name=redirect_field_name)
+    decorator = django_user_passes_test(
+        test, login_url=login_url, redirect_field_name=redirect_field_name
+    )
 
     return decorator
 
+
 def add_google_analytics_context(context: Dict[str, object]) -> None:
     if settings.GOOGLE_ANALYTICS_ID is not None:  # nocoverage
         page_params = context.setdefault("page_params", {})
         assert isinstance(page_params, dict)
         page_params["google_analytics_id"] = settings.GOOGLE_ANALYTICS_ID
 
+
 def add_google_analytics(view_func: ViewFuncT) -> ViewFuncT:
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
@@ -839,4 +984,5 @@ def add_google_analytics(view_func: ViewFuncT) -> ViewFuncT:
         elif response.status_code == 200:  # nocoverage
             raise TypeError("add_google_analytics requires a TemplateResponse")
         return response
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
diff --git a/zerver/filters.py b/zerver/filters.py
index 8d3e2fbe47..5a8187ac6f 100644
--- a/zerver/filters.py
+++ b/zerver/filters.py
@@ -8,14 +8,27 @@ from django.views.debug import SafeExceptionReporterFilter
 class ZulipExceptionReporterFilter(SafeExceptionReporterFilter):
     def get_post_parameters(self, request: HttpRequest) -> Dict[str, Any]:
         filtered_post = SafeExceptionReporterFilter.get_post_parameters(self, request).copy()
-        filtered_vars = ['content', 'secret', 'password', 'key', 'api-key', 'subject', 'stream',
-                         'subscriptions', 'to', 'csrfmiddlewaretoken', 'api_key',
-                         'realm_counts', 'installation_counts']
+        filtered_vars = [
+            'content',
+            'secret',
+            'password',
+            'key',
+            'api-key',
+            'subject',
+            'stream',
+            'subscriptions',
+            'to',
+            'csrfmiddlewaretoken',
+            'api_key',
+            'realm_counts',
+            'installation_counts',
+        ]
 
         for var in filtered_vars:
             if var in filtered_post:
                 filtered_post[var] = '**********'
         return filtered_post
 
+
 def clean_data_from_query_parameters(val: str) -> str:
     return re.sub(r"([a-z_-]+=)([^&]+)([&]|$)", r"\1******\3", val)
diff --git a/zerver/forms.py b/zerver/forms.py
index 3f854cabb8..a38d65cfcd 100644
--- a/zerver/forms.py
+++ b/zerver/forms.py
@@ -38,19 +38,28 @@ from zerver.models import (
 )
 from zproject.backends import check_password_strength, email_auth_enabled, email_belongs_to_ldap
 
-MIT_VALIDATION_ERROR = 'That user does not exist at MIT or is a ' + \
-                       '<a href="https://ist.mit.edu/email-lists">mailing list</a>. ' + \
-                       'If you want to sign up an alias for Zulip, ' + \
-                       '<a href="mailto:support@zulip.com">contact us</a>.'
-WRONG_SUBDOMAIN_ERROR = "Your Zulip account is not a member of the " + \
-                        "organization associated with this subdomain.  " + \
-                        "Please contact your organization administrator with any questions."
-DEACTIVATED_ACCOUNT_ERROR = "Your account is no longer active. " + \
-                            "Please contact your organization administrator to reactivate it."
+MIT_VALIDATION_ERROR = (
+    'That user does not exist at MIT or is a '
+    + '<a href="https://ist.mit.edu/email-lists">mailing list</a>. '
+    + 'If you want to sign up an alias for Zulip, '
+    + '<a href="mailto:support@zulip.com">contact us</a>.'
+)
+WRONG_SUBDOMAIN_ERROR = (
+    "Your Zulip account is not a member of the "
+    + "organization associated with this subdomain.  "
+    + "Please contact your organization administrator with any questions."
+)
+DEACTIVATED_ACCOUNT_ERROR = (
+    "Your account is no longer active. "
+    + "Please contact your organization administrator to reactivate it."
+)
 PASSWORD_TOO_WEAK_ERROR = "The password is too weak."
-AUTHENTICATION_RATE_LIMITED_ERROR = "You're making too many attempts to sign in. " + \
-                                    "Try again in {} seconds or contact your organization administrator " + \
-                                    "for help."
+AUTHENTICATION_RATE_LIMITED_ERROR = (
+    "You're making too many attempts to sign in. "
+    + "Try again in {} seconds or contact your organization administrator "
+    + "for help."
+)
+
 
 def email_is_not_mit_mailing_list(email: str) -> None:
     """Prevent MIT mailing lists from signing up for Zulip"""
@@ -65,12 +74,14 @@ def email_is_not_mit_mailing_list(email: str) -> None:
             else:
                 raise AssertionError("Unexpected DNS error")
 
-def check_subdomain_available(subdomain: str, allow_reserved_subdomain: bool=False) -> None:
+
+def check_subdomain_available(subdomain: str, allow_reserved_subdomain: bool = False) -> None:
     error_strings = {
         'too short': _("Subdomain needs to have length 3 or greater."),
         'extremal dash': _("Subdomain cannot start or end with a '-'."),
         'bad character': _("Subdomain can only have lowercase letters, numbers, and '-'s."),
-        'unavailable': _("Subdomain unavailable. Please choose a different one.")}
+        'unavailable': _("Subdomain unavailable. Please choose a different one."),
+    }
 
     if subdomain == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN:
         if is_root_domain_available():
@@ -87,6 +98,7 @@ def check_subdomain_available(subdomain: str, allow_reserved_subdomain: bool=Fal
     if is_reserved_subdomain(subdomain) and not allow_reserved_subdomain:
         raise ValidationError(error_strings['unavailable'])
 
+
 class RegistrationForm(forms.Form):
     MAX_PASSWORD_LENGTH = 100
     full_name = forms.CharField(max_length=UserProfile.MAX_NAME_LENGTH)
@@ -105,8 +117,8 @@ class RegistrationForm(forms.Form):
         if settings.TERMS_OF_SERVICE:
             self.fields['terms'] = forms.BooleanField(required=True)
         self.fields['realm_name'] = forms.CharField(
-            max_length=Realm.MAX_REALM_NAME_LENGTH,
-            required=self.realm_creation)
+            max_length=Realm.MAX_REALM_NAME_LENGTH, required=self.realm_creation
+        )
 
     def clean_full_name(self) -> str:
         try:
@@ -135,9 +147,11 @@ class RegistrationForm(forms.Form):
         check_subdomain_available(subdomain)
         return subdomain
 
+
 class ToSForm(forms.Form):
     terms = forms.BooleanField(required=True)
 
+
 class HomepageForm(forms.Form):
     email = forms.EmailField()
 
@@ -156,38 +170,52 @@ class HomepageForm(forms.Form):
         from_multiuse_invite = self.from_multiuse_invite
 
         if realm is None:
-            raise ValidationError(_("The organization you are trying to join using {email} does not exist.").format(email=email))
+            raise ValidationError(
+                _("The organization you are trying to join using {email} does not exist.").format(
+                    email=email
+                )
+            )
 
         if not from_multiuse_invite and realm.invite_required:
-            raise ValidationError(_("Please request an invite for {email} "
-                                    "from the organization "
-                                    "administrator.").format(email=email))
+            raise ValidationError(
+                _(
+                    "Please request an invite for {email} "
+                    "from the organization "
+                    "administrator."
+                ).format(email=email)
+            )
 
         try:
             email_allowed_for_realm(email, realm)
         except DomainNotAllowedForRealmError:
             raise ValidationError(
-                _("Your email address, {email}, is not in one of the domains "
-                  "that are allowed to register for accounts in this organization.").format(
-                      string_id=realm.string_id, email=email))
+                _(
+                    "Your email address, {email}, is not in one of the domains "
+                    "that are allowed to register for accounts in this organization."
+                ).format(string_id=realm.string_id, email=email)
+            )
         except DisposableEmailError:
             raise ValidationError(_("Please use your real email address."))
         except EmailContainsPlusError:
-            raise ValidationError(_("Email addresses containing + are not allowed in this organization."))
+            raise ValidationError(
+                _("Email addresses containing + are not allowed in this organization.")
+            )
 
         if realm.is_zephyr_mirror_realm:
             email_is_not_mit_mailing_list(email)
 
         return email
 
+
 def email_is_not_disposable(email: str) -> None:
     if is_disposable_domain(email_to_domain(email)):
         raise ValidationError(_("Please use your real email address."))
 
+
 class RealmCreationForm(forms.Form):
     # This form determines whether users can create a new realm.
-    email = forms.EmailField(validators=[email_not_system_bot,
-                                         email_is_not_disposable])
+    email = forms.EmailField(validators=[email_not_system_bot, email_is_not_disposable])
+
 
 class LoggingSetPasswordForm(SetPasswordForm):
     new_password1 = forms.CharField(
@@ -213,31 +241,33 @@ class LoggingSetPasswordForm(SetPasswordForm):
 
         return new_password
 
-    def save(self, commit: bool=True) -> UserProfile:
-        do_change_password(self.user, self.cleaned_data['new_password1'],
-                           commit=commit)
+    def save(self, commit: bool = True) -> UserProfile:
+        do_change_password(self.user, self.cleaned_data['new_password1'], commit=commit)
         return self.user
 
-def generate_password_reset_url(user_profile: UserProfile,
-                                token_generator: PasswordResetTokenGenerator) -> str:
+
+def generate_password_reset_url(
+    user_profile: UserProfile, token_generator: PasswordResetTokenGenerator
+) -> str:
     token = token_generator.make_token(user_profile)
     uid = urlsafe_base64_encode(str(user_profile.id).encode())
-    endpoint = reverse('password_reset_confirm',
-                       kwargs=dict(uidb64=uid, token=token))
+    endpoint = reverse('password_reset_confirm', kwargs=dict(uidb64=uid, token=token))
     return f"{user_profile.realm.uri}{endpoint}"
 
+
 class ZulipPasswordResetForm(PasswordResetForm):
-    def save(self,
-             domain_override: Optional[bool]=None,
-             subject_template_name: str='registration/password_reset_subject.txt',
-             email_template_name: str='registration/password_reset_email.html',
-             use_https: bool=False,
-             token_generator: PasswordResetTokenGenerator=default_token_generator,
-             from_email: Optional[str]=None,
-             request: HttpRequest=None,
-             html_email_template_name: Optional[str]=None,
-             extra_email_context: Optional[Dict[str, Any]]=None,
-             ) -> None:
+    def save(
+        self,
+        domain_override: Optional[bool] = None,
+        subject_template_name: str = 'registration/password_reset_subject.txt',
+        email_template_name: str = 'registration/password_reset_email.html',
+        use_https: bool = False,
+        token_generator: PasswordResetTokenGenerator = default_token_generator,
+        from_email: Optional[str] = None,
+        request: HttpRequest = None,
+        html_email_template_name: Optional[str] = None,
+        extra_email_context: Optional[Dict[str, Any]] = None,
+    ) -> None:
         """
         If the email address has an account in the target realm,
         generates a one-use only link for resetting password and sends
@@ -254,7 +284,9 @@ class ZulipPasswordResetForm(PasswordResetForm):
         realm = get_realm(get_subdomain(request))
 
         if not email_auth_enabled(realm):
-            logging.info("Password reset attempted for %s even though password auth is disabled.", email)
+            logging.info(
+                "Password reset attempted for %s even though password auth is disabled.", email
+            )
             return
         if email_belongs_to_ldap(realm, email):
             # TODO: Ideally, we'd provide a user-facing error here
@@ -293,22 +325,31 @@ class ZulipPasswordResetForm(PasswordResetForm):
         if user is not None:
             context['active_account_in_realm'] = True
             context['reset_url'] = generate_password_reset_url(user, token_generator)
-            send_email('zerver/emails/password_reset', to_user_ids=[user.id],
-                       from_name=FromAddress.security_email_from_name(user_profile=user),
-                       from_address=FromAddress.tokenized_no_reply_address(),
-                       context=context)
+            send_email(
+                'zerver/emails/password_reset',
+                to_user_ids=[user.id],
+                from_name=FromAddress.security_email_from_name(user_profile=user),
+                from_address=FromAddress.tokenized_no_reply_address(),
+                context=context,
+            )
         else:
             context['active_account_in_realm'] = False
             active_accounts_in_other_realms = UserProfile.objects.filter(
-                delivery_email__iexact=email, is_active=True)
+                delivery_email__iexact=email, is_active=True
+            )
             if active_accounts_in_other_realms:
                 context['active_accounts_in_other_realms'] = active_accounts_in_other_realms
             language = request.LANGUAGE_CODE
-            send_email('zerver/emails/password_reset', to_emails=[email],
-                       from_name=FromAddress.security_email_from_name(language=language),
-                       from_address=FromAddress.tokenized_no_reply_address(),
-                       language=language, context=context,
-                       realm=realm)
+            send_email(
+                'zerver/emails/password_reset',
+                to_emails=[email],
+                from_name=FromAddress.security_email_from_name(language=language),
+                from_address=FromAddress.tokenized_no_reply_address(),
+                language=language,
+                context=context,
+                realm=realm,
+            )
+
 
 class RateLimitedPasswordResetByEmail(RateLimitedObject):
     def __init__(self, email: str) -> None:
@@ -321,15 +362,18 @@ class RateLimitedPasswordResetByEmail(RateLimitedObject):
     def rules(self) -> List[Tuple[int, int]]:
         return settings.RATE_LIMITING_RULES['password_reset_form_by_email']
 
+
 def rate_limit_password_reset_form_by_email(email: str) -> None:
     ratelimited, _ = RateLimitedPasswordResetByEmail(email).rate_limit()
     if ratelimited:
         raise RateLimited
 
+
 class CreateUserForm(forms.Form):
     full_name = forms.CharField(max_length=100)
     email = forms.EmailField()
 
+
 class OurAuthenticationForm(AuthenticationForm):
     def clean(self) -> Dict[str, Any]:
         username = self.cleaned_data.get('username')
@@ -341,8 +385,13 @@ class OurAuthenticationForm(AuthenticationForm):
 
             return_data: Dict[str, Any] = {}
             try:
-                self.user_cache = authenticate(request=self.request, username=username, password=password,
-                                               realm=realm, return_data=return_data)
+                self.user_cache = authenticate(
+                    request=self.request,
+                    username=username,
+                    password=password,
+                    realm=realm,
+                    return_data=return_data,
+                )
             except RateLimited as e:
                 assert e.secs_to_freedom is not None
                 secs_to_freedom = int(e.secs_to_freedom)
@@ -358,8 +407,9 @@ class OurAuthenticationForm(AuthenticationForm):
                 raise ValidationError(mark_safe(DEACTIVATED_ACCOUNT_ERROR))
 
             if return_data.get("invalid_subdomain"):
-                logging.warning("User %s attempted password login to wrong subdomain %s",
-                                username, subdomain)
+                logging.warning(
+                    "User %s attempted password login to wrong subdomain %s", username, subdomain
+                )
                 raise ValidationError(mark_safe(WRONG_SUBDOMAIN_ERROR))
 
             if self.user_cache is None:
@@ -380,15 +430,18 @@ class OurAuthenticationForm(AuthenticationForm):
         """
         return field_name
 
+
 class AuthenticationTokenForm(TwoFactorAuthenticationTokenForm):
     """
     We add this form to update the widget of otp_token. The default
     widget is an input element whose type is a number, which doesn't
     stylistically match our theme.
     """
-    otp_token = forms.IntegerField(label=_("Token"), min_value=1,
-                                   max_value=int('9' * totp_digits()),
-                                   widget=forms.TextInput)
+
+    otp_token = forms.IntegerField(
+        label=_("Token"), min_value=1, max_value=int('9' * totp_digits()), widget=forms.TextInput
+    )
+
 
 class MultiEmailField(forms.Field):
     def to_python(self, emails: str) -> List[str]:
@@ -404,9 +457,9 @@ class MultiEmailField(forms.Field):
         for email in emails:
             validate_email(email)
 
+
 class FindMyTeamForm(forms.Form):
-    emails = MultiEmailField(
-        help_text=_("Add up to 10 comma-separated email addresses."))
+    emails = MultiEmailField(help_text=_("Add up to 10 comma-separated email addresses."))
 
     def clean_emails(self) -> List[str]:
         emails = self.cleaned_data['emails']
@@ -415,6 +468,7 @@ class FindMyTeamForm(forms.Form):
 
         return emails
 
+
 class RealmRedirectForm(forms.Form):
     subdomain = forms.CharField(max_length=Realm.MAX_REALM_SUBDOMAIN_LENGTH, required=True)
 
diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index eaecf92383..df9e4a1ac5 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -243,12 +243,14 @@ if settings.BILLING_ENABLED:
         update_license_ledger_if_needed,
     )
 
+
 @dataclass
 class SubscriptionInfo:
     subscriptions: List[Dict[str, Any]]
     unsubscribed: List[Dict[str, Any]]
     never_subscribed: List[Dict[str, Any]]
 
+
 # This will be used to type annotate parameters in a function if the function
 # works on both str and unicode in python 2 but in python 3 it only works on str.
 SizedTextIterable = Union[Sequence[str], AbstractSet[str]]
@@ -256,18 +258,36 @@ ONBOARDING_TOTAL_MESSAGES = 1000
 ONBOARDING_UNREAD_MESSAGES = 20
 
 STREAM_ASSIGNMENT_COLORS = [
-    "#76ce90", "#fae589", "#a6c7e5", "#e79ab5",
-    "#bfd56f", "#f4ae55", "#b0a5fd", "#addfe5",
-    "#f5ce6e", "#c2726a", "#94c849", "#bd86e5",
-    "#ee7e4a", "#a6dcbf", "#95a5fd", "#53a063",
-    "#9987e1", "#e4523d", "#c2c2c2", "#4f8de4",
-    "#c6a8ad", "#e7cc4d", "#c8bebf", "#a47462"]
+    "#76ce90",
+    "#fae589",
+    "#a6c7e5",
+    "#e79ab5",
+    "#bfd56f",
+    "#f4ae55",
+    "#b0a5fd",
+    "#addfe5",
+    "#f5ce6e",
+    "#c2726a",
+    "#94c849",
+    "#bd86e5",
+    "#ee7e4a",
+    "#a6dcbf",
+    "#95a5fd",
+    "#53a063",
+    "#9987e1",
+    "#e4523d",
+    "#c2c2c2",
+    "#4f8de4",
+    "#c6a8ad",
+    "#e7cc4d",
+    "#c8bebf",
+    "#a47462",
+]
+
 
 def subscriber_info(user_id: int) -> Dict[str, Any]:
-    return {
-        'id': user_id,
-        'flags': ['read']
-    }
+    return {'id': user_id, 'flags': ['read']}
+
 
 def can_access_stream_user_ids(stream: Stream) -> Set[int]:
     # return user ids of users who can access the attributes of
@@ -278,26 +298,34 @@ def can_access_stream_user_ids(stream: Stream) -> Set[int]:
         return public_stream_user_ids(stream)
     else:
         # for a private stream, it's subscribers plus realm admins.
-        return private_stream_user_ids(
-            stream.id) | {user.id for user in stream.realm.get_admin_users_and_bots()}
+        return private_stream_user_ids(stream.id) | {
+            user.id for user in stream.realm.get_admin_users_and_bots()
+        }
+
 
 def private_stream_user_ids(stream_id: int) -> Set[int]:
     # TODO: Find similar queries elsewhere and de-duplicate this code.
     subscriptions = get_active_subscriptions_for_stream_id(stream_id)
     return {sub['user_profile_id'] for sub in subscriptions.values('user_profile_id')}
 
+
 def public_stream_user_ids(stream: Stream) -> Set[int]:
-    guest_subscriptions = get_active_subscriptions_for_stream_id(
-        stream.id).filter(user_profile__role=UserProfile.ROLE_GUEST)
-    guest_subscriptions = {sub['user_profile_id'] for sub in guest_subscriptions.values('user_profile_id')}
+    guest_subscriptions = get_active_subscriptions_for_stream_id(stream.id).filter(
+        user_profile__role=UserProfile.ROLE_GUEST
+    )
+    guest_subscriptions = {
+        sub['user_profile_id'] for sub in guest_subscriptions.values('user_profile_id')
+    }
     return set(active_non_guest_user_ids(stream.realm_id)) | guest_subscriptions
 
+
 def bot_owner_user_ids(user_profile: UserProfile) -> Set[int]:
     is_private_bot = (
-        user_profile.default_sending_stream and
-        user_profile.default_sending_stream.invite_only or
-        user_profile.default_events_register_stream and
-        user_profile.default_events_register_stream.invite_only)
+        user_profile.default_sending_stream
+        and user_profile.default_sending_stream.invite_only
+        or user_profile.default_events_register_stream
+        and user_profile.default_events_register_stream.invite_only
+    )
     if is_private_bot:
         return {user_profile.bot_owner_id}
     else:
@@ -305,16 +333,23 @@ def bot_owner_user_ids(user_profile: UserProfile) -> Set[int]:
         users.add(user_profile.bot_owner_id)
         return users
 
+
 def realm_user_count(realm: Realm) -> int:
     return UserProfile.objects.filter(realm=realm, is_active=True, is_bot=False).count()
 
+
 def realm_user_count_by_role(realm: Realm) -> Dict[str, Any]:
-    human_counts = {str(UserProfile.ROLE_REALM_ADMINISTRATOR): 0,
-                    str(UserProfile.ROLE_REALM_OWNER): 0,
-                    str(UserProfile.ROLE_MEMBER): 0,
-                    str(UserProfile.ROLE_GUEST): 0}
-    for value_dict in list(UserProfile.objects.filter(
-            realm=realm, is_bot=False, is_active=True).values('role').annotate(Count('role'))):
+    human_counts = {
+        str(UserProfile.ROLE_REALM_ADMINISTRATOR): 0,
+        str(UserProfile.ROLE_REALM_OWNER): 0,
+        str(UserProfile.ROLE_MEMBER): 0,
+        str(UserProfile.ROLE_GUEST): 0,
+    }
+    for value_dict in list(
+        UserProfile.objects.filter(realm=realm, is_bot=False, is_active=True)
+        .values('role')
+        .annotate(Count('role'))
+    ):
         human_counts[str(value_dict['role'])] = value_dict['role__count']
     bot_count = UserProfile.objects.filter(realm=realm, is_bot=True, is_active=True).count()
     return {
@@ -322,10 +357,12 @@ def realm_user_count_by_role(realm: Realm) -> Dict[str, Any]:
         RealmAuditLog.ROLE_COUNT_BOTS: bot_count,
     }
 
+
 def get_signups_stream(realm: Realm) -> Stream:
     # This one-liner helps us work around a lint rule.
     return get_stream("signups", realm)
 
+
 def notify_new_user(user_profile: UserProfile) -> None:
     sender_email = settings.NOTIFICATION_BOT
     sender = get_system_bot(sender_email)
@@ -337,15 +374,10 @@ def notify_new_user(user_profile: UserProfile) -> None:
     if signup_notifications_stream is not None and user_count > 1:
         with override_language(user_profile.realm.default_language):
             message = _("{user} just signed up for Zulip. (total: {user_count})").format(
-                user=f"@_**{user_profile.full_name}|{user_profile.id}**",
-                user_count=user_count
+                user=f"@_**{user_profile.full_name}|{user_profile.id}**", user_count=user_count
             )
             internal_send_stream_message(
-                user_profile.realm,
-                sender,
-                signup_notifications_stream,
-                _("signups"),
-                message
+                user_profile.realm, sender, signup_notifications_stream, _("signups"), message
             )
 
     # We also send a notification to the Zulip administrative realm
@@ -356,15 +388,10 @@ def notify_new_user(user_profile: UserProfile) -> None:
         with override_language(admin_realm.default_language):
             # We intentionally use the same strings as above to avoid translation burden.
             message = _("{user} just signed up for Zulip. (total: {user_count})").format(
-                user=f"{user_profile.full_name} <`{user_profile.email}`>",
-                user_count=user_count
+                user=f"{user_profile.full_name} <`{user_profile.email}`>", user_count=user_count
             )
             internal_send_stream_message(
-                admin_realm,
-                sender,
-                signups_stream,
-                user_profile.realm.display_subdomain,
-                message
+                admin_realm, sender, signups_stream, user_profile.realm.display_subdomain, message
             )
 
     except Stream.DoesNotExist:
@@ -372,12 +399,13 @@ def notify_new_user(user_profile: UserProfile) -> None:
         # realm, don't auto-create it to send to it; just do nothing.
         pass
 
+
 def notify_invites_changed(user_profile: UserProfile) -> None:
     event = dict(type="invites_changed")
-    admin_ids = [user.id for user in
-                 user_profile.realm.get_admin_users_and_bots()]
+    admin_ids = [user.id for user in user_profile.realm.get_admin_users_and_bots()]
     send_event(user_profile.realm, event, admin_ids)
 
+
 def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -> None:
     """Give you the last ONBOARDING_TOTAL_MESSAGES messages on your public
     streams, so you have something to look at in your home view once
@@ -387,18 +415,22 @@ def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -
     one_week_ago = timezone_now() - datetime.timedelta(weeks=1)
 
     recipient_ids = [stream.recipient_id for stream in streams if not stream.invite_only]
-    recent_messages = Message.objects.filter(recipient_id__in=recipient_ids,
-                                             date_sent__gt=one_week_ago).order_by("-id")
-    message_ids_to_use = list(reversed(recent_messages.values_list(
-        'id', flat=True)[0:ONBOARDING_TOTAL_MESSAGES]))
+    recent_messages = Message.objects.filter(
+        recipient_id__in=recipient_ids, date_sent__gt=one_week_ago
+    ).order_by("-id")
+    message_ids_to_use = list(
+        reversed(recent_messages.values_list('id', flat=True)[0:ONBOARDING_TOTAL_MESSAGES])
+    )
     if len(message_ids_to_use) == 0:
         return
 
     # Handle the race condition where a message arrives between
     # bulk_add_subscriptions above and the Message query just above
-    already_ids = set(UserMessage.objects.filter(message_id__in=message_ids_to_use,
-                                                 user_profile=user_profile).values_list("message_id",
-                                                                                        flat=True))
+    already_ids = set(
+        UserMessage.objects.filter(
+            message_id__in=message_ids_to_use, user_profile=user_profile
+        ).values_list("message_id", flat=True)
+    )
 
     # Mark the newest ONBOARDING_UNREAD_MESSAGES as unread.
     marked_unread = 0
@@ -416,15 +448,18 @@ def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -
 
     UserMessage.objects.bulk_create(reversed(ums_to_create))
 
+
 # Does the processing for a new user account:
 # * Subscribes to default/invitation streams
 # * Fills in some recent historical messages
 # * Notifies other users in realm and Zulip about the signup
 # * Deactivates PreregistrationUser objects
-def process_new_human_user(user_profile: UserProfile,
-                           prereg_user: Optional[PreregistrationUser]=None,
-                           default_stream_groups: Sequence[DefaultStreamGroup]=[],
-                           realm_creation: bool=False) -> None:
+def process_new_human_user(
+    user_profile: UserProfile,
+    prereg_user: Optional[PreregistrationUser] = None,
+    default_stream_groups: Sequence[DefaultStreamGroup] = [],
+    realm_creation: bool = False,
+) -> None:
     realm = user_profile.realm
 
     mit_beta_user = realm.is_zephyr_mirror_realm
@@ -448,8 +483,9 @@ def process_new_human_user(user_profile: UserProfile,
             if stream not in streams:
                 streams.append(stream)
 
-    bulk_add_subscriptions(realm, streams, [user_profile], acting_user=acting_user,
-                           from_user_creation=True)
+    bulk_add_subscriptions(
+        realm, streams, [user_profile], acting_user=acting_user, from_user_creation=True
+    )
 
     add_new_user_history(user_profile, streams)
 
@@ -461,21 +497,24 @@ def process_new_human_user(user_profile: UserProfile,
                 realm,
                 get_system_bot(settings.NOTIFICATION_BOT),
                 prereg_user.referred_by,
-                _("{user} accepted your invitation to join Zulip!").format(user=f"{user_profile.full_name} <`{user_profile.email}`>")
+                _("{user} accepted your invitation to join Zulip!").format(
+                    user=f"{user_profile.full_name} <`{user_profile.email}`>"
+                ),
             )
     # Mark any other PreregistrationUsers that are STATUS_ACTIVE as
     # inactive so we can keep track of the PreregistrationUser we
     # actually used for analytics
     if prereg_user is not None:
-        PreregistrationUser.objects.filter(
-            email__iexact=user_profile.delivery_email).exclude(id=prereg_user.id)\
-            .update(status=confirmation_settings.STATUS_REVOKED)
+        PreregistrationUser.objects.filter(email__iexact=user_profile.delivery_email).exclude(
+            id=prereg_user.id
+        ).update(status=confirmation_settings.STATUS_REVOKED)
 
         if prereg_user.referred_by is not None:
             notify_invites_changed(user_profile)
     else:
-        PreregistrationUser.objects.filter(email__iexact=user_profile.delivery_email)\
-            .update(status=confirmation_settings.STATUS_REVOKED)
+        PreregistrationUser.objects.filter(email__iexact=user_profile.delivery_email).update(
+            status=confirmation_settings.STATUS_REVOKED
+        )
 
     notify_new_user(user_profile)
     # Clear any scheduled invitation emails to prevent them
@@ -487,25 +526,32 @@ def process_new_human_user(user_profile: UserProfile,
     # We have an import loop here; it's intentional, because we want
     # to keep all the onboarding code in zerver/lib/onboarding.py.
     from zerver.lib.onboarding import send_initial_pms
+
     send_initial_pms(user_profile)
 
+
 def notify_created_user(user_profile: UserProfile) -> None:
     user_row = user_profile_to_user_row(user_profile)
-    person = format_user_row(user_profile.realm, user_profile, user_row,
-                             # Since we don't know what the client
-                             # supports at this point in the code, we
-                             # just assume client_gravatar and
-                             # user_avatar_url_field_optional = False :(
-                             client_gravatar=False,
-                             user_avatar_url_field_optional=False,
-                             # We assume there's no custom profile
-                             # field data for a new user; initial
-                             # values are expected to be added in a
-                             # later event.
-                             custom_profile_field_data={})
+    person = format_user_row(
+        user_profile.realm,
+        user_profile,
+        user_row,
+        # Since we don't know what the client
+        # supports at this point in the code, we
+        # just assume client_gravatar and
+        # user_avatar_url_field_optional = False :(
+        client_gravatar=False,
+        user_avatar_url_field_optional=False,
+        # We assume there's no custom profile
+        # field data for a new user; initial
+        # values are expected to be added in a
+        # later event.
+        custom_profile_field_data={},
+    )
     event: Dict[str, Any] = dict(type="realm_user", op="add", person=person)
     send_event(user_profile.realm, event, active_user_ids(user_profile.realm_id))
 
+
 def created_bot_event(user_profile: UserProfile) -> Dict[str, Any]:
     def stream_name(stream: Optional[Stream]) -> Optional[str]:
         if not stream:
@@ -515,18 +561,19 @@ def created_bot_event(user_profile: UserProfile) -> Dict[str, Any]:
     default_sending_stream_name = stream_name(user_profile.default_sending_stream)
     default_events_register_stream_name = stream_name(user_profile.default_events_register_stream)
 
-    bot = dict(email=user_profile.email,
-               user_id=user_profile.id,
-               full_name=user_profile.full_name,
-               bot_type=user_profile.bot_type,
-               is_active=user_profile.is_active,
-               api_key=get_api_key(user_profile),
-               default_sending_stream=default_sending_stream_name,
-               default_events_register_stream=default_events_register_stream_name,
-               default_all_public_streams=user_profile.default_all_public_streams,
-               avatar_url=avatar_url(user_profile),
-               services = get_service_dicts_for_bot(user_profile.id),
-               )
+    bot = dict(
+        email=user_profile.email,
+        user_id=user_profile.id,
+        full_name=user_profile.full_name,
+        bot_type=user_profile.bot_type,
+        is_active=user_profile.is_active,
+        api_key=get_api_key(user_profile),
+        default_sending_stream=default_sending_stream_name,
+        default_events_register_stream=default_events_register_stream_name,
+        default_all_public_streams=user_profile.default_all_public_streams,
+        avatar_url=avatar_url(user_profile),
+        services=get_service_dicts_for_bot(user_profile.id),
+    )
 
     # Set the owner key only when the bot has an owner.
     # The default bots don't have an owner. So don't
@@ -536,35 +583,40 @@ def created_bot_event(user_profile: UserProfile) -> Dict[str, Any]:
 
     return dict(type="realm_bot", op="add", bot=bot)
 
+
 def notify_created_bot(user_profile: UserProfile) -> None:
     event = created_bot_event(user_profile)
     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:
+
+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],
     realm: Realm,
     full_name: str,
-    bot_type: Optional[int]=None,
-    role: Optional[int]=None,
-    bot_owner: Optional[UserProfile]=None,
-    tos_version: Optional[str]=None,
-    timezone: str="",
-    avatar_source: str=UserProfile.AVATAR_FROM_GRAVATAR,
-    default_sending_stream: Optional[Stream]=None,
-    default_events_register_stream: Optional[Stream]=None,
-    default_all_public_streams: Optional[bool]=None,
-    prereg_user: Optional[PreregistrationUser]=None,
-    default_stream_groups: Sequence[DefaultStreamGroup]=[],
-    source_profile: Optional[UserProfile]=None,
-    realm_creation: bool=False,
-    acting_user: Optional[UserProfile]=None,
+    bot_type: Optional[int] = None,
+    role: Optional[int] = None,
+    bot_owner: Optional[UserProfile] = None,
+    tos_version: Optional[str] = None,
+    timezone: str = "",
+    avatar_source: str = UserProfile.AVATAR_FROM_GRAVATAR,
+    default_sending_stream: Optional[Stream] = None,
+    default_events_register_stream: Optional[Stream] = None,
+    default_all_public_streams: Optional[bool] = None,
+    prereg_user: Optional[PreregistrationUser] = None,
+    default_stream_groups: Sequence[DefaultStreamGroup] = [],
+    source_profile: Optional[UserProfile] = None,
+    realm_creation: bool = False,
+    acting_user: Optional[UserProfile] = None,
 ) -> UserProfile:
 
     user_profile = create_user(
@@ -588,13 +640,23 @@ def do_create_user(
     if not acting_user:
         acting_user = user_profile
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, acting_user=acting_user, modified_user=user_profile,
-        event_type=RealmAuditLog.USER_CREATED, event_time=event_time,
-        extra_data=orjson.dumps({
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
-        }).decode())
-    do_increment_logging_stat(user_profile.realm, COUNT_STATS['active_users_log:is_bot:day'],
-                              user_profile.is_bot, event_time)
+        realm=user_profile.realm,
+        acting_user=acting_user,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_CREATED,
+        event_time=event_time,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
+            }
+        ).decode(),
+    )
+    do_increment_logging_stat(
+        user_profile.realm,
+        COUNT_STATS['active_users_log:is_bot:day'],
+        user_profile.is_bot,
+        event_time,
+    )
     if settings.BILLING_ENABLED:
         update_license_ledger_if_needed(user_profile.realm, event_time)
 
@@ -602,35 +664,53 @@ def do_create_user(
     # with bot-specific info like services.
     notify_created_user(user_profile)
     if bot_type is None:
-        process_new_human_user(user_profile, prereg_user=prereg_user,
-                               default_stream_groups=default_stream_groups,
-                               realm_creation=realm_creation)
+        process_new_human_user(
+            user_profile,
+            prereg_user=prereg_user,
+            default_stream_groups=default_stream_groups,
+            realm_creation=realm_creation,
+        )
     return user_profile
 
-def do_activate_user(user_profile: UserProfile, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_activate_user(user_profile: UserProfile, acting_user: Optional[UserProfile] = None) -> None:
     user_profile.is_active = True
     user_profile.is_mirror_dummy = False
     user_profile.set_unusable_password()
     user_profile.date_joined = timezone_now()
     user_profile.tos_version = settings.TOS_VERSION
-    user_profile.save(update_fields=["is_active", "date_joined", "password",
-                                     "is_mirror_dummy", "tos_version"])
+    user_profile.save(
+        update_fields=["is_active", "date_joined", "password", "is_mirror_dummy", "tos_version"]
+    )
 
     event_time = user_profile.date_joined
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, modified_user=user_profile, acting_user=acting_user,
-        event_type=RealmAuditLog.USER_ACTIVATED, event_time=event_time,
-        extra_data=orjson.dumps({
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
-        }).decode())
-    do_increment_logging_stat(user_profile.realm, COUNT_STATS['active_users_log:is_bot:day'],
-                              user_profile.is_bot, event_time)
+        realm=user_profile.realm,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        event_type=RealmAuditLog.USER_ACTIVATED,
+        event_time=event_time,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
+            }
+        ).decode(),
+    )
+    do_increment_logging_stat(
+        user_profile.realm,
+        COUNT_STATS['active_users_log:is_bot:day'],
+        user_profile.is_bot,
+        event_time,
+    )
     if settings.BILLING_ENABLED:
         update_license_ledger_if_needed(user_profile.realm, event_time)
 
     notify_created_user(user_profile)
 
-def do_reactivate_user(user_profile: UserProfile, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_reactivate_user(
+    user_profile: UserProfile, acting_user: Optional[UserProfile] = None
+) -> None:
     # Unlike do_activate_user, this is meant for re-activating existing users,
     # so it doesn't reset their password, etc.
     user_profile.is_active = True
@@ -638,13 +718,23 @@ def do_reactivate_user(user_profile: UserProfile, acting_user: Optional[UserProf
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, modified_user=user_profile, acting_user=acting_user,
-        event_type=RealmAuditLog.USER_REACTIVATED, event_time=event_time,
-        extra_data=orjson.dumps({
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
-        }).decode())
-    do_increment_logging_stat(user_profile.realm, COUNT_STATS['active_users_log:is_bot:day'],
-                              user_profile.is_bot, event_time)
+        realm=user_profile.realm,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        event_type=RealmAuditLog.USER_REACTIVATED,
+        event_time=event_time,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
+            }
+        ).decode(),
+    )
+    do_increment_logging_stat(
+        user_profile.realm,
+        COUNT_STATS['active_users_log:is_bot:day'],
+        user_profile.is_bot,
+        event_time,
+    )
     if settings.BILLING_ENABLED:
         update_license_ledger_if_needed(user_profile.realm, event_time)
 
@@ -653,18 +743,21 @@ def do_reactivate_user(user_profile: UserProfile, acting_user: Optional[UserProf
     if user_profile.is_bot:
         notify_created_bot(user_profile)
 
+
 def active_humans_in_realm(realm: Realm) -> Sequence[UserProfile]:
     return UserProfile.objects.filter(realm=realm, is_active=True, is_bot=False)
 
 
-def do_set_realm_property(realm: Realm, name: str, value: Any,
-                          acting_user: Optional[UserProfile] = None) -> None:
+def do_set_realm_property(
+    realm: Realm, name: str, value: Any, acting_user: Optional[UserProfile] = None
+) -> None:
     """Takes in a realm object, the name of an attribute to update, the
-       value to update and and the user who initiated the update.
+    value to update and and the user who initiated the update.
     """
     property_type = Realm.property_types[name]
-    assert isinstance(value, property_type), (
-        f'Cannot update {name}: {value} is not an instance of {property_type}')
+    assert isinstance(
+        value, property_type
+    ), f'Cannot update {name}: {value} is not an instance of {property_type}'
 
     old_value = getattr(realm, name)
     setattr(realm, name, value)
@@ -680,12 +773,18 @@ def do_set_realm_property(realm: Realm, name: str, value: Any,
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED, event_time=event_time,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: value,
-            'property': name,
-        }).decode())
+        realm=realm,
+        event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+        event_time=event_time,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: value,
+                'property': name,
+            }
+        ).decode(),
+    )
 
     if name == "email_address_visibility":
         if Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE not in [old_value, value]:
@@ -705,9 +804,10 @@ def do_set_realm_property(realm: Realm, name: str, value: Any,
         for user_profile in user_profiles:
             flush_user_profile(sender=UserProfile, instance=user_profile)
 
-def do_set_realm_authentication_methods(realm: Realm,
-                                        authentication_methods: Dict[str, bool],
-                                        acting_user: Optional[UserProfile]=None) -> None:
+
+def do_set_realm_authentication_methods(
+    realm: Realm, authentication_methods: Dict[str, bool], acting_user: Optional[UserProfile] = None
+) -> None:
     old_value = realm.authentication_methods_dict()
     for key, value in list(authentication_methods.items()):
         index = getattr(realm.authentication_methods, key).number
@@ -715,12 +815,18 @@ def do_set_realm_authentication_methods(realm: Realm,
     realm.save(update_fields=['authentication_methods'])
     updated_value = realm.authentication_methods_dict()
     RealmAuditLog.objects.create(
-        realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED, event_time=timezone_now(),
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: updated_value,
-            'property': 'authentication_methods',
-        }).decode())
+        realm=realm,
+        event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+        event_time=timezone_now(),
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: updated_value,
+                'property': 'authentication_methods',
+            }
+        ).decode(),
+    )
     event = dict(
         type="realm",
         op="update_dict",
@@ -729,34 +835,47 @@ def do_set_realm_authentication_methods(realm: Realm,
     )
     send_event(realm, event, active_user_ids(realm.id))
 
-def do_set_realm_message_editing(realm: Realm,
-                                 allow_message_editing: bool,
-                                 message_content_edit_limit_seconds: int,
-                                 allow_community_topic_editing: bool,
-                                 acting_user: Optional[UserProfile]=None) -> None:
-    old_values = dict(allow_message_editing=realm.allow_message_editing,
-                      message_content_edit_limit_seconds=realm.message_content_edit_limit_seconds,
-                      allow_community_topic_editing=realm.allow_community_topic_editing)
+
+def do_set_realm_message_editing(
+    realm: Realm,
+    allow_message_editing: bool,
+    message_content_edit_limit_seconds: int,
+    allow_community_topic_editing: bool,
+    acting_user: Optional[UserProfile] = None,
+) -> None:
+    old_values = dict(
+        allow_message_editing=realm.allow_message_editing,
+        message_content_edit_limit_seconds=realm.message_content_edit_limit_seconds,
+        allow_community_topic_editing=realm.allow_community_topic_editing,
+    )
 
     realm.allow_message_editing = allow_message_editing
     realm.message_content_edit_limit_seconds = message_content_edit_limit_seconds
     realm.allow_community_topic_editing = allow_community_topic_editing
 
     event_time = timezone_now()
-    updated_properties = dict(allow_message_editing=allow_message_editing,
-                              message_content_edit_limit_seconds=message_content_edit_limit_seconds,
-                              allow_community_topic_editing=allow_community_topic_editing)
+    updated_properties = dict(
+        allow_message_editing=allow_message_editing,
+        message_content_edit_limit_seconds=message_content_edit_limit_seconds,
+        allow_community_topic_editing=allow_community_topic_editing,
+    )
 
     for updated_property, updated_value in updated_properties.items():
         if updated_value == old_values[updated_property]:
             continue
         RealmAuditLog.objects.create(
-            realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED, event_time=event_time,
-            acting_user=acting_user, extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_values[updated_property],
-                RealmAuditLog.NEW_VALUE: updated_value,
-                'property': updated_property,
-            }).decode())
+            realm=realm,
+            event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+            event_time=event_time,
+            acting_user=acting_user,
+            extra_data=orjson.dumps(
+                {
+                    RealmAuditLog.OLD_VALUE: old_values[updated_property],
+                    RealmAuditLog.NEW_VALUE: updated_value,
+                    'property': updated_property,
+                }
+            ).decode(),
+        )
 
     realm.save(update_fields=list(updated_properties.keys()))
     event = dict(
@@ -767,20 +886,31 @@ def do_set_realm_message_editing(realm: Realm,
     )
     send_event(realm, event, active_user_ids(realm.id))
 
-def do_set_realm_notifications_stream(realm: Realm, stream: Optional[Stream], stream_id: int,
-                                      acting_user: Optional[UserProfile]=None) -> None:
+
+def do_set_realm_notifications_stream(
+    realm: Realm,
+    stream: Optional[Stream],
+    stream_id: int,
+    acting_user: Optional[UserProfile] = None,
+) -> None:
     old_value = realm.notifications_stream_id
     realm.notifications_stream = stream
     realm.save(update_fields=['notifications_stream'])
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED, event_time=event_time,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: stream_id,
-            'property': 'notifications_stream',
-        }).decode())
+        realm=realm,
+        event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+        event_time=event_time,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: stream_id,
+                'property': 'notifications_stream',
+            }
+        ).decode(),
+    )
 
     event = dict(
         type="realm",
@@ -790,20 +920,31 @@ def do_set_realm_notifications_stream(realm: Realm, stream: Optional[Stream], st
     )
     send_event(realm, event, active_user_ids(realm.id))
 
-def do_set_realm_signup_notifications_stream(realm: Realm, stream: Optional[Stream], stream_id: int,
-                                             acting_user: Optional[UserProfile]=None) -> None:
+
+def do_set_realm_signup_notifications_stream(
+    realm: Realm,
+    stream: Optional[Stream],
+    stream_id: int,
+    acting_user: Optional[UserProfile] = None,
+) -> None:
     old_value = realm.signup_notifications_stream_id
     realm.signup_notifications_stream = stream
     realm.save(update_fields=['signup_notifications_stream'])
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED, event_time=event_time,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: stream_id,
-            'property': 'signup_notifications_stream',
-        }).decode())
+        realm=realm,
+        event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+        event_time=event_time,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: stream_id,
+                'property': 'signup_notifications_stream',
+            }
+        ).decode(),
+    )
     event = dict(
         type="realm",
         op="update",
@@ -812,7 +953,8 @@ def do_set_realm_signup_notifications_stream(realm: Realm, stream: Optional[Stre
     )
     send_event(realm, event, active_user_ids(realm.id))
 
-def do_deactivate_realm(realm: Realm, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_deactivate_realm(realm: Realm, acting_user: Optional[UserProfile] = None) -> None:
     """
     Deactivate this realm. Do NOT deactivate the users -- we need to be able to
     tell the difference between users that were intentionally deactivated,
@@ -830,10 +972,16 @@ def do_deactivate_realm(realm: Realm, acting_user: Optional[UserProfile]=None) -
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=realm, event_type=RealmAuditLog.REALM_DEACTIVATED, event_time=event_time,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(realm),
-        }).decode())
+        realm=realm,
+        event_type=RealmAuditLog.REALM_DEACTIVATED,
+        event_time=event_time,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(realm),
+            }
+        ).decode(),
+    )
 
     ScheduledEmail.objects.filter(realm=realm).delete()
     for user in active_humans_in_realm(realm):
@@ -842,20 +990,26 @@ def do_deactivate_realm(realm: Realm, acting_user: Optional[UserProfile]=None) -
         # notice when they try to log in.
         delete_user_sessions(user)
 
-    event = dict(type="realm", op="deactivated",
-                 realm_id=realm.id)
+    event = dict(type="realm", op="deactivated", realm_id=realm.id)
     send_event(realm, event, active_user_ids(realm.id))
 
+
 def do_reactivate_realm(realm: Realm) -> None:
     realm.deactivated = False
     realm.save(update_fields=["deactivated"])
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=realm, event_type=RealmAuditLog.REALM_REACTIVATED, event_time=event_time,
-        extra_data=orjson.dumps({
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(realm),
-        }).decode())
+        realm=realm,
+        event_type=RealmAuditLog.REALM_REACTIVATED,
+        event_time=event_time,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(realm),
+            }
+        ).decode(),
+    )
+
 
 def do_change_realm_subdomain(realm: Realm, new_subdomain: str) -> None:
     old_subdomain = realm.subdomain
@@ -865,8 +1019,7 @@ def do_change_realm_subdomain(realm: Realm, new_subdomain: str) -> None:
 
     # If a realm if being renamed multiple times, we should find all the placeholder
     # realms and reset their deactivated_redirect field to point to the new realm uri
-    placeholder_realms = Realm.objects.filter(deactivated_redirect=old_uri,
-                                              deactivated=True)
+    placeholder_realms = Realm.objects.filter(deactivated_redirect=old_uri, deactivated=True)
     for placeholder_realm in placeholder_realms:
         do_add_deactivated_redirect(placeholder_realm, realm.uri)
 
@@ -878,11 +1031,13 @@ def do_change_realm_subdomain(realm: Realm, new_subdomain: str) -> None:
     do_deactivate_realm(placeholder_realm)
     do_add_deactivated_redirect(placeholder_realm, realm.uri)
 
+
 def do_add_deactivated_redirect(realm: Realm, redirect_url: str) -> None:
     realm.deactivated_redirect = redirect_url
     realm.save(update_fields=["deactivated_redirect"])
 
-def do_scrub_realm(realm: Realm, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_scrub_realm(realm: Realm, acting_user: Optional[UserProfile] = None) -> None:
     if settings.BILLING_ENABLED:
         downgrade_now_without_creating_additional_invoices(realm)
 
@@ -899,9 +1054,13 @@ def do_scrub_realm(realm: Realm, acting_user: Optional[UserProfile]=None) -> Non
     do_remove_realm_custom_profile_fields(realm)
     Attachment.objects.filter(realm=realm).delete()
 
-    RealmAuditLog.objects.create(realm=realm, event_time=timezone_now(),
-                                 acting_user=acting_user,
-                                 event_type=RealmAuditLog.REALM_SCRUBBED)
+    RealmAuditLog.objects.create(
+        realm=realm,
+        event_time=timezone_now(),
+        acting_user=acting_user,
+        event_type=RealmAuditLog.REALM_SCRUBBED,
+    )
+
 
 def do_delete_user(user_profile: UserProfile) -> None:
     if user_profile.realm.is_zephyr_mirror_realm:
@@ -910,8 +1069,9 @@ def do_delete_user(user_profile: UserProfile) -> None:
     do_deactivate_user(user_profile)
 
     subscribed_huddle_recipient_ids = set(
-        Subscription.objects.filter(user_profile=user_profile, recipient__type=Recipient.HUDDLE)
-        .values_list('recipient_id', flat=True)
+        Subscription.objects.filter(
+            user_profile=user_profile, recipient__type=Recipient.HUDDLE
+        ).values_list('recipient_id', flat=True)
     )
     user_id = user_profile.id
     realm = user_profile.realm
@@ -922,18 +1082,24 @@ def do_delete_user(user_profile: UserProfile) -> None:
     # the user's personal recipient manually. This will also delete all Messages pointing
     # to this recipient (all private messages sent to the user).
     personal_recipient.delete()
-    replacement_user = create_user(force_id=user_id, email=f"deleteduser{user_id}@{realm.uri}",
-                                   password=None,
-                                   realm=realm,
-                                   full_name=f"Deleted User {user_id}",
-                                   is_mirror_dummy=True)
-    subs_to_recreate = [Subscription(user_profile=replacement_user, recipient=recipient)
-                        for recipient in Recipient.objects.filter(id__in=subscribed_huddle_recipient_ids)]
+    replacement_user = create_user(
+        force_id=user_id,
+        email=f"deleteduser{user_id}@{realm.uri}",
+        password=None,
+        realm=realm,
+        full_name=f"Deleted User {user_id}",
+        is_mirror_dummy=True,
+    )
+    subs_to_recreate = [
+        Subscription(user_profile=replacement_user, recipient=recipient)
+        for recipient in Recipient.objects.filter(id__in=subscribed_huddle_recipient_ids)
+    ]
     Subscription.objects.bulk_create(subs_to_recreate)
 
-def do_deactivate_user(user_profile: UserProfile,
-                       acting_user: Optional[UserProfile]=None,
-                       _cascade: bool=True) -> None:
+
+def do_deactivate_user(
+    user_profile: UserProfile, acting_user: Optional[UserProfile] = None, _cascade: bool = True
+) -> None:
     if not user_profile.is_active:
         return
 
@@ -953,34 +1119,53 @@ def do_deactivate_user(user_profile: UserProfile,
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, modified_user=user_profile, acting_user=acting_user,
-        event_type=RealmAuditLog.USER_DEACTIVATED, event_time=event_time,
-        extra_data=orjson.dumps({
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
-        }).decode())
-    do_increment_logging_stat(user_profile.realm, COUNT_STATS['active_users_log:is_bot:day'],
-                              user_profile.is_bot, event_time, increment=-1)
+        realm=user_profile.realm,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        event_type=RealmAuditLog.USER_DEACTIVATED,
+        event_time=event_time,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
+            }
+        ).decode(),
+    )
+    do_increment_logging_stat(
+        user_profile.realm,
+        COUNT_STATS['active_users_log:is_bot:day'],
+        user_profile.is_bot,
+        event_time,
+        increment=-1,
+    )
     if settings.BILLING_ENABLED:
         update_license_ledger_if_needed(user_profile.realm, event_time)
 
-    event = dict(type="realm_user", op="remove",
-                 person=dict(user_id=user_profile.id,
-                             full_name=user_profile.full_name))
+    event = dict(
+        type="realm_user",
+        op="remove",
+        person=dict(user_id=user_profile.id, full_name=user_profile.full_name),
+    )
     send_event(user_profile.realm, event, active_user_ids(user_profile.realm_id))
 
     if user_profile.is_bot:
-        event = dict(type="realm_bot", op="remove",
-                     bot=dict(user_id=user_profile.id,
-                              full_name=user_profile.full_name))
+        event = dict(
+            type="realm_bot",
+            op="remove",
+            bot=dict(user_id=user_profile.id, full_name=user_profile.full_name),
+        )
         send_event(user_profile.realm, event, bot_owner_user_ids(user_profile))
 
     if _cascade:
-        bot_profiles = UserProfile.objects.filter(is_bot=True, is_active=True,
-                                                  bot_owner=user_profile)
+        bot_profiles = UserProfile.objects.filter(
+            is_bot=True, is_active=True, bot_owner=user_profile
+        )
         for profile in bot_profiles:
             do_deactivate_user(profile, acting_user=acting_user, _cascade=False)
 
-def do_deactivate_stream(stream: Stream, log: bool=True, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_deactivate_stream(
+    stream: Stream, log: bool = True, acting_user: Optional[UserProfile] = None
+) -> None:
     # We want to mark all messages in the to-be-deactivated stream as
     # read for all users; otherwise they will pollute queries like
     # "Get the user's first unread message".  Since this can be an
@@ -988,7 +1173,7 @@ def do_deactivate_stream(stream: Stream, log: bool=True, acting_user: Optional[U
     # processor.
     deferred_work_event = {
         "type": "mark_stream_messages_as_read_for_everyone",
-        "stream_recipient_id": stream.recipient_id
+        "stream_recipient_id": stream.recipient_id,
     }
     queue_json_publish("deferred_work", deferred_work_event)
 
@@ -1004,19 +1189,19 @@ def do_deactivate_stream(stream: Stream, log: bool=True, acting_user: Optional[U
     # special prefix that both indicates that the stream is deactivated and
     # frees up the original name for reuse.
     old_name = stream.name
-    new_name = ("!DEACTIVATED:" + old_name)[:Stream.MAX_NAME_LENGTH]
+    new_name = ("!DEACTIVATED:" + old_name)[: Stream.MAX_NAME_LENGTH]
     for i in range(20):
         if stream_name_in_use(new_name, stream.realm_id):
             # This stream has already been deactivated, keep prepending !s until
             # we have a unique stream name or you've hit a rename limit.
-            new_name = ("!" + new_name)[:Stream.MAX_NAME_LENGTH]
+            new_name = ("!" + new_name)[: Stream.MAX_NAME_LENGTH]
         else:
             break
 
     # If you don't have a unique name at this point, this will fail later in the
     # code path.
 
-    stream.name = new_name[:Stream.MAX_NAME_LENGTH]
+    stream.name = new_name[: Stream.MAX_NAME_LENGTH]
     stream.save(update_fields=['name', 'deactivated', 'invite_only'])
 
     # If this is a default stream, remove it, properly sending a
@@ -1034,21 +1219,27 @@ def do_deactivate_stream(stream: Stream, log: bool=True, acting_user: Optional[U
 
     stream_dict = stream.to_dict()
     stream_dict.update(dict(name=old_name, invite_only=was_invite_only))
-    event = dict(type="stream", op="delete",
-                 streams=[stream_dict])
+    event = dict(type="stream", op="delete", streams=[stream_dict])
     send_event(stream.realm, event, affected_user_ids)
 
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=stream.realm, acting_user=acting_user,
-                                 modified_stream=stream, event_type=RealmAuditLog.STREAM_DEACTIVATED,
-                                 event_time=event_time)
+    RealmAuditLog.objects.create(
+        realm=stream.realm,
+        acting_user=acting_user,
+        modified_stream=stream,
+        event_type=RealmAuditLog.STREAM_DEACTIVATED,
+        event_time=event_time,
+    )
+
 
 def send_user_email_update_event(user_profile: UserProfile) -> None:
-    payload = dict(user_id=user_profile.id,
-                   new_email=user_profile.email)
-    send_event(user_profile.realm,
-               dict(type='realm_user', op='update', person=payload),
-               active_user_ids(user_profile.realm_id))
+    payload = dict(user_id=user_profile.id, new_email=user_profile.email)
+    send_event(
+        user_profile.realm,
+        dict(type='realm_user', op='update', person=payload),
+        active_user_ids(user_profile.realm_id),
+    )
+
 
 def do_change_user_delivery_email(user_profile: UserProfile, new_email: str) -> None:
     delete_user_profile_caches([user_profile])
@@ -1063,8 +1254,7 @@ def do_change_user_delivery_email(user_profile: UserProfile, new_email: str) ->
     # We notify just the target user (and eventually org admins, only
     # when email_address_visibility=EMAIL_ADDRESS_VISIBILITY_ADMINS)
     # about their new delivery email, since that field is private.
-    payload = dict(user_id=user_profile.id,
-                   delivery_email=new_email)
+    payload = dict(user_id=user_profile.id, delivery_email=new_email)
     event = dict(type='realm_user', op='update', person=payload)
     send_event(user_profile.realm, event, [user_profile.id])
 
@@ -1080,17 +1270,27 @@ def do_change_user_delivery_email(user_profile: UserProfile, new_email: str) ->
         send_user_email_update_event(user_profile)
 
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=user_profile,
-                                 modified_user=user_profile, event_type=RealmAuditLog.USER_EMAIL_CHANGED,
-                                 event_time=event_time)
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        acting_user=user_profile,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_EMAIL_CHANGED,
+        event_time=event_time,
+    )
+
 
 def do_start_email_change_process(user_profile: UserProfile, new_email: str) -> None:
     old_email = user_profile.delivery_email
-    obj = EmailChangeStatus.objects.create(new_email=new_email, old_email=old_email,
-                                           user_profile=user_profile, realm=user_profile.realm)
+    obj = EmailChangeStatus.objects.create(
+        new_email=new_email,
+        old_email=old_email,
+        user_profile=user_profile,
+        realm=user_profile.realm,
+    )
 
     activation_url = create_confirmation_link(obj, Confirmation.EMAIL_CHANGE)
     from zerver.context_processors import common_context
+
     context = common_context(user_profile)
     context.update(
         old_email=old_email,
@@ -1098,22 +1298,31 @@ def do_start_email_change_process(user_profile: UserProfile, new_email: str) ->
         activate_url=activation_url,
     )
     language = user_profile.default_language
-    send_email('zerver/emails/confirm_new_email', to_emails=[new_email],
-               from_name=FromAddress.security_email_from_name(language=language),
-               from_address=FromAddress.tokenized_no_reply_address(),
-               language=language, context=context,
-               realm=user_profile.realm)
+    send_email(
+        'zerver/emails/confirm_new_email',
+        to_emails=[new_email],
+        from_name=FromAddress.security_email_from_name(language=language),
+        from_address=FromAddress.tokenized_no_reply_address(),
+        language=language,
+        context=context,
+        realm=user_profile.realm,
+    )
+
 
 def compute_irc_user_fullname(email: str) -> str:
     return email.split("@")[0] + " (IRC)"
 
+
 def compute_jabber_user_fullname(email: str) -> str:
     return email.split("@")[0] + " (XMPP)"
 
-@cache_with_key(lambda realm, email, f: user_profile_by_email_cache_key(email),
-                timeout=3600*24*7)
-def create_mirror_user_if_needed(realm: Realm, email: str,
-                                 email_to_fullname: Callable[[str], str]) -> UserProfile:
+
+@cache_with_key(
+    lambda realm, email, f: user_profile_by_email_cache_key(email), timeout=3600 * 24 * 7
+)
+def create_mirror_user_if_needed(
+    realm: Realm, email: str, email_to_fullname: Callable[[str], str]
+) -> UserProfile:
     try:
         return get_user_by_delivery_email(email, realm)
     except UserProfile.DoesNotExist:
@@ -1130,19 +1339,22 @@ def create_mirror_user_if_needed(realm: Realm, email: str,
         except IntegrityError:
             return get_user_by_delivery_email(email, realm)
 
-def render_incoming_message(message: Message,
-                            content: str,
-                            user_ids: Set[int],
-                            realm: Realm,
-                            mention_data: Optional[MentionData]=None,
-                            email_gateway: bool=False) -> str:
+
+def render_incoming_message(
+    message: Message,
+    content: str,
+    user_ids: Set[int],
+    realm: Realm,
+    mention_data: Optional[MentionData] = None,
+    email_gateway: bool = False,
+) -> str:
     realm_alert_words_automaton = get_alert_word_automaton(realm)
     try:
         rendered_content = render_markdown(
             message=message,
             content=content,
             realm=realm,
-            realm_alert_words_automaton = realm_alert_words_automaton,
+            realm_alert_words_automaton=realm_alert_words_automaton,
             mention_data=mention_data,
             email_gateway=email_gateway,
         )
@@ -1150,6 +1362,7 @@ def render_incoming_message(message: Message,
         raise JsonableError(_('Unable to render message'))
     return rendered_content
 
+
 class RecipientInfoResult(TypedDict):
     active_user_ids: Set[int]
     push_notify_user_ids: Set[int]
@@ -1161,11 +1374,14 @@ class RecipientInfoResult(TypedDict):
     default_bot_user_ids: Set[int]
     service_bot_tuples: List[Tuple[int, int]]
 
-def get_recipient_info(recipient: Recipient,
-                       sender_id: int,
-                       stream_topic: Optional[StreamTopicTarget],
-                       possibly_mentioned_user_ids: AbstractSet[int]=set(),
-                       possible_wildcard_mention: bool=True) -> RecipientInfoResult:
+
+def get_recipient_info(
+    recipient: Recipient,
+    sender_id: int,
+    stream_topic: Optional[StreamTopicTarget],
+    possibly_mentioned_user_ids: AbstractSet[int] = set(),
+    possible_wildcard_mention: bool = True,
+) -> RecipientInfoResult:
     stream_push_user_ids: Set[int] = set()
     stream_email_user_ids: Set[int] = set()
     wildcard_mention_user_ids: Set[int] = set()
@@ -1174,35 +1390,38 @@ def get_recipient_info(recipient: Recipient,
         # The sender and recipient may be the same id, so
         # de-duplicate using a set.
         message_to_user_ids = list({recipient.type_id, sender_id})
-        assert(len(message_to_user_ids) in [1, 2])
+        assert len(message_to_user_ids) in [1, 2]
 
     elif recipient.type == Recipient.STREAM:
         # Anybody calling us w/r/t a stream message needs to supply
         # stream_topic.  We may eventually want to have different versions
         # of this function for different message types.
-        assert(stream_topic is not None)
+        assert stream_topic is not None
         user_ids_muting_topic = stream_topic.user_ids_muting_topic()
 
-        subscription_rows = stream_topic.get_active_subscriptions().annotate(
-            user_profile_email_notifications=F('user_profile__enable_stream_email_notifications'),
-            user_profile_push_notifications=F('user_profile__enable_stream_push_notifications'),
-            user_profile_wildcard_mentions_notify=F(
-                'user_profile__wildcard_mentions_notify'),
-        ).values(
-            'user_profile_id',
-            'push_notifications',
-            'email_notifications',
-            'wildcard_mentions_notify',
-            'user_profile_email_notifications',
-            'user_profile_push_notifications',
-            'user_profile_wildcard_mentions_notify',
-            'is_muted',
-        ).order_by('user_profile_id')
+        subscription_rows = (
+            stream_topic.get_active_subscriptions()
+            .annotate(
+                user_profile_email_notifications=F(
+                    'user_profile__enable_stream_email_notifications'
+                ),
+                user_profile_push_notifications=F('user_profile__enable_stream_push_notifications'),
+                user_profile_wildcard_mentions_notify=F('user_profile__wildcard_mentions_notify'),
+            )
+            .values(
+                'user_profile_id',
+                'push_notifications',
+                'email_notifications',
+                'wildcard_mentions_notify',
+                'user_profile_email_notifications',
+                'user_profile_push_notifications',
+                'user_profile_wildcard_mentions_notify',
+                'is_muted',
+            )
+            .order_by('user_profile_id')
+        )
 
-        message_to_user_ids = [
-            row['user_profile_id']
-            for row in subscription_rows
-        ]
+        message_to_user_ids = [row['user_profile_id'] for row in subscription_rows]
 
         def should_send(setting: str, row: Dict[str, Any]) -> bool:
             # This implements the structure that the UserProfile stream notification settings
@@ -1265,9 +1484,7 @@ def get_recipient_info(recipient: Recipient,
     user_ids |= possibly_mentioned_user_ids
 
     if user_ids:
-        query = UserProfile.objects.filter(
-            is_active=True
-        ).values(
+        query = UserProfile.objects.filter(is_active=True).values(
             'id',
             'enable_online_push_notifications',
             'is_bot',
@@ -1302,11 +1519,7 @@ def get_recipient_info(recipient: Recipient,
 
     def get_ids_for(f: Callable[[Dict[str, Any]], bool]) -> Set[int]:
         """Only includes users on the explicit message to line"""
-        return {
-            row['id']
-            for row in rows
-            if f(row)
-        } & message_to_user_id_set
+        return {row['id'] for row in rows if f(row)} & message_to_user_id_set
 
     def is_service_bot(row: Dict[str, Any]) -> bool:
         return row['is_bot'] and (row['bot_type'] in UserProfile.SERVICE_BOT_TYPES)
@@ -1336,16 +1549,10 @@ def get_recipient_info(recipient: Recipient,
     # sure we have the data we need for that without extra database
     # queries.
     default_bot_user_ids = {
-        row['id']
-        for row in rows
-        if row['is_bot'] and row['bot_type'] == UserProfile.DEFAULT_BOT
+        row['id'] for row in rows if row['is_bot'] and row['bot_type'] == UserProfile.DEFAULT_BOT
     }
 
-    service_bot_tuples = [
-        (row['id'], row['bot_type'])
-        for row in rows
-        if is_service_bot(row)
-    ]
+    service_bot_tuples = [(row['id'], row['bot_type']) for row in rows if is_service_bot(row)]
 
     info: RecipientInfoResult = dict(
         active_user_ids=active_user_ids,
@@ -1360,9 +1567,14 @@ def get_recipient_info(recipient: Recipient,
     )
     return info
 
-def get_service_bot_events(sender: UserProfile, service_bot_tuples: List[Tuple[int, int]],
-                           mentioned_user_ids: Set[int], active_user_ids: Set[int],
-                           recipient_type: int) -> Dict[str, List[Dict[str, Any]]]:
+
+def get_service_bot_events(
+    sender: UserProfile,
+    service_bot_tuples: List[Tuple[int, int]],
+    mentioned_user_ids: Set[int],
+    active_user_ids: Set[int],
+    recipient_type: int,
+) -> Dict[str, List[Dict[str, Any]]]:
 
     event_dict: Dict[str, List[Dict[str, Any]]] = defaultdict(list)
 
@@ -1379,11 +1591,12 @@ def get_service_bot_events(sender: UserProfile, service_bot_tuples: List[Tuple[i
         else:
             logging.error(
                 'Unexpected bot_type for Service bot id=%s: %s',
-                user_profile_id, bot_type,
+                user_profile_id,
+                bot_type,
             )
             return
 
-        is_stream = (recipient_type == Recipient.STREAM)
+        is_stream = recipient_type == Recipient.STREAM
 
         # Important note: service_bot_tuples may contain service bots
         # who were not actually mentioned in the message (e.g. if
@@ -1407,10 +1620,12 @@ def get_service_bot_events(sender: UserProfile, service_bot_tuples: List[Tuple[i
         else:
             return
 
-        event_dict[queue_name].append({
-            'trigger': trigger,
-            'user_profile_id': user_profile_id,
-        })
+        event_dict[queue_name].append(
+            {
+                'trigger': trigger,
+                'user_profile_id': user_profile_id,
+            }
+        )
 
     for user_profile_id, bot_type in service_bot_tuples:
         maybe_add_event(
@@ -1420,6 +1635,7 @@ def get_service_bot_events(sender: UserProfile, service_bot_tuples: List[Tuple[i
 
     return event_dict
 
+
 def do_schedule_messages(send_message_requests: Sequence[SendMessageRequest]) -> List[int]:
     scheduled_messages: List[ScheduledMessage] = []
 
@@ -1446,8 +1662,9 @@ def do_schedule_messages(send_message_requests: Sequence[SendMessageRequest]) ->
     return [scheduled_message.id for scheduled_message in scheduled_messages]
 
 
-def build_message_send_dict(message_dict: Dict[str, Any],
-                            email_gateway: bool=False) -> SendMessageRequest:
+def build_message_send_dict(
+    message_dict: Dict[str, Any], email_gateway: bool = False
+) -> SendMessageRequest:
     """Returns a dictionary that can be passed into do_send_messages.  In
     production, this is always called by check_message, but some
     testing code paths call it directly.
@@ -1517,37 +1734,44 @@ def build_message_send_dict(message_dict: Dict[str, Any],
     info['um_eligible_user_ids'] |= mentioned_bot_user_ids
 
     message_send_dict = SendMessageRequest(
-        stream = message_dict.get('stream', None),
-        local_id = message_dict.get('local_id', None),
-        sender_queue_id = message_dict.get('sender_queue_id', None),
+        stream=message_dict.get('stream', None),
+        local_id=message_dict.get('local_id', None),
+        sender_queue_id=message_dict.get('sender_queue_id', None),
         realm=realm,
         mention_data=mention_data,
         message=message_dict['message'],
-        active_user_ids = info['active_user_ids'],
-        push_notify_user_ids = info['push_notify_user_ids'],
-        stream_push_user_ids = info['stream_push_user_ids'],
-        stream_email_user_ids = info['stream_email_user_ids'],
-        um_eligible_user_ids = info['um_eligible_user_ids'],
-        long_term_idle_user_ids = info['long_term_idle_user_ids'],
-        default_bot_user_ids = info['default_bot_user_ids'],
-        service_bot_tuples = info['service_bot_tuples'],
+        active_user_ids=info['active_user_ids'],
+        push_notify_user_ids=info['push_notify_user_ids'],
+        stream_push_user_ids=info['stream_push_user_ids'],
+        stream_email_user_ids=info['stream_email_user_ids'],
+        um_eligible_user_ids=info['um_eligible_user_ids'],
+        long_term_idle_user_ids=info['long_term_idle_user_ids'],
+        default_bot_user_ids=info['default_bot_user_ids'],
+        service_bot_tuples=info['service_bot_tuples'],
         wildcard_mention_user_ids=wildcard_mention_user_ids,
         links_for_embed=links_for_embed,
-        widget_content=message_dict.get('widget_content', None)
+        widget_content=message_dict.get('widget_content', None),
     )
 
     return message_send_dict
 
-def do_send_messages(send_message_requests_maybe_none: Sequence[Optional[SendMessageRequest]],
-                     email_gateway: bool=False,
-                     mark_as_read: Sequence[int]=[]) -> List[int]:
+
+def do_send_messages(
+    send_message_requests_maybe_none: Sequence[Optional[SendMessageRequest]],
+    email_gateway: bool = False,
+    mark_as_read: Sequence[int] = [],
+) -> List[int]:
     """See
     https://zulip.readthedocs.io/en/latest/subsystems/sending-messages.html
     for high-level documentation on this subsystem.
     """
 
     # Filter out messages which didn't pass internal_prep_message properly
-    send_message_requests = [send_request for send_request in send_message_requests_maybe_none if send_request is not None]
+    send_message_requests = [
+        send_request
+        for send_request in send_message_requests_maybe_none
+        if send_request is not None
+    ]
 
     # Save the message receipts in the database
     user_message_flags: Dict[int, Dict[int, List[str]]] = defaultdict(dict)
@@ -1556,8 +1780,9 @@ def do_send_messages(send_message_requests_maybe_none: Sequence[Optional[SendMes
 
         # Claim attachments in message
         for send_request in send_message_requests:
-            if do_claim_attachments(send_request.message,
-                                    send_request.message.potential_attachment_path_ids):
+            if do_claim_attachments(
+                send_request.message, send_request.message.potential_attachment_path_ids
+            ):
                 send_request.message.has_attachment = True
                 send_request.message.save(update_fields=['has_attachment'])
 
@@ -1570,8 +1795,8 @@ def do_send_messages(send_message_requests_maybe_none: Sequence[Optional[SendMes
                 message=send_request.message,
                 um_eligible_user_ids=send_request.um_eligible_user_ids,
                 long_term_idle_user_ids=send_request.long_term_idle_user_ids,
-                stream_push_user_ids = send_request.stream_push_user_ids,
-                stream_email_user_ids = send_request.stream_email_user_ids,
+                stream_push_user_ids=send_request.stream_push_user_ids,
+                stream_email_user_ids=send_request.stream_email_user_ids,
                 mentioned_user_ids=mentioned_user_ids,
                 mark_as_read=mark_as_read,
             )
@@ -1688,14 +1913,18 @@ def do_send_messages(send_message_requests_maybe_none: Sequence[Optional[SendMes
                 'message_id': send_request.message.id,
                 'message_content': send_request.message.content,
                 'message_realm_id': send_request.realm.id,
-                'urls': list(send_request.links_for_embed)}
+                'urls': list(send_request.links_for_embed),
+            }
             queue_json_publish('embed_links', event_data)
 
         if send_request.message.recipient.type == Recipient.PERSONAL:
             welcome_bot_id = get_system_bot(settings.WELCOME_BOT).id
-            if (welcome_bot_id in send_request.active_user_ids and
-                    welcome_bot_id != send_request.message.sender_id):
+            if (
+                welcome_bot_id in send_request.active_user_ids
+                and welcome_bot_id != send_request.message.sender_id
+            ):
                 from zerver.lib.onboarding import send_welcome_bot_response
+
                 send_welcome_bot_response(send_request)
 
         for queue_name, events in send_request.message.service_queue_events.items():
@@ -1711,12 +1940,13 @@ def do_send_messages(send_message_requests_maybe_none: Sequence[Optional[SendMes
 
     return [send_request.message.id for send_request in send_message_requests]
 
+
 class UserMessageLite:
-    '''
+    """
     The Django ORM is too slow for bulk operations.  This class
     is optimized for the simple use case of inserting a bunch of
     rows into zerver_usermessage.
-    '''
+    """
 
     def __init__(self, user_profile_id: int, message_id: int, flags: int) -> None:
         self.user_profile_id = user_profile_id
@@ -1726,13 +1956,16 @@ class UserMessageLite:
     def flags_list(self) -> List[str]:
         return UserMessage.flags_list_for_flags(self.flags)
 
-def create_user_messages(message: Message,
-                         um_eligible_user_ids: AbstractSet[int],
-                         long_term_idle_user_ids: AbstractSet[int],
-                         stream_push_user_ids: AbstractSet[int],
-                         stream_email_user_ids: AbstractSet[int],
-                         mentioned_user_ids: AbstractSet[int],
-                         mark_as_read: Sequence[int] = []) -> List[UserMessageLite]:
+
+def create_user_messages(
+    message: Message,
+    um_eligible_user_ids: AbstractSet[int],
+    long_term_idle_user_ids: AbstractSet[int],
+    stream_push_user_ids: AbstractSet[int],
+    stream_email_user_ids: AbstractSet[int],
+    mentioned_user_ids: AbstractSet[int],
+    mark_as_read: Sequence[int] = [],
+) -> List[UserMessageLite]:
     ums_to_create = []
     for user_profile_id in um_eligible_user_ids:
         um = UserMessageLite(
@@ -1748,9 +1981,9 @@ def create_user_messages(message: Message,
     ids_with_alert_words = message.user_ids_with_alert_words
 
     for um in ums_to_create:
-        if (um.user_profile_id == message.sender.id and
-                message.sent_by_human()) or \
-           um.user_profile_id in mark_as_read:
+        if (
+            um.user_profile_id == message.sender.id and message.sent_by_human()
+        ) or um.user_profile_id in mark_as_read:
             um.flags |= UserMessage.flags.read
         if wildcard:
             um.flags |= UserMessage.flags.wildcard_mentioned
@@ -1782,45 +2015,49 @@ def create_user_messages(message: Message,
     # for details on this system.
     user_messages = []
     for um in ums_to_create:
-        if (um.user_profile_id in long_term_idle_user_ids and
-                um.user_profile_id not in stream_push_user_ids and
-                um.user_profile_id not in stream_email_user_ids and
-                message.is_stream_message() and
-                int(um.flags) == 0):
+        if (
+            um.user_profile_id in long_term_idle_user_ids
+            and um.user_profile_id not in stream_push_user_ids
+            and um.user_profile_id not in stream_email_user_ids
+            and message.is_stream_message()
+            and int(um.flags) == 0
+        ):
             continue
         user_messages.append(um)
 
     return user_messages
 
+
 def bulk_insert_ums(ums: List[UserMessageLite]) -> None:
-    '''
+    """
     Doing bulk inserts this way is much faster than using Django,
     since we don't have any ORM overhead.  Profiling with 1000
     users shows a speedup of 0.436 -> 0.027 seconds, so we're
     talking about a 15x speedup.
-    '''
+    """
     if not ums:
         return
 
-    vals = [
-        (um.user_profile_id, um.message_id, um.flags)
-        for um in ums
-    ]
-    query = SQL('''
+    vals = [(um.user_profile_id, um.message_id, um.flags) for um in ums]
+    query = SQL(
+        '''
         INSERT into
             zerver_usermessage (user_profile_id, message_id, flags)
         VALUES %s
-    ''')
+    '''
+    )
 
     with connection.cursor() as cursor:
         execute_values(cursor.cursor, query, vals)
 
-def do_add_submessage(realm: Realm,
-                      sender_id: int,
-                      message_id: int,
-                      msg_type: str,
-                      content: str,
-                      ) -> None:
+
+def do_add_submessage(
+    realm: Realm,
+    sender_id: int,
+    message_id: int,
+    msg_type: str,
+    content: str,
+) -> None:
     submessage = SubMessage(
         sender_id=sender_id,
         message_id=message_id,
@@ -1842,11 +2079,15 @@ def do_add_submessage(realm: Realm,
 
     send_event(realm, event, target_user_ids)
 
-def notify_reaction_update(user_profile: UserProfile, message: Message,
-                           reaction: Reaction, op: str) -> None:
-    user_dict = {'user_id': user_profile.id,
-                 'email': user_profile.email,
-                 'full_name': user_profile.full_name}
+
+def notify_reaction_update(
+    user_profile: UserProfile, message: Message, reaction: Reaction, op: str
+) -> None:
+    user_dict = {
+        'user_id': user_profile.id,
+        'email': user_profile.email,
+        'full_name': user_profile.full_name,
+    }
 
     event: Dict[str, Any] = {
         'type': 'reaction',
@@ -1879,11 +2120,21 @@ def notify_reaction_update(user_profile: UserProfile, message: Message,
     ums = UserMessage.objects.filter(message=message.id)
     send_event(user_profile.realm, event, [um.user_profile_id for um in ums])
 
-def do_add_reaction(user_profile: UserProfile, message: Message,
-                    emoji_name: str, emoji_code: str, reaction_type: str) -> None:
-    reaction = Reaction(user_profile=user_profile, message=message,
-                        emoji_name=emoji_name, emoji_code=emoji_code,
-                        reaction_type=reaction_type)
+
+def do_add_reaction(
+    user_profile: UserProfile,
+    message: Message,
+    emoji_name: str,
+    emoji_code: str,
+    reaction_type: str,
+) -> None:
+    reaction = Reaction(
+        user_profile=user_profile,
+        message=message,
+        emoji_name=emoji_name,
+        emoji_code=emoji_code,
+        reaction_type=reaction_type,
+    )
     try:
         reaction.save()
     except django.db.utils.IntegrityError:  # nocoverage
@@ -1894,26 +2145,30 @@ def do_add_reaction(user_profile: UserProfile, message: Message,
 
     notify_reaction_update(user_profile, message, reaction, "add")
 
-def do_remove_reaction(user_profile: UserProfile, message: Message,
-                       emoji_code: str, reaction_type: str) -> None:
-    reaction = Reaction.objects.filter(user_profile=user_profile,
-                                       message=message,
-                                       emoji_code=emoji_code,
-                                       reaction_type=reaction_type).get()
+
+def do_remove_reaction(
+    user_profile: UserProfile, message: Message, emoji_code: str, reaction_type: str
+) -> None:
+    reaction = Reaction.objects.filter(
+        user_profile=user_profile,
+        message=message,
+        emoji_code=emoji_code,
+        reaction_type=reaction_type,
+    ).get()
     reaction.delete()
     notify_reaction_update(user_profile, message, reaction, "remove")
 
+
 def do_send_typing_notification(
-        realm: Realm,
-        sender: UserProfile,
-        recipient_user_profiles: List[UserProfile],
-        operator: str) -> None:
+    realm: Realm, sender: UserProfile, recipient_user_profiles: List[UserProfile], operator: str
+) -> None:
 
     sender_dict = {'user_id': sender.id, 'email': sender.email}
 
     # Include a list of recipients in the event body to help identify where the typing is happening
-    recipient_dicts = [{'user_id': profile.id, 'email': profile.email}
-                       for profile in recipient_user_profiles]
+    recipient_dicts = [
+        {'user_id': profile.id, 'email': profile.email} for profile in recipient_user_profiles
+    ]
     event = dict(
         type='typing',
         op=operator,
@@ -1922,19 +2177,14 @@ def do_send_typing_notification(
     )
 
     # Only deliver the notification to active user recipients
-    user_ids_to_notify = [
-        user.id
-        for user in recipient_user_profiles
-        if user.is_active
-    ]
+    user_ids_to_notify = [user.id for user in recipient_user_profiles if user.is_active]
 
     send_event(realm, event, user_ids_to_notify)
 
+
 # check_send_typing_notification:
 # Checks the typing notification and sends it
-def check_send_typing_notification(sender: UserProfile,
-                                   user_ids: List[int],
-                                   operator: str) -> None:
+def check_send_typing_notification(sender: UserProfile, user_ids: List[int], operator: str) -> None:
 
     realm = sender.realm
     if len(user_ids) == 0:
@@ -1964,8 +2214,7 @@ def check_send_typing_notification(sender: UserProfile,
             # We include cross-bot realms as possible recipients,
             # so that clients can know which huddle conversation
             # is relevant here.
-            user_profile = get_user_by_id_in_realm_including_cross_realm(
-                user_id, sender.realm)
+            user_profile = get_user_by_id_in_realm_including_cross_realm(user_id, sender.realm)
         except UserProfile.DoesNotExist:
             raise JsonableError(_("Invalid user ID {}").format(user_id))
         user_profiles.append(user_profile)
@@ -1978,20 +2227,28 @@ def check_send_typing_notification(sender: UserProfile,
     )
 
 
-def ensure_stream(realm: Realm,
-                  stream_name: str,
-                  invite_only: bool=False,
-                  stream_description: str="",
-                  acting_user: Optional[UserProfile]=None) -> Stream:
-    return create_stream_if_needed(realm, stream_name,
-                                   invite_only=invite_only,
-                                   stream_description=stream_description,
-                                   acting_user=acting_user)[0]
+def ensure_stream(
+    realm: Realm,
+    stream_name: str,
+    invite_only: bool = False,
+    stream_description: str = "",
+    acting_user: Optional[UserProfile] = None,
+) -> Stream:
+    return create_stream_if_needed(
+        realm,
+        stream_name,
+        invite_only=invite_only,
+        stream_description=stream_description,
+        acting_user=acting_user,
+    )[0]
 
-def get_recipient_from_user_profiles(recipient_profiles: Sequence[UserProfile],
-                                     forwarded_mirror_message: bool,
-                                     forwarder_user_profile: Optional[UserProfile],
-                                     sender: UserProfile) -> Recipient:
+
+def get_recipient_from_user_profiles(
+    recipient_profiles: Sequence[UserProfile],
+    forwarded_mirror_message: bool,
+    forwarder_user_profile: Optional[UserProfile],
+    sender: UserProfile,
+) -> Recipient:
 
     # Avoid mutating the passed in list of recipient_profiles.
     recipient_profiles_map = {user_profile.id: user_profile for user_profile in recipient_profiles}
@@ -2011,7 +2268,7 @@ def get_recipient_from_user_profiles(recipient_profiles: Sequence[UserProfile],
 
     # If the private message is just between the sender and
     # another person, force it to be a personal internally
-    if (len(recipient_profiles_map) == 2 and sender.id in recipient_profiles_map):
+    if len(recipient_profiles_map) == 2 and sender.id in recipient_profiles_map:
         del recipient_profiles_map[sender.id]
 
     assert recipient_profiles_map
@@ -2025,9 +2282,10 @@ def get_recipient_from_user_profiles(recipient_profiles: Sequence[UserProfile],
     user_ids = set(recipient_profiles_map)
     return get_huddle_recipient(user_ids)
 
-def validate_recipient_user_profiles(user_profiles: Sequence[UserProfile],
-                                     sender: UserProfile,
-                                     allow_deactivated: bool=False) -> Sequence[UserProfile]:
+
+def validate_recipient_user_profiles(
+    user_profiles: Sequence[UserProfile], sender: UserProfile, allow_deactivated: bool = False
+) -> Sequence[UserProfile]:
     recipient_profiles_map: Dict[int, UserProfile] = {}
 
     # We exempt cross-realm bots from the check that all the recipients
@@ -2037,9 +2295,14 @@ def validate_recipient_user_profiles(user_profiles: Sequence[UserProfile],
         realms.add(sender.realm_id)
 
     for user_profile in user_profiles:
-        if (not user_profile.is_active and not user_profile.is_mirror_dummy and
-                not allow_deactivated) or user_profile.realm.deactivated:
-            raise ValidationError(_("'{email}' is no longer using Zulip.").format(email=user_profile.email))
+        if (
+            not user_profile.is_active
+            and not user_profile.is_mirror_dummy
+            and not allow_deactivated
+        ) or user_profile.realm.deactivated:
+            raise ValidationError(
+                _("'{email}' is no longer using Zulip.").format(email=user_profile.email)
+            )
         recipient_profiles_map[user_profile.id] = user_profile
         if not is_cross_realm_bot_email(user_profile.email):
             realms.add(user_profile.realm_id)
@@ -2049,15 +2312,23 @@ def validate_recipient_user_profiles(user_profiles: Sequence[UserProfile],
 
     return list(recipient_profiles_map.values())
 
-def recipient_for_user_profiles(user_profiles: Sequence[UserProfile], forwarded_mirror_message: bool,
-                                forwarder_user_profile: Optional[UserProfile],
-                                sender: UserProfile, allow_deactivated: bool=False) -> Recipient:
 
-    recipient_profiles = validate_recipient_user_profiles(user_profiles, sender,
-                                                          allow_deactivated=allow_deactivated)
+def recipient_for_user_profiles(
+    user_profiles: Sequence[UserProfile],
+    forwarded_mirror_message: bool,
+    forwarder_user_profile: Optional[UserProfile],
+    sender: UserProfile,
+    allow_deactivated: bool = False,
+) -> Recipient:
+
+    recipient_profiles = validate_recipient_user_profiles(
+        user_profiles, sender, allow_deactivated=allow_deactivated
+    )
+
+    return get_recipient_from_user_profiles(
+        recipient_profiles, forwarded_mirror_message, forwarder_user_profile, sender
+    )
 
-    return get_recipient_from_user_profiles(recipient_profiles, forwarded_mirror_message,
-                                            forwarder_user_profile, sender)
 
 def already_sent_mirrored_message_id(message: Message) -> Optional[int]:
     if message.recipient.type == Recipient.HUDDLE:
@@ -2074,7 +2345,8 @@ def already_sent_mirrored_message_id(message: Message) -> Optional[int]:
         content=message.content,
         sending_client=message.sending_client,
         date_sent__gte=message.date_sent - time_window,
-        date_sent__lte=message.date_sent + time_window)
+        date_sent__lte=message.date_sent + time_window,
+    )
 
     messages = filter_by_exact_message_topic(
         query=query,
@@ -2085,6 +2357,7 @@ def already_sent_mirrored_message_id(message: Message) -> Optional[int]:
         return messages[0].id
     return None
 
+
 def extract_stream_indicator(s: str) -> Union[str, int]:
     # Users can pass stream name as either an id or a name,
     # and if they choose to pass a name, they may JSON encode
@@ -2114,6 +2387,7 @@ def extract_stream_indicator(s: str) -> Union[str, int]:
 
     raise JsonableError(_("Invalid data type for stream"))
 
+
 def extract_private_recipients(s: str) -> Union[List[str], List[int]]:
     # We try to accept multiple incoming formats for recipients.
     # See test_extract_recipients() for examples of what we allow.
@@ -2141,6 +2415,7 @@ def extract_private_recipients(s: str) -> Union[List[str], List[int]]:
 
     return get_validated_user_ids(data)
 
+
 def get_validated_user_ids(user_ids: Iterable[int]) -> List[int]:
     for user_id in user_ids:
         if not isinstance(user_id, int):
@@ -2148,6 +2423,7 @@ def get_validated_user_ids(user_ids: Iterable[int]) -> List[int]:
 
     return list(set(user_ids))
 
+
 def get_validated_emails(emails: Iterable[str]) -> List[str]:
     for email in emails:
         if not isinstance(email, str):
@@ -2155,69 +2431,97 @@ def get_validated_emails(emails: Iterable[str]) -> List[str]:
 
     return list(filter(bool, {email.strip() for email in emails}))
 
-def check_send_stream_message(sender: UserProfile, client: Client, stream_name: str,
-                              topic: str, body: str, realm: Optional[Realm]=None) -> int:
+
+def check_send_stream_message(
+    sender: UserProfile,
+    client: Client,
+    stream_name: str,
+    topic: str,
+    body: str,
+    realm: Optional[Realm] = None,
+) -> int:
     addressee = Addressee.for_stream_name(stream_name, topic)
     message = check_message(sender, client, addressee, body, realm)
 
     return do_send_messages([message])[0]
 
-def check_send_private_message(sender: UserProfile, client: Client,
-                               receiving_user: UserProfile, body: str) -> int:
+
+def check_send_private_message(
+    sender: UserProfile, client: Client, receiving_user: UserProfile, body: str
+) -> int:
     addressee = Addressee.for_user_profile(receiving_user)
     message = check_message(sender, client, addressee, body)
 
     return do_send_messages([message])[0]
 
+
 # check_send_message:
 # Returns the id of the sent message.  Has same argspec as check_message.
-def check_send_message(sender: UserProfile, client: Client, message_type_name: str,
-                       message_to: Union[Sequence[int], Sequence[str]],
-                       topic_name: Optional[str],
-                       message_content: str, realm: Optional[Realm]=None,
-                       forged: bool=False, forged_timestamp: Optional[float]=None,
-                       forwarder_user_profile: Optional[UserProfile]=None,
-                       local_id: Optional[str]=None,
-                       sender_queue_id: Optional[str]=None,
-                       widget_content: Optional[str]=None) -> int:
+def check_send_message(
+    sender: UserProfile,
+    client: Client,
+    message_type_name: str,
+    message_to: Union[Sequence[int], Sequence[str]],
+    topic_name: Optional[str],
+    message_content: str,
+    realm: Optional[Realm] = None,
+    forged: bool = False,
+    forged_timestamp: Optional[float] = None,
+    forwarder_user_profile: Optional[UserProfile] = None,
+    local_id: Optional[str] = None,
+    sender_queue_id: Optional[str] = None,
+    widget_content: Optional[str] = None,
+) -> int:
 
-    addressee = Addressee.legacy_build(
-        sender,
-        message_type_name,
-        message_to,
-        topic_name)
+    addressee = Addressee.legacy_build(sender, message_type_name, message_to, topic_name)
     try:
-        message = check_message(sender, client, addressee,
-                                message_content, realm, forged, forged_timestamp,
-                                forwarder_user_profile, local_id, sender_queue_id,
-                                widget_content)
+        message = check_message(
+            sender,
+            client,
+            addressee,
+            message_content,
+            realm,
+            forged,
+            forged_timestamp,
+            forwarder_user_profile,
+            local_id,
+            sender_queue_id,
+            widget_content,
+        )
     except ZephyrMessageAlreadySentException as e:
         return e.message_id
     return do_send_messages([message])[0]
 
-def check_schedule_message(sender: UserProfile, client: Client,
-                           message_type_name: str,
-                           message_to: Union[Sequence[str], Sequence[int]],
-                           topic_name: Optional[str], message_content: str,
-                           delivery_type: str, deliver_at: datetime.datetime,
-                           realm: Optional[Realm]=None,
-                           forwarder_user_profile: Optional[UserProfile]=None,
-                           ) -> int:
-    addressee = Addressee.legacy_build(
-        sender,
-        message_type_name,
-        message_to,
-        topic_name)
 
-    send_request = check_message(sender, client, addressee,
-                                 message_content, realm=realm,
-                                 forwarder_user_profile=forwarder_user_profile)
+def check_schedule_message(
+    sender: UserProfile,
+    client: Client,
+    message_type_name: str,
+    message_to: Union[Sequence[str], Sequence[int]],
+    topic_name: Optional[str],
+    message_content: str,
+    delivery_type: str,
+    deliver_at: datetime.datetime,
+    realm: Optional[Realm] = None,
+    forwarder_user_profile: Optional[UserProfile] = None,
+) -> int:
+    addressee = Addressee.legacy_build(sender, message_type_name, message_to, topic_name)
+
+    send_request = check_message(
+        sender,
+        client,
+        addressee,
+        message_content,
+        realm=realm,
+        forwarder_user_profile=forwarder_user_profile,
+    )
     send_request.deliver_at = deliver_at
     send_request.delivery_type = delivery_type
 
     recipient = send_request.message.recipient
-    if (delivery_type == 'remind' and (recipient.type != Recipient.STREAM and
-                                       recipient.type_id != sender.id)):
+    if delivery_type == 'remind' and (
+        recipient.type != Recipient.STREAM and recipient.type_id != sender.id
+    ):
         raise JsonableError(_("Reminders can only be set for streams."))
 
     return do_schedule_messages([send_request])[0]
@@ -2227,18 +2531,23 @@ def check_default_stream_group_name(group_name: str) -> None:
     if group_name.strip() == "":
         raise JsonableError(_("Invalid default stream group name '{}'").format(group_name))
     if len(group_name) > DefaultStreamGroup.MAX_NAME_LENGTH:
-        raise JsonableError(_("Default stream group name too long (limit: {} characters)").format(
-            DefaultStreamGroup.MAX_NAME_LENGTH,
-        ))
+        raise JsonableError(
+            _("Default stream group name too long (limit: {} characters)").format(
+                DefaultStreamGroup.MAX_NAME_LENGTH,
+            )
+        )
     for i in group_name:
         if ord(i) == 0:
-            raise JsonableError(_("Default stream group name '{}' contains NULL (0x00) characters.").format(
-                group_name,
-            ))
+            raise JsonableError(
+                _("Default stream group name '{}' contains NULL (0x00) characters.").format(
+                    group_name,
+                )
+            )
 
-def send_rate_limited_pm_notification_to_bot_owner(sender: UserProfile,
-                                                   realm: Realm,
-                                                   content: str) -> None:
+
+def send_rate_limited_pm_notification_to_bot_owner(
+    sender: UserProfile, realm: Realm, content: str
+) -> None:
     """
     Sends a PM error notification to a bot's owner if one hasn't already
     been sent in the last 5 minutes.
@@ -2264,18 +2573,21 @@ def send_rate_limited_pm_notification_to_bot_owner(sender: UserProfile,
     if last_reminder and timezone_now() - last_reminder <= waitperiod:
         return
 
-    internal_send_private_message(realm, get_system_bot(settings.NOTIFICATION_BOT),
-                                  sender.bot_owner, content)
+    internal_send_private_message(
+        realm, get_system_bot(settings.NOTIFICATION_BOT), sender.bot_owner, content
+    )
 
     sender.last_reminder = timezone_now()
     sender.save(update_fields=['last_reminder'])
 
 
-def send_pm_if_empty_stream(stream: Optional[Stream],
-                            realm: Realm,
-                            sender: UserProfile,
-                            stream_name: Optional[str]=None,
-                            stream_id: Optional[int]=None) -> None:
+def send_pm_if_empty_stream(
+    stream: Optional[Stream],
+    realm: Realm,
+    sender: UserProfile,
+    stream_name: Optional[str] = None,
+    stream_id: Optional[int] = None,
+) -> None:
     """If a bot sends a message to a stream that doesn't exist or has no
     subscribers, sends a notification to the bot owner (if not a
     cross-realm bot) so that the owner can correct the issue."""
@@ -2292,24 +2604,32 @@ def send_pm_if_empty_stream(stream: Optional[Stream],
         with override_language(sender.bot_owner.default_language):
             if stream is None:
                 if stream_id is not None:
-                    content = _("Your bot {bot_identity} tried to send a message to stream ID "
-                                "{stream_id}, but there is no stream with that ID.").format(**arg_dict)
+                    content = _(
+                        "Your bot {bot_identity} tried to send a message to stream ID "
+                        "{stream_id}, but there is no stream with that ID."
+                    ).format(**arg_dict)
                 else:
-                    assert(stream_name is not None)
-                    content = _("Your bot {bot_identity} tried to send a message to stream "
-                                "{stream_name}, but that stream does not exist. "
-                                "Click [here]({new_stream_link}) to create it.").format(**arg_dict)
+                    assert stream_name is not None
+                    content = _(
+                        "Your bot {bot_identity} tried to send a message to stream "
+                        "{stream_name}, but that stream does not exist. "
+                        "Click [here]({new_stream_link}) to create it."
+                    ).format(**arg_dict)
             else:
                 if num_subscribers_for_stream_id(stream.id) > 0:
                     return
-                content = _("Your bot {bot_identity} tried to send a message to "
-                            "stream {stream_name}. The stream exists but "
-                            "does not have any subscribers.").format(**arg_dict)
+                content = _(
+                    "Your bot {bot_identity} tried to send a message to "
+                    "stream {stream_name}. The stream exists but "
+                    "does not have any subscribers."
+                ).format(**arg_dict)
 
         send_rate_limited_pm_notification_to_bot_owner(sender, realm, content)
 
-def validate_stream_name_with_pm_notification(stream_name: str, realm: Realm,
-                                              sender: UserProfile) -> Stream:
+
+def validate_stream_name_with_pm_notification(
+    stream_name: str, realm: Realm, sender: UserProfile
+) -> Stream:
     stream_name = stream_name.strip()
     check_stream_name(stream_name)
 
@@ -2322,8 +2642,10 @@ def validate_stream_name_with_pm_notification(stream_name: str, realm: Realm,
 
     return stream
 
-def validate_stream_id_with_pm_notification(stream_id: int, realm: Realm,
-                                            sender: UserProfile) -> Stream:
+
+def validate_stream_id_with_pm_notification(
+    stream_id: int, realm: Realm, sender: UserProfile
+) -> Stream:
     try:
         stream = get_stream_by_id_in_realm(stream_id, realm)
         send_pm_if_empty_stream(stream, realm, sender)
@@ -2333,8 +2655,10 @@ def validate_stream_id_with_pm_notification(stream_id: int, realm: Realm,
 
     return stream
 
-def check_private_message_policy(realm: Realm, sender: UserProfile,
-                                 user_profiles: Sequence[UserProfile]) -> None:
+
+def check_private_message_policy(
+    realm: Realm, sender: UserProfile, user_profiles: Sequence[UserProfile]
+) -> None:
     if realm.private_message_policy == Realm.PRIVATE_MESSAGE_POLICY_DISABLED:
         if sender.is_bot or (len(user_profiles) == 1 and user_profiles[0].is_bot):
             # We allow PMs only between users and bots, to avoid
@@ -2344,16 +2668,23 @@ def check_private_message_policy(realm: Realm, sender: UserProfile,
 
         raise JsonableError(_("Private messages are disabled in this organization."))
 
+
 # check_message:
 # Returns message ready for sending with do_send_message on success or the error message (string) on error.
-def check_message(sender: UserProfile, client: Client, addressee: Addressee,
-                  message_content_raw: str, realm: Optional[Realm]=None, forged: bool=False,
-                  forged_timestamp: Optional[float]=None,
-                  forwarder_user_profile: Optional[UserProfile]=None,
-                  local_id: Optional[str]=None,
-                  sender_queue_id: Optional[str]=None,
-                  widget_content: Optional[str]=None,
-                  email_gateway: bool=False) -> SendMessageRequest:
+def check_message(
+    sender: UserProfile,
+    client: Client,
+    addressee: Addressee,
+    message_content_raw: str,
+    realm: Optional[Realm] = None,
+    forged: bool = False,
+    forged_timestamp: Optional[float] = None,
+    forwarder_user_profile: Optional[UserProfile] = None,
+    local_id: Optional[str] = None,
+    sender_queue_id: Optional[str] = None,
+    widget_content: Optional[str] = None,
+    email_gateway: bool = False,
+) -> SendMessageRequest:
     """See
     https://zulip.readthedocs.io/en/latest/subsystems/sending-messages.html
     for high-level documentation on this subsystem.
@@ -2397,14 +2728,17 @@ def check_message(sender: UserProfile, client: Client, addressee: Addressee,
 
         if sender.bot_type != sender.OUTGOING_WEBHOOK_BOT:
             access_stream_for_send_message(
-                sender=sender,
-                stream=stream,
-                forwarder_user_profile=forwarder_user_profile)
+                sender=sender, stream=stream, forwarder_user_profile=forwarder_user_profile
+            )
 
     elif addressee.is_private():
         user_profiles = addressee.user_profiles()
-        mirror_message = client and client.name in ["zephyr_mirror", "irc_mirror",
-                                                    "jabber_mirror", "JabberMirror"]
+        mirror_message = client and client.name in [
+            "zephyr_mirror",
+            "irc_mirror",
+            "jabber_mirror",
+            "JabberMirror",
+        ]
 
         check_private_message_policy(realm, sender, user_profiles)
 
@@ -2413,9 +2747,9 @@ def check_message(sender: UserProfile, client: Client, addressee: Addressee,
         # `forwarded_mirror_message` security check in that case.
         forwarded_mirror_message = mirror_message and not forged
         try:
-            recipient = recipient_for_user_profiles(user_profiles,
-                                                    forwarded_mirror_message,
-                                                    forwarder_user_profile, sender)
+            recipient = recipient_for_user_profiles(
+                user_profiles, forwarded_mirror_message, forwarder_user_profile, sender
+            )
         except ValidationError as e:
             assert isinstance(e.messages[0], str)
             raise JsonableError(e.messages[0])
@@ -2454,25 +2788,37 @@ def check_message(sender: UserProfile, client: Client, addressee: Addressee,
         try:
             check_widget_content(widget_content)
         except ValidationError as error:
-            raise JsonableError(_('Widgets: {error_msg}').format(
-                error_msg=error.message,
-            ))
+            raise JsonableError(
+                _('Widgets: {error_msg}').format(
+                    error_msg=error.message,
+                )
+            )
 
-    message_dict = {'message': message, 'stream': stream, 'local_id': local_id,
-                    'sender_queue_id': sender_queue_id, 'realm': realm,
-                    'widget_content': widget_content}
+    message_dict = {
+        'message': message,
+        'stream': stream,
+        'local_id': local_id,
+        'sender_queue_id': sender_queue_id,
+        'realm': realm,
+        'widget_content': widget_content,
+    }
     message_send_dict = build_message_send_dict(message_dict, email_gateway)
 
     if stream is not None and message_send_dict.message.mentions_wildcard:
         if not wildcard_mention_allowed(sender, stream):
-            raise JsonableError(_("You do not have permission to use wildcard mentions in this stream."))
+            raise JsonableError(
+                _("You do not have permission to use wildcard mentions in this stream.")
+            )
     return message_send_dict
 
-def _internal_prep_message(realm: Realm,
-                           sender: UserProfile,
-                           addressee: Addressee,
-                           content: str,
-                           email_gateway: bool=False) -> Optional[SendMessageRequest]:
+
+def _internal_prep_message(
+    realm: Realm,
+    sender: UserProfile,
+    addressee: Addressee,
+    content: str,
+    email_gateway: bool = False,
+) -> Optional[SendMessageRequest]:
     """
     Create a message object and checks it, but doesn't send it or save it to the database.
     The internal function that calls this can therefore batch send a bunch of created
@@ -2494,17 +2840,32 @@ def _internal_prep_message(realm: Realm,
             ensure_stream(realm, stream_name, acting_user=sender)
 
     try:
-        return check_message(sender, get_client("Internal"), addressee,
-                             content, realm=realm, email_gateway=email_gateway)
+        return check_message(
+            sender,
+            get_client("Internal"),
+            addressee,
+            content,
+            realm=realm,
+            email_gateway=email_gateway,
+        )
     except JsonableError as e:
-        logging.exception("Error queueing internal message by %s: %s", sender.delivery_email, e.msg, stack_info=True)
+        logging.exception(
+            "Error queueing internal message by %s: %s",
+            sender.delivery_email,
+            e.msg,
+            stack_info=True,
+        )
 
     return None
 
+
 def internal_prep_stream_message(
-        realm: Realm, sender: UserProfile,
-        stream: Stream, topic: str, content: str,
-        email_gateway: bool=False,
+    realm: Realm,
+    sender: UserProfile,
+    stream: Stream,
+    topic: str,
+    content: str,
+    email_gateway: bool = False,
 ) -> Optional[SendMessageRequest]:
     """
     See _internal_prep_message for details of how this works.
@@ -2519,9 +2880,13 @@ def internal_prep_stream_message(
         email_gateway=email_gateway,
     )
 
+
 def internal_prep_stream_message_by_name(
-        realm: Realm, sender: UserProfile,
-        stream_name: str, topic: str, content: str,
+    realm: Realm,
+    sender: UserProfile,
+    stream_name: str,
+    topic: str,
+    content: str,
 ) -> Optional[SendMessageRequest]:
     """
     See _internal_prep_message for details of how this works.
@@ -2535,10 +2900,10 @@ def internal_prep_stream_message_by_name(
         content=content,
     )
 
-def internal_prep_private_message(realm: Realm,
-                                  sender: UserProfile,
-                                  recipient_user: UserProfile,
-                                  content: str) -> Optional[SendMessageRequest]:
+
+def internal_prep_private_message(
+    realm: Realm, sender: UserProfile, recipient_user: UserProfile, content: str
+) -> Optional[SendMessageRequest]:
     """
     See _internal_prep_message for details of how this works.
     """
@@ -2551,41 +2916,47 @@ def internal_prep_private_message(realm: Realm,
         content=content,
     )
 
-def internal_send_private_message(realm: Realm,
-                                  sender: UserProfile,
-                                  recipient_user: UserProfile,
-                                  content: str) -> Optional[int]:
+
+def internal_send_private_message(
+    realm: Realm, sender: UserProfile, recipient_user: UserProfile, content: str
+) -> Optional[int]:
     message = internal_prep_private_message(realm, sender, recipient_user, content)
     if message is None:
         return None
     message_ids = do_send_messages([message])
     return message_ids[0]
 
-def internal_send_stream_message(
-        realm: Realm,
-        sender: UserProfile,
-        stream: Stream,
-        topic: str,
-        content: str,
-        email_gateway: bool=False) -> Optional[int]:
 
-    message = internal_prep_stream_message(
-        realm, sender, stream,
-        topic, content, email_gateway
-    )
+def internal_send_stream_message(
+    realm: Realm,
+    sender: UserProfile,
+    stream: Stream,
+    topic: str,
+    content: str,
+    email_gateway: bool = False,
+) -> Optional[int]:
+
+    message = internal_prep_stream_message(realm, sender, stream, topic, content, email_gateway)
 
     if message is None:
         return None
     message_ids = do_send_messages([message])
     return message_ids[0]
 
+
 def internal_send_stream_message_by_name(
-        realm: Realm, sender: UserProfile,
-        stream_name: str, topic: str, content: str,
+    realm: Realm,
+    sender: UserProfile,
+    stream_name: str,
+    topic: str,
+    content: str,
 ) -> Optional[int]:
     message = internal_prep_stream_message_by_name(
-        realm, sender, stream_name,
-        topic, content,
+        realm,
+        sender,
+        stream_name,
+        topic,
+        content,
     )
 
     if message is None:
@@ -2593,8 +2964,10 @@ def internal_send_stream_message_by_name(
     message_ids = do_send_messages([message])
     return message_ids[0]
 
-def internal_send_huddle_message(realm: Realm, sender: UserProfile, emails: List[str],
-                                 content: str) -> Optional[int]:
+
+def internal_send_huddle_message(
+    realm: Realm, sender: UserProfile, emails: List[str], content: str
+) -> Optional[int]:
     addressee = Addressee.for_private(emails, realm)
     message = _internal_prep_message(
         realm=realm,
@@ -2607,6 +2980,7 @@ def internal_send_huddle_message(realm: Realm, sender: UserProfile, emails: List
     message_ids = do_send_messages([message])
     return message_ids[0]
 
+
 def pick_color(user_profile: UserProfile, used_colors: Set[str]) -> str:
     # These colors are shared with the palette in subs.js.
     available_colors = [s for s in STREAM_ASSIGNMENT_COLORS if s not in used_colors]
@@ -2616,22 +2990,28 @@ def pick_color(user_profile: UserProfile, used_colors: Set[str]) -> str:
     else:
         return STREAM_ASSIGNMENT_COLORS[len(used_colors) % len(STREAM_ASSIGNMENT_COLORS)]
 
-def validate_user_access_to_subscribers(user_profile: Optional[UserProfile],
-                                        stream: Stream) -> None:
-    """ Validates whether the user can view the subscribers of a stream.  Raises a JsonableError if:
-        * The user and the stream are in different realms
-        * The realm is MIT and the stream is not invite only.
-        * The stream is invite only, requesting_user is passed, and that user
-          does not subscribe to the stream.
+
+def validate_user_access_to_subscribers(
+    user_profile: Optional[UserProfile], stream: Stream
+) -> None:
+    """Validates whether the user can view the subscribers of a stream.  Raises a JsonableError if:
+    * The user and the stream are in different realms
+    * The realm is MIT and the stream is not invite only.
+    * The stream is invite only, requesting_user is passed, and that user
+      does not subscribe to the stream.
     """
     validate_user_access_to_subscribers_helper(
         user_profile,
-        {"realm_id": stream.realm_id,
-         "is_web_public": stream.is_web_public,
-         "invite_only": stream.invite_only},
+        {
+            "realm_id": stream.realm_id,
+            "is_web_public": stream.is_web_public,
+            "invite_only": stream.invite_only,
+        },
         # We use a lambda here so that we only compute whether the
         # user is subscribed if we have to
-        lambda user_profile: subscribed_to_stream(user_profile, stream.id))
+        lambda user_profile: subscribed_to_stream(user_profile, stream.id),
+    )
+
 
 def validate_user_access_to_subscribers_helper(
     user_profile: Optional[UserProfile],
@@ -2686,9 +3066,10 @@ def validate_user_access_to_subscribers_helper(
     if user_profile.is_realm_admin:
         return
 
-    if (stream_dict["invite_only"] and not check_user_subscribed(user_profile)):
+    if stream_dict["invite_only"] and not check_user_subscribed(user_profile):
         raise JsonableError(_("Unable to retrieve subscribers for private stream"))
 
+
 def bulk_get_subscriber_user_ids(
     stream_dicts: Iterable[Mapping[str, Any]],
     user_profile: UserProfile,
@@ -2724,7 +3105,8 @@ def bulk_get_subscriber_user_ids(
     to optimize.)
     '''
 
-    query = SQL('''
+    query = SQL(
+        '''
         SELECT
             zerver_subscription.recipient_id,
             zerver_subscription.user_profile_id
@@ -2739,7 +3121,8 @@ def bulk_get_subscriber_user_ids(
         ORDER BY
             zerver_subscription.recipient_id,
             zerver_subscription.user_profile_id
-        ''')
+        '''
+    )
 
     cursor = connection.cursor()
     cursor.execute(query, {"recipient_ids": tuple(recipient_ids)})
@@ -2757,9 +3140,10 @@ def bulk_get_subscriber_user_ids(
 
     return result
 
+
 def get_subscribers_query(stream: Stream, requesting_user: Optional[UserProfile]) -> QuerySet:
     # TODO: Make a generic stub for QuerySet
-    """ Build a query to get the subscribers list for a stream, raising a JsonableError if:
+    """Build a query to get the subscribers list for a stream, raising a JsonableError if:
 
     'realm' is optional in stream.
 
@@ -2777,8 +3161,9 @@ def get_subscribers_query(stream: Stream, requesting_user: Optional[UserProfile]
     return subscriptions
 
 
-def get_subscriber_emails(stream: Stream,
-                          requesting_user: Optional[UserProfile]=None) -> List[str]:
+def get_subscriber_emails(
+    stream: Stream, requesting_user: Optional[UserProfile] = None
+) -> List[str]:
     subscriptions_query = get_subscribers_query(stream, requesting_user)
     subscriptions = subscriptions_query.values('user_profile__email')
     return [subscription['user_profile__email'] for subscription in subscriptions]
@@ -2808,7 +3193,8 @@ def send_subscription_add_events(
             sub_dict['in_home_view'] = not subscription.is_muted
             sub_dict['email_address'] = encode_email_address(stream, show_sender=True)
             sub_dict['stream_weekly_traffic'] = get_average_weekly_stream_traffic(
-                stream.id, stream.date_created, recent_traffic)
+                stream.id, stream.date_created, recent_traffic
+            )
             if stream.is_in_zephyr_realm and not stream.invite_only:
                 sub_dict['subscribers'] = []
             else:
@@ -2816,18 +3202,20 @@ def send_subscription_add_events(
             sub_dicts.append(sub_dict)
 
         # Send a notification to the user who subscribed.
-        event = dict(type="subscription", op="add",
-                     subscriptions=sub_dicts)
+        event = dict(type="subscription", op="add", subscriptions=sub_dicts)
         send_event(realm, event, [user_id])
 
+
 SubT = Tuple[List[SubInfo], List[SubInfo]]
+
+
 def bulk_add_subscriptions(
     realm: Realm,
     streams: Iterable[Stream],
     users: Iterable[UserProfile],
-    color_map: Mapping[str, str]={},
-    acting_user: Optional[UserProfile]=None,
-    from_user_creation: bool=False,
+    color_map: Mapping[str, str] = {},
+    acting_user: Optional[UserProfile] = None,
+    from_user_creation: bool = False,
 ) -> SubT:
     users = list(users)
 
@@ -2877,10 +3265,7 @@ def bulk_add_subscriptions(
             used_colors.add(color)
 
             sub = Subscription(
-                user_profile=user_profile,
-                active=True,
-                color=color,
-                recipient_id=recipient_id
+                user_profile=user_profile, active=True, color=color, recipient_id=recipient_id
             )
             sub_info = SubInfo(user_profile, sub, stream)
             subs_to_add.append(sub_info)
@@ -2898,10 +3283,7 @@ def bulk_add_subscriptions(
 
     stream_dict = {stream.id: stream for stream in streams}
 
-    new_streams = [
-        stream_dict[stream_id]
-        for stream_id in altered_user_dict
-    ]
+    new_streams = [stream_dict[stream_id] for stream_id in altered_user_dict]
 
     subscriber_peer_info = bulk_get_subscriber_peer_info(
         realm=realm,
@@ -2938,6 +3320,7 @@ def bulk_add_subscriptions(
         already_subscribed,
     )
 
+
 # This function contains all the database changes as part of
 # subscribing users to streams; we use a transaction to ensure that
 # the RealmAuditLog entries are created atomically with the
@@ -2960,24 +3343,33 @@ def bulk_add_subs_to_db_with_logging(
 
     all_subscription_logs: (List[RealmAuditLog]) = []
     for sub_info in subs_to_add:
-        all_subscription_logs.append(RealmAuditLog(realm=realm,
-                                                   acting_user=acting_user,
-                                                   modified_user=sub_info.user,
-                                                   modified_stream=sub_info.stream,
-                                                   event_last_message_id=event_last_message_id,
-                                                   event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
-                                                   event_time=event_time))
+        all_subscription_logs.append(
+            RealmAuditLog(
+                realm=realm,
+                acting_user=acting_user,
+                modified_user=sub_info.user,
+                modified_stream=sub_info.stream,
+                event_last_message_id=event_last_message_id,
+                event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
+                event_time=event_time,
+            )
+        )
     for sub_info in subs_to_activate:
-        all_subscription_logs.append(RealmAuditLog(realm=realm,
-                                                   acting_user=acting_user,
-                                                   modified_user=sub_info.user,
-                                                   modified_stream=sub_info.stream,
-                                                   event_last_message_id=event_last_message_id,
-                                                   event_type=RealmAuditLog.SUBSCRIPTION_ACTIVATED,
-                                                   event_time=event_time))
+        all_subscription_logs.append(
+            RealmAuditLog(
+                realm=realm,
+                acting_user=acting_user,
+                modified_user=sub_info.user,
+                modified_stream=sub_info.stream,
+                event_last_message_id=event_last_message_id,
+                event_type=RealmAuditLog.SUBSCRIPTION_ACTIVATED,
+                event_time=event_time,
+            )
+        )
     # Now since we have all log objects generated we can do a bulk insert
     RealmAuditLog.objects.bulk_create(all_subscription_logs)
 
+
 def send_stream_creation_events_for_private_streams(
     realm: Realm,
     stream_dict: Dict[int, Stream],
@@ -2999,6 +3391,7 @@ def send_stream_creation_events_for_private_streams(
             if notify_user_ids:
                 send_stream_creation_event(stream, notify_user_ids)
 
+
 def send_peer_subscriber_events(
     op: str,
     realm: Realm,
@@ -3013,8 +3406,7 @@ def send_peer_subscriber_events(
     assert op in ["peer_add", "peer_remove"]
 
     private_stream_ids = [
-        stream_id for stream_id in altered_user_dict
-        if stream_dict[stream_id].invite_only
+        stream_id for stream_id in altered_user_dict if stream_dict[stream_id].invite_only
     ]
 
     for stream_id in private_stream_ids:
@@ -3026,14 +3418,14 @@ def send_peer_subscriber_events(
                 type="subscription",
                 op=op,
                 stream_ids=[stream_id],
-                user_ids=sorted(list(altered_user_ids))
+                user_ids=sorted(list(altered_user_ids)),
             )
             send_event(realm, event, peer_user_ids)
 
     public_stream_ids = [
-        stream_id for stream_id in altered_user_dict
-        if not stream_dict[stream_id].invite_only
-        and not stream_dict[stream_id].is_in_zephyr_realm
+        stream_id
+        for stream_id in altered_user_dict
+        if not stream_dict[stream_id].invite_only and not stream_dict[stream_id].is_in_zephyr_realm
     ]
 
     if public_stream_ids:
@@ -3078,6 +3470,7 @@ def send_peer_subscriber_events(
             )
             send_event(realm, event, peer_user_ids)
 
+
 def send_peer_remove_events(
     realm: Realm,
     streams: List[Stream],
@@ -3099,6 +3492,7 @@ def send_peer_remove_events(
         private_peer_dict=private_peer_dict,
     )
 
+
 def get_available_notification_sounds() -> List[str]:
     notification_sounds_path = static_path('audio/notification_sounds')
     available_notification_sounds = []
@@ -3114,18 +3508,23 @@ def get_available_notification_sounds() -> List[str]:
 
     return sorted(available_notification_sounds)
 
+
 def notify_subscriptions_removed(user_profile: UserProfile, streams: Iterable[Stream]) -> None:
 
     payload = [dict(name=stream.name, stream_id=stream.id) for stream in streams]
-    event = dict(type="subscription", op="remove",
-                 subscriptions=payload)
+    event = dict(type="subscription", op="remove", subscriptions=payload)
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 SubAndRemovedT = Tuple[List[Tuple[UserProfile, Stream]], List[Tuple[UserProfile, Stream]]]
-def bulk_remove_subscriptions(users: Iterable[UserProfile],
-                              streams: Iterable[Stream],
-                              acting_client: Client,
-                              acting_user: Optional[UserProfile]=None) -> SubAndRemovedT:
+
+
+def bulk_remove_subscriptions(
+    users: Iterable[UserProfile],
+    streams: Iterable[Stream],
+    acting_client: Client,
+    acting_user: Optional[UserProfile] = None,
+) -> SubAndRemovedT:
 
     users = list(users)
     streams = list(streams)
@@ -3142,10 +3541,7 @@ def bulk_remove_subscriptions(users: Iterable[UserProfile],
         for user_profile in users:
             user_sub_stream_info = existing_subs_by_user[user_profile.id]
 
-            subscribed_stream_ids = {
-                sub_info.stream.id
-                for sub_info in user_sub_stream_info
-            }
+            subscribed_stream_ids = {sub_info.stream.id for sub_info in user_sub_stream_info}
             not_subscribed_stream_ids = stream_ids - subscribed_stream_ids
 
             for stream_id in not_subscribed_stream_ids:
@@ -3174,7 +3570,7 @@ def bulk_remove_subscriptions(users: Iterable[UserProfile],
         occupied_streams_before = list(get_occupied_streams(our_realm))
         Subscription.objects.filter(
             id__in=sub_ids_to_deactivate,
-        ) .update(active=False)
+        ).update(active=False)
         occupied_streams_after = list(get_occupied_streams(our_realm))
 
         # Log Subscription Activities in RealmAuditLog
@@ -3208,9 +3604,11 @@ def bulk_remove_subscriptions(users: Iterable[UserProfile],
             continue
         notify_subscriptions_removed(user_profile, streams_by_user[user_profile.id])
 
-        event = {'type': 'mark_stream_messages_as_read',
-                 'user_profile_id': user_profile.id,
-                 'stream_recipient_ids': [stream.recipient_id for stream in streams]}
+        event = {
+            'type': 'mark_stream_messages_as_read',
+            'user_profile_id': user_profile.id,
+            'stream_recipient_ids': [stream.recipient_id for stream in streams],
+        }
         queue_json_publish("deferred_work", event)
 
     send_peer_remove_events(
@@ -3220,8 +3618,7 @@ def bulk_remove_subscriptions(users: Iterable[UserProfile],
     )
 
     new_vacant_streams = set(occupied_streams_before) - set(occupied_streams_after)
-    new_vacant_private_streams = [stream for stream in new_vacant_streams
-                                  if stream.invite_only]
+    new_vacant_private_streams = [stream for stream in new_vacant_streams if stream.invite_only]
 
     if new_vacant_private_streams:
         # Deactivate any newly-vacant private streams
@@ -3233,9 +3630,15 @@ def bulk_remove_subscriptions(users: Iterable[UserProfile],
         not_subscribed,
     )
 
-def do_change_subscription_property(user_profile: UserProfile, sub: Subscription,
-                                    stream: Stream, property_name: str, value: Any,
-                                    acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_subscription_property(
+    user_profile: UserProfile,
+    sub: Subscription,
+    stream: Stream,
+    property_name: str,
+    value: Any,
+    acting_user: Optional[UserProfile] = None,
+) -> None:
     database_property_name = property_name
     event_property_name = property_name
     database_value = value
@@ -3256,53 +3659,79 @@ def do_change_subscription_property(user_profile: UserProfile, sub: Subscription
     sub.save(update_fields=[database_property_name])
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, event_type=RealmAuditLog.SUBSCRIPTION_PROPERTY_CHANGED,
-        event_time=event_time, modified_user=user_profile, acting_user=acting_user,
-        modified_stream=stream, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: database_value,
-            'property': database_property_name,
-        }).decode())
+        realm=user_profile.realm,
+        event_type=RealmAuditLog.SUBSCRIPTION_PROPERTY_CHANGED,
+        event_time=event_time,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        modified_stream=stream,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: database_value,
+                'property': database_property_name,
+            }
+        ).decode(),
+    )
 
-    event = dict(type="subscription",
-                 op="update",
-                 email=user_profile.email,
-                 property=event_property_name,
-                 value=event_value,
-                 stream_id=stream.id,
-                 name=stream.name)
+    event = dict(
+        type="subscription",
+        op="update",
+        email=user_profile.email,
+        property=event_property_name,
+        value=event_value,
+        stream_id=stream.id,
+        name=stream.name,
+    )
     send_event(user_profile.realm, event, [user_profile.id])
 
-def do_change_password(user_profile: UserProfile, password: str, commit: bool=True) -> None:
+
+def do_change_password(user_profile: UserProfile, password: str, commit: bool = True) -> None:
     user_profile.set_password(password)
     if commit:
         user_profile.save(update_fields=["password"])
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=user_profile,
-                                 modified_user=user_profile, event_type=RealmAuditLog.USER_PASSWORD_CHANGED,
-                                 event_time=event_time)
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        acting_user=user_profile,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_PASSWORD_CHANGED,
+        event_time=event_time,
+    )
 
-def do_change_full_name(user_profile: UserProfile, full_name: str,
-                        acting_user: Optional[UserProfile]) -> None:
+
+def do_change_full_name(
+    user_profile: UserProfile, full_name: str, acting_user: Optional[UserProfile]
+) -> None:
     old_name = user_profile.full_name
     user_profile.full_name = full_name
     user_profile.save(update_fields=["full_name"])
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=acting_user,
-                                 modified_user=user_profile, event_type=RealmAuditLog.USER_FULL_NAME_CHANGED,
-                                 event_time=event_time, extra_data=old_name)
-    payload = dict(user_id=user_profile.id,
-                   full_name=user_profile.full_name)
-    send_event(user_profile.realm,
-               dict(type='realm_user', op='update', person=payload),
-               active_user_ids(user_profile.realm_id))
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        acting_user=acting_user,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_FULL_NAME_CHANGED,
+        event_time=event_time,
+        extra_data=old_name,
+    )
+    payload = dict(user_id=user_profile.id, full_name=user_profile.full_name)
+    send_event(
+        user_profile.realm,
+        dict(type='realm_user', op='update', person=payload),
+        active_user_ids(user_profile.realm_id),
+    )
     if user_profile.is_bot:
-        send_event(user_profile.realm,
-                   dict(type='realm_bot', op='update', bot=payload),
-                   bot_owner_user_ids(user_profile))
+        send_event(
+            user_profile.realm,
+            dict(type='realm_bot', op='update', bot=payload),
+            bot_owner_user_ids(user_profile),
+        )
 
-def check_change_full_name(user_profile: UserProfile, full_name_raw: str,
-                           acting_user: UserProfile) -> str:
+
+def check_change_full_name(
+    user_profile: UserProfile, full_name_raw: str, acting_user: UserProfile
+) -> str:
     """Verifies that the user's proposed full name is valid.  The caller
     is responsible for checking check permissions.  Returns the new
     full name, which may differ from what was passed in (because this
@@ -3311,8 +3740,10 @@ def check_change_full_name(user_profile: UserProfile, full_name_raw: str,
     do_change_full_name(user_profile, new_full_name, acting_user)
     return new_full_name
 
-def check_change_bot_full_name(user_profile: UserProfile, full_name_raw: str,
-                               acting_user: UserProfile) -> None:
+
+def check_change_bot_full_name(
+    user_profile: UserProfile, full_name_raw: str, acting_user: UserProfile
+) -> None:
     new_full_name = check_full_name(full_name_raw)
 
     if new_full_name == user_profile.full_name:
@@ -3327,15 +3758,21 @@ def check_change_bot_full_name(user_profile: UserProfile, full_name_raw: str,
     )
     do_change_full_name(user_profile, new_full_name, acting_user)
 
-def do_change_bot_owner(user_profile: UserProfile, bot_owner: UserProfile,
-                        acting_user: UserProfile) -> None:
+
+def do_change_bot_owner(
+    user_profile: UserProfile, bot_owner: UserProfile, acting_user: UserProfile
+) -> None:
     previous_owner = user_profile.bot_owner
     user_profile.bot_owner = bot_owner
     user_profile.save()  # Can't use update_fields because of how the foreign key works.
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=acting_user,
-                                 modified_user=user_profile, event_type=RealmAuditLog.USER_BOT_OWNER_CHANGED,
-                                 event_time=event_time)
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        acting_user=acting_user,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_BOT_OWNER_CHANGED,
+        event_time=event_time,
+    )
 
     update_users = bot_owner_user_ids(user_profile)
 
@@ -3345,13 +3782,17 @@ def do_change_bot_owner(user_profile: UserProfile, bot_owner: UserProfile,
 
     # Delete the bot from previous owner's bot data.
     if previous_owner and not previous_owner.is_realm_admin:
-        send_event(user_profile.realm,
-                   dict(type='realm_bot',
-                        op="delete",
-                        bot=dict(
-                            user_id=user_profile.id,
-                        )),
-                   {previous_owner.id})
+        send_event(
+            user_profile.realm,
+            dict(
+                type='realm_bot',
+                op="delete",
+                bot=dict(
+                    user_id=user_profile.id,
+                ),
+            ),
+            {previous_owner.id},
+        )
         # Do not send update event for previous bot owner.
         update_users = update_users - {previous_owner.id}
 
@@ -3362,13 +3803,18 @@ def do_change_bot_owner(user_profile: UserProfile, bot_owner: UserProfile,
         # Do not send update event for bot_owner.
         update_users = update_users - {bot_owner.id}
 
-    send_event(user_profile.realm,
-               dict(type='realm_bot',
-                    op='update',
-                    bot=dict(user_id=user_profile.id,
-                             owner_id=user_profile.bot_owner.id,
-                             )),
-               update_users)
+    send_event(
+        user_profile.realm,
+        dict(
+            type='realm_bot',
+            op='update',
+            bot=dict(
+                user_id=user_profile.id,
+                owner_id=user_profile.bot_owner.id,
+            ),
+        ),
+        update_users,
+    )
 
     # Since `bot_owner_id` is included in the user profile dict we need
     # to update the users dict with the new bot owner id
@@ -3382,14 +3828,19 @@ def do_change_bot_owner(user_profile: UserProfile, bot_owner: UserProfile,
     )
     send_event(user_profile.realm, event, active_user_ids(user_profile.realm_id))
 
+
 def do_change_tos_version(user_profile: UserProfile, tos_version: str) -> None:
     user_profile.tos_version = tos_version
     user_profile.save(update_fields=["tos_version"])
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=user_profile,
-                                 modified_user=user_profile,
-                                 event_type=RealmAuditLog.USER_TOS_VERSION_CHANGED,
-                                 event_time=event_time)
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        acting_user=user_profile,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_TOS_VERSION_CHANGED,
+        event_time=event_time,
+    )
+
 
 def do_regenerate_api_key(user_profile: UserProfile, acting_user: UserProfile) -> str:
     old_api_key = user_profile.api_key
@@ -3403,34 +3854,48 @@ def do_regenerate_api_key(user_profile: UserProfile, acting_user: UserProfile) -
     cache_delete(user_profile_by_api_key_cache_key(old_api_key))
 
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=acting_user,
-                                 modified_user=user_profile, event_type=RealmAuditLog.USER_API_KEY_CHANGED,
-                                 event_time=event_time)
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        acting_user=acting_user,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_API_KEY_CHANGED,
+        event_time=event_time,
+    )
 
     if user_profile.is_bot:
-        send_event(user_profile.realm,
-                   dict(type='realm_bot',
-                        op='update',
-                        bot=dict(user_id=user_profile.id,
-                                 api_key=new_api_key,
-                                 )),
-                   bot_owner_user_ids(user_profile))
+        send_event(
+            user_profile.realm,
+            dict(
+                type='realm_bot',
+                op='update',
+                bot=dict(
+                    user_id=user_profile.id,
+                    api_key=new_api_key,
+                ),
+            ),
+            bot_owner_user_ids(user_profile),
+        )
 
-    event = {'type': 'clear_push_device_tokens',
-             'user_profile_id': user_profile.id}
+    event = {'type': 'clear_push_device_tokens', 'user_profile_id': user_profile.id}
     queue_json_publish("deferred_work", event)
 
     return new_api_key
 
+
 def notify_avatar_url_change(user_profile: UserProfile) -> None:
     if user_profile.is_bot:
-        send_event(user_profile.realm,
-                   dict(type='realm_bot',
-                        op='update',
-                        bot=dict(user_id=user_profile.id,
-                                 avatar_url=avatar_url(user_profile),
-                                 )),
-                   bot_owner_user_ids(user_profile))
+        send_event(
+            user_profile.realm,
+            dict(
+                type='realm_bot',
+                op='update',
+                bot=dict(
+                    user_id=user_profile.id,
+                    avatar_url=avatar_url(user_profile),
+                ),
+            ),
+            bot_owner_user_ids(user_profile),
+        )
 
     payload = dict(
         avatar_source=user_profile.avatar_source,
@@ -3442,51 +3907,72 @@ def notify_avatar_url_change(user_profile: UserProfile) -> None:
         user_id=user_profile.id,
     )
 
-    send_event(user_profile.realm,
-               dict(type='realm_user',
-                    op='update',
-                    person=payload),
-               active_user_ids(user_profile.realm_id))
+    send_event(
+        user_profile.realm,
+        dict(type='realm_user', op='update', person=payload),
+        active_user_ids(user_profile.realm_id),
+    )
 
-def do_change_avatar_fields(user_profile: UserProfile, avatar_source: str,
-                            skip_notify: bool=False, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_avatar_fields(
+    user_profile: UserProfile,
+    avatar_source: str,
+    skip_notify: bool = False,
+    acting_user: Optional[UserProfile] = None,
+) -> None:
     user_profile.avatar_source = avatar_source
     user_profile.avatar_version += 1
     user_profile.save(update_fields=["avatar_source", "avatar_version"])
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=user_profile.realm, modified_user=user_profile,
-                                 event_type=RealmAuditLog.USER_AVATAR_SOURCE_CHANGED,
-                                 extra_data={'avatar_source': avatar_source},
-                                 event_time=event_time, acting_user=acting_user)
+    RealmAuditLog.objects.create(
+        realm=user_profile.realm,
+        modified_user=user_profile,
+        event_type=RealmAuditLog.USER_AVATAR_SOURCE_CHANGED,
+        extra_data={'avatar_source': avatar_source},
+        event_time=event_time,
+        acting_user=acting_user,
+    )
 
     if not skip_notify:
         notify_avatar_url_change(user_profile)
 
-def do_delete_avatar_image(user: UserProfile, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_delete_avatar_image(user: UserProfile, acting_user: Optional[UserProfile] = None) -> None:
     do_change_avatar_fields(user, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=acting_user)
     delete_avatar_image(user)
 
-def do_change_icon_source(realm: Realm, icon_source: str, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_icon_source(
+    realm: Realm, icon_source: str, acting_user: Optional[UserProfile] = None
+) -> None:
     realm.icon_source = icon_source
     realm.icon_version += 1
     realm.save(update_fields=["icon_source", "icon_version"])
 
     event_time = timezone_now()
-    RealmAuditLog.objects.create(realm=realm,
-                                 event_type=RealmAuditLog.REALM_ICON_SOURCE_CHANGED,
-                                 extra_data={'icon_source': icon_source,
-                                             'icon_version': realm.icon_version},
-                                 event_time=event_time, acting_user=acting_user)
+    RealmAuditLog.objects.create(
+        realm=realm,
+        event_type=RealmAuditLog.REALM_ICON_SOURCE_CHANGED,
+        extra_data={'icon_source': icon_source, 'icon_version': realm.icon_version},
+        event_time=event_time,
+        acting_user=acting_user,
+    )
 
-    send_event(realm,
-               dict(type='realm',
-                    op='update_dict',
-                    property="icon",
-                    data=dict(icon_source=realm.icon_source,
-                              icon_url=realm_icon_url(realm))),
-               active_user_ids(realm.id))
+    send_event(
+        realm,
+        dict(
+            type='realm',
+            op='update_dict',
+            property="icon",
+            data=dict(icon_source=realm.icon_source, icon_url=realm_icon_url(realm)),
+        ),
+        active_user_ids(realm.id),
+    )
 
-def do_change_logo_source(realm: Realm, logo_source: str, night: bool, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_logo_source(
+    realm: Realm, logo_source: str, night: bool, acting_user: Optional[UserProfile] = None
+) -> None:
     if not night:
         realm.logo_source = logo_source
         realm.logo_version += 1
@@ -3497,23 +3983,32 @@ def do_change_logo_source(realm: Realm, logo_source: str, night: bool, acting_us
         realm.night_logo_version += 1
         realm.save(update_fields=["night_logo_source", "night_logo_version"])
 
-    RealmAuditLog.objects.create(event_type=RealmAuditLog.REALM_LOGO_CHANGED,
-                                 realm=realm, event_time=timezone_now(),
-                                 acting_user=acting_user)
+    RealmAuditLog.objects.create(
+        event_type=RealmAuditLog.REALM_LOGO_CHANGED,
+        realm=realm,
+        event_time=timezone_now(),
+        acting_user=acting_user,
+    )
 
-    event = dict(type='realm',
-                 op='update_dict',
-                 property="night_logo" if night else "logo",
-                 data=get_realm_logo_data(realm, night))
+    event = dict(
+        type='realm',
+        op='update_dict',
+        property="night_logo" if night else "logo",
+        data=get_realm_logo_data(realm, night),
+    )
     send_event(realm, event, active_user_ids(realm.id))
 
+
 def do_change_plan_type(realm: Realm, plan_type: int) -> None:
     old_value = realm.plan_type
     realm.plan_type = plan_type
     realm.save(update_fields=['plan_type'])
-    RealmAuditLog.objects.create(event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED,
-                                 realm=realm, event_time=timezone_now(),
-                                 extra_data={'old_value': old_value, 'new_value': plan_type})
+    RealmAuditLog.objects.create(
+        event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED,
+        realm=realm,
+        event_time=timezone_now(),
+        extra_data={'old_value': old_value, 'new_value': plan_type},
+    )
 
     if plan_type == Realm.STANDARD:
         realm.max_invites = Realm.INVITES_STANDARD_REALM_DAILY_MAX
@@ -3538,117 +4033,174 @@ def do_change_plan_type(realm: Realm, plan_type: int) -> None:
 
     realm.save(update_fields=['_max_invites', 'message_visibility_limit', 'upload_quota_gb'])
 
-    event = {'type': 'realm', 'op': 'update', 'property': 'plan_type', 'value': plan_type,
-             'extra_data': {'upload_quota': realm.upload_quota_bytes()}}
+    event = {
+        'type': 'realm',
+        'op': 'update',
+        'property': 'plan_type',
+        'value': plan_type,
+        'extra_data': {'upload_quota': realm.upload_quota_bytes()},
+    }
     send_event(realm, event, active_user_ids(realm.id))
 
-def do_change_default_sending_stream(user_profile: UserProfile, stream: Optional[Stream],
-                                     acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_default_sending_stream(
+    user_profile: UserProfile, stream: Optional[Stream], acting_user: Optional[UserProfile] = None
+) -> None:
     old_value = user_profile.default_sending_stream_id
     user_profile.default_sending_stream = stream
     user_profile.save(update_fields=['default_sending_stream'])
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, event_type=RealmAuditLog.USER_DEFAULT_SENDING_STREAM_CHANGED,
-        event_time=event_time, modified_user=user_profile,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: None if stream is None else stream.id,
-        }).decode())
+        realm=user_profile.realm,
+        event_type=RealmAuditLog.USER_DEFAULT_SENDING_STREAM_CHANGED,
+        event_time=event_time,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: None if stream is None else stream.id,
+            }
+        ).decode(),
+    )
 
     if user_profile.is_bot:
         if stream:
             stream_name: Optional[str] = stream.name
         else:
             stream_name = None
-        send_event(user_profile.realm,
-                   dict(type='realm_bot',
-                        op='update',
-                        bot=dict(user_id=user_profile.id,
-                                 default_sending_stream=stream_name,
-                                 )),
-                   bot_owner_user_ids(user_profile))
+        send_event(
+            user_profile.realm,
+            dict(
+                type='realm_bot',
+                op='update',
+                bot=dict(
+                    user_id=user_profile.id,
+                    default_sending_stream=stream_name,
+                ),
+            ),
+            bot_owner_user_ids(user_profile),
+        )
 
-def do_change_default_events_register_stream(user_profile: UserProfile,
-                                             stream: Optional[Stream],
-                                             acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_default_events_register_stream(
+    user_profile: UserProfile, stream: Optional[Stream], acting_user: Optional[UserProfile] = None
+) -> None:
     old_value = user_profile.default_events_register_stream_id
     user_profile.default_events_register_stream = stream
     user_profile.save(update_fields=['default_events_register_stream'])
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, event_type=RealmAuditLog.USER_DEFAULT_REGISTER_STREAM_CHANGED,
-        event_time=event_time, modified_user=user_profile,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: None if stream is None else stream.id,
-        }).decode())
+        realm=user_profile.realm,
+        event_type=RealmAuditLog.USER_DEFAULT_REGISTER_STREAM_CHANGED,
+        event_time=event_time,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: None if stream is None else stream.id,
+            }
+        ).decode(),
+    )
 
     if user_profile.is_bot:
         if stream:
             stream_name: Optional[str] = stream.name
         else:
             stream_name = None
-        send_event(user_profile.realm,
-                   dict(type='realm_bot',
-                        op='update',
-                        bot=dict(user_id=user_profile.id,
-                                 default_events_register_stream=stream_name,
-                                 )),
-                   bot_owner_user_ids(user_profile))
+        send_event(
+            user_profile.realm,
+            dict(
+                type='realm_bot',
+                op='update',
+                bot=dict(
+                    user_id=user_profile.id,
+                    default_events_register_stream=stream_name,
+                ),
+            ),
+            bot_owner_user_ids(user_profile),
+        )
 
-def do_change_default_all_public_streams(user_profile: UserProfile, value: bool,
-                                         acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_default_all_public_streams(
+    user_profile: UserProfile, value: bool, acting_user: Optional[UserProfile] = None
+) -> None:
     old_value = user_profile.default_all_public_streams
     user_profile.default_all_public_streams = value
     user_profile.save(update_fields=['default_all_public_streams'])
 
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, event_type=RealmAuditLog.USER_DEFAULT_ALL_PUBLIC_STREAMS_CHANGED,
-        event_time=event_time, modified_user=user_profile,
-        acting_user=acting_user, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: value,
-        }).decode())
+        realm=user_profile.realm,
+        event_type=RealmAuditLog.USER_DEFAULT_ALL_PUBLIC_STREAMS_CHANGED,
+        event_time=event_time,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: value,
+            }
+        ).decode(),
+    )
 
     if user_profile.is_bot:
-        send_event(user_profile.realm,
-                   dict(type='realm_bot',
-                        op='update',
-                        bot=dict(user_id=user_profile.id,
-                                 default_all_public_streams=user_profile.default_all_public_streams,
-                                 )),
-                   bot_owner_user_ids(user_profile))
+        send_event(
+            user_profile.realm,
+            dict(
+                type='realm_bot',
+                op='update',
+                bot=dict(
+                    user_id=user_profile.id,
+                    default_all_public_streams=user_profile.default_all_public_streams,
+                ),
+            ),
+            bot_owner_user_ids(user_profile),
+        )
 
-def do_change_user_role(user_profile: UserProfile, value: int, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_user_role(
+    user_profile: UserProfile, value: int, acting_user: Optional[UserProfile] = None
+) -> None:
     old_value = user_profile.role
     user_profile.role = value
     user_profile.save(update_fields=["role"])
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, modified_user=user_profile, acting_user=acting_user,
-        event_type=RealmAuditLog.USER_ROLE_CHANGED, event_time=timezone_now(),
-        extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: value,
-            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
-        }).decode())
-    event = dict(type="realm_user", op="update",
-                 person=dict(user_id=user_profile.id, role=user_profile.role))
+        realm=user_profile.realm,
+        modified_user=user_profile,
+        acting_user=acting_user,
+        event_type=RealmAuditLog.USER_ROLE_CHANGED,
+        event_time=timezone_now(),
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: value,
+                RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user_profile.realm),
+            }
+        ).decode(),
+    )
+    event = dict(
+        type="realm_user", op="update", person=dict(user_id=user_profile.id, role=user_profile.role)
+    )
     send_event(user_profile.realm, event, active_user_ids(user_profile.realm_id))
 
+
 def do_change_can_forge_sender(user_profile: UserProfile, value: bool) -> None:
     user_profile.can_forge_sender = value
     user_profile.save(update_fields=["can_forge_sender"])
 
+
 def do_change_can_create_users(user_profile: UserProfile, value: bool) -> None:
     user_profile.can_create_users = value
     user_profile.save(update_fields=["can_create_users"])
 
-def do_change_stream_invite_only(stream: Stream, invite_only: bool,
-                                 history_public_to_subscribers: Optional[bool]=None) -> None:
+
+def do_change_stream_invite_only(
+    stream: Stream, invite_only: bool, history_public_to_subscribers: Optional[bool] = None
+) -> None:
     history_public_to_subscribers = get_default_value_for_history_public_to_subscribers(
         stream.realm,
         invite_only,
@@ -3668,10 +4220,12 @@ def do_change_stream_invite_only(stream: Stream, invite_only: bool,
     )
     send_event(stream.realm, event, can_access_stream_user_ids(stream))
 
+
 def do_change_stream_web_public(stream: Stream, is_web_public: bool) -> None:
     stream.is_web_public = is_web_public
     stream.save(update_fields=['is_web_public'])
 
+
 def do_change_stream_post_policy(stream: Stream, stream_post_policy: int) -> None:
     stream.stream_post_policy = stream_post_policy
     stream.save(update_fields=['stream_post_policy'])
@@ -3699,20 +4253,25 @@ def do_change_stream_post_policy(stream: Stream, stream_post_policy: int) -> Non
     )
     send_event(stream.realm, event, can_access_stream_user_ids(stream))
 
-def do_rename_stream(stream: Stream,
-                     new_name: str,
-                     user_profile: UserProfile) -> Dict[str, str]:
+
+def do_rename_stream(stream: Stream, new_name: str, user_profile: UserProfile) -> Dict[str, str]:
     old_name = stream.name
     stream.name = new_name
     stream.save(update_fields=["name"])
 
     RealmAuditLog.objects.create(
-        realm=stream.realm, acting_user=user_profile, modified_stream=stream,
-        event_type=RealmAuditLog.STREAM_NAME_CHANGED, event_time=timezone_now(),
-        extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_name,
-            RealmAuditLog.NEW_VALUE: new_name,
-        }).decode())
+        realm=stream.realm,
+        acting_user=user_profile,
+        modified_stream=stream,
+        event_type=RealmAuditLog.STREAM_NAME_CHANGED,
+        event_time=timezone_now(),
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_name,
+                RealmAuditLog.NEW_VALUE: new_name,
+            }
+        ).decode(),
+    )
 
     recipient_id = stream.recipient_id
     messages = Message.objects.filter(recipient_id=recipient_id).only("id")
@@ -3729,8 +4288,7 @@ def do_rename_stream(stream: Stream,
     # Delete cache entries for everything else, which is cheaper and
     # clearer than trying to set them. display_recipient is the out of
     # date field in all cases.
-    cache_delete_many(
-        to_dict_cache_key_id(message.id) for message in messages)
+    cache_delete_many(to_dict_cache_key_id(message.id) for message in messages)
     new_email = encode_email_address(stream, show_sender=True)
 
     # We will tell our users to essentially
@@ -3772,6 +4330,7 @@ def do_rename_stream(stream: Stream,
     # email forwarding address to display the correctly-escaped new name.
     return {"email_address": new_email}
 
+
 def do_change_stream_description(stream: Stream, new_description: str) -> None:
     stream.description = new_description
     stream.rendered_description = render_stream_description(new_description)
@@ -3788,7 +4347,10 @@ def do_change_stream_description(stream: Stream, new_description: str) -> None:
     )
     send_event(stream.realm, event, can_access_stream_user_ids(stream))
 
-def do_change_stream_message_retention_days(stream: Stream, message_retention_days: Optional[int]=None) -> None:
+
+def do_change_stream_message_retention_days(
+    stream: Stream, message_retention_days: Optional[int] = None
+) -> None:
     stream.message_retention_days = message_retention_days
     stream.save(update_fields=['message_retention_days'])
 
@@ -3802,8 +4364,10 @@ def do_change_stream_message_retention_days(stream: Stream, message_retention_da
     )
     send_event(stream.realm, event, can_access_stream_user_ids(stream))
 
-def do_create_realm(string_id: str, name: str,
-                    emails_restricted_to_domains: Optional[bool]=None) -> Realm:
+
+def do_create_realm(
+    string_id: str, name: str, emails_restricted_to_domains: Optional[bool] = None
+) -> Realm:
     if Realm.objects.filter(string_id=string_id).exists():
         raise AssertionError(f"Realm {string_id} already exists!")
     if not server_initialized():
@@ -3818,8 +4382,11 @@ def do_create_realm(string_id: str, name: str,
 
     # Create stream once Realm object has been saved
     notifications_stream = ensure_stream(
-        realm, Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
-        stream_description="Everyone is added to this stream by default. Welcome! :octopus:", acting_user=None)
+        realm,
+        Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
+        stream_description="Everyone is added to this stream by default. Welcome! :octopus:",
+        acting_user=None,
+    )
     realm.notifications_stream = notifications_stream
 
     # With the current initial streams situation, the only public
@@ -3827,8 +4394,12 @@ def do_create_realm(string_id: str, name: str,
     DefaultStream.objects.create(stream=notifications_stream, realm=realm)
 
     signup_notifications_stream = ensure_stream(
-        realm, Realm.INITIAL_PRIVATE_STREAM_NAME, invite_only=True,
-        stream_description="A private stream for core team members.", acting_user=None)
+        realm,
+        Realm.INITIAL_PRIVATE_STREAM_NAME,
+        invite_only=True,
+        stream_description="A private stream for core team members.",
+        acting_user=None,
+    )
     realm.signup_notifications_stream = signup_notifications_stream
 
     realm.save(update_fields=['notifications_stream', 'signup_notifications_stream'])
@@ -3859,17 +4430,22 @@ def do_create_realm(string_id: str, name: str,
         pass
     return realm
 
-def do_change_notification_settings(user_profile: UserProfile, name: str,
-                                    value: Union[bool, int, str],
-                                    acting_user: Optional[UserProfile]=None) -> None:
+
+def do_change_notification_settings(
+    user_profile: UserProfile,
+    name: str,
+    value: Union[bool, int, str],
+    acting_user: Optional[UserProfile] = None,
+) -> None:
     """Takes in a UserProfile object, the name of a global notification
     preference to update, and the value to update to
     """
 
     old_value = getattr(user_profile, name)
     notification_setting_type = UserProfile.notification_setting_types[name]
-    assert isinstance(value, notification_setting_type), (
-        f'Cannot update {name}: {value} is not an instance of {notification_setting_type}')
+    assert isinstance(
+        value, notification_setting_type
+    ), f'Cannot update {name}: {value} is not an instance of {notification_setting_type}'
 
     setattr(user_profile, name, value)
 
@@ -3878,36 +4454,49 @@ def do_change_notification_settings(user_profile: UserProfile, name: str,
         clear_scheduled_emails([user_profile.id], ScheduledEmail.DIGEST)
 
     user_profile.save(update_fields=[name])
-    event = {'type': 'update_global_notifications',
-             'user': user_profile.email,
-             'notification_name': name,
-             'setting': value}
+    event = {
+        'type': 'update_global_notifications',
+        'user': user_profile.email,
+        'notification_name': name,
+        'setting': value,
+    }
     event_time = timezone_now()
     RealmAuditLog.objects.create(
-        realm=user_profile.realm, event_type=RealmAuditLog.USER_NOTIFICATION_SETTINGS_CHANGED, event_time=event_time,
-        acting_user=acting_user, modified_user=user_profile, extra_data=orjson.dumps({
-            RealmAuditLog.OLD_VALUE: old_value,
-            RealmAuditLog.NEW_VALUE: value,
-            'property': name,
-        }).decode())
+        realm=user_profile.realm,
+        event_type=RealmAuditLog.USER_NOTIFICATION_SETTINGS_CHANGED,
+        event_time=event_time,
+        acting_user=acting_user,
+        modified_user=user_profile,
+        extra_data=orjson.dumps(
+            {
+                RealmAuditLog.OLD_VALUE: old_value,
+                RealmAuditLog.NEW_VALUE: value,
+                'property': name,
+            }
+        ).decode(),
+    )
 
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 def do_change_enter_sends(user_profile: UserProfile, enter_sends: bool) -> None:
     user_profile.enter_sends = enter_sends
     user_profile.save(update_fields=["enter_sends"])
 
-def do_set_user_display_setting(user_profile: UserProfile,
-                                setting_name: str,
-                                setting_value: Union[bool, str, int]) -> None:
+
+def do_set_user_display_setting(
+    user_profile: UserProfile, setting_name: str, setting_value: Union[bool, str, int]
+) -> None:
     property_type = UserProfile.property_types[setting_name]
     assert isinstance(setting_value, property_type)
     setattr(user_profile, setting_name, setting_value)
     user_profile.save(update_fields=[setting_name])
-    event = {'type': 'update_display_settings',
-             'user': user_profile.email,
-             'setting_name': setting_name,
-             'setting': setting_value}
+    event = {
+        'type': 'update_display_settings',
+        'user': user_profile.email,
+        'setting_name': setting_name,
+        'setting': setting_value,
+    }
     if setting_name == "default_language":
         assert isinstance(setting_value, str)
         event['language_name'] = get_language_name(setting_value)
@@ -3916,25 +4505,31 @@ def do_set_user_display_setting(user_profile: UserProfile,
 
     # Updates to the timezone display setting are sent to all users
     if setting_name == "timezone":
-        payload = dict(email=user_profile.email,
-                       user_id=user_profile.id,
-                       timezone=canonicalize_timezone(user_profile.timezone))
-        send_event(user_profile.realm,
-                   dict(type='realm_user', op='update', person=payload),
-                   active_user_ids(user_profile.realm_id))
+        payload = dict(
+            email=user_profile.email,
+            user_id=user_profile.id,
+            timezone=canonicalize_timezone(user_profile.timezone),
+        )
+        send_event(
+            user_profile.realm,
+            dict(type='realm_user', op='update', person=payload),
+            active_user_ids(user_profile.realm_id),
+        )
 
-def lookup_default_stream_groups(default_stream_group_names: List[str],
-                                 realm: Realm) -> List[DefaultStreamGroup]:
+
+def lookup_default_stream_groups(
+    default_stream_group_names: List[str], realm: Realm
+) -> List[DefaultStreamGroup]:
     default_stream_groups = []
     for group_name in default_stream_group_names:
         try:
-            default_stream_group = DefaultStreamGroup.objects.get(
-                name=group_name, realm=realm)
+            default_stream_group = DefaultStreamGroup.objects.get(name=group_name, realm=realm)
         except DefaultStreamGroup.DoesNotExist:
             raise JsonableError(_('Invalid default stream group {}').format(group_name))
         default_stream_groups.append(default_stream_group)
     return default_stream_groups
 
+
 def notify_default_streams(realm: Realm) -> None:
     event = dict(
         type="default_streams",
@@ -3942,13 +4537,17 @@ def notify_default_streams(realm: Realm) -> None:
     )
     send_event(realm, event, active_non_guest_user_ids(realm.id))
 
+
 def notify_default_stream_groups(realm: Realm) -> None:
     event = dict(
         type="default_stream_groups",
-        default_stream_groups=default_stream_groups_to_dicts_sorted(get_default_stream_groups(realm)),
+        default_stream_groups=default_stream_groups_to_dicts_sorted(
+            get_default_stream_groups(realm)
+        ),
     )
     send_event(realm, event, active_non_guest_user_ids(realm.id))
 
+
 def do_add_default_stream(stream: Stream) -> None:
     realm_id = stream.realm_id
     stream_id = stream.id
@@ -3956,65 +4555,87 @@ def do_add_default_stream(stream: Stream) -> None:
         DefaultStream.objects.create(realm_id=realm_id, stream_id=stream_id)
         notify_default_streams(stream.realm)
 
+
 def do_remove_default_stream(stream: Stream) -> None:
     realm_id = stream.realm_id
     stream_id = stream.id
     DefaultStream.objects.filter(realm_id=realm_id, stream_id=stream_id).delete()
     notify_default_streams(stream.realm)
 
-def do_create_default_stream_group(realm: Realm, group_name: str,
-                                   description: str, streams: List[Stream]) -> None:
+
+def do_create_default_stream_group(
+    realm: Realm, group_name: str, description: str, streams: List[Stream]
+) -> None:
     default_streams = get_default_streams_for_realm(realm.id)
     for stream in streams:
         if stream in default_streams:
-            raise JsonableError(_(
-                "'{stream_name}' is a default stream and cannot be added to '{group_name}'",
-            ).format(stream_name=stream.name, group_name=group_name))
+            raise JsonableError(
+                _(
+                    "'{stream_name}' is a default stream and cannot be added to '{group_name}'",
+                ).format(stream_name=stream.name, group_name=group_name)
+            )
 
     check_default_stream_group_name(group_name)
     (group, created) = DefaultStreamGroup.objects.get_or_create(
-        name=group_name, realm=realm, description=description)
+        name=group_name, realm=realm, description=description
+    )
     if not created:
-        raise JsonableError(_(
-            "Default stream group '{group_name}' already exists",
-        ).format(group_name=group_name))
+        raise JsonableError(
+            _(
+                "Default stream group '{group_name}' already exists",
+            ).format(group_name=group_name)
+        )
 
     group.streams.set(streams)
     notify_default_stream_groups(realm)
 
-def do_add_streams_to_default_stream_group(realm: Realm, group: DefaultStreamGroup,
-                                           streams: List[Stream]) -> None:
+
+def do_add_streams_to_default_stream_group(
+    realm: Realm, group: DefaultStreamGroup, streams: List[Stream]
+) -> None:
     default_streams = get_default_streams_for_realm(realm.id)
     for stream in streams:
         if stream in default_streams:
-            raise JsonableError(_(
-                "'{stream_name}' is a default stream and cannot be added to '{group_name}'",
-            ).format(stream_name=stream.name, group_name=group.name))
+            raise JsonableError(
+                _(
+                    "'{stream_name}' is a default stream and cannot be added to '{group_name}'",
+                ).format(stream_name=stream.name, group_name=group.name)
+            )
         if stream in group.streams.all():
-            raise JsonableError(_(
-                "Stream '{stream_name}' is already present in default stream group '{group_name}'",
-            ).format(stream_name=stream.name, group_name=group.name))
+            raise JsonableError(
+                _(
+                    "Stream '{stream_name}' is already present in default stream group '{group_name}'",
+                ).format(stream_name=stream.name, group_name=group.name)
+            )
         group.streams.add(stream)
 
     group.save()
     notify_default_stream_groups(realm)
 
-def do_remove_streams_from_default_stream_group(realm: Realm, group: DefaultStreamGroup,
-                                                streams: List[Stream]) -> None:
+
+def do_remove_streams_from_default_stream_group(
+    realm: Realm, group: DefaultStreamGroup, streams: List[Stream]
+) -> None:
     for stream in streams:
         if stream not in group.streams.all():
-            raise JsonableError(_(
-                "Stream '{stream_name}' is not present in default stream group '{group_name}'",
-            ).format(stream_name=stream.name, group_name=group.name))
+            raise JsonableError(
+                _(
+                    "Stream '{stream_name}' is not present in default stream group '{group_name}'",
+                ).format(stream_name=stream.name, group_name=group.name)
+            )
         group.streams.remove(stream)
 
     group.save()
     notify_default_stream_groups(realm)
 
-def do_change_default_stream_group_name(realm: Realm, group: DefaultStreamGroup,
-                                        new_group_name: str) -> None:
+
+def do_change_default_stream_group_name(
+    realm: Realm, group: DefaultStreamGroup, new_group_name: str
+) -> None:
     if group.name == new_group_name:
-        raise JsonableError(_("This default stream group is already named '{}'").format(new_group_name))
+        raise JsonableError(
+            _("This default stream group is already named '{}'").format(new_group_name)
+        )
 
     if DefaultStreamGroup.objects.filter(name=new_group_name, realm=realm).exists():
         raise JsonableError(_("Default stream group '{}' already exists").format(new_group_name))
@@ -4023,34 +4644,45 @@ def do_change_default_stream_group_name(realm: Realm, group: DefaultStreamGroup,
     group.save()
     notify_default_stream_groups(realm)
 
-def do_change_default_stream_group_description(realm: Realm, group: DefaultStreamGroup,
-                                               new_description: str) -> None:
+
+def do_change_default_stream_group_description(
+    realm: Realm, group: DefaultStreamGroup, new_description: str
+) -> None:
     group.description = new_description
     group.save()
     notify_default_stream_groups(realm)
 
+
 def do_remove_default_stream_group(realm: Realm, group: DefaultStreamGroup) -> None:
     group.delete()
     notify_default_stream_groups(realm)
 
+
 def get_default_streams_for_realm(realm_id: int) -> List[Stream]:
-    return [default.stream for default in
-            DefaultStream.objects.select_related().filter(realm_id=realm_id)]
+    return [
+        default.stream
+        for default in DefaultStream.objects.select_related().filter(realm_id=realm_id)
+    ]
+
 
 def get_default_subs(user_profile: UserProfile) -> List[Stream]:
     # Right now default streams are realm-wide.  This wrapper gives us flexibility
     # to some day further customize how we set up default streams for new users.
     return get_default_streams_for_realm(user_profile.realm_id)
 
+
 # returns default streams in json serializeable format
 def streams_to_dicts_sorted(streams: List[Stream]) -> List[Dict[str, Any]]:
     return sorted((stream.to_dict() for stream in streams), key=lambda elt: elt["name"])
 
+
 def default_stream_groups_to_dicts_sorted(groups: List[DefaultStreamGroup]) -> List[Dict[str, Any]]:
     return sorted((group.to_dict() for group in groups), key=lambda elt: elt["name"])
 
-def do_update_user_activity_interval(user_profile: UserProfile,
-                                     log_time: datetime.datetime) -> None:
+
+def do_update_user_activity_interval(
+    user_profile: UserProfile, log_time: datetime.datetime
+) -> None:
     effective_end = log_time + UserActivityInterval.MIN_INTERVAL_LENGTH
     # This code isn't perfect, because with various races we might end
     # up creating two overlapping intervals, but that shouldn't happen
@@ -4061,8 +4693,9 @@ def do_update_user_activity_interval(user_profile: UserProfile,
         # (1) The start of the new interval could be inside the old interval
         # (2) The end of the new interval could be inside the old interval
         # In either case, we just extend the old interval to include the new interval.
-        if ((log_time <= last.end and log_time >= last.start) or
-                (effective_end <= last.end and effective_end >= last.start)):
+        if (log_time <= last.end and log_time >= last.start) or (
+            effective_end <= last.end and effective_end >= last.start
+        ):
             last.end = max(last.end, effective_end)
             last.start = min(last.start, log_time)
             last.save(update_fields=["start", "end"])
@@ -4071,35 +4704,40 @@ def do_update_user_activity_interval(user_profile: UserProfile,
         pass
 
     # Otherwise, the intervals don't overlap, so we should make a new one
-    UserActivityInterval.objects.create(user_profile=user_profile, start=log_time,
-                                        end=effective_end)
+    UserActivityInterval.objects.create(
+        user_profile=user_profile, start=log_time, end=effective_end
+    )
+
 
 @statsd_increment('user_activity')
-def do_update_user_activity(user_profile_id: int,
-                            client_id: int,
-                            query: str,
-                            count: int,
-                            log_time: datetime.datetime) -> None:
+def do_update_user_activity(
+    user_profile_id: int, client_id: int, query: str, count: int, log_time: datetime.datetime
+) -> None:
     (activity, created) = UserActivity.objects.get_or_create(
-        user_profile_id = user_profile_id,
-        client_id = client_id,
-        query = query,
-        defaults={'last_visit': log_time, 'count': count})
+        user_profile_id=user_profile_id,
+        client_id=client_id,
+        query=query,
+        defaults={'last_visit': log_time, 'count': count},
+    )
 
     if not created:
         activity.count += count
         activity.last_visit = log_time
         activity.save(update_fields=["last_visit", "count"])
 
+
 def send_presence_changed(user_profile: UserProfile, presence: UserPresence) -> None:
     presence_dict = presence.to_dict()
-    event = dict(type="presence",
-                 email=user_profile.email,
-                 user_id=user_profile.id,
-                 server_timestamp=time.time(),
-                 presence={presence_dict['client']: presence_dict})
+    event = dict(
+        type="presence",
+        email=user_profile.email,
+        user_id=user_profile.id,
+        server_timestamp=time.time(),
+        presence={presence_dict['client']: presence_dict},
+    )
     send_event(user_profile.realm, event, active_user_ids(user_profile.realm_id))
 
+
 def consolidate_client(client: Client) -> Client:
     # The web app reports a client as 'website'
     # The desktop app reports a client as ZulipDesktop
@@ -4112,11 +4750,11 @@ def consolidate_client(client: Client) -> Client:
     else:
         return client
 
+
 @statsd_increment('user_presence')
-def do_update_user_presence(user_profile: UserProfile,
-                            client: Client,
-                            log_time: datetime.datetime,
-                            status: int) -> None:
+def do_update_user_presence(
+    user_profile: UserProfile, client: Client, log_time: datetime.datetime, status: int
+) -> None:
     client = consolidate_client(client)
 
     defaults = dict(
@@ -4126,9 +4764,9 @@ def do_update_user_presence(user_profile: UserProfile,
     )
 
     (presence, created) = UserPresence.objects.get_or_create(
-        user_profile = user_profile,
-        client = client,
-        defaults = defaults,
+        user_profile=user_profile,
+        client=client,
+        defaults=defaults,
     )
 
     stale_status = (log_time - presence.timestamp) > datetime.timedelta(minutes=1, seconds=10)
@@ -4167,27 +4805,35 @@ def do_update_user_presence(user_profile: UserProfile,
         # realms are pretty small.
         send_presence_changed(user_profile, presence)
 
+
 def update_user_activity_interval(user_profile: UserProfile, log_time: datetime.datetime) -> None:
-    event = {'user_profile_id': user_profile.id,
-             'time': datetime_to_timestamp(log_time)}
+    event = {'user_profile_id': user_profile.id, 'time': datetime_to_timestamp(log_time)}
     queue_json_publish("user_activity_interval", event)
 
-def update_user_presence(user_profile: UserProfile, client: Client, log_time: datetime.datetime,
-                         status: int, new_user_input: bool) -> None:
-    event = {'user_profile_id': user_profile.id,
-             'status': status,
-             'time': datetime_to_timestamp(log_time),
-             'client': client.name}
+
+def update_user_presence(
+    user_profile: UserProfile,
+    client: Client,
+    log_time: datetime.datetime,
+    status: int,
+    new_user_input: bool,
+) -> None:
+    event = {
+        'user_profile_id': user_profile.id,
+        'status': status,
+        'time': datetime_to_timestamp(log_time),
+        'client': client.name,
+    }
 
     queue_json_publish("user_presence", event)
 
     if new_user_input:
         update_user_activity_interval(user_profile, log_time)
 
-def do_update_user_status(user_profile: UserProfile,
-                          away: Optional[bool],
-                          status_text: Optional[str],
-                          client_id: int) -> None:
+
+def do_update_user_status(
+    user_profile: UserProfile, away: Optional[bool], status_text: Optional[str], client_id: int
+) -> None:
     if away is None:
         status = None
     elif away:
@@ -4217,21 +4863,24 @@ def do_update_user_status(user_profile: UserProfile,
 
     send_event(realm, event, active_user_ids(realm.id))
 
+
 def do_mark_all_as_read(user_profile: UserProfile, client: Client) -> int:
     log_statsd_event('bankruptcy')
 
     # First, we clear mobile push notifications.  This is safer in the
     # event that the below logic times out and we're killed.
-    all_push_message_ids = UserMessage.objects.filter(
-        user_profile=user_profile,
-    ).extra(
-        where=[UserMessage.where_active_push_notification()],
-    ).values_list("message_id", flat=True)[0:10000]
+    all_push_message_ids = (
+        UserMessage.objects.filter(
+            user_profile=user_profile,
+        )
+        .extra(
+            where=[UserMessage.where_active_push_notification()],
+        )
+        .values_list("message_id", flat=True)[0:10000]
+    )
     do_clear_mobile_push_notifications_for_ids([user_profile.id], all_push_message_ids)
 
-    msgs = UserMessage.objects.filter(
-        user_profile=user_profile
-    ).extra(
+    msgs = UserMessage.objects.filter(user_profile=user_profile).extra(
         where=[UserMessage.where_unread()],
     )
 
@@ -4241,7 +4890,7 @@ def do_mark_all_as_read(user_profile: UserProfile, client: Client) -> int:
 
     event = dict(
         type='update_message_flags',
-        op ='add',
+        op='add',
         operation='add',
         flag='read',
         messages=[],  # we don't send messages, since the client reloads anyway
@@ -4251,17 +4900,22 @@ def do_mark_all_as_read(user_profile: UserProfile, client: Client) -> int:
 
     send_event(user_profile.realm, event, [user_profile.id])
 
-    do_increment_logging_stat(user_profile, COUNT_STATS['messages_read::hour'],
-                              None, event_time, increment=count)
-    do_increment_logging_stat(user_profile, COUNT_STATS['messages_read_interactions::hour'],
-                              None, event_time, increment=min(1, count))
+    do_increment_logging_stat(
+        user_profile, COUNT_STATS['messages_read::hour'], None, event_time, increment=count
+    )
+    do_increment_logging_stat(
+        user_profile,
+        COUNT_STATS['messages_read_interactions::hour'],
+        None,
+        event_time,
+        increment=min(1, count),
+    )
 
     return count
 
+
 def do_mark_stream_messages_as_read(
-    user_profile: UserProfile,
-    stream_recipient_id: int,
-    topic_name: Optional[str]=None
+    user_profile: UserProfile, stream_recipient_id: int, topic_name: Optional[str] = None
 ) -> int:
     log_statsd_event('mark_stream_as_read')
 
@@ -4300,15 +4954,22 @@ def do_mark_stream_messages_as_read(
     send_event(user_profile.realm, event, [user_profile.id])
     do_clear_mobile_push_notifications_for_ids([user_profile.id], message_ids)
 
-    do_increment_logging_stat(user_profile, COUNT_STATS['messages_read::hour'],
-                              None, event_time, increment=count)
-    do_increment_logging_stat(user_profile, COUNT_STATS['messages_read_interactions::hour'],
-                              None, event_time, increment=min(1, count))
+    do_increment_logging_stat(
+        user_profile, COUNT_STATS['messages_read::hour'], None, event_time, increment=count
+    )
+    do_increment_logging_stat(
+        user_profile,
+        COUNT_STATS['messages_read_interactions::hour'],
+        None,
+        event_time,
+        increment=min(1, count),
+    )
     return count
 
-def do_update_mobile_push_notification(message: Message,
-                                       prior_mention_user_ids: Set[int],
-                                       stream_push_user_ids: Set[int]) -> None:
+
+def do_update_mobile_push_notification(
+    message: Message, prior_mention_user_ids: Set[int], stream_push_user_ids: Set[int]
+) -> None:
     # Called during the message edit code path to remove mobile push
     # notifications for users who are no longer mentioned following
     # the edit.  See #15428 for details.
@@ -4323,8 +4984,10 @@ def do_update_mobile_push_notification(message: Message,
     remove_notify_users = prior_mention_user_ids - message.mentions_user_ids - stream_push_user_ids
     do_clear_mobile_push_notifications_for_ids(list(remove_notify_users), [message.id])
 
-def do_clear_mobile_push_notifications_for_ids(user_profile_ids: List[int],
-                                               message_ids: List[int]) -> None:
+
+def do_clear_mobile_push_notifications_for_ids(
+    user_profile_ids: List[int], message_ids: List[int]
+) -> None:
     if len(message_ids) == 0:
         return
 
@@ -4333,30 +4996,35 @@ def do_clear_mobile_push_notifications_for_ids(user_profile_ids: List[int],
     assert len(user_profile_ids) == 1 or len(message_ids) == 1
 
     messages_by_user = defaultdict(list)
-    notifications_to_update = list(UserMessage.objects.filter(
-        message_id__in=message_ids,
-        user_profile_id__in=user_profile_ids,
-    ).extra(
-        where=[UserMessage.where_active_push_notification()],
-    ).values_list('user_profile_id', 'message_id'))
+    notifications_to_update = list(
+        UserMessage.objects.filter(
+            message_id__in=message_ids,
+            user_profile_id__in=user_profile_ids,
+        )
+        .extra(
+            where=[UserMessage.where_active_push_notification()],
+        )
+        .values_list('user_profile_id', 'message_id')
+    )
 
     for (user_id, message_id) in notifications_to_update:
         messages_by_user[user_id].append(message_id)
 
     for (user_profile_id, event_message_ids) in messages_by_user.items():
-        queue_json_publish("missedmessage_mobile_notifications", {
-            "type": "remove",
-            "user_profile_id": user_profile_id,
-            "message_ids": event_message_ids,
-        })
+        queue_json_publish(
+            "missedmessage_mobile_notifications",
+            {
+                "type": "remove",
+                "user_profile_id": user_profile_id,
+                "message_ids": event_message_ids,
+            },
+        )
 
-def do_update_message_flags(user_profile: UserProfile,
-                            client: Client,
-                            operation: str,
-                            flag: str,
-                            messages: List[int]) -> int:
-    valid_flags = [item for item in UserMessage.flags
-                   if item not in UserMessage.NON_API_FLAGS]
+
+def do_update_message_flags(
+    user_profile: UserProfile, client: Client, operation: str, flag: str, messages: List[int]
+) -> int:
+    valid_flags = [item for item in UserMessage.flags if item not in UserMessage.NON_API_FLAGS]
     if flag not in valid_flags:
         raise JsonableError(_("Invalid flag: '{}'").format(flag))
     if flag in UserMessage.NON_EDITABLE_FLAGS:
@@ -4365,8 +5033,7 @@ def do_update_message_flags(user_profile: UserProfile,
         raise JsonableError(_("Invalid message flag operation: '{}'").format(operation))
     flagattr = getattr(UserMessage.flags, flag)
 
-    msgs = UserMessage.objects.filter(user_profile=user_profile,
-                                      message__id__in=messages)
+    msgs = UserMessage.objects.filter(user_profile=user_profile, message__id__in=messages)
     # This next block allows you to star any message, even those you
     # didn't receive (e.g. because you're looking at a public stream
     # you're not subscribed to, etc.).  The problem is that starring
@@ -4387,42 +5054,58 @@ def do_update_message_flags(user_profile: UserProfile,
         # to via narrowing to the stream it is on, even though you
         # didn't actually receive it.  So we create a historical,
         # read UserMessage message row for you to star.
-        UserMessage.objects.create(user_profile=user_profile,
-                                   message=message,
-                                   flags=UserMessage.flags.historical | UserMessage.flags.read)
+        UserMessage.objects.create(
+            user_profile=user_profile,
+            message=message,
+            flags=UserMessage.flags.historical | UserMessage.flags.read,
+        )
 
     if operation == 'add':
         count = msgs.update(flags=F('flags').bitor(flagattr))
     elif operation == 'remove':
         count = msgs.update(flags=F('flags').bitand(~flagattr))
 
-    event = {'type': 'update_message_flags',
-             'op': operation,
-             'operation': operation,
-             'flag': flag,
-             'messages': messages,
-             'all': False}
+    event = {
+        'type': 'update_message_flags',
+        'op': operation,
+        'operation': operation,
+        'flag': flag,
+        'messages': messages,
+        'all': False,
+    }
     send_event(user_profile.realm, event, [user_profile.id])
 
     if flag == "read" and operation == "add":
         event_time = timezone_now()
         do_clear_mobile_push_notifications_for_ids([user_profile.id], messages)
 
-        do_increment_logging_stat(user_profile, COUNT_STATS['messages_read::hour'],
-                                  None, event_time, increment=count)
-        do_increment_logging_stat(user_profile, COUNT_STATS['messages_read_interactions::hour'],
-                                  None, event_time, increment=min(1, count))
+        do_increment_logging_stat(
+            user_profile, COUNT_STATS['messages_read::hour'], None, event_time, increment=count
+        )
+        do_increment_logging_stat(
+            user_profile,
+            COUNT_STATS['messages_read_interactions::hour'],
+            None,
+            event_time,
+            increment=min(1, count),
+        )
     return count
 
+
 class MessageUpdateUserInfoResult(TypedDict):
     message_user_ids: Set[int]
     mention_user_ids: Set[int]
 
-def notify_topic_moved_streams(user_profile: UserProfile,
-                               old_stream: Stream, old_topic: str,
-                               new_stream: Stream, new_topic: Optional[str],
-                               send_notification_to_old_thread: bool,
-                               send_notification_to_new_thread: bool) -> None:
+
+def notify_topic_moved_streams(
+    user_profile: UserProfile,
+    old_stream: Stream,
+    old_topic: str,
+    new_stream: Stream,
+    new_topic: Optional[str],
+    send_notification_to_old_thread: bool,
+    send_notification_to_new_thread: bool,
+) -> None:
     # Since moving content between streams is highly disruptive,
     # it's worth adding a couple tombstone messages showing what
     # happened.
@@ -4437,9 +5120,13 @@ def notify_topic_moved_streams(user_profile: UserProfile,
     if send_notification_to_new_thread:
         with override_language(new_stream.realm.default_language):
             internal_send_stream_message(
-                new_stream.realm, sender, new_stream, new_topic,
+                new_stream.realm,
+                sender,
+                new_stream,
+                new_topic,
                 _("This topic was moved here from {old_location} by {user}").format(
-                    old_location=old_topic_link, user=user_mention,
+                    old_location=old_topic_link,
+                    user=user_mention,
                 ),
             )
 
@@ -4447,12 +5134,17 @@ def notify_topic_moved_streams(user_profile: UserProfile,
         with override_language(old_stream.realm.default_language):
             # Send a notification to the old stream that the topic was moved.
             internal_send_stream_message(
-                old_stream.realm, sender, old_stream, old_topic,
+                old_stream.realm,
+                sender,
+                old_stream,
+                old_topic,
                 _("This topic was moved by {user} to {new_location}").format(
-                    user=user_mention, new_location=new_topic_link,
+                    user=user_mention,
+                    new_location=new_topic_link,
                 ),
             )
 
+
 def get_user_info_for_message_updates(message_id: int) -> MessageUpdateUserInfoResult:
 
     # We exclude UserMessage.flags.historical rows since those
@@ -4466,24 +5158,18 @@ def get_user_info_for_message_updates(message_id: int) -> MessageUpdateUserInfoR
     ).values('user_profile_id', 'flags')
     rows = list(query)
 
-    message_user_ids = {
-        row['user_profile_id']
-        for row in rows
-    }
+    message_user_ids = {row['user_profile_id'] for row in rows}
 
     mask = UserMessage.flags.mentioned | UserMessage.flags.wildcard_mentioned
 
-    mention_user_ids = {
-        row['user_profile_id']
-        for row in rows
-        if int(row['flags']) & mask
-    }
+    mention_user_ids = {row['user_profile_id'] for row in rows if int(row['flags']) & mask}
 
     return dict(
         message_user_ids=message_user_ids,
         mention_user_ids=mention_user_ids,
     )
 
+
 def update_user_message_flags(message: Message, ums: Iterable[UserMessage]) -> None:
     wildcard = message.mentions_wildcard
     mentioned_ids = message.mentions_user_ids
@@ -4496,7 +5182,7 @@ def update_user_message_flags(message: Message, ums: Iterable[UserMessage]) -> N
                 um.flags |= flag
                 changed_ums.add(um)
         else:
-            if (um.flags & flag):
+            if um.flags & flag:
                 um.flags &= ~flag
                 changed_ums.add(um)
 
@@ -4512,7 +5198,10 @@ def update_user_message_flags(message: Message, ums: Iterable[UserMessage]) -> N
     for um in changed_ums:
         um.save(update_fields=['flags'])
 
-def update_to_dict_cache(changed_messages: List[Message], realm_id: Optional[int]=None) -> List[int]:
+
+def update_to_dict_cache(
+    changed_messages: List[Message], realm_id: Optional[int] = None
+) -> List[int]:
     """Updates the message as stored in the to_dict cache (for serving
     messages)."""
     items_for_remote_cache = {}
@@ -4526,15 +5215,16 @@ def update_to_dict_cache(changed_messages: List[Message], realm_id: Optional[int
     cache_set_many(items_for_remote_cache)
     return message_ids
 
+
 # We use transaction.atomic to support select_for_update in the attachment codepath.
 @transaction.atomic
-def do_update_embedded_data(user_profile: UserProfile,
-                            message: Message,
-                            content: Optional[str],
-                            rendered_content: Optional[str]) -> None:
-    event: Dict[str, Any] = {
-        'type': 'update_message',
-        'message_id': message.id}
+def do_update_embedded_data(
+    user_profile: UserProfile,
+    message: Message,
+    content: Optional[str],
+    rendered_content: Optional[str],
+) -> None:
+    event: Dict[str, Any] = {'type': 'update_message', 'message_id': message.id}
     changed_messages = [message]
 
     ums = UserMessage.objects.filter(message=message.id)
@@ -4556,8 +5246,10 @@ def do_update_embedded_data(user_profile: UserProfile,
             'id': um.user_profile_id,
             'flags': um.flags_list(),
         }
+
     send_event(user_profile.realm, event, list(map(user_info, ums)))
 
+
 class DeleteMessagesEvent(TypedDict, total=False):
     type: str
     message_ids: List[int]
@@ -4567,14 +5259,23 @@ class DeleteMessagesEvent(TypedDict, total=False):
     topic: str
     stream_id: int
 
+
 # We use transaction.atomic to support select_for_update in the attachment codepath.
 @transaction.atomic
-def do_update_message(user_profile: UserProfile, message: Message,
-                      new_stream: Optional[Stream], topic_name: Optional[str],
-                      propagate_mode: str, send_notification_to_old_thread: bool,
-                      send_notification_to_new_thread: bool, content: Optional[str],
-                      rendered_content: Optional[str], prior_mention_user_ids: Set[int],
-                      mention_user_ids: Set[int], mention_data: Optional[MentionData]=None) -> int:
+def do_update_message(
+    user_profile: UserProfile,
+    message: Message,
+    new_stream: Optional[Stream],
+    topic_name: Optional[str],
+    propagate_mode: str,
+    send_notification_to_old_thread: bool,
+    send_notification_to_new_thread: bool,
+    content: Optional[str],
+    rendered_content: Optional[str],
+    prior_mention_user_ids: Set[int],
+    mention_user_ids: Set[int],
+    mention_data: Optional[MentionData] = None,
+) -> int:
     """
     The main function for message editing.  A message edit event can
     modify:
@@ -4680,7 +5381,9 @@ def do_update_message(user_profile: UserProfile, message: Message,
         else:
             event['wildcard_mention_user_ids'] = []
 
-        do_update_mobile_push_notification(message, prior_mention_user_ids, info['stream_push_user_ids'])
+        do_update_mobile_push_notification(
+            message, prior_mention_user_ids, info['stream_push_user_ids']
+        )
 
     if topic_name is not None or new_stream is not None:
         orig_topic_name = message.topic_name()
@@ -4708,27 +5411,30 @@ def do_update_message(user_profile: UserProfile, message: Message,
         # though the messages were deleted, and we should send a
         # delete_message event to them instead.
 
-        subscribers = get_active_subscriptions_for_stream_id(
-            stream_id).select_related("user_profile")
-        subs_to_new_stream = list(get_active_subscriptions_for_stream_id(
-            new_stream.id).select_related("user_profile"))
+        subscribers = get_active_subscriptions_for_stream_id(stream_id).select_related(
+            "user_profile"
+        )
+        subs_to_new_stream = list(
+            get_active_subscriptions_for_stream_id(new_stream.id).select_related("user_profile")
+        )
 
         old_stream_sub_ids = [user.user_profile_id for user in subscribers]
         new_stream_sub_ids = [user.user_profile_id for user in subs_to_new_stream]
 
         # Get users who aren't subscribed to the new_stream.
-        subs_losing_usermessages  = [
-            sub for sub in subscribers
-            if sub.user_profile_id not in new_stream_sub_ids
+        subs_losing_usermessages = [
+            sub for sub in subscribers if sub.user_profile_id not in new_stream_sub_ids
         ]
         # Users who can longer access the message without some action
         # from administrators.
         subs_losing_access = [
-            sub for sub in subs_losing_usermessages
+            sub
+            for sub in subs_losing_usermessages
             if sub.user_profile.is_guest or not new_stream.is_public()
         ]
-        ums = ums.exclude(user_profile_id__in=[
-            sub.user_profile_id for sub in subs_losing_usermessages])
+        ums = ums.exclude(
+            user_profile_id__in=[sub.user_profile_id for sub in subs_losing_usermessages]
+        )
 
         subs_gaining_usermessages = []
         if not new_stream.is_history_public_to_subscribers():
@@ -4737,8 +5443,7 @@ def do_update_message(user_profile: UserProfile, message: Message,
             # and create new UserMessage for these users so that they can
             # access this message.
             subs_gaining_usermessages += [
-                user_id for user_id in new_stream_sub_ids
-                if user_id not in old_stream_sub_ids
+                user_id for user_id in new_stream_sub_ids if user_id not in old_stream_sub_ids
             ]
 
     if topic_name is not None:
@@ -4762,7 +5467,7 @@ def do_update_message(user_profile: UserProfile, message: Message,
             new_stream=new_stream,
             old_recipient_id=old_recipient_id,
             edit_history_event=edit_history_event,
-            last_edit_time=timestamp
+            last_edit_time=timestamp,
         )
         changed_messages += messages_list
 
@@ -4793,8 +5498,7 @@ def do_update_message(user_profile: UserProfile, message: Message,
             # longer have access to these messages.  Note: This could be
             # very expensive, since it's N guest users x M messages.
             UserMessage.objects.filter(
-                user_profile_id__in=[sub.user_profile_id for sub in
-                                     subs_losing_usermessages],
+                user_profile_id__in=[sub.user_profile_id for sub in subs_losing_usermessages],
                 message_id__in=message_ids,
             ).delete()
 
@@ -4854,7 +5558,9 @@ def do_update_message(user_profile: UserProfile, message: Message,
             # in users_to_be_notified list.  This is the case where a
             # user both has a UserMessage row and is a current
             # Subscriber
-            subscribers = subscribers.exclude(user_profile_id__in=[um.user_profile_id for um in ums])
+            subscribers = subscribers.exclude(
+                user_profile_id__in=[um.user_profile_id for um in ums]
+            )
 
             if new_stream is not None:
                 assert delete_event_notify_user_ids is not None
@@ -4877,27 +5583,34 @@ def do_update_message(user_profile: UserProfile, message: Message,
                 # subscribers of the old stream but are subscribed to
                 # the new stream; clients will be confused.
                 old_stream_unsubbed_guests = [
-                    sub for sub in subs_to_new_stream
-                    if sub.user_profile.is_guest
-                    and sub.user_profile_id not in subscriber_ids
+                    sub
+                    for sub in subs_to_new_stream
+                    if sub.user_profile.is_guest and sub.user_profile_id not in subscriber_ids
                 ]
-                subscribers = subscribers.exclude(user_profile_id__in=[
-                    sub.user_profile_id for sub in old_stream_unsubbed_guests])
+                subscribers = subscribers.exclude(
+                    user_profile_id__in=[sub.user_profile_id for sub in old_stream_unsubbed_guests]
+                )
                 subscriber_ids = [user.user_profile_id for user in subscribers]
 
             users_to_be_notified += list(map(subscriber_info, subscriber_ids))
 
     send_event(user_profile.realm, event, users_to_be_notified)
 
-    if (len(changed_messages) > 0 and new_stream is not None and
-            stream_being_edited is not None):
+    if len(changed_messages) > 0 and new_stream is not None and stream_being_edited is not None:
         # Notify users that the topic was moved.
-        notify_topic_moved_streams(user_profile, stream_being_edited, orig_topic_name,
-                                   new_stream, topic_name, send_notification_to_old_thread,
-                                   send_notification_to_new_thread)
+        notify_topic_moved_streams(
+            user_profile,
+            stream_being_edited,
+            orig_topic_name,
+            new_stream,
+            topic_name,
+            send_notification_to_old_thread,
+            send_notification_to_new_thread,
+        )
 
     return len(changed_messages)
 
+
 def do_delete_messages(realm: Realm, messages: Iterable[Message]) -> None:
     # messages in delete_message event belong to the same topic
     # or is a single private message, as any other behaviour is not possible with
@@ -4941,17 +5654,20 @@ def do_delete_messages(realm: Realm, messages: Iterable[Message]) -> None:
     event['message_type'] = message_type
     send_event(realm, event, users_to_notify)
 
+
 def do_delete_messages_by_sender(user: UserProfile) -> None:
-    message_ids = list(Message.objects.filter(sender=user).values_list('id', flat=True).order_by('id'))
+    message_ids = list(
+        Message.objects.filter(sender=user).values_list('id', flat=True).order_by('id')
+    )
     if message_ids:
         move_messages_to_archive(message_ids, chunk_size=retention.STREAM_MESSAGE_BATCH_SIZE)
 
+
 def get_streams_traffic(stream_ids: Set[int]) -> Dict[int, int]:
     stat = COUNT_STATS['messages_in_stream:is_bot:day']
     traffic_from = timezone_now() - datetime.timedelta(days=28)
 
-    query = StreamCount.objects.filter(property=stat.property,
-                                       end_time__gt=traffic_from)
+    query = StreamCount.objects.filter(property=stat.property, end_time__gt=traffic_from)
     query = query.filter(stream_id__in=stream_ids)
 
     traffic_list = query.values('stream_id').annotate(value=Sum('value'))
@@ -4961,13 +5677,17 @@ def get_streams_traffic(stream_ids: Set[int]) -> Dict[int, int]:
 
     return traffic_dict
 
+
 def round_to_2_significant_digits(number: int) -> int:
     return int(round(number, 2 - len(str(number))))
 
+
 STREAM_TRAFFIC_CALCULATION_MIN_AGE_DAYS = 7
 
-def get_average_weekly_stream_traffic(stream_id: int, stream_date_created: datetime.datetime,
-                                      recent_traffic: Dict[int, int]) -> Optional[int]:
+
+def get_average_weekly_stream_traffic(
+    stream_id: int, stream_date_created: datetime.datetime, recent_traffic: Dict[int, int]
+) -> Optional[int]:
     try:
         stream_traffic = recent_traffic[stream_id]
     except KeyError:
@@ -4987,6 +5707,7 @@ def get_average_weekly_stream_traffic(stream_id: int, stream_date_created: datet
 
     return round_to_2_significant_digits(average_weekly_traffic)
 
+
 def get_web_public_subs(realm: Realm) -> SubscriptionInfo:
     color_idx = 0
 
@@ -5009,9 +5730,9 @@ def get_web_public_subs(realm: Realm) -> SubscriptionInfo:
         stream_dict['push_notifications'] = True
         stream_dict['email_notifications'] = True
         stream_dict['pin_to_top'] = False
-        stream_weekly_traffic = get_average_weekly_stream_traffic(stream.id,
-                                                                  stream.date_created,
-                                                                  {})
+        stream_weekly_traffic = get_average_weekly_stream_traffic(
+            stream.id, stream.date_created, {}
+        )
         stream_dict['stream_weekly_traffic'] = stream_weekly_traffic
         stream_dict['email_address'] = ''
         subscribed.append(stream_dict)
@@ -5022,6 +5743,7 @@ def get_web_public_subs(realm: Realm) -> SubscriptionInfo:
         never_subscribed=[],
     )
 
+
 def build_stream_dict_for_sub(
     user: UserProfile,
     sub: Subscription,
@@ -5051,19 +5773,23 @@ def build_stream_dict_for_sub(
     # Backwards-compatibility for clients that haven't been
     # updated for the is_announcement_only -> stream_post_policy
     # migration.
-    result["is_announcement_only"] = \
+    result["is_announcement_only"] = (
         stream["stream_post_policy"] == Stream.STREAM_POST_POLICY_ADMINS
+    )
 
     # Add a few computed fields not directly from the data models.
     result["stream_weekly_traffic"] = get_average_weekly_stream_traffic(
-        stream["id"], stream["date_created"], recent_traffic)
+        stream["id"], stream["date_created"], recent_traffic
+    )
 
     result["email_address"] = encode_email_address_helper(
-        stream["name"], stream["email_token"], show_sender=True)
+        stream["name"], stream["email_token"], show_sender=True
+    )
 
     # Our caller may add a subscribers field.
     return result
 
+
 def build_stream_dict_for_never_sub(
     stream: Stream,
     recent_traffic: Dict[int, int],
@@ -5079,21 +5805,25 @@ def build_stream_dict_for_never_sub(
         result[field_name] = stream[field_name]
 
     result["stream_weekly_traffic"] = get_average_weekly_stream_traffic(
-        stream["id"], stream["date_created"], recent_traffic)
+        stream["id"], stream["date_created"], recent_traffic
+    )
 
     # Backwards-compatibility addition of removed field.
-    result["is_announcement_only"] = stream["stream_post_policy"] == Stream.STREAM_POST_POLICY_ADMINS
+    result["is_announcement_only"] = (
+        stream["stream_post_policy"] == Stream.STREAM_POST_POLICY_ADMINS
+    )
 
     # Our caller may add a subscribers field.
     return result
 
+
 # In general, it's better to avoid using .values() because it makes
 # the code pretty ugly, but in this case, it has significant
 # performance impact for loading / for users with large numbers of
 # subscriptions, so it's worth optimizing.
 def gather_subscriptions_helper(
     user_profile: UserProfile,
-    include_subscribers: bool=True,
+    include_subscribers: bool = True,
 ) -> SubscriptionInfo:
     realm = user_profile.realm
     all_streams = get_active_streams(realm).values(
@@ -5108,17 +5838,18 @@ def gather_subscriptions_helper(
     recip_id_to_stream_id = {stream["recipient_id"]: stream["id"] for stream in all_streams}
     all_streams_map = {stream["id"]: stream for stream in all_streams}
 
-    sub_dicts = get_stream_subscriptions_for_user(user_profile).values(
-        *Subscription.API_FIELDS,
-        "recipient_id",
-        "active",
-    ).order_by("recipient_id")
+    sub_dicts = (
+        get_stream_subscriptions_for_user(user_profile)
+        .values(
+            *Subscription.API_FIELDS,
+            "recipient_id",
+            "active",
+        )
+        .order_by("recipient_id")
+    )
 
     # We only care about subscriptions for active streams.
-    sub_dicts = [
-        sub for sub in sub_dicts
-        if recip_id_to_stream_id.get(sub["recipient_id"])
-    ]
+    sub_dicts = [sub for sub in sub_dicts if recip_id_to_stream_id.get(sub["recipient_id"])]
 
     def get_stream_id(sub: Subscription) -> int:
         return recip_id_to_stream_id[sub["recipient_id"]]
@@ -5159,16 +5890,14 @@ def gather_subscriptions_helper(
         never_subscribed_stream_ids = web_public_stream_ids - sub_unsub_stream_ids
 
     never_subscribed_streams = [
-        all_streams_map[stream_id]
-        for stream_id in never_subscribed_stream_ids
+        all_streams_map[stream_id] for stream_id in never_subscribed_stream_ids
     ]
 
     for stream in never_subscribed_streams:
         is_public = not stream['invite_only']
         if is_public or user_profile.is_realm_admin:
             stream_dict = build_stream_dict_for_never_sub(
-                stream=stream,
-                recent_traffic=recent_traffic
+                stream=stream, recent_traffic=recent_traffic
             )
 
             never_subscribed.append(stream_dict)
@@ -5195,9 +5924,10 @@ def gather_subscriptions_helper(
         never_subscribed=sorted(never_subscribed, key=lambda x: x['name']),
     )
 
+
 def gather_subscriptions(
     user_profile: UserProfile,
-    include_subscribers: bool=False,
+    include_subscribers: bool = False,
 ) -> Tuple[List[Dict[str, Any]], List[Dict[str, Any]]]:
     helper_result = gather_subscriptions_helper(
         user_profile,
@@ -5225,12 +5955,15 @@ def gather_subscriptions(
 
     return (subscribed, unsubscribed)
 
-def get_active_presence_idle_user_ids(realm: Realm,
-                                      sender_id: int,
-                                      message_type: str,
-                                      active_user_ids: Set[int],
-                                      user_flags: Dict[int, List[str]]) -> List[int]:
-    '''
+
+def get_active_presence_idle_user_ids(
+    realm: Realm,
+    sender_id: int,
+    message_type: str,
+    active_user_ids: Set[int],
+    user_flags: Dict[int, List[str]],
+) -> List[int]:
+    """
     Given a list of active_user_ids, we build up a subset
     of those users who fit these criteria:
 
@@ -5238,7 +5971,7 @@ def get_active_presence_idle_user_ids(realm: Realm,
           to mentions, alert words, or being PM'ed).
         * They are no longer "present" according to the
           UserPresence table.
-    '''
+    """
 
     if realm.presence_disabled:
         return []
@@ -5256,6 +5989,7 @@ def get_active_presence_idle_user_ids(realm: Realm,
 
     return filter_presence_idle_user_ids(user_ids)
 
+
 def filter_presence_idle_user_ids(user_ids: Set[int]) -> List[int]:
     # Given a set of user IDs (the recipients of a message), accesses
     # the UserPresence table to determine which of these users are
@@ -5276,30 +6010,45 @@ def filter_presence_idle_user_ids(user_ids: Set[int]) -> List[int]:
     OFFLINE_THRESHOLD_SECS = 140
 
     recent = timezone_now() - datetime.timedelta(seconds=OFFLINE_THRESHOLD_SECS)
-    rows = UserPresence.objects.filter(
-        user_profile_id__in=user_ids,
-        status=UserPresence.ACTIVE,
-        timestamp__gte=recent,
-    ).exclude(client__name="ZulipMobile").distinct('user_profile_id').values('user_profile_id')
+    rows = (
+        UserPresence.objects.filter(
+            user_profile_id__in=user_ids,
+            status=UserPresence.ACTIVE,
+            timestamp__gte=recent,
+        )
+        .exclude(client__name="ZulipMobile")
+        .distinct('user_profile_id')
+        .values('user_profile_id')
+    )
     active_user_ids = {row['user_profile_id'] for row in rows}
     idle_user_ids = user_ids - active_user_ids
     return sorted(idle_user_ids)
 
-def do_send_confirmation_email(invitee: PreregistrationUser,
-                               referrer: UserProfile) -> str:
+
+def do_send_confirmation_email(invitee: PreregistrationUser, referrer: UserProfile) -> str:
     """
     Send the confirmation/welcome e-mail to an invited user.
     """
     activation_url = create_confirmation_link(invitee, Confirmation.INVITATION)
-    context = {'referrer_full_name': referrer.full_name, 'referrer_email': referrer.delivery_email,
-               'activate_url': activation_url, 'referrer_realm_name': referrer.realm.name}
+    context = {
+        'referrer_full_name': referrer.full_name,
+        'referrer_email': referrer.delivery_email,
+        'activate_url': activation_url,
+        'referrer_realm_name': referrer.realm.name,
+    }
     from_name = f"{referrer.full_name} (via Zulip)"
-    send_email('zerver/emails/invitation', to_emails=[invitee.email], from_name=from_name,
-               from_address=FromAddress.tokenized_no_reply_address(),
-               language=referrer.realm.default_language, context=context,
-               realm=referrer.realm)
+    send_email(
+        'zerver/emails/invitation',
+        to_emails=[invitee.email],
+        from_name=from_name,
+        from_address=FromAddress.tokenized_no_reply_address(),
+        language=referrer.realm.default_language,
+        context=context,
+        realm=referrer.realm,
+    )
     return activation_url
 
+
 def email_not_system_bot(email: str) -> None:
     if is_cross_realm_bot_email(email):
         msg = email_reserved_for_system_bots_error(email)
@@ -5310,16 +6059,19 @@ def email_not_system_bot(email: str) -> None:
             params=dict(deactivated=False),
         )
 
+
 class InvitationError(JsonableError):
     code = ErrorCode.INVITATION_FAILED
     data_fields = ['errors', 'sent_invitations']
 
-    def __init__(self, msg: str, errors: List[Tuple[str, str, bool]],
-                 sent_invitations: bool) -> None:
+    def __init__(
+        self, msg: str, errors: List[Tuple[str, str, bool]], sent_invitations: bool
+    ) -> None:
         self._msg: str = msg
         self.errors: List[Tuple[str, str, bool]] = errors
         self.sent_invitations: bool = sent_invitations
 
+
 def estimate_recent_invites(realms: Iterable[Realm], *, days: int) -> int:
     '''An upper bound on the number of invites sent in the last `days` days'''
     recent_invites = RealmCount.objects.filter(
@@ -5331,11 +6083,14 @@ def estimate_recent_invites(realms: Iterable[Realm], *, days: int) -> int:
         return 0
     return recent_invites
 
+
 def check_invite_limit(realm: Realm, num_invitees: int) -> None:
     '''Discourage using invitation emails as a vector for carrying spam.'''
-    msg = _("You do not have enough remaining invites for today. "
-            "Please contact {email} to have your limit raised. "
-            "No invitations were sent.").format(email=settings.ZULIP_ADMINISTRATOR)
+    msg = _(
+        "You do not have enough remaining invites for today. "
+        "Please contact {email} to have your limit raised. "
+        "No invitations were sent."
+    ).format(email=settings.ZULIP_ADMINISTRATOR)
     if not settings.OPEN_REALM_CREATION:
         return
 
@@ -5366,10 +6121,13 @@ def check_invite_limit(realm: Realm, num_invitees: int) -> None:
         if num_invitees + recent_invites > count:
             raise InvitationError(msg, [], sent_invitations=False)
 
-def do_invite_users(user_profile: UserProfile,
-                    invitee_emails: SizedTextIterable,
-                    streams: Iterable[Stream],
-                    invite_as: int=PreregistrationUser.INVITE_AS['MEMBER']) -> None:
+
+def do_invite_users(
+    user_profile: UserProfile,
+    invitee_emails: SizedTextIterable,
+    streams: Iterable[Stream],
+    invite_as: int = PreregistrationUser.INVITE_AS['MEMBER'],
+) -> None:
 
     check_invite_limit(user_profile.realm, len(invitee_emails))
 
@@ -5377,12 +6135,15 @@ def do_invite_users(user_profile: UserProfile,
     if not realm.invite_required:
         # Inhibit joining an open realm to send spam invitations.
         min_age = datetime.timedelta(days=settings.INVITES_MIN_USER_AGE_DAYS)
-        if (user_profile.date_joined > timezone_now() - min_age
-                and not user_profile.is_realm_admin):
+        if user_profile.date_joined > timezone_now() - min_age and not user_profile.is_realm_admin:
             raise InvitationError(
-                _("Your account is too new to send invites for this organization. "
-                  "Ask an organization admin, or a more experienced user."),
-                [], sent_invitations=False)
+                _(
+                    "Your account is too new to send invites for this organization. "
+                    "Ask an organization admin, or a more experienced user."
+                ),
+                [],
+                sent_invitations=False,
+            )
 
     good_emails: Set[str] = set()
     errors: List[Tuple[str, str, bool]] = []
@@ -5418,26 +6179,34 @@ def do_invite_users(user_profile: UserProfile,
     if errors:
         raise InvitationError(
             _("Some emails did not validate, so we didn't send any invitations."),
-            errors + skipped, sent_invitations=False)
+            errors + skipped,
+            sent_invitations=False,
+        )
 
     if skipped and len(skipped) == len(invitee_emails):
         # All e-mails were skipped, so we didn't actually invite anyone.
-        raise InvitationError(_("We weren't able to invite anyone."),
-                              skipped, sent_invitations=False)
+        raise InvitationError(
+            _("We weren't able to invite anyone."), skipped, sent_invitations=False
+        )
 
     # We do this here rather than in the invite queue processor since this
     # is used for rate limiting invitations, rather than keeping track of
     # when exactly invitations were sent
-    do_increment_logging_stat(user_profile.realm, COUNT_STATS['invites_sent::day'],
-                              None, timezone_now(), increment=len(validated_emails))
+    do_increment_logging_stat(
+        user_profile.realm,
+        COUNT_STATS['invites_sent::day'],
+        None,
+        timezone_now(),
+        increment=len(validated_emails),
+    )
 
     # Now that we are past all the possible errors, we actually create
     # the PreregistrationUser objects and trigger the email invitations.
     for email in validated_emails:
         # The logged in user is the referrer.
-        prereg_user = PreregistrationUser(email=email, referred_by=user_profile,
-                                          invited_as=invite_as,
-                                          realm=user_profile.realm)
+        prereg_user = PreregistrationUser(
+            email=email, referred_by=user_profile, invited_as=invite_as, realm=user_profile.realm
+        )
         prereg_user.save()
         stream_ids = [stream.id for stream in streams]
         prereg_user.streams.set(stream_ids)
@@ -5446,12 +6215,18 @@ def do_invite_users(user_profile: UserProfile,
         queue_json_publish("invites", event)
 
     if skipped:
-        raise InvitationError(_("Some of those addresses are already using Zulip, "
-                                "so we didn't send them an invitation. We did send "
-                                "invitations to everyone else!"),
-                              skipped, sent_invitations=True)
+        raise InvitationError(
+            _(
+                "Some of those addresses are already using Zulip, "
+                "so we didn't send them an invitation. We did send "
+                "invitations to everyone else!"
+            ),
+            skipped,
+            sent_invitations=True,
+        )
     notify_invites_changed(user_profile)
 
+
 def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
     if user_profile.is_realm_admin:
         prereg_users = filter_to_valid_prereg_users(
@@ -5465,35 +6240,49 @@ def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
     invites = []
 
     for invitee in prereg_users:
-        invites.append(dict(email=invitee.email,
-                            invited_by_user_id=invitee.referred_by.id,
-                            invited=datetime_to_timestamp(invitee.invited_at),
-                            id=invitee.id,
-                            invited_as=invitee.invited_as,
-                            is_multiuse=False))
+        invites.append(
+            dict(
+                email=invitee.email,
+                invited_by_user_id=invitee.referred_by.id,
+                invited=datetime_to_timestamp(invitee.invited_at),
+                id=invitee.id,
+                invited_as=invitee.invited_as,
+                is_multiuse=False,
+            )
+        )
 
     if not user_profile.is_realm_admin:
         # We do not return multiuse invites to non-admin users.
         return invites
 
-    lowest_datetime = timezone_now() - datetime.timedelta(days=settings.INVITATION_LINK_VALIDITY_DAYS)
-    multiuse_confirmation_objs = Confirmation.objects.filter(realm=user_profile.realm,
-                                                             type=Confirmation.MULTIUSE_INVITE,
-                                                             date_sent__gte=lowest_datetime)
+    lowest_datetime = timezone_now() - datetime.timedelta(
+        days=settings.INVITATION_LINK_VALIDITY_DAYS
+    )
+    multiuse_confirmation_objs = Confirmation.objects.filter(
+        realm=user_profile.realm, type=Confirmation.MULTIUSE_INVITE, date_sent__gte=lowest_datetime
+    )
     for confirmation_obj in multiuse_confirmation_objs:
         invite = confirmation_obj.content_object
-        invites.append(dict(invited_by_user_id=invite.referred_by.id,
-                            invited=datetime_to_timestamp(confirmation_obj.date_sent),
-                            id=invite.id,
-                            link_url=confirmation_url(confirmation_obj.confirmation_key,
-                                                      user_profile.realm,
-                                                      Confirmation.MULTIUSE_INVITE),
-                            invited_as=invite.invited_as,
-                            is_multiuse=True))
+        invites.append(
+            dict(
+                invited_by_user_id=invite.referred_by.id,
+                invited=datetime_to_timestamp(confirmation_obj.date_sent),
+                id=invite.id,
+                link_url=confirmation_url(
+                    confirmation_obj.confirmation_key,
+                    user_profile.realm,
+                    Confirmation.MULTIUSE_INVITE,
+                ),
+                invited_as=invite.invited_as,
+                is_multiuse=True,
+            )
+        )
     return invites
 
-def do_create_multiuse_invite_link(referred_by: UserProfile, invited_as: int,
-                                   streams: Sequence[Stream] = []) -> str:
+
+def do_create_multiuse_invite_link(
+    referred_by: UserProfile, invited_as: int, streams: Sequence[Stream] = []
+) -> str:
     realm = referred_by.realm
     invite = MultiuseInvite.objects.create(realm=realm, referred_by=referred_by)
     if streams:
@@ -5503,6 +6292,7 @@ def do_create_multiuse_invite_link(referred_by: UserProfile, invited_as: int,
     notify_invites_changed(referred_by)
     return create_confirmation_link(invite, Confirmation.MULTIUSE_INVITE)
 
+
 def do_revoke_user_invite(prereg_user: PreregistrationUser) -> None:
     email = prereg_user.email
 
@@ -5511,19 +6301,19 @@ def do_revoke_user_invite(prereg_user: PreregistrationUser) -> None:
     # to a "revoked" status so that we can give the invited user a better
     # error message.
     content_type = ContentType.objects.get_for_model(PreregistrationUser)
-    Confirmation.objects.filter(content_type=content_type,
-                                object_id=prereg_user.id).delete()
+    Confirmation.objects.filter(content_type=content_type, object_id=prereg_user.id).delete()
     prereg_user.delete()
     clear_scheduled_invitation_emails(email)
     notify_invites_changed(prereg_user)
 
+
 def do_revoke_multi_use_invite(multiuse_invite: MultiuseInvite) -> None:
     content_type = ContentType.objects.get_for_model(MultiuseInvite)
-    Confirmation.objects.filter(content_type=content_type,
-                                object_id=multiuse_invite.id).delete()
+    Confirmation.objects.filter(content_type=content_type, object_id=multiuse_invite.id).delete()
     multiuse_invite.delete()
     notify_invites_changed(multiuse_invite.referred_by)
 
+
 def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> int:
     # These are two structurally for the caller's code path.
     assert prereg_user.referred_by is not None
@@ -5534,25 +6324,30 @@ def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> int:
     prereg_user.invited_at = timezone_now()
     prereg_user.save()
 
-    do_increment_logging_stat(prereg_user.realm, COUNT_STATS['invites_sent::day'],
-                              None, prereg_user.invited_at)
+    do_increment_logging_stat(
+        prereg_user.realm, COUNT_STATS['invites_sent::day'], None, prereg_user.invited_at
+    )
 
     clear_scheduled_invitation_emails(prereg_user.email)
     # We don't store the custom email body, so just set it to None
-    event = {"prereg_id": prereg_user.id, "referrer_id": prereg_user.referred_by.id, "email_body": None}
+    event = {
+        "prereg_id": prereg_user.id,
+        "referrer_id": prereg_user.referred_by.id,
+        "email_body": None,
+    }
     queue_json_publish("invites", event)
 
     return datetime_to_timestamp(prereg_user.invited_at)
 
+
 def notify_realm_emoji(realm: Realm) -> None:
-    event = dict(type="realm_emoji", op="update",
-                 realm_emoji=realm.get_emoji())
+    event = dict(type="realm_emoji", op="update", realm_emoji=realm.get_emoji())
     send_event(realm, event, active_user_ids(realm.id))
 
-def check_add_realm_emoji(realm: Realm,
-                          name: str,
-                          author: UserProfile,
-                          image_file: File) -> Optional[RealmEmoji]:
+
+def check_add_realm_emoji(
+    realm: Realm, name: str, author: UserProfile, image_file: File
+) -> Optional[RealmEmoji]:
     realm_emoji = RealmEmoji(realm=realm, name=name, author=author)
     realm_emoji.full_clean()
     realm_emoji.save()
@@ -5577,29 +6372,34 @@ def check_add_realm_emoji(realm: Realm,
             notify_realm_emoji(realm_emoji.realm)
     return realm_emoji
 
+
 def do_remove_realm_emoji(realm: Realm, name: str) -> None:
     emoji = RealmEmoji.objects.get(realm=realm, name=name, deactivated=False)
     emoji.deactivated = True
     emoji.save(update_fields=['deactivated'])
     notify_realm_emoji(realm)
 
+
 def notify_alert_words(user_profile: UserProfile, words: Iterable[str]) -> None:
     event = dict(type="alert_words", alert_words=words)
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 def do_add_alert_words(user_profile: UserProfile, alert_words: Iterable[str]) -> None:
     words = add_user_alert_words(user_profile, alert_words)
     notify_alert_words(user_profile, words)
 
+
 def do_remove_alert_words(user_profile: UserProfile, alert_words: Iterable[str]) -> None:
     words = remove_user_alert_words(user_profile, alert_words)
     notify_alert_words(user_profile, words)
 
+
 def do_mute_topic(
     user_profile: UserProfile,
     stream: Stream,
     topic: str,
-    date_muted: Optional[datetime.datetime]=None
+    date_muted: Optional[datetime.datetime] = None,
 ) -> None:
     if date_muted is None:
         date_muted = timezone_now()
@@ -5607,21 +6407,25 @@ def do_mute_topic(
     event = dict(type="muted_topics", muted_topics=get_topic_mutes(user_profile))
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 def do_unmute_topic(user_profile: UserProfile, stream: Stream, topic: str) -> None:
     remove_topic_mute(user_profile, stream.id, topic)
     event = dict(type="muted_topics", muted_topics=get_topic_mutes(user_profile))
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 def do_mark_hotspot_as_read(user: UserProfile, hotspot: str) -> None:
     UserHotspot.objects.get_or_create(user=user, hotspot=hotspot)
     event = dict(type="hotspots", hotspots=get_next_hotspots(user))
     send_event(user.realm, event, [user.id])
 
+
 def notify_realm_filters(realm: Realm) -> None:
     realm_filters = realm_filters_for_realm(realm.id)
     event = dict(type="realm_filters", realm_filters=realm_filters)
     send_event(realm, event, active_user_ids(realm.id))
 
+
 # NOTE: Regexes must be simple enough that they can be easily translated to JavaScript
 # RegExp syntax. In addition to JS-compatible syntax, the following features are available:
 #   * Named groups will be converted to numbered groups automatically
@@ -5629,45 +6433,60 @@ def notify_realm_filters(realm: Realm) -> None:
 def do_add_realm_filter(realm: Realm, pattern: str, url_format_string: str) -> int:
     pattern = pattern.strip()
     url_format_string = url_format_string.strip()
-    realm_filter = RealmFilter(
-        realm=realm, pattern=pattern,
-        url_format_string=url_format_string)
+    realm_filter = RealmFilter(realm=realm, pattern=pattern, url_format_string=url_format_string)
     realm_filter.full_clean()
     realm_filter.save()
     notify_realm_filters(realm)
 
     return realm_filter.id
 
-def do_remove_realm_filter(realm: Realm, pattern: Optional[str]=None,
-                           id: Optional[int]=None) -> None:
+
+def do_remove_realm_filter(
+    realm: Realm, pattern: Optional[str] = None, id: Optional[int] = None
+) -> None:
     if pattern is not None:
         RealmFilter.objects.get(realm=realm, pattern=pattern).delete()
     else:
         RealmFilter.objects.get(realm=realm, pk=id).delete()
     notify_realm_filters(realm)
 
+
 def get_emails_from_user_ids(user_ids: Sequence[int]) -> Dict[int, str]:
     # We may eventually use memcached to speed this up, but the DB is fast.
     return UserProfile.emails_from_ids(user_ids)
 
+
 def do_add_realm_domain(realm: Realm, domain: str, allow_subdomains: bool) -> (RealmDomain):
-    realm_domain = RealmDomain.objects.create(realm=realm, domain=domain,
-                                              allow_subdomains=allow_subdomains)
-    event = dict(type="realm_domains", op="add",
-                 realm_domain=dict(domain=realm_domain.domain,
-                                   allow_subdomains=realm_domain.allow_subdomains))
+    realm_domain = RealmDomain.objects.create(
+        realm=realm, domain=domain, allow_subdomains=allow_subdomains
+    )
+    event = dict(
+        type="realm_domains",
+        op="add",
+        realm_domain=dict(
+            domain=realm_domain.domain, allow_subdomains=realm_domain.allow_subdomains
+        ),
+    )
     send_event(realm, event, active_user_ids(realm.id))
     return realm_domain
 
+
 def do_change_realm_domain(realm_domain: RealmDomain, allow_subdomains: bool) -> None:
     realm_domain.allow_subdomains = allow_subdomains
     realm_domain.save(update_fields=['allow_subdomains'])
-    event = dict(type="realm_domains", op="change",
-                 realm_domain=dict(domain=realm_domain.domain,
-                                   allow_subdomains=realm_domain.allow_subdomains))
+    event = dict(
+        type="realm_domains",
+        op="change",
+        realm_domain=dict(
+            domain=realm_domain.domain, allow_subdomains=realm_domain.allow_subdomains
+        ),
+    )
     send_event(realm_domain.realm, event, active_user_ids(realm_domain.realm_id))
 
-def do_remove_realm_domain(realm_domain: RealmDomain, acting_user: Optional[UserProfile]=None) -> None:
+
+def do_remove_realm_domain(
+    realm_domain: RealmDomain, acting_user: Optional[UserProfile] = None
+) -> None:
     realm = realm_domain.realm
     domain = realm_domain.domain
     realm_domain.delete()
@@ -5680,27 +6499,40 @@ def do_remove_realm_domain(realm_domain: RealmDomain, acting_user: Optional[User
     event = dict(type="realm_domains", op="remove", domain=domain)
     send_event(realm, event, active_user_ids(realm.id))
 
+
 def get_occupied_streams(realm: Realm) -> QuerySet:
     # TODO: Make a generic stub for QuerySet
     """ Get streams with subscribers """
     exists_expression = Exists(
-        Subscription.objects.filter(active=True, user_profile__is_active=True,
-                                    user_profile__realm=realm,
-                                    recipient_id=OuterRef('recipient_id')),
+        Subscription.objects.filter(
+            active=True,
+            user_profile__is_active=True,
+            user_profile__realm=realm,
+            recipient_id=OuterRef('recipient_id'),
+        ),
+    )
+    occupied_streams = (
+        Stream.objects.filter(realm=realm, deactivated=False)
+        .annotate(occupied=exists_expression)
+        .filter(occupied=True)
     )
-    occupied_streams = Stream.objects.filter(realm=realm, deactivated=False) \
-        .annotate(occupied=exists_expression).filter(occupied=True)
     return occupied_streams
 
+
 def get_web_public_streams(realm: Realm) -> List[Dict[str, Any]]:
     query = Stream.objects.filter(realm=realm, deactivated=False, is_web_public=True)
     streams = Stream.get_client_data(query)
     return streams
 
+
 def do_get_streams(
-        user_profile: UserProfile, include_public: bool=True, include_web_public: bool=False,
-        include_subscribed: bool=True, include_all_active: bool=False,
-        include_default: bool=False, include_owner_subscribed: bool=False,
+    user_profile: UserProfile,
+    include_public: bool = True,
+    include_web_public: bool = False,
+    include_subscribed: bool = True,
+    include_all_active: bool = False,
+    include_default: bool = False,
+    include_owner_subscribed: bool = False,
 ) -> List[Dict[str, Any]]:
     # This function is only used by API clients now.
 
@@ -5762,8 +6594,10 @@ def do_get_streams(
 
     return streams
 
-def notify_attachment_update(user_profile: UserProfile, op: str,
-                             attachment_dict: Dict[str, Any]) -> None:
+
+def notify_attachment_update(
+    user_profile: UserProfile, op: str, attachment_dict: Dict[str, Any]
+) -> None:
     event = {
         'type': 'attachment',
         'op': op,
@@ -5772,6 +6606,7 @@ def notify_attachment_update(user_profile: UserProfile, op: str,
     }
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 def do_claim_attachments(message: Message, potential_path_ids: List[str]) -> bool:
     claimed = False
     for path_id in potential_path_ids:
@@ -5795,18 +6630,20 @@ def do_claim_attachments(message: Message, potential_path_ids: List[str]) -> boo
             # the user in this situation, so we log in these cases.
             logging.warning(
                 "User %s tried to share upload %s in message %s, but lacks permission",
-                user_profile.id, path_id, message.id,
+                user_profile.id,
+                path_id,
+                message.id,
             )
             continue
 
         claimed = True
-        attachment = claim_attachment(user_profile,
-                                      path_id, message,
-                                      is_message_realm_public,
-                                      is_message_web_public)
+        attachment = claim_attachment(
+            user_profile, path_id, message, is_message_realm_public, is_message_web_public
+        )
         notify_attachment_update(user_profile, "update", attachment.to_dict())
     return claimed
 
+
 def do_delete_old_unclaimed_attachments(weeks_ago: int) -> None:
     old_unclaimed_attachments = get_old_unclaimed_attachments(weeks_ago)
 
@@ -5814,6 +6651,7 @@ def do_delete_old_unclaimed_attachments(weeks_ago: int) -> None:
         delete_message_image(attachment.path_id)
         attachment.delete()
 
+
 def check_attachment_reference_change(message: Message) -> bool:
     # For a unsaved message edit (message.* has been updated, but not
     # saved to the database), adjusts Attachment data to correspond to
@@ -5835,33 +6673,44 @@ def check_attachment_reference_change(message: Message) -> bool:
 
     return message.attachment_set.exists()
 
+
 def notify_realm_custom_profile_fields(realm: Realm, operation: str) -> None:
     fields = custom_profile_fields_for_realm(realm.id)
-    event = dict(type="custom_profile_fields",
-                 op=operation,
-                 fields=[f.as_dict() for f in fields])
+    event = dict(type="custom_profile_fields", op=operation, fields=[f.as_dict() for f in fields])
     send_event(realm, event, active_user_ids(realm.id))
 
-def try_add_realm_default_custom_profile_field(realm: Realm,
-                                               field_subtype: str) -> CustomProfileField:
+
+def try_add_realm_default_custom_profile_field(
+    realm: Realm, field_subtype: str
+) -> CustomProfileField:
     field_data = DEFAULT_EXTERNAL_ACCOUNTS[field_subtype]
-    field = CustomProfileField(realm=realm, name=field_data['name'],
-                               field_type=CustomProfileField.EXTERNAL_ACCOUNT,
-                               hint=field_data['hint'],
-                               field_data=orjson.dumps(dict(subtype=field_subtype)).decode())
+    field = CustomProfileField(
+        realm=realm,
+        name=field_data['name'],
+        field_type=CustomProfileField.EXTERNAL_ACCOUNT,
+        hint=field_data['hint'],
+        field_data=orjson.dumps(dict(subtype=field_subtype)).decode(),
+    )
     field.save()
     field.order = field.id
     field.save(update_fields=['order'])
     notify_realm_custom_profile_fields(realm, 'add')
     return field
 
-def try_add_realm_custom_profile_field(realm: Realm, name: str, field_type: int,
-                                       hint: str='',
-                                       field_data: Optional[ProfileFieldData]=None) -> CustomProfileField:
+
+def try_add_realm_custom_profile_field(
+    realm: Realm,
+    name: str,
+    field_type: int,
+    hint: str = '',
+    field_data: Optional[ProfileFieldData] = None,
+) -> CustomProfileField:
     field = CustomProfileField(realm=realm, name=name, field_type=field_type)
     field.hint = hint
-    if (field.field_type == CustomProfileField.CHOICE or
-            field.field_type == CustomProfileField.EXTERNAL_ACCOUNT):
+    if (
+        field.field_type == CustomProfileField.CHOICE
+        or field.field_type == CustomProfileField.EXTERNAL_ACCOUNT
+    ):
         field.field_data = orjson.dumps(field_data or {}).decode()
 
     field.save()
@@ -5870,6 +6719,7 @@ def try_add_realm_custom_profile_field(realm: Realm, name: str, field_type: int,
     notify_realm_custom_profile_fields(realm, 'add')
     return field
 
+
 def do_remove_realm_custom_profile_field(realm: Realm, field: CustomProfileField) -> None:
     """
     Deleting a field will also delete the user profile data
@@ -5878,20 +6728,29 @@ def do_remove_realm_custom_profile_field(realm: Realm, field: CustomProfileField
     field.delete()
     notify_realm_custom_profile_fields(realm, 'delete')
 
+
 def do_remove_realm_custom_profile_fields(realm: Realm) -> None:
     CustomProfileField.objects.filter(realm=realm).delete()
 
-def try_update_realm_custom_profile_field(realm: Realm, field: CustomProfileField,
-                                          name: str, hint: str='',
-                                          field_data: Optional[ProfileFieldData]=None) -> None:
+
+def try_update_realm_custom_profile_field(
+    realm: Realm,
+    field: CustomProfileField,
+    name: str,
+    hint: str = '',
+    field_data: Optional[ProfileFieldData] = None,
+) -> None:
     field.name = name
     field.hint = hint
-    if (field.field_type == CustomProfileField.CHOICE or
-            field.field_type == CustomProfileField.EXTERNAL_ACCOUNT):
+    if (
+        field.field_type == CustomProfileField.CHOICE
+        or field.field_type == CustomProfileField.EXTERNAL_ACCOUNT
+    ):
         field.field_data = orjson.dumps(field_data or {}).decode()
     field.save()
     notify_realm_custom_profile_fields(realm, 'update')
 
+
 def try_reorder_realm_custom_profile_fields(realm: Realm, order: List[int]) -> None:
     order_mapping = {_[1]: _[0] for _ in enumerate(order)}
     fields = CustomProfileField.objects.filter(realm=realm)
@@ -5903,8 +6762,10 @@ def try_reorder_realm_custom_profile_fields(realm: Realm, order: List[int]) -> N
         field.save(update_fields=['order'])
     notify_realm_custom_profile_fields(realm, 'update')
 
-def notify_user_update_custom_profile_data(user_profile: UserProfile,
-                                           field: Dict[str, Union[int, str, List[int], None]]) -> None:
+
+def notify_user_update_custom_profile_data(
+    user_profile: UserProfile, field: Dict[str, Union[int, str, List[int], None]]
+) -> None:
     data = dict(id=field['id'])
     if field['type'] == CustomProfileField.USER:
         data["value"] = orjson.dumps(field['value']).decode()
@@ -5916,14 +6777,16 @@ def notify_user_update_custom_profile_data(user_profile: UserProfile,
     event = dict(type="realm_user", op="update", person=payload)
     send_event(user_profile.realm, event, active_user_ids(user_profile.realm.id))
 
-def do_update_user_custom_profile_data_if_changed(user_profile: UserProfile,
-                                                  data: List[Dict[str, Union[int, str, List[int]]]],
-                                                  ) -> None:
+
+def do_update_user_custom_profile_data_if_changed(
+    user_profile: UserProfile,
+    data: List[Dict[str, Union[int, str, List[int]]]],
+) -> None:
     with transaction.atomic():
         for field in data:
             field_value, created = CustomProfileFieldValue.objects.get_or_create(
-                user_profile=user_profile,
-                field_id=field['id'])
+                user_profile=user_profile, field_id=field['id']
+            )
 
             if not created and field_value.value == str(field['value']):
                 # If the field value isn't actually being changed to a different one,
@@ -5938,49 +6801,61 @@ def do_update_user_custom_profile_data_if_changed(user_profile: UserProfile,
                 field_value.save(update_fields=['value', 'rendered_value'])
             else:
                 field_value.save(update_fields=['value'])
-            notify_user_update_custom_profile_data(user_profile, {
-                "id": field_value.field_id,
-                "value": field_value.value,
-                "rendered_value": field_value.rendered_value,
-                "type": field_value.field.field_type})
+            notify_user_update_custom_profile_data(
+                user_profile,
+                {
+                    "id": field_value.field_id,
+                    "value": field_value.value,
+                    "rendered_value": field_value.rendered_value,
+                    "type": field_value.field.field_type,
+                },
+            )
+
 
 def check_remove_custom_profile_field_value(user_profile: UserProfile, field_id: int) -> None:
     try:
         field = CustomProfileField.objects.get(realm=user_profile.realm, id=field_id)
         field_value = CustomProfileFieldValue.objects.get(field=field, user_profile=user_profile)
         field_value.delete()
-        notify_user_update_custom_profile_data(user_profile, {'id': field_id,
-                                                              'value': None,
-                                                              'rendered_value': None,
-                                                              'type': field.field_type})
+        notify_user_update_custom_profile_data(
+            user_profile,
+            {'id': field_id, 'value': None, 'rendered_value': None, 'type': field.field_type},
+        )
     except CustomProfileField.DoesNotExist:
         raise JsonableError(_('Field id {id} not found.').format(id=field_id))
     except CustomProfileFieldValue.DoesNotExist:
         pass
 
+
 def do_send_create_user_group_event(user_group: UserGroup, members: List[UserProfile]) -> None:
-    event = dict(type="user_group",
-                 op="add",
-                 group=dict(name=user_group.name,
-                            members=[member.id for member in members],
-                            description=user_group.description,
-                            id=user_group.id,
-                            ),
-                 )
+    event = dict(
+        type="user_group",
+        op="add",
+        group=dict(
+            name=user_group.name,
+            members=[member.id for member in members],
+            description=user_group.description,
+            id=user_group.id,
+        ),
+    )
     send_event(user_group.realm, event, active_user_ids(user_group.realm_id))
 
-def check_add_user_group(realm: Realm, name: str, initial_members: List[UserProfile],
-                         description: str) -> None:
+
+def check_add_user_group(
+    realm: Realm, name: str, initial_members: List[UserProfile], description: str
+) -> None:
     try:
         user_group = create_user_group(name, initial_members, realm, description=description)
         do_send_create_user_group_event(user_group, initial_members)
     except django.db.utils.IntegrityError:
         raise JsonableError(_("User group '{}' already exists.").format(name))
 
+
 def do_send_user_group_update_event(user_group: UserGroup, data: Dict[str, str]) -> None:
     event = dict(type="user_group", op='update', group_id=user_group.id, data=data)
     send_event(user_group.realm, event, active_user_ids(user_group.realm_id))
 
+
 def do_update_user_group_name(user_group: UserGroup, name: str) -> None:
     try:
         user_group.name = name
@@ -5989,74 +6864,96 @@ def do_update_user_group_name(user_group: UserGroup, name: str) -> None:
         raise JsonableError(_("User group '{}' already exists.").format(name))
     do_send_user_group_update_event(user_group, dict(name=name))
 
+
 def do_update_user_group_description(user_group: UserGroup, description: str) -> None:
     user_group.description = description
     user_group.save(update_fields=['description'])
     do_send_user_group_update_event(user_group, dict(description=description))
 
-def do_update_outgoing_webhook_service(bot_profile: UserProfile,
-                                       service_interface: int,
-                                       service_payload_url: str) -> None:
+
+def do_update_outgoing_webhook_service(
+    bot_profile: UserProfile, service_interface: int, service_payload_url: str
+) -> None:
     # TODO: First service is chosen because currently one bot can only have one service.
     # Update this once multiple services are supported.
     service = get_bot_services(bot_profile.id)[0]
     service.base_url = service_payload_url
     service.interface = service_interface
     service.save()
-    send_event(bot_profile.realm,
-               dict(type='realm_bot',
-                    op='update',
-                    bot=dict(user_id=bot_profile.id,
-                             services = [dict(base_url=service.base_url,
-                                              interface=service.interface,
-                                              token=service.token)],
-                             ),
-                    ),
-               bot_owner_user_ids(bot_profile))
+    send_event(
+        bot_profile.realm,
+        dict(
+            type='realm_bot',
+            op='update',
+            bot=dict(
+                user_id=bot_profile.id,
+                services=[
+                    dict(
+                        base_url=service.base_url, interface=service.interface, token=service.token
+                    )
+                ],
+            ),
+        ),
+        bot_owner_user_ids(bot_profile),
+    )
 
-def do_update_bot_config_data(bot_profile: UserProfile,
-                              config_data: Dict[str, str]) -> None:
+
+def do_update_bot_config_data(bot_profile: UserProfile, config_data: Dict[str, str]) -> None:
     for key, value in config_data.items():
         set_bot_config(bot_profile, key, value)
     updated_config_data = get_bot_config(bot_profile)
-    send_event(bot_profile.realm,
-               dict(type='realm_bot',
-                    op='update',
-                    bot=dict(user_id=bot_profile.id,
-                             services = [dict(config_data=updated_config_data)],
-                             ),
-                    ),
-               bot_owner_user_ids(bot_profile))
+    send_event(
+        bot_profile.realm,
+        dict(
+            type='realm_bot',
+            op='update',
+            bot=dict(
+                user_id=bot_profile.id,
+                services=[dict(config_data=updated_config_data)],
+            ),
+        ),
+        bot_owner_user_ids(bot_profile),
+    )
+
 
 def get_service_dicts_for_bot(user_profile_id: int) -> List[Dict[str, Any]]:
     user_profile = get_user_profile_by_id(user_profile_id)
     services = get_bot_services(user_profile_id)
     service_dicts: List[Dict[str, Any]] = []
     if user_profile.bot_type == UserProfile.OUTGOING_WEBHOOK_BOT:
-        service_dicts = [{'base_url': service.base_url,
-                          'interface': service.interface,
-                          'token': service.token,
-                          }
-                         for service in services]
+        service_dicts = [
+            {
+                'base_url': service.base_url,
+                'interface': service.interface,
+                'token': service.token,
+            }
+            for service in services
+        ]
     elif user_profile.bot_type == UserProfile.EMBEDDED_BOT:
         try:
-            service_dicts = [{'config_data': get_bot_config(user_profile),
-                              'service_name': services[0].name,
-                              }]
+            service_dicts = [
+                {
+                    'config_data': get_bot_config(user_profile),
+                    'service_name': services[0].name,
+                }
+            ]
         # A ConfigError just means that there are no config entries for user_profile.
         except ConfigError:
             pass
     return service_dicts
 
-def get_service_dicts_for_bots(bot_dicts: List[Dict[str, Any]],
-                               realm: Realm) -> Dict[int, List[Dict[str, Any]]]:
+
+def get_service_dicts_for_bots(
+    bot_dicts: List[Dict[str, Any]], realm: Realm
+) -> Dict[int, List[Dict[str, Any]]]:
     bot_profile_ids = [bot_dict['id'] for bot_dict in bot_dicts]
     bot_services_by_uid: Dict[int, List[Service]] = defaultdict(list)
     for service in Service.objects.filter(user_profile_id__in=bot_profile_ids):
         bot_services_by_uid[service.user_profile_id].append(service)
 
-    embedded_bot_ids = [bot_dict['id'] for bot_dict in bot_dicts
-                        if bot_dict['bot_type'] == UserProfile.EMBEDDED_BOT]
+    embedded_bot_ids = [
+        bot_dict['id'] for bot_dict in bot_dicts if bot_dict['bot_type'] == UserProfile.EMBEDDED_BOT
+    ]
     embedded_bot_configs = get_bot_configs(embedded_bot_ids)
 
     service_dicts_by_uid: Dict[int, List[Dict[str, Any]]] = {}
@@ -6065,109 +6962,125 @@ def get_service_dicts_for_bots(bot_dicts: List[Dict[str, Any]],
         bot_type = bot_dict["bot_type"]
         services = bot_services_by_uid[bot_profile_id]
         service_dicts: List[Dict[str, Any]] = []
-        if bot_type  == UserProfile.OUTGOING_WEBHOOK_BOT:
-            service_dicts = [{'base_url': service.base_url,
-                              'interface': service.interface,
-                              'token': service.token,
-                              }
-                             for service in services]
+        if bot_type == UserProfile.OUTGOING_WEBHOOK_BOT:
+            service_dicts = [
+                {
+                    'base_url': service.base_url,
+                    'interface': service.interface,
+                    'token': service.token,
+                }
+                for service in services
+            ]
         elif bot_type == UserProfile.EMBEDDED_BOT:
             if bot_profile_id in embedded_bot_configs.keys():
                 bot_config = embedded_bot_configs[bot_profile_id]
-                service_dicts = [{'config_data': bot_config,
-                                  'service_name': services[0].name,
-                                  }]
+                service_dicts = [
+                    {
+                        'config_data': bot_config,
+                        'service_name': services[0].name,
+                    }
+                ]
         service_dicts_by_uid[bot_profile_id] = service_dicts
     return service_dicts_by_uid
 
-def get_owned_bot_dicts(user_profile: UserProfile,
-                        include_all_realm_bots_if_admin: bool=True) -> List[Dict[str, Any]]:
+
+def get_owned_bot_dicts(
+    user_profile: UserProfile, include_all_realm_bots_if_admin: bool = True
+) -> List[Dict[str, Any]]:
     if user_profile.is_realm_admin and include_all_realm_bots_if_admin:
         result = get_bot_dicts_in_realm(user_profile.realm)
     else:
-        result = UserProfile.objects.filter(realm=user_profile.realm, is_bot=True,
-                                            bot_owner=user_profile).values(*bot_dict_fields)
+        result = UserProfile.objects.filter(
+            realm=user_profile.realm, is_bot=True, bot_owner=user_profile
+        ).values(*bot_dict_fields)
     services_by_ids = get_service_dicts_for_bots(result, user_profile.realm)
-    return [{'email': botdict['email'],
-             'user_id': botdict['id'],
-             'full_name': botdict['full_name'],
-             'bot_type': botdict['bot_type'],
-             'is_active': botdict['is_active'],
-             'api_key': botdict['api_key'],
-             'default_sending_stream': botdict['default_sending_stream__name'],
-             'default_events_register_stream': botdict['default_events_register_stream__name'],
-             'default_all_public_streams': botdict['default_all_public_streams'],
-             'owner_id': botdict['bot_owner__id'],
-             'avatar_url': avatar_url_from_dict(botdict),
-             'services': services_by_ids[botdict['id']],
-             }
-            for botdict in result]
+    return [
+        {
+            'email': botdict['email'],
+            'user_id': botdict['id'],
+            'full_name': botdict['full_name'],
+            'bot_type': botdict['bot_type'],
+            'is_active': botdict['is_active'],
+            'api_key': botdict['api_key'],
+            'default_sending_stream': botdict['default_sending_stream__name'],
+            'default_events_register_stream': botdict['default_events_register_stream__name'],
+            'default_all_public_streams': botdict['default_all_public_streams'],
+            'owner_id': botdict['bot_owner__id'],
+            'avatar_url': avatar_url_from_dict(botdict),
+            'services': services_by_ids[botdict['id']],
+        }
+        for botdict in result
+    ]
 
-def do_send_user_group_members_update_event(event_name: str,
-                                            user_group: UserGroup,
-                                            user_ids: List[int]) -> None:
-    event = dict(type="user_group",
-                 op=event_name,
-                 group_id=user_group.id,
-                 user_ids=user_ids)
+
+def do_send_user_group_members_update_event(
+    event_name: str, user_group: UserGroup, user_ids: List[int]
+) -> None:
+    event = dict(type="user_group", op=event_name, group_id=user_group.id, user_ids=user_ids)
     send_event(user_group.realm, event, active_user_ids(user_group.realm_id))
 
-def bulk_add_members_to_user_group(user_group: UserGroup,
-                                   user_profiles: List[UserProfile]) -> None:
-    memberships = [UserGroupMembership(user_group_id=user_group.id,
-                                       user_profile=user_profile)
-                   for user_profile in user_profiles]
+
+def bulk_add_members_to_user_group(user_group: UserGroup, user_profiles: List[UserProfile]) -> None:
+    memberships = [
+        UserGroupMembership(user_group_id=user_group.id, user_profile=user_profile)
+        for user_profile in user_profiles
+    ]
     UserGroupMembership.objects.bulk_create(memberships)
 
     user_ids = [up.id for up in user_profiles]
     do_send_user_group_members_update_event('add_members', user_group, user_ids)
 
-def remove_members_from_user_group(user_group: UserGroup,
-                                   user_profiles: List[UserProfile]) -> None:
+
+def remove_members_from_user_group(user_group: UserGroup, user_profiles: List[UserProfile]) -> None:
     UserGroupMembership.objects.filter(
-        user_group_id=user_group.id,
-        user_profile__in=user_profiles).delete()
+        user_group_id=user_group.id, user_profile__in=user_profiles
+    ).delete()
 
     user_ids = [up.id for up in user_profiles]
     do_send_user_group_members_update_event('remove_members', user_group, user_ids)
 
-def do_send_delete_user_group_event(realm: Realm, user_group_id: int,
-                                    realm_id: int) -> None:
-    event = dict(type="user_group",
-                 op="remove",
-                 group_id=user_group_id)
+
+def do_send_delete_user_group_event(realm: Realm, user_group_id: int, realm_id: int) -> None:
+    event = dict(type="user_group", op="remove", group_id=user_group_id)
     send_event(realm, event, active_user_ids(realm_id))
 
+
 def check_delete_user_group(user_group_id: int, user_profile: UserProfile) -> None:
     user_group = access_user_group_by_id(user_group_id, user_profile)
     user_group.delete()
     do_send_delete_user_group_event(user_profile.realm, user_group_id, user_profile.realm.id)
 
+
 def do_send_realm_reactivation_email(realm: Realm) -> None:
     url = create_confirmation_link(realm, Confirmation.REALM_REACTIVATION)
-    context = {'confirmation_url': url,
-               'realm_uri': realm.uri,
-               'realm_name': realm.name}
+    context = {'confirmation_url': url, 'realm_uri': realm.uri, 'realm_name': realm.name}
     language = realm.default_language
     send_email_to_admins(
-        'zerver/emails/realm_reactivation', realm,
+        'zerver/emails/realm_reactivation',
+        realm,
         from_address=FromAddress.tokenized_no_reply_address(),
         from_name=FromAddress.security_email_from_name(language=language),
-        language=language, context=context)
+        language=language,
+        context=context,
+    )
+
 
 def do_set_zoom_token(user: UserProfile, token: Optional[Dict[str, object]]) -> None:
     user.zoom_token = token
     user.save(update_fields=["zoom_token"])
     send_event(
-        user.realm, dict(type="has_zoom_token", value=token is not None), [user.id],
+        user.realm,
+        dict(type="has_zoom_token", value=token is not None),
+        [user.id],
     )
 
+
 def notify_realm_export(user_profile: UserProfile) -> None:
     # In the future, we may want to send this event to all realm admins.
-    event = dict(type='realm_export',
-                 exports=get_realm_exports_serialized(user_profile))
+    event = dict(type='realm_export', exports=get_realm_exports_serialized(user_profile))
     send_event(user_profile.realm, event, [user_profile.id])
 
+
 def do_delete_realm_export(user_profile: UserProfile, export: RealmAuditLog) -> None:
     # Give mypy a hint so it knows `orjson.loads`
     # isn't being passed an `Optional[str]`.
@@ -6185,8 +7098,8 @@ def do_delete_realm_export(user_profile: UserProfile, export: RealmAuditLog) ->
     export.save(update_fields=['extra_data'])
     notify_realm_export(user_profile)
 
-def get_topic_messages(user_profile: UserProfile, stream: Stream,
-                       topic_name: str) -> List[Message]:
+
+def get_topic_messages(user_profile: UserProfile, stream: Stream, topic_name: str) -> List[Message]:
     query = UserMessage.objects.filter(
         user_profile=user_profile,
         message__recipient=stream.recipient,
diff --git a/zerver/lib/addressee.py b/zerver/lib/addressee.py
index cdb820eafa..a61f48ba87 100644
--- a/zerver/lib/addressee.py
+++ b/zerver/lib/addressee.py
@@ -22,6 +22,7 @@ def get_user_profiles(emails: Iterable[str], realm: Realm) -> List[UserProfile]:
         user_profiles.append(user_profile)
     return user_profiles
 
+
 def get_user_profiles_by_ids(user_ids: Iterable[int], realm: Realm) -> List[UserProfile]:
     user_profiles: List[UserProfile] = []
     for user_id in user_ids:
@@ -32,6 +33,7 @@ def get_user_profiles_by_ids(user_ids: Iterable[int], realm: Realm) -> List[User
         user_profiles.append(user_profile)
     return user_profiles
 
+
 def validate_topic(topic: str) -> str:
     assert topic is not None
     topic = topic.strip()
@@ -40,6 +42,7 @@ def validate_topic(topic: str) -> str:
 
     return topic
 
+
 class Addressee:
     # This is really just a holder for vars that tended to be passed
     # around in a non-type-safe way before this class was introduced.
@@ -52,13 +55,16 @@ class Addressee:
     # in memory.
     #
     # This should be treated as an immutable class.
-    def __init__(self, msg_type: str,
-                 user_profiles: Optional[Sequence[UserProfile]]=None,
-                 stream: Optional[Stream]=None,
-                 stream_name: Optional[str]=None,
-                 stream_id: Optional[int]=None,
-                 topic: Optional[str]=None) -> None:
-        assert(msg_type in ['stream', 'private'])
+    def __init__(
+        self,
+        msg_type: str,
+        user_profiles: Optional[Sequence[UserProfile]] = None,
+        stream: Optional[Stream] = None,
+        stream_name: Optional[str] = None,
+        stream_id: Optional[int] = None,
+        topic: Optional[str] = None,
+    ) -> None:
+        assert msg_type in ['stream', 'private']
         if msg_type == 'stream' and topic is None:
             raise JsonableError(_("Missing topic"))
         self._msg_type = msg_type
@@ -75,33 +81,35 @@ class Addressee:
         return self._msg_type == 'private'
 
     def user_profiles(self) -> Sequence[UserProfile]:
-        assert(self.is_private())
+        assert self.is_private()
         assert self._user_profiles is not None
         return self._user_profiles
 
     def stream(self) -> Optional[Stream]:
-        assert(self.is_stream())
+        assert self.is_stream()
         return self._stream
 
     def stream_name(self) -> Optional[str]:
-        assert(self.is_stream())
+        assert self.is_stream()
         return self._stream_name
 
     def stream_id(self) -> Optional[int]:
-        assert(self.is_stream())
+        assert self.is_stream()
         return self._stream_id
 
     def topic(self) -> str:
-        assert(self.is_stream())
-        assert(self._topic is not None)
+        assert self.is_stream()
+        assert self._topic is not None
         return self._topic
 
     @staticmethod
-    def legacy_build(sender: UserProfile,
-                     message_type_name: str,
-                     message_to: Union[Sequence[int], Sequence[str]],
-                     topic_name: Optional[str],
-                     realm: Optional[Realm]=None) -> 'Addressee':
+    def legacy_build(
+        sender: UserProfile,
+        message_type_name: str,
+        message_to: Union[Sequence[int], Sequence[str]],
+        topic_name: Optional[str],
+        realm: Optional[Realm] = None,
+    ) -> 'Addressee':
 
         # For legacy reason message_to used to be either a list of
         # emails or a list of streams.  We haven't fixed all of our
diff --git a/zerver/lib/alert_words.py b/zerver/lib/alert_words.py
index 5d0d7f9d3a..6da7a2b5c2 100644
--- a/zerver/lib/alert_words.py
+++ b/zerver/lib/alert_words.py
@@ -11,20 +11,22 @@ from zerver.lib.cache import (
 from zerver.models import AlertWord, Realm, UserProfile, flush_realm_alert_words
 
 
-@cache_with_key(realm_alert_words_cache_key, timeout=3600*24)
+@cache_with_key(realm_alert_words_cache_key, timeout=3600 * 24)
 def alert_words_in_realm(realm: Realm) -> Dict[int, List[str]]:
-    user_ids_and_words = AlertWord.objects.filter(
-        realm=realm, user_profile__is_active=True).values("user_profile_id", "word")
+    user_ids_and_words = AlertWord.objects.filter(realm=realm, user_profile__is_active=True).values(
+        "user_profile_id", "word"
+    )
     user_ids_with_words: Dict[int, List[str]] = {}
     for id_and_word in user_ids_and_words:
         user_ids_with_words.setdefault(id_and_word["user_profile_id"], [])
         user_ids_with_words[id_and_word["user_profile_id"]].append(id_and_word["word"])
     return user_ids_with_words
 
-@cache_with_key(realm_alert_words_automaton_cache_key, timeout=3600*24)
+
+@cache_with_key(realm_alert_words_automaton_cache_key, timeout=3600 * 24)
 def get_alert_word_automaton(realm: Realm) -> ahocorasick.Automaton:
     user_id_with_words = alert_words_in_realm(realm)
-    alert_word_automaton  = ahocorasick.Automaton()
+    alert_word_automaton = ahocorasick.Automaton()
     for (user_id, alert_words) in user_id_with_words.items():
         for alert_word in alert_words:
             alert_word_lower = alert_word.lower()
@@ -42,9 +44,11 @@ def get_alert_word_automaton(realm: Realm) -> ahocorasick.Automaton:
         return None
     return alert_word_automaton
 
+
 def user_alert_words(user_profile: UserProfile) -> List[str]:
     return list(AlertWord.objects.filter(user_profile=user_profile).values_list("word", flat=True))
 
+
 @transaction.atomic
 def add_user_alert_words(user_profile: UserProfile, new_words: Iterable[str]) -> List[str]:
     existing_words_lower = {word.lower() for word in user_alert_words(user_profile)}
@@ -66,6 +70,7 @@ def add_user_alert_words(user_profile: UserProfile, new_words: Iterable[str]) ->
 
     return user_alert_words(user_profile)
 
+
 @transaction.atomic
 def remove_user_alert_words(user_profile: UserProfile, delete_words: Iterable[str]) -> List[str]:
     # TODO: Ideally, this would be a bulk query, but Django doesn't have a `__iexact`.
diff --git a/zerver/lib/attachments.py b/zerver/lib/attachments.py
index 477770f658..f799a7f88c 100644
--- a/zerver/lib/attachments.py
+++ b/zerver/lib/attachments.py
@@ -11,8 +11,10 @@ def user_attachments(user_profile: UserProfile) -> List[Dict[str, Any]]:
     attachments = Attachment.objects.filter(owner=user_profile).prefetch_related('messages')
     return [a.to_dict() for a in attachments]
 
-def access_attachment_by_id(user_profile: UserProfile, attachment_id: int,
-                            needs_owner: bool=False) -> Attachment:
+
+def access_attachment_by_id(
+    user_profile: UserProfile, attachment_id: int, needs_owner: bool = False
+) -> Attachment:
     query = Attachment.objects.filter(id=attachment_id)
     if needs_owner:
         query = query.filter(owner=user_profile)
@@ -22,9 +24,12 @@ def access_attachment_by_id(user_profile: UserProfile, attachment_id: int,
         raise JsonableError(_("Invalid attachment"))
     return attachment
 
+
 def remove_attachment(user_profile: UserProfile, attachment: Attachment) -> None:
     try:
         delete_message_image(attachment.path_id)
     except Exception:
-        raise JsonableError(_("An error occurred while deleting the attachment. Please try again later."))
+        raise JsonableError(
+            _("An error occurred while deleting the attachment. Please try again later.")
+        )
     attachment.delete()
diff --git a/zerver/lib/avatar.py b/zerver/lib/avatar.py
index 94493eb99e..1bf78bbb71 100644
--- a/zerver/lib/avatar.py
+++ b/zerver/lib/avatar.py
@@ -12,7 +12,9 @@ from zerver.lib.upload import MEDIUM_AVATAR_SIZE, upload_backend
 from zerver.models import UserProfile
 
 
-def avatar_url(user_profile: UserProfile, medium: bool=False, client_gravatar: bool=False) -> Optional[str]:
+def avatar_url(
+    user_profile: UserProfile, medium: bool = False, client_gravatar: bool = False
+) -> Optional[str]:
 
     return get_avatar_field(
         user_id=user_profile.id,
@@ -24,31 +26,36 @@ def avatar_url(user_profile: UserProfile, medium: bool=False, client_gravatar: b
         client_gravatar=client_gravatar,
     )
 
-def avatar_url_from_dict(userdict: Dict[str, Any], medium: bool=False) -> str:
-    '''
+
+def avatar_url_from_dict(userdict: Dict[str, Any], medium: bool = False) -> str:
+    """
     DEPRECATED: We should start using
                 get_avatar_field to populate users,
                 particularly for codepaths where the
                 client can compute gravatar URLs
                 on the client side.
-    '''
+    """
     url = _get_unversioned_avatar_url(
         userdict['id'],
         userdict['avatar_source'],
         userdict['realm_id'],
         email=userdict['email'],
-        medium=medium)
+        medium=medium,
+    )
     url += '&version={:d}'.format(userdict['avatar_version'])
     return url
 
-def get_avatar_field(user_id: int,
-                     realm_id: int,
-                     email: str,
-                     avatar_source: str,
-                     avatar_version: int,
-                     medium: bool,
-                     client_gravatar: bool) -> Optional[str]:
-    '''
+
+def get_avatar_field(
+    user_id: int,
+    realm_id: int,
+    email: str,
+    avatar_source: str,
+    avatar_version: int,
+    medium: bool,
+    client_gravatar: bool,
+) -> Optional[str]:
+    """
     Most of the parameters to this function map to fields
     by the same name in UserProfile (avatar_source, realm_id,
     email, etc.).
@@ -63,14 +70,14 @@ def get_avatar_field(user_id: int,
         client_gravatar - If the client can compute their own
             gravatars, this will be set to True, and we'll avoid
             computing them on the server (mostly to save bandwidth).
-    '''
+    """
 
     if client_gravatar:
-        '''
+        """
         If our client knows how to calculate gravatar hashes, we
         will return None and let the client compute the gravatar
         url.
-        '''
+        """
         if settings.ENABLE_GRAVATAR:
             if avatar_source == UserProfile.AVATAR_FROM_GRAVATAR:
                 return None
@@ -90,29 +97,35 @@ def get_avatar_field(user_id: int,
     url += f'&version={avatar_version:d}'
     return url
 
-def get_gravatar_url(email: str, avatar_version: int, medium: bool=False) -> str:
+
+def get_gravatar_url(email: str, avatar_version: int, medium: bool = False) -> str:
     url = _get_unversioned_gravatar_url(email, medium)
     url += f'&version={avatar_version:d}'
     return url
 
+
 def _get_unversioned_gravatar_url(email: str, medium: bool) -> str:
     if settings.ENABLE_GRAVATAR:
         gravitar_query_suffix = f"&s={MEDIUM_AVATAR_SIZE}" if medium else ""
         hash_key = gravatar_hash(email)
         return f"https://secure.gravatar.com/avatar/{hash_key}?d=identicon{gravitar_query_suffix}"
-    return settings.DEFAULT_AVATAR_URI+'?x=x'
+    return settings.DEFAULT_AVATAR_URI + '?x=x'
 
-def _get_unversioned_avatar_url(user_profile_id: int,
-                                avatar_source: str,
-                                realm_id: int,
-                                email: Optional[str]=None,
-                                medium: bool=False) -> str:
+
+def _get_unversioned_avatar_url(
+    user_profile_id: int,
+    avatar_source: str,
+    realm_id: int,
+    email: Optional[str] = None,
+    medium: bool = False,
+) -> str:
     if avatar_source == 'U':
         hash_key = user_avatar_path_from_ids(user_profile_id, realm_id)
         return upload_backend.get_avatar_url(hash_key, medium=medium)
     assert email is not None
     return _get_unversioned_gravatar_url(email, medium)
 
+
 def absolute_avatar_url(user_profile: UserProfile) -> str:
     """
     Absolute URLs are used to simplify logic for applications that
@@ -123,6 +136,7 @@ def absolute_avatar_url(user_profile: UserProfile) -> str:
     assert avatar is not None
     return urllib.parse.urljoin(user_profile.realm.uri, avatar)
 
+
 def is_avatar_new(ldap_avatar: bytes, user_profile: UserProfile) -> bool:
     new_avatar_hash = user_avatar_content_hash(ldap_avatar)
 
diff --git a/zerver/lib/avatar_hash.py b/zerver/lib/avatar_hash.py
index 492a575cc0..240c033a5d 100644
--- a/zerver/lib/avatar_hash.py
+++ b/zerver/lib/avatar_hash.py
@@ -15,6 +15,7 @@ def gravatar_hash(email: str) -> str:
     # not error out on it.
     return make_safe_digest(email.lower(), hashlib.md5)
 
+
 def user_avatar_hash(uid: str) -> str:
 
     # WARNING: If this method is changed, you may need to do a migration
@@ -26,15 +27,18 @@ def user_avatar_hash(uid: str) -> str:
     user_key = uid + settings.AVATAR_SALT
     return make_safe_digest(user_key, hashlib.sha1)
 
+
 def user_avatar_path(user_profile: UserProfile) -> str:
 
     # WARNING: If this method is changed, you may need to do a migration
     # similar to zerver/migrations/0060_move_avatars_to_be_uid_based.py .
     return user_avatar_path_from_ids(user_profile.id, user_profile.realm_id)
 
+
 def user_avatar_path_from_ids(user_profile_id: int, realm_id: int) -> str:
     user_id_hash = user_avatar_hash(str(user_profile_id))
     return f'{str(realm_id)}/{user_id_hash}'
 
+
 def user_avatar_content_hash(ldap_avatar: bytes) -> str:
     return hashlib.sha256(ldap_avatar).hexdigest()
diff --git a/zerver/lib/bot_config.py b/zerver/lib/bot_config.py
index e4bf3c873e..94e065316a 100644
--- a/zerver/lib/bot_config.py
+++ b/zerver/lib/bot_config.py
@@ -15,12 +15,14 @@ from zerver.models import BotConfigData, UserProfile
 class ConfigError(Exception):
     pass
 
+
 def get_bot_config(bot_profile: UserProfile) -> Dict[str, str]:
     entries = BotConfigData.objects.filter(bot_profile=bot_profile)
     if not entries:
         raise ConfigError("No config data available.")
     return {entry.key: entry.value for entry in entries}
 
+
 def get_bot_configs(bot_profile_ids: List[int]) -> Dict[int, Dict[str, str]]:
     if not bot_profile_ids:
         return {}
@@ -30,17 +32,22 @@ def get_bot_configs(bot_profile_ids: List[int]) -> Dict[int, Dict[str, str]]:
         entries_by_uid[entry.bot_profile_id].update({entry.key: entry.value})
     return entries_by_uid
 
-def get_bot_config_size(bot_profile: UserProfile, key: Optional[str]=None) -> int:
+
+def get_bot_config_size(bot_profile: UserProfile, key: Optional[str] = None) -> int:
     if key is None:
-        return BotConfigData.objects.filter(bot_profile=bot_profile) \
-                                    .annotate(key_size=Length('key'), value_size=Length('value')) \
-                                    .aggregate(sum=Sum(F('key_size')+F('value_size')))['sum'] or 0
+        return (
+            BotConfigData.objects.filter(bot_profile=bot_profile)
+            .annotate(key_size=Length('key'), value_size=Length('value'))
+            .aggregate(sum=Sum(F('key_size') + F('value_size')))['sum']
+            or 0
+        )
     else:
         try:
             return len(key) + len(BotConfigData.objects.get(bot_profile=bot_profile, key=key).value)
         except BotConfigData.DoesNotExist:
             return 0
 
+
 def set_bot_config(bot_profile: UserProfile, key: str, value: str) -> None:
     config_size_limit = settings.BOT_CONFIG_SIZE_LIMIT
     old_entry_size = get_bot_config_size(bot_profile, key)
@@ -48,15 +55,20 @@ def set_bot_config(bot_profile: UserProfile, key: str, value: str) -> None:
     old_config_size = get_bot_config_size(bot_profile)
     new_config_size = old_config_size + (new_entry_size - old_entry_size)
     if new_config_size > config_size_limit:
-        raise ConfigError("Cannot store configuration. Request would require {} characters. "
-                          "The current configuration size limit is {} characters.".format(new_config_size,
-                                                                                          config_size_limit))
-    obj, created = BotConfigData.objects.get_or_create(bot_profile=bot_profile, key=key,
-                                                       defaults={'value': value})
+        raise ConfigError(
+            "Cannot store configuration. Request would require {} characters. "
+            "The current configuration size limit is {} characters.".format(
+                new_config_size, config_size_limit
+            )
+        )
+    obj, created = BotConfigData.objects.get_or_create(
+        bot_profile=bot_profile, key=key, defaults={'value': value}
+    )
     if not created:
         obj.value = value
         obj.save()
 
+
 def load_bot_config_template(bot: str) -> Dict[str, str]:
     bot_module_name = f'zulip_bots.bots.{bot}'
     bot_module = importlib.import_module(bot_module_name)
diff --git a/zerver/lib/bot_lib.py b/zerver/lib/bot_lib.py
index 9ba4e92e87..acbb83e7d9 100644
--- a/zerver/lib/bot_lib.py
+++ b/zerver/lib/bot_lib.py
@@ -60,12 +60,15 @@ class StateHandler:
     def contains(self, key: str) -> bool:
         return is_key_in_bot_storage(self.user_profile, key)
 
+
 class EmbeddedBotQuitException(Exception):
     pass
 
+
 class EmbeddedBotEmptyRecipientsList(Exception):
     pass
 
+
 class EmbeddedBotHandler:
     def __init__(self, user_profile: UserProfile) -> None:
         # Only expose a subset of our UserProfile's functionality
@@ -82,8 +85,11 @@ class EmbeddedBotHandler:
 
         if message['type'] == 'stream':
             internal_send_stream_message_by_name(
-                self.user_profile.realm, self.user_profile,
-                message['to'], message['topic'], message['content'],
+                self.user_profile.realm,
+                self.user_profile,
+                message['to'],
+                message['topic'],
+                message['content'],
             )
             return
 
@@ -96,31 +102,37 @@ class EmbeddedBotHandler:
             raise EmbeddedBotEmptyRecipientsList(_('Message must have recipients!'))
         elif len(message['to']) == 1:
             recipient_user = get_active_user(recipients[0], self.user_profile.realm)
-            internal_send_private_message(self.user_profile.realm, self.user_profile,
-                                          recipient_user, message['content'])
+            internal_send_private_message(
+                self.user_profile.realm, self.user_profile, recipient_user, message['content']
+            )
         else:
-            internal_send_huddle_message(self.user_profile.realm, self.user_profile,
-                                         recipients, message['content'])
+            internal_send_huddle_message(
+                self.user_profile.realm, self.user_profile, recipients, message['content']
+            )
 
     def send_reply(self, message: Dict[str, Any], response: str) -> None:
         if message['type'] == 'private':
-            self.send_message(dict(
-                type='private',
-                to=[x['email'] for x in message['display_recipient']],
-                content=response,
-                sender_email=message['sender_email'],
-            ))
+            self.send_message(
+                dict(
+                    type='private',
+                    to=[x['email'] for x in message['display_recipient']],
+                    content=response,
+                    sender_email=message['sender_email'],
+                )
+            )
         else:
-            self.send_message(dict(
-                type='stream',
-                to=message['display_recipient'],
-                topic=get_topic_from_message_info(message),
-                content=response,
-                sender_email=message['sender_email'],
-            ))
+            self.send_message(
+                dict(
+                    type='stream',
+                    to=message['display_recipient'],
+                    topic=get_topic_from_message_info(message),
+                    content=response,
+                    sender_email=message['sender_email'],
+                )
+            )
 
     # The bot_name argument exists only to comply with ExternalBotHandler.get_config_info().
-    def get_config_info(self, bot_name: str, optional: bool=False) -> Dict[str, str]:
+    def get_config_info(self, bot_name: str, optional: bool = False) -> Dict[str, str]:
         try:
             return get_bot_config(self.user_profile)
         except ConfigError:
@@ -128,5 +140,5 @@ class EmbeddedBotHandler:
                 return {}
             raise
 
-    def quit(self, message: str= "") -> None:
+    def quit(self, message: str = "") -> None:
         raise EmbeddedBotQuitException(message)
diff --git a/zerver/lib/bot_storage.py b/zerver/lib/bot_storage.py
index db6d1d7474..50ae7162eb 100644
--- a/zerver/lib/bot_storage.py
+++ b/zerver/lib/bot_storage.py
@@ -11,23 +11,31 @@ from zerver.models import BotStorageData, UserProfile
 class StateError(Exception):
     pass
 
+
 def get_bot_storage(bot_profile: UserProfile, key: str) -> str:
     try:
         return BotStorageData.objects.get(bot_profile=bot_profile, key=key).value
     except BotStorageData.DoesNotExist:
         raise StateError("Key does not exist.")
 
-def get_bot_storage_size(bot_profile: UserProfile, key: Optional[str]=None) -> int:
+
+def get_bot_storage_size(bot_profile: UserProfile, key: Optional[str] = None) -> int:
     if key is None:
-        return BotStorageData.objects.filter(bot_profile=bot_profile) \
-                                     .annotate(key_size=Length('key'), value_size=Length('value')) \
-                                     .aggregate(sum=Sum(F('key_size')+F('value_size')))['sum'] or 0
+        return (
+            BotStorageData.objects.filter(bot_profile=bot_profile)
+            .annotate(key_size=Length('key'), value_size=Length('value'))
+            .aggregate(sum=Sum(F('key_size') + F('value_size')))['sum']
+            or 0
+        )
     else:
         try:
-            return len(key) + len(BotStorageData.objects.get(bot_profile=bot_profile, key=key).value)
+            return len(key) + len(
+                BotStorageData.objects.get(bot_profile=bot_profile, key=key).value
+            )
         except BotStorageData.DoesNotExist:
             return 0
 
+
 def set_bot_storage(bot_profile: UserProfile, entries: List[Tuple[str, str]]) -> None:
     storage_size_limit = settings.USER_STATE_SIZE_LIMIT
     storage_size_difference = 0
@@ -37,12 +45,17 @@ def set_bot_storage(bot_profile: UserProfile, entries: List[Tuple[str, str]]) ->
         storage_size_difference += (len(key) + len(value)) - get_bot_storage_size(bot_profile, key)
     new_storage_size = get_bot_storage_size(bot_profile) + storage_size_difference
     if new_storage_size > storage_size_limit:
-        raise StateError("Request exceeds storage limit by {} characters. The limit is {} characters."
-                         .format(new_storage_size - storage_size_limit, storage_size_limit))
+        raise StateError(
+            "Request exceeds storage limit by {} characters. The limit is {} characters.".format(
+                new_storage_size - storage_size_limit, storage_size_limit
+            )
+        )
     else:
         for key, value in entries:
-            BotStorageData.objects.update_or_create(bot_profile=bot_profile, key=key,
-                                                    defaults={'value': value})
+            BotStorageData.objects.update_or_create(
+                bot_profile=bot_profile, key=key, defaults={'value': value}
+            )
+
 
 def remove_bot_storage(bot_profile: UserProfile, keys: List[str]) -> None:
     queryset = BotStorageData.objects.filter(bot_profile=bot_profile, key__in=keys)
@@ -50,8 +63,12 @@ def remove_bot_storage(bot_profile: UserProfile, keys: List[str]) -> None:
         raise StateError("Key does not exist.")
     queryset.delete()
 
+
 def is_key_in_bot_storage(bot_profile: UserProfile, key: str) -> bool:
     return BotStorageData.objects.filter(bot_profile=bot_profile, key=key).exists()
 
+
 def get_keys_in_bot_storage(bot_profile: UserProfile) -> List[str]:
-    return list(BotStorageData.objects.filter(bot_profile=bot_profile).values_list('key', flat=True))
+    return list(
+        BotStorageData.objects.filter(bot_profile=bot_profile).values_list('key', flat=True)
+    )
diff --git a/zerver/lib/bulk_create.py b/zerver/lib/bulk_create.py
index ba82329aa5..12ba3d5875 100644
--- a/zerver/lib/bulk_create.py
+++ b/zerver/lib/bulk_create.py
@@ -8,28 +8,40 @@ from zerver.lib.streams import render_stream_description
 from zerver.models import Realm, RealmAuditLog, Recipient, Stream, Subscription, UserProfile
 
 
-def bulk_create_users(realm: Realm,
-                      users_raw: Set[Tuple[str, str, bool]],
-                      bot_type: Optional[int]=None,
-                      bot_owner: Optional[UserProfile]=None,
-                      tos_version: Optional[str]=None,
-                      timezone: str="") -> None:
+def bulk_create_users(
+    realm: Realm,
+    users_raw: Set[Tuple[str, str, bool]],
+    bot_type: Optional[int] = None,
+    bot_owner: Optional[UserProfile] = None,
+    tos_version: Optional[str] = None,
+    timezone: str = "",
+) -> None:
     """
     Creates and saves a UserProfile with the given email.
     Has some code based off of UserManage.create_user, but doesn't .save()
     """
-    existing_users = frozenset(UserProfile.objects.filter(
-        realm=realm).values_list('email', flat=True))
+    existing_users = frozenset(
+        UserProfile.objects.filter(realm=realm).values_list('email', flat=True)
+    )
     users = sorted(user_raw for user_raw in users_raw if user_raw[0] not in existing_users)
 
     # Now create user_profiles
     profiles_to_create: List[UserProfile] = []
     for (email, full_name, active) in users:
-        profile = create_user_profile(realm, email,
-                                      initial_password(email), active, bot_type,
-                                      full_name, bot_owner, False, tos_version,
-                                      timezone, tutorial_status=UserProfile.TUTORIAL_FINISHED,
-                                      enter_sends=True)
+        profile = create_user_profile(
+            realm,
+            email,
+            initial_password(email),
+            active,
+            bot_type,
+            full_name,
+            bot_owner,
+            False,
+            tos_version,
+            timezone,
+            tutorial_status=UserProfile.TUTORIAL_FINISHED,
+            enter_sends=True,
+        )
         profiles_to_create.append(profile)
 
     if realm.email_address_visibility == Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE:
@@ -47,9 +59,14 @@ def bulk_create_users(realm: Realm,
     user_ids = {user.id for user in profiles_to_create}
 
     RealmAuditLog.objects.bulk_create(
-        RealmAuditLog(realm=realm, modified_user=profile_,
-                      event_type=RealmAuditLog.USER_CREATED, event_time=profile_.date_joined)
-        for profile_ in profiles_to_create)
+        RealmAuditLog(
+            realm=realm,
+            modified_user=profile_,
+            event_type=RealmAuditLog.USER_CREATED,
+            event_time=profile_.date_joined,
+        )
+        for profile_ in profiles_to_create
+    )
 
     recipients_to_create: List[Recipient] = []
     for user_id in user_ids:
@@ -58,7 +75,9 @@ def bulk_create_users(realm: Realm,
 
     Recipient.objects.bulk_create(recipients_to_create)
 
-    bulk_set_users_or_streams_recipient_fields(UserProfile, profiles_to_create, recipients_to_create)
+    bulk_set_users_or_streams_recipient_fields(
+        UserProfile, profiles_to_create, recipients_to_create
+    )
 
     recipients_by_user_id: Dict[int, Recipient] = {}
     for recipient in recipients_to_create:
@@ -72,9 +91,12 @@ def bulk_create_users(realm: Realm,
 
     Subscription.objects.bulk_create(subscriptions_to_create)
 
-def bulk_set_users_or_streams_recipient_fields(model: Model,
-                                               objects: Union[Iterable[UserProfile], Iterable[Stream]],
-                                               recipients: Optional[Iterable[Recipient]]=None) -> None:
+
+def bulk_set_users_or_streams_recipient_fields(
+    model: Model,
+    objects: Union[Iterable[UserProfile], Iterable[Stream]],
+    recipients: Optional[Iterable[Recipient]] = None,
+) -> None:
     assert model in [UserProfile, Stream]
     for obj in objects:
         assert isinstance(obj, model)
@@ -99,18 +121,18 @@ def bulk_set_users_or_streams_recipient_fields(model: Model,
             objects_to_update.add(result)
     model.objects.bulk_update(objects_to_update, ['recipient'])
 
+
 # This is only sed in populate_db, so doesn't really need tests
-def bulk_create_streams(realm: Realm,
-                        stream_dict: Dict[str, Dict[str, Any]]) -> None:  # nocoverage
+def bulk_create_streams(realm: Realm, stream_dict: Dict[str, Dict[str, Any]]) -> None:  # nocoverage
     existing_streams = {
-        name.lower()
-        for name in Stream.objects.filter(realm=realm).values_list('name', flat=True)
+        name.lower() for name in Stream.objects.filter(realm=realm).values_list('name', flat=True)
     }
     streams_to_create: List[Stream] = []
     for name, options in stream_dict.items():
         if 'history_public_to_subscribers' not in options:
             options['history_public_to_subscribers'] = (
-                not options.get("invite_only", False) and not realm.is_zephyr_mirror_realm)
+                not options.get("invite_only", False) and not realm.is_zephyr_mirror_realm
+            )
         if name.lower() not in existing_streams:
             streams_to_create.append(
                 Stream(
@@ -119,8 +141,9 @@ def bulk_create_streams(realm: Realm,
                     description=options["description"],
                     rendered_description=render_stream_description(options["description"]),
                     invite_only=options.get("invite_only", False),
-                    stream_post_policy=options.get("stream_post_policy",
-                                                   Stream.STREAM_POST_POLICY_EVERYONE),
+                    stream_post_policy=options.get(
+                        "stream_post_policy", Stream.STREAM_POST_POLICY_EVERYONE
+                    ),
                     history_public_to_subscribers=options["history_public_to_subscribers"],
                     is_web_public=options.get("is_web_public", False),
                     is_in_zephyr_realm=realm.is_zephyr_mirror_realm,
@@ -140,8 +163,7 @@ def bulk_create_streams(realm: Realm,
     recipients_to_create: List[Recipient] = []
     for stream in Stream.objects.filter(realm=realm).values('id', 'name'):
         if stream['name'].lower() not in existing_streams:
-            recipients_to_create.append(Recipient(type_id=stream['id'],
-                                                  type=Recipient.STREAM))
+            recipients_to_create.append(Recipient(type_id=stream['id'], type=Recipient.STREAM))
     Recipient.objects.bulk_create(recipients_to_create)
 
     bulk_set_users_or_streams_recipient_fields(Stream, streams_to_create, recipients_to_create)
diff --git a/zerver/lib/cache.py b/zerver/lib/cache.py
index e51f637aed..5002c917b9 100644
--- a/zerver/lib/cache.py
+++ b/zerver/lib/cache.py
@@ -42,6 +42,7 @@ FuncT = TypeVar('FuncT', bound=Callable[..., object])
 
 logger = logging.getLogger()
 
+
 class NotFoundInCache(Exception):
     pass
 
@@ -50,22 +51,27 @@ remote_cache_time_start = 0.0
 remote_cache_total_time = 0.0
 remote_cache_total_requests = 0
 
+
 def get_remote_cache_time() -> float:
     return remote_cache_total_time
 
+
 def get_remote_cache_requests() -> int:
     return remote_cache_total_requests
 
+
 def remote_cache_stats_start() -> None:
     global remote_cache_time_start
     remote_cache_time_start = time.time()
 
+
 def remote_cache_stats_finish() -> None:
     global remote_cache_total_time
     global remote_cache_total_requests
     global remote_cache_time_start
     remote_cache_total_requests += 1
-    remote_cache_total_time += (time.time() - remote_cache_time_start)
+    remote_cache_total_time += time.time() - remote_cache_time_start
+
 
 def get_or_create_key_prefix() -> str:
     if settings.PUPPETEER_TESTS:
@@ -105,8 +111,10 @@ def get_or_create_key_prefix() -> str:
 
     return prefix
 
+
 KEY_PREFIX: str = get_or_create_key_prefix()
 
+
 def bounce_key_prefix_for_testing(test_name: str) -> None:
     global KEY_PREFIX
     KEY_PREFIX = test_name + ':' + str(os.getpid()) + ':'
@@ -114,20 +122,23 @@ def bounce_key_prefix_for_testing(test_name: str) -> None:
     # Memcached keys should have a length of less than 250.
     KEY_PREFIX = hashlib.sha1(KEY_PREFIX.encode('utf-8')).hexdigest() + ":"
 
+
 def get_cache_backend(cache_name: Optional[str]) -> BaseCache:
     if cache_name is None:
         return djcache
     return caches[cache_name]
 
+
 def get_cache_with_key(
-        keyfunc: Callable[..., str],
-        cache_name: Optional[str]=None,
+    keyfunc: Callable[..., str],
+    cache_name: Optional[str] = None,
 ) -> Callable[[FuncT], FuncT]:
     """
     The main goal of this function getting value from the cache like in the "cache_with_key".
     A cache value can contain any data including the "None", so
     here used exception for case if value isn't found in the cache.
     """
+
     def decorator(func: FuncT) -> FuncT:
         @wraps(func)
         def func_with_caching(*args: object, **kwargs: object) -> object:
@@ -147,16 +158,19 @@ def get_cache_with_key(
 
     return decorator
 
+
 def cache_with_key(
-        keyfunc: Callable[..., str], cache_name: Optional[str]=None,
-        timeout: Optional[int]=None, with_statsd_key: Optional[str]=None,
+    keyfunc: Callable[..., str],
+    cache_name: Optional[str] = None,
+    timeout: Optional[int] = None,
+    with_statsd_key: Optional[str] = None,
 ) -> Callable[[FuncT], FuncT]:
     """Decorator which applies Django caching to a function.
 
-       Decorator argument is a function which computes a cache key
-       from the original function's arguments.  You are responsible
-       for avoiding collisions with other uses of this decorator or
-       other uses of caching."""
+    Decorator argument is a function which computes a cache key
+    from the original function's arguments.  You are responsible
+    for avoiding collisions with other uses of this decorator or
+    other uses of caching."""
 
     def decorator(func: FuncT) -> FuncT:
         @wraps(func)
@@ -197,14 +211,19 @@ def cache_with_key(
 
     return decorator
 
+
 class InvalidCacheKeyException(Exception):
     pass
 
+
 def log_invalid_cache_keys(stack_trace: str, key: List[str]) -> None:
     logger.warning(
-        "Invalid cache key used: %s\nStack trace: %s\n", key, stack_trace,
+        "Invalid cache key used: %s\nStack trace: %s\n",
+        key,
+        stack_trace,
     )
 
+
 def validate_cache_key(key: str) -> None:
     if not key.startswith(KEY_PREFIX):
         key = KEY_PREFIX + key
@@ -222,7 +241,10 @@ def validate_cache_key(key: str) -> None:
     if len(key) > MEMCACHED_MAX_KEY_LENGTH:
         raise InvalidCacheKeyException(f"Cache key too long: {key} Length: {len(key)}")
 
-def cache_set(key: str, val: Any, cache_name: Optional[str]=None, timeout: Optional[int]=None) -> None:
+
+def cache_set(
+    key: str, val: Any, cache_name: Optional[str] = None, timeout: Optional[int] = None
+) -> None:
     final_key = KEY_PREFIX + key
     validate_cache_key(final_key)
 
@@ -231,7 +253,8 @@ def cache_set(key: str, val: Any, cache_name: Optional[str]=None, timeout: Optio
     cache_backend.set(final_key, (val,), timeout=timeout)
     remote_cache_stats_finish()
 
-def cache_get(key: str, cache_name: Optional[str]=None) -> Any:
+
+def cache_get(key: str, cache_name: Optional[str] = None) -> Any:
     final_key = KEY_PREFIX + key
     validate_cache_key(final_key)
 
@@ -241,16 +264,18 @@ def cache_get(key: str, cache_name: Optional[str]=None) -> Any:
     remote_cache_stats_finish()
     return ret
 
-def cache_get_many(keys: List[str], cache_name: Optional[str]=None) -> Dict[str, Any]:
+
+def cache_get_many(keys: List[str], cache_name: Optional[str] = None) -> Dict[str, Any]:
     keys = [KEY_PREFIX + key for key in keys]
     for key in keys:
         validate_cache_key(key)
     remote_cache_stats_start()
     ret = get_cache_backend(cache_name).get_many(keys)
     remote_cache_stats_finish()
-    return {key[len(KEY_PREFIX):]: value for key, value in ret.items()}
+    return {key[len(KEY_PREFIX) :]: value for key, value in ret.items()}
 
-def safe_cache_get_many(keys: List[str], cache_name: Optional[str]=None) -> Dict[str, Any]:
+
+def safe_cache_get_many(keys: List[str], cache_name: Optional[str] = None) -> Dict[str, Any]:
     """Variant of cache_get_many that drops any keys that fail
     validation, rather than throwing an exception visible to the
     caller."""
@@ -266,8 +291,10 @@ def safe_cache_get_many(keys: List[str], cache_name: Optional[str]=None) -> Dict
         log_invalid_cache_keys(stack_trace, bad_keys)
         return cache_get_many(good_keys, cache_name)
 
-def cache_set_many(items: Dict[str, Any], cache_name: Optional[str]=None,
-                   timeout: Optional[int]=None) -> None:
+
+def cache_set_many(
+    items: Dict[str, Any], cache_name: Optional[str] = None, timeout: Optional[int] = None
+) -> None:
     new_items = {}
     for key in items:
         new_key = KEY_PREFIX + key
@@ -278,8 +305,10 @@ def cache_set_many(items: Dict[str, Any], cache_name: Optional[str]=None,
     get_cache_backend(cache_name).set_many(items, timeout=timeout)
     remote_cache_stats_finish()
 
-def safe_cache_set_many(items: Dict[str, Any], cache_name: Optional[str]=None,
-                        timeout: Optional[int]=None) -> None:
+
+def safe_cache_set_many(
+    items: Dict[str, Any], cache_name: Optional[str] = None, timeout: Optional[int] = None
+) -> None:
     """Variant of cache_set_many that drops saving any keys that fail
     validation, rather than throwing an exception visible to the
     caller."""
@@ -297,7 +326,8 @@ def safe_cache_set_many(items: Dict[str, Any], cache_name: Optional[str]=None,
         good_items = {key: items[key] for key in good_keys}
         return cache_set_many(good_items, cache_name, timeout)
 
-def cache_delete(key: str, cache_name: Optional[str]=None) -> None:
+
+def cache_delete(key: str, cache_name: Optional[str] = None) -> None:
     final_key = KEY_PREFIX + key
     validate_cache_key(final_key)
 
@@ -305,7 +335,8 @@ def cache_delete(key: str, cache_name: Optional[str]=None) -> None:
     get_cache_backend(cache_name).delete(final_key)
     remote_cache_stats_finish()
 
-def cache_delete_many(items: Iterable[str], cache_name: Optional[str]=None) -> None:
+
+def cache_delete_many(items: Iterable[str], cache_name: Optional[str] = None) -> None:
     keys = [KEY_PREFIX + item for item in items]
     for key in keys:
         validate_cache_key(key)
@@ -313,6 +344,7 @@ def cache_delete_many(items: Iterable[str], cache_name: Optional[str]=None) -> N
     get_cache_backend(cache_name).delete_many(keys)
     remote_cache_stats_finish()
 
+
 def filter_good_and_bad_keys(keys: List[str]) -> Tuple[List[str], List[str]]:
     good_keys = []
     bad_keys = []
@@ -325,6 +357,7 @@ def filter_good_and_bad_keys(keys: List[str]) -> Tuple[List[str], List[str]]:
 
     return good_keys, bad_keys
 
+
 # Generic_bulk_cached fetch and its helpers.  We start with declaring
 # a few type variables that help define its interface.
 
@@ -356,14 +389,14 @@ CompressedItemT = TypeVar('CompressedItemT')
 #   value for cache (in case the values that we're caching are some
 #   function of the objects, not the objects themselves)
 def generic_bulk_cached_fetch(
-        cache_key_function: Callable[[ObjKT], str],
-        query_function: Callable[[List[ObjKT]], Iterable[ItemT]],
-        object_ids: Sequence[ObjKT],
-        *,
-        extractor: Callable[[CompressedItemT], CacheItemT],
-        setter: Callable[[CacheItemT], CompressedItemT],
-        id_fetcher: Callable[[ItemT], ObjKT],
-        cache_transformer: Callable[[ItemT], CacheItemT],
+    cache_key_function: Callable[[ObjKT], str],
+    query_function: Callable[[List[ObjKT]], Iterable[ItemT]],
+    object_ids: Sequence[ObjKT],
+    *,
+    extractor: Callable[[CompressedItemT], CacheItemT],
+    setter: Callable[[CacheItemT], CompressedItemT],
+    id_fetcher: Callable[[ItemT], ObjKT],
+    cache_transformer: Callable[[ItemT], CacheItemT],
 ) -> Dict[ObjKT, CacheItemT]:
     if len(object_ids) == 0:
         # Nothing to fetch.
@@ -380,8 +413,9 @@ def generic_bulk_cached_fetch(
     cached_objects: Dict[str, CacheItemT] = {}
     for (key, val) in cached_objects_compressed.items():
         cached_objects[key] = extractor(cached_objects_compressed[key][0])
-    needed_ids = [object_id for object_id in object_ids if
-                  cache_keys[object_id] not in cached_objects]
+    needed_ids = [
+        object_id for object_id in object_ids if cache_keys[object_id] not in cached_objects
+    ]
 
     # Only call query_function if there are some ids to fetch from the database:
     if len(needed_ids) > 0:
@@ -397,8 +431,12 @@ def generic_bulk_cached_fetch(
         cached_objects[key] = item
     if len(items_for_remote_cache) > 0:
         safe_cache_set_many(items_for_remote_cache)
-    return {object_id: cached_objects[cache_keys[object_id]] for object_id in object_ids
-            if cache_keys[object_id] in cached_objects}
+    return {
+        object_id: cached_objects[cache_keys[object_id]]
+        for object_id in object_ids
+        if cache_keys[object_id] in cached_objects
+    }
+
 
 def transformed_bulk_cached_fetch(
     cache_key_function: Callable[[ObjKT], str],
@@ -418,6 +456,7 @@ def transformed_bulk_cached_fetch(
         cache_transformer=cache_transformer,
     )
 
+
 def bulk_cached_fetch(
     cache_key_function: Callable[[ObjKT], str],
     query_function: Callable[[List[ObjKT]], Iterable[ItemT]],
@@ -433,58 +472,83 @@ def bulk_cached_fetch(
         cache_transformer=lambda obj: obj,
     )
 
+
 def preview_url_cache_key(url: str) -> str:
     return f"preview_url:{make_safe_digest(url)}"
 
+
 def display_recipient_cache_key(recipient_id: int) -> str:
     return f"display_recipient_dict:{recipient_id}"
 
+
 def display_recipient_bulk_get_users_by_id_cache_key(user_id: int) -> str:
     # Cache key function for a function for bulk fetching users, used internally
     # by display_recipient code.
     return 'bulk_fetch_display_recipients:' + user_profile_by_id_cache_key(user_id)
 
+
 def user_profile_by_email_cache_key(email: str) -> str:
     # See the comment in zerver/lib/avatar_hash.py:gravatar_hash for why we
     # are proactively encoding email addresses even though they will
     # with high likelihood be ASCII-only for the foreseeable future.
     return f'user_profile_by_email:{make_safe_digest(email.strip())}'
 
+
 def user_profile_cache_key_id(email: str, realm_id: int) -> str:
     return f"user_profile:{make_safe_digest(email.strip())}:{realm_id}"
 
+
 def user_profile_cache_key(email: str, realm: 'Realm') -> str:
     return user_profile_cache_key_id(email, realm.id)
 
+
 def bot_profile_cache_key(email: str) -> str:
     return f"bot_profile:{make_safe_digest(email.strip())}"
 
+
 def user_profile_by_id_cache_key(user_profile_id: int) -> str:
     return f"user_profile_by_id:{user_profile_id}"
 
+
 def user_profile_by_api_key_cache_key(api_key: str) -> str:
     return f"user_profile_by_api_key:{api_key}"
 
+
 realm_user_dict_fields: List[str] = [
-    'id', 'full_name', 'email',
-    'avatar_source', 'avatar_version', 'is_active',
-    'role', 'is_bot', 'realm_id', 'timezone',
-    'date_joined', 'bot_owner_id', 'delivery_email',
-    'bot_type', 'long_term_idle'
+    'id',
+    'full_name',
+    'email',
+    'avatar_source',
+    'avatar_version',
+    'is_active',
+    'role',
+    'is_bot',
+    'realm_id',
+    'timezone',
+    'date_joined',
+    'bot_owner_id',
+    'delivery_email',
+    'bot_type',
+    'long_term_idle',
 ]
 
+
 def realm_user_dicts_cache_key(realm_id: int) -> str:
     return f"realm_user_dicts:{realm_id}"
 
+
 def get_realm_used_upload_space_cache_key(realm: 'Realm') -> str:
     return f'realm_used_upload_space:{realm.id}'
 
+
 def active_user_ids_cache_key(realm_id: int) -> str:
     return f"active_user_ids:{realm_id}"
 
+
 def active_non_guest_user_ids_cache_key(realm_id: int) -> str:
     return f"active_non_guest_user_ids:{realm_id}"
 
+
 bot_dict_fields: List[str] = [
     'api_key',
     'avatar_source',
@@ -501,16 +565,20 @@ bot_dict_fields: List[str] = [
     'realm_id',
 ]
 
+
 def bot_dicts_in_realm_cache_key(realm: 'Realm') -> str:
     return f"bot_dicts_in_realm:{realm.id}"
 
+
 def get_stream_cache_key(stream_name: str, realm_id: int) -> str:
     return f"stream_by_realm_and_name:{realm_id}:{make_safe_digest(stream_name.strip().lower())}"
 
+
 def delete_user_profile_caches(user_profiles: Iterable['UserProfile']) -> None:
     # Imported here to avoid cyclic dependency.
     from zerver.lib.users import get_all_api_keys
     from zerver.models import is_cross_realm_bot_email
+
     keys = []
     for user_profile in user_profiles:
         keys.append(user_profile_by_email_cache_key(user_profile.delivery_email))
@@ -524,14 +592,17 @@ def delete_user_profile_caches(user_profiles: Iterable['UserProfile']) -> None:
 
     cache_delete_many(keys)
 
+
 def delete_display_recipient_cache(user_profile: 'UserProfile') -> None:
     from zerver.models import Subscription  # We need to import here to avoid cyclic dependency.
+
     recipient_ids = Subscription.objects.filter(user_profile=user_profile)
     recipient_ids = recipient_ids.values_list('recipient_id', flat=True)
     keys = [display_recipient_cache_key(rid) for rid in recipient_ids]
     keys.append(display_recipient_bulk_get_users_by_id_cache_key(user_profile.id))
     cache_delete_many(keys)
 
+
 def changed(kwargs: Any, fields: List[str]) -> bool:
     if kwargs.get('update_fields') is None:
         # adds/deletes should invalidate the cache
@@ -544,6 +615,7 @@ def changed(kwargs: Any, fields: List[str]) -> bool:
 
     return False
 
+
 # Called by models.py to flush the user_profile cache whenever we save
 # a user_profile object
 def flush_user_profile(sender: Any, **kwargs: Any) -> None:
@@ -570,16 +642,20 @@ def flush_user_profile(sender: Any, **kwargs: Any) -> None:
     if user_profile.is_bot and changed(kwargs, bot_dict_fields):
         cache_delete(bot_dicts_in_realm_cache_key(user_profile.realm))
 
+
 # Called by models.py to flush various caches whenever we save
 # a Realm object.  The main tricky thing here is that Realm info is
 # generally cached indirectly through user_profile objects.
-def flush_realm(sender: Any, from_deletion: bool=False, **kwargs: Any) -> None:
+def flush_realm(sender: Any, from_deletion: bool = False, **kwargs: Any) -> None:
     realm = kwargs['instance']
     users = realm.get_active_users()
     delete_user_profile_caches(users)
 
-    if from_deletion or realm.deactivated or (kwargs["update_fields"] is not None and
-                                              "string_id" in kwargs['update_fields']):
+    if (
+        from_deletion
+        or realm.deactivated
+        or (kwargs["update_fields"] is not None and "string_id" in kwargs['update_fields'])
+    ):
         cache_delete(realm_user_dicts_cache_key(realm.id))
         cache_delete(active_user_ids_cache_key(realm.id))
         cache_delete(bot_dicts_in_realm_cache_key(realm))
@@ -592,52 +668,67 @@ def flush_realm(sender: Any, from_deletion: bool=False, **kwargs: Any) -> None:
         cache_delete(realm_rendered_description_cache_key(realm))
         cache_delete(realm_text_description_cache_key(realm))
 
+
 def realm_alert_words_cache_key(realm: 'Realm') -> str:
     return f"realm_alert_words:{realm.string_id}"
 
+
 def realm_alert_words_automaton_cache_key(realm: 'Realm') -> str:
     return f"realm_alert_words_automaton:{realm.string_id}"
 
+
 def realm_rendered_description_cache_key(realm: 'Realm') -> str:
     return f"realm_rendered_description:{realm.string_id}"
 
+
 def realm_text_description_cache_key(realm: 'Realm') -> str:
     return f"realm_text_description:{realm.string_id}"
 
+
 # Called by models.py to flush the stream cache whenever we save a stream
 # object.
 def flush_stream(sender: Any, **kwargs: Any) -> None:
     from zerver.models import UserProfile
+
     stream = kwargs['instance']
     items_for_remote_cache = {}
     items_for_remote_cache[get_stream_cache_key(stream.name, stream.realm_id)] = (stream,)
     cache_set_many(items_for_remote_cache)
 
-    if kwargs.get('update_fields') is None or 'name' in kwargs['update_fields'] and \
-       UserProfile.objects.filter(
-           Q(default_sending_stream=stream) |
-           Q(default_events_register_stream=stream)).exists():
+    if (
+        kwargs.get('update_fields') is None
+        or 'name' in kwargs['update_fields']
+        and UserProfile.objects.filter(
+            Q(default_sending_stream=stream) | Q(default_events_register_stream=stream)
+        ).exists()
+    ):
         cache_delete(bot_dicts_in_realm_cache_key(stream.realm))
 
+
 def flush_used_upload_space_cache(sender: Any, **kwargs: Any) -> None:
     attachment = kwargs['instance']
 
     if kwargs.get("created") is None or kwargs.get("created") is True:
         cache_delete(get_realm_used_upload_space_cache_key(attachment.owner.realm))
 
+
 def to_dict_cache_key_id(message_id: int) -> str:
     return f'message_dict:{message_id}'
 
-def to_dict_cache_key(message: 'Message', realm_id: Optional[int]=None) -> str:
+
+def to_dict_cache_key(message: 'Message', realm_id: Optional[int] = None) -> str:
     return to_dict_cache_key_id(message.id)
 
+
 def open_graph_description_cache_key(content: bytes, request: HttpRequest) -> str:
     return 'open_graph_description_path:{}'.format(make_safe_digest(request.META['PATH_INFO']))
 
+
 def flush_message(sender: Any, **kwargs: Any) -> None:
     message = kwargs['instance']
     cache_delete(to_dict_cache_key_id(message.id))
 
+
 def flush_submessage(sender: Any, **kwargs: Any) -> None:
     submessage = kwargs['instance']
     # submessages are not cached directly, they are part of their
@@ -645,9 +736,11 @@ def flush_submessage(sender: Any, **kwargs: Any) -> None:
     message_id = submessage.message_id
     cache_delete(to_dict_cache_key_id(message_id))
 
+
 DECORATOR = Callable[[Callable[..., Any]], Callable[..., Any]]
 
-def ignore_unhashable_lru_cache(maxsize: int=128, typed: bool=False) -> DECORATOR:
+
+def ignore_unhashable_lru_cache(maxsize: int = 128, typed: bool = False) -> DECORATOR:
     """
     This is a wrapper over lru_cache function. It adds following features on
     top of lru_cache:
@@ -695,8 +788,10 @@ def ignore_unhashable_lru_cache(maxsize: int=128, typed: bool=False) -> DECORATO
 
     return decorator
 
+
 def dict_to_items_tuple(user_function: Callable[..., Any]) -> Callable[..., Any]:
     """Wrapper that converts any dict args to dict item tuples."""
+
     def dict_to_tuple(arg: Any) -> Any:
         if isinstance(arg, dict):
             return tuple(sorted(arg.items()))
@@ -708,8 +803,10 @@ def dict_to_items_tuple(user_function: Callable[..., Any]) -> Callable[..., Any]
 
     return wrapper
 
+
 def items_tuple_to_dict(user_function: Callable[..., Any]) -> Callable[..., Any]:
     """Wrapper that converts any dict items tuple args to dicts."""
+
     def dict_items_to_dict(arg: Any) -> Any:
         if isinstance(arg, tuple):
             try:
diff --git a/zerver/lib/cache_helpers.py b/zerver/lib/cache_helpers.py
index 1ad4ef7eab..e16f601b69 100644
--- a/zerver/lib/cache_helpers.py
+++ b/zerver/lib/cache_helpers.py
@@ -36,47 +36,52 @@ from zerver.models import (
 
 MESSAGE_CACHE_SIZE = 75000
 
+
 def message_fetch_objects() -> List[Any]:
     try:
         max_id = Message.objects.only('id').order_by("-id")[0].id
     except IndexError:
         return []
-    return Message.objects.select_related().filter(~Q(sender__email='tabbott/extra@mit.edu'),
-                                                   id__gt=max_id - MESSAGE_CACHE_SIZE)
+    return Message.objects.select_related().filter(
+        ~Q(sender__email='tabbott/extra@mit.edu'), id__gt=max_id - MESSAGE_CACHE_SIZE
+    )
 
-def message_cache_items(items_for_remote_cache: Dict[str, Tuple[bytes]],
-                        message: Message) -> None:
-    '''
+
+def message_cache_items(items_for_remote_cache: Dict[str, Tuple[bytes]], message: Message) -> None:
+    """
     Note: this code is untested, and the caller has been
     commented out for a while.
-    '''
+    """
     key = to_dict_cache_key_id(message.id)
     value = MessageDict.to_dict_uncached([message])[message.id]
     items_for_remote_cache[key] = (value,)
 
-def user_cache_items(items_for_remote_cache: Dict[str, Tuple[UserProfile]],
-                     user_profile: UserProfile) -> None:
+
+def user_cache_items(
+    items_for_remote_cache: Dict[str, Tuple[UserProfile]], user_profile: UserProfile
+) -> None:
     for api_key in get_all_api_keys(user_profile):
         items_for_remote_cache[user_profile_by_api_key_cache_key(api_key)] = (user_profile,)
-    items_for_remote_cache[user_profile_cache_key(user_profile.email,
-                                                  user_profile.realm)] = (user_profile,)
+    items_for_remote_cache[user_profile_cache_key(user_profile.email, user_profile.realm)] = (
+        user_profile,
+    )
     # We have other user_profile caches, but none of them are on the
     # core serving path for lots of requests.
 
-def stream_cache_items(items_for_remote_cache: Dict[str, Tuple[Stream]],
-                       stream: Stream) -> None:
+
+def stream_cache_items(items_for_remote_cache: Dict[str, Tuple[Stream]], stream: Stream) -> None:
     items_for_remote_cache[get_stream_cache_key(stream.name, stream.realm_id)] = (stream,)
 
-def client_cache_items(items_for_remote_cache: Dict[str, Tuple[Client]],
-                       client: Client) -> None:
+
+def client_cache_items(items_for_remote_cache: Dict[str, Tuple[Client]], client: Client) -> None:
     items_for_remote_cache[get_client_cache_key(client.name)] = (client,)
 
-def huddle_cache_items(items_for_remote_cache: Dict[str, Tuple[Huddle]],
-                       huddle: Huddle) -> None:
+
+def huddle_cache_items(items_for_remote_cache: Dict[str, Tuple[Huddle]], huddle: Huddle) -> None:
     items_for_remote_cache[huddle_hash_cache_key(huddle.huddle_hash)] = (huddle,)
 
-def session_cache_items(items_for_remote_cache: Dict[str, str],
-                        session: Session) -> None:
+
+def session_cache_items(items_for_remote_cache: Dict[str, str], session: Session) -> None:
     if settings.SESSION_ENGINE != "django.contrib.sessions.backends.cached_db":
         # If we're not using the cached_db session engine, we there
         # will be no store.cache_key attribute, and in any case we
@@ -85,6 +90,7 @@ def session_cache_items(items_for_remote_cache: Dict[str, str],
     store = session_engine.SessionStore(session_key=session.session_key)
     items_for_remote_cache[store.cache_key] = store.decode(session.session_data)
 
+
 def get_active_realm_ids() -> List[int]:
     """For installations like Zulip Cloud hosting a lot of realms, it only makes
     sense to do cache-filling work for realms that have any currently
@@ -94,22 +100,30 @@ def get_active_realm_ids() -> List[int]:
     a new organization).
     """
     date = timezone_now() - datetime.timedelta(days=2)
-    return RealmCount.objects.filter(
-        end_time__gte=date,
-        property="1day_actives::day",
-        value__gt=0).distinct("realm_id").values_list("realm_id", flat=True)
+    return (
+        RealmCount.objects.filter(end_time__gte=date, property="1day_actives::day", value__gt=0)
+        .distinct("realm_id")
+        .values_list("realm_id", flat=True)
+    )
+
 
 def get_streams() -> List[Stream]:
-    return Stream.objects.select_related().filter(
-        realm__in=get_active_realm_ids()).exclude(
+    return (
+        Stream.objects.select_related()
+        .filter(realm__in=get_active_realm_ids())
+        .exclude(
             # We filter out Zephyr realms, because they can easily
             # have 10,000s of streams with only 1 subscriber.
-            is_in_zephyr_realm=True)
+            is_in_zephyr_realm=True
+        )
+    )
+
 
 def get_users() -> List[UserProfile]:
     return UserProfile.objects.select_related().filter(
-        long_term_idle=False,
-        realm__in=get_active_realm_ids())
+        long_term_idle=False, realm__in=get_active_realm_ids()
+    )
+
 
 # Format is (objects query, items filler function, timeout, batch size)
 #
@@ -117,18 +131,31 @@ def get_users() -> List[UserProfile]:
 # doing any setup for things we're unlikely to use (without the lambda
 # wrapper the below adds an extra 3ms or so to startup time for
 # anything importing this file).
-cache_fillers: Dict[str, Tuple[Callable[[], List[Any]], Callable[[Dict[str, Any], Any], None], int, int]] = {
-    'user': (get_users, user_cache_items, 3600*24*7, 10000),
-    'client': (lambda: Client.objects.select_related().all(), client_cache_items, 3600*24*7, 10000),
-    'stream': (get_streams, stream_cache_items, 3600*24*7, 10000),
+cache_fillers: Dict[
+    str, Tuple[Callable[[], List[Any]], Callable[[Dict[str, Any], Any], None], int, int]
+] = {
+    'user': (get_users, user_cache_items, 3600 * 24 * 7, 10000),
+    'client': (
+        lambda: Client.objects.select_related().all(),
+        client_cache_items,
+        3600 * 24 * 7,
+        10000,
+    ),
+    'stream': (get_streams, stream_cache_items, 3600 * 24 * 7, 10000),
     # Message cache fetching disabled until we can fix the fact that it
     # does a bunch of inefficient memcached queries as part of filling
     # the display_recipient cache
     #    'message': (message_fetch_objects, message_cache_items, 3600 * 24, 1000),
-    'huddle': (lambda: Huddle.objects.select_related().all(), huddle_cache_items, 3600*24*7, 10000),
-    'session': (lambda: Session.objects.all(), session_cache_items, 3600*24*7, 10000),
+    'huddle': (
+        lambda: Huddle.objects.select_related().all(),
+        huddle_cache_items,
+        3600 * 24 * 7,
+        10000,
+    ),
+    'session': (lambda: Session.objects.all(), session_cache_items, 3600 * 24 * 7, 10000),
 }
 
+
 def fill_remote_cache(cache: str) -> None:
     remote_cache_time_start = get_remote_cache_time()
     remote_cache_requests_start = get_remote_cache_requests()
@@ -138,10 +165,13 @@ def fill_remote_cache(cache: str) -> None:
     for obj in objects():
         items_filler(items_for_remote_cache, obj)
         count += 1
-        if (count % batch_size == 0):
-            cache_set_many(items_for_remote_cache, timeout=3600*24)
+        if count % batch_size == 0:
+            cache_set_many(items_for_remote_cache, timeout=3600 * 24)
             items_for_remote_cache = {}
-    cache_set_many(items_for_remote_cache, timeout=3600*24*7)
-    logging.info("Successfully populated %s cache!  Consumed %s remote cache queries (%s time)",
-                 cache, get_remote_cache_requests() - remote_cache_requests_start,
-                 round(get_remote_cache_time() - remote_cache_time_start, 2))
+    cache_set_many(items_for_remote_cache, timeout=3600 * 24 * 7)
+    logging.info(
+        "Successfully populated %s cache!  Consumed %s remote cache queries (%s time)",
+        cache,
+        get_remote_cache_requests() - remote_cache_requests_start,
+        round(get_remote_cache_time() - remote_cache_time_start, 2),
+    )
diff --git a/zerver/lib/camo.py b/zerver/lib/camo.py
index 35af326ccf..3d4dfa6a0e 100644
--- a/zerver/lib/camo.py
+++ b/zerver/lib/camo.py
@@ -10,6 +10,7 @@ def generate_camo_url(url: str) -> str:
     digest = hmac.new(encoded_camo_key, encoded_url, hashlib.sha1).hexdigest()
     return "{}/{}".format(digest, encoded_url.hex())
 
+
 # Encodes the provided URL using the same algorithm used by the camo
 # caching https image proxy
 def get_camo_url(url: str) -> str:
@@ -18,6 +19,7 @@ def get_camo_url(url: str) -> str:
         return url
     return f"{settings.CAMO_URI}{generate_camo_url(url)}"
 
+
 def is_camo_url_valid(digest: str, url: str) -> bool:
     camo_url = generate_camo_url(url)
     camo_url_digest = camo_url.split('/')[0]
diff --git a/zerver/lib/ccache.py b/zerver/lib/ccache.py
index f4c7a99116..5ac360b3d1 100644
--- a/zerver/lib/ccache.py
+++ b/zerver/lib/ccache.py
@@ -39,14 +39,16 @@ def der_encode_length(length: int) -> bytes:
         return struct.pack('!B', length)
     out = b""
     while length > 0:
-        out = struct.pack('!B', length & 0xff) + out
+        out = struct.pack('!B', length & 0xFF) + out
         length >>= 8
     out = struct.pack('!B', len(out) | 0x80) + out
     return out
 
+
 def der_encode_tlv(tag: int, value: bytes) -> bytes:
     return struct.pack('!B', tag) + der_encode_length(len(value)) + value
 
+
 def der_encode_integer_value(val: int) -> bytes:
     if not isinstance(val, int):
         raise TypeError("int")
@@ -63,34 +65,42 @@ def der_encode_integer_value(val: int) -> bytes:
     out = b""
     # We can stop once sign-extension matches the remaining value.
     while val != sign:
-        byte = val & 0xff
+        byte = val & 0xFF
         out = struct.pack('!B', byte) + out
         sign = -1 if byte & 0x80 == 0x80 else 0
         val >>= 8
     return out
 
+
 def der_encode_integer(val: int) -> bytes:
     return der_encode_tlv(0x02, der_encode_integer_value(val))
+
+
 def der_encode_int32(val: int) -> bytes:
     if val < -2147483648 or val > 2147483647:
         raise ValueError("Bad value")
     return der_encode_integer(val)
+
+
 def der_encode_uint32(val: int) -> bytes:
     if val < 0 or val > 4294967295:
         raise ValueError("Bad value")
     return der_encode_integer(val)
 
+
 def der_encode_string(val: str) -> bytes:
     if not isinstance(val, str):
         raise TypeError("unicode")
-    return der_encode_tlv(0x1b, val.encode("utf-8"))
+    return der_encode_tlv(0x1B, val.encode("utf-8"))
+
 
 def der_encode_octet_string(val: bytes) -> bytes:
     if not isinstance(val, bytes):
         raise TypeError("bytes")
     return der_encode_tlv(0x04, val)
 
-def der_encode_sequence(tlvs: List[Optional[bytes]], tagged: bool=True) -> bytes:
+
+def der_encode_sequence(tlvs: List[Optional[bytes]], tagged: bool = True) -> bytes:
     body = []
     for i, tlv in enumerate(tlvs):
         # Missing optional elements represented as None.
@@ -98,46 +108,66 @@ def der_encode_sequence(tlvs: List[Optional[bytes]], tagged: bool=True) -> bytes
             continue
         if tagged:
             # Assume kerberos-style explicit tagging of components.
-            tlv = der_encode_tlv(0xa0 | i, tlv)
+            tlv = der_encode_tlv(0xA0 | i, tlv)
         body.append(tlv)
     return der_encode_tlv(0x30, b"".join(body))
 
+
 def der_encode_ticket(tkt: Dict[str, Any]) -> bytes:
     return der_encode_tlv(
         0x61,  # Ticket
         der_encode_sequence(
-            [der_encode_integer(5),  # tktVno
-             der_encode_string(tkt["realm"]),
-             der_encode_sequence(  # PrincipalName
-                 [der_encode_int32(tkt["sname"]["nameType"]),
-                  der_encode_sequence([der_encode_string(c)
-                                       for c in tkt["sname"]["nameString"]],
-                                      tagged=False)]),
-             der_encode_sequence(  # EncryptedData
-                 [der_encode_int32(tkt["encPart"]["etype"]),
-                  (der_encode_uint32(tkt["encPart"]["kvno"])
-                   if "kvno" in tkt["encPart"]
-                   else None),
-                  der_encode_octet_string(
-                      base64.b64decode(tkt["encPart"]["cipher"]))])]))
+            [
+                der_encode_integer(5),  # tktVno
+                der_encode_string(tkt["realm"]),
+                der_encode_sequence(  # PrincipalName
+                    [
+                        der_encode_int32(tkt["sname"]["nameType"]),
+                        der_encode_sequence(
+                            [der_encode_string(c) for c in tkt["sname"]["nameString"]], tagged=False
+                        ),
+                    ]
+                ),
+                der_encode_sequence(  # EncryptedData
+                    [
+                        der_encode_int32(tkt["encPart"]["etype"]),
+                        (
+                            der_encode_uint32(tkt["encPart"]["kvno"])
+                            if "kvno" in tkt["encPart"]
+                            else None
+                        ),
+                        der_encode_octet_string(base64.b64decode(tkt["encPart"]["cipher"])),
+                    ]
+                ),
+            ]
+        ),
+    )
+
 
 # Kerberos ccache writing code. Using format documentation from here:
 # https://www.gnu.org/software/shishi/manual/html_node/The-Credential-Cache-Binary-File-Format.html
 
+
 def ccache_counted_octet_string(data: bytes) -> bytes:
     if not isinstance(data, bytes):
         raise TypeError("bytes")
     return struct.pack("!I", len(data)) + data
 
+
 def ccache_principal(name: Dict[str, str], realm: str) -> bytes:
     header = struct.pack("!II", name["nameType"], len(name["nameString"]))
-    return (header + ccache_counted_octet_string(realm.encode()) +
-            b"".join(ccache_counted_octet_string(c.encode())
-                     for c in name["nameString"]))
+    return (
+        header
+        + ccache_counted_octet_string(realm.encode())
+        + b"".join(ccache_counted_octet_string(c.encode()) for c in name["nameString"])
+    )
+
 
 def ccache_key(key: Dict[str, str]) -> bytes:
-    return (struct.pack("!H", key["keytype"]) +
-            ccache_counted_octet_string(base64.b64decode(key["keyvalue"])))
+    return struct.pack("!H", key["keytype"]) + ccache_counted_octet_string(
+        base64.b64decode(key["keyvalue"])
+    )
+
 
 def flags_to_uint32(flags: List[str]) -> int:
     ret = 0
@@ -146,15 +176,18 @@ def flags_to_uint32(flags: List[str]) -> int:
             ret |= 1 << (31 - i)
     return ret
 
+
 def ccache_credential(cred: Dict[str, Any]) -> bytes:
     out = ccache_principal(cred["cname"], cred["crealm"])
     out += ccache_principal(cred["sname"], cred["srealm"])
     out += ccache_key(cred["key"])
-    out += struct.pack("!IIII",
-                       cred["authtime"] // 1000,
-                       cred.get("starttime", cred["authtime"]) // 1000,
-                       cred["endtime"] // 1000,
-                       cred.get("renewTill", 0) // 1000)
+    out += struct.pack(
+        "!IIII",
+        cred["authtime"] // 1000,
+        cred.get("starttime", cred["authtime"]) // 1000,
+        cred["endtime"] // 1000,
+        cred.get("renewTill", 0) // 1000,
+    )
     out += struct.pack("!B", 0)
     out += struct.pack("!I", flags_to_uint32(cred["flags"]))
     # TODO: Care about addrs or authdata? Former is "caddr" key.
@@ -164,16 +197,19 @@ def ccache_credential(cred: Dict[str, Any]) -> bytes:
     out += ccache_counted_octet_string(b"")
     return out
 
+
 def make_ccache(cred: Dict[str, Any]) -> bytes:
     # Do we need a DeltaTime header? The ccache I get just puts zero
     # in there, so do the same.
-    out = struct.pack("!HHHHII",
-                      0x0504,  # file_format_version
-                      12,  # headerlen
-                      1,  # tag (DeltaTime)
-                      8,  # taglen (two uint32_ts)
-                      0, 0,  # time_offset / usec_offset
-                      )
+    out = struct.pack(
+        "!HHHHII",
+        0x0504,  # file_format_version
+        12,  # headerlen
+        1,  # tag (DeltaTime)
+        8,  # taglen (two uint32_ts)
+        0,
+        0,  # time_offset / usec_offset
+    )
     out += ccache_principal(cred["cname"], cred["crealm"])
     out += ccache_credential(cred)
     return out
diff --git a/zerver/lib/context_managers.py b/zerver/lib/context_managers.py
index 0ca6c81af6..f1b2bd419c 100644
--- a/zerver/lib/context_managers.py
+++ b/zerver/lib/context_managers.py
@@ -7,10 +7,10 @@ from typing import IO, Any, Iterator, Union
 
 
 @contextmanager
-def flock(lockfile: Union[int, IO[Any]], shared: bool=False) -> Iterator[None]:
+def flock(lockfile: Union[int, IO[Any]], shared: bool = False) -> Iterator[None]:
     """Lock a file object using flock(2) for the duration of a 'with' statement.
 
-       If shared is True, use a LOCK_SH lock, otherwise LOCK_EX."""
+    If shared is True, use a LOCK_SH lock, otherwise LOCK_EX."""
 
     fcntl.flock(lockfile, fcntl.LOCK_SH if shared else fcntl.LOCK_EX)
     try:
@@ -18,13 +18,14 @@ def flock(lockfile: Union[int, IO[Any]], shared: bool=False) -> Iterator[None]:
     finally:
         fcntl.flock(lockfile, fcntl.LOCK_UN)
 
+
 @contextmanager
-def lockfile(filename: str, shared: bool=False) -> Iterator[None]:
+def lockfile(filename: str, shared: bool = False) -> Iterator[None]:
     """Lock a file using flock(2) for the duration of a 'with' statement.
 
-       If shared is True, use a LOCK_SH lock, otherwise LOCK_EX.
+    If shared is True, use a LOCK_SH lock, otherwise LOCK_EX.
 
-       The file is given by name and will be created if it does not exist."""
+    The file is given by name and will be created if it does not exist."""
     with open(filename, 'w') as lock:
         with flock(lock, shared=shared):
             yield
diff --git a/zerver/lib/create_user.py b/zerver/lib/create_user.py
index 709f2787a4..d5887f40c6 100644
--- a/zerver/lib/create_user.py
+++ b/zerver/lib/create_user.py
@@ -39,18 +39,25 @@ def copy_user_settings(source_profile: UserProfile, target_profile: UserProfile)
 
     if source_profile.avatar_source == UserProfile.AVATAR_FROM_USER:
         from zerver.lib.actions import do_change_avatar_fields
-        do_change_avatar_fields(target_profile, UserProfile.AVATAR_FROM_USER,
-                                skip_notify=True, acting_user=target_profile)
+
+        do_change_avatar_fields(
+            target_profile,
+            UserProfile.AVATAR_FROM_USER,
+            skip_notify=True,
+            acting_user=target_profile,
+        )
         copy_avatar(source_profile, target_profile)
 
     copy_hotpots(source_profile, target_profile)
 
+
 def get_display_email_address(user_profile: UserProfile) -> str:
     if not user_profile.email_address_is_realm_public():
         return f"user{user_profile.id}@{get_fake_email_domain(user_profile.realm)}"
     return user_profile.delivery_email
 
-def get_role_for_new_user(invited_as: int, realm_creation: bool=False) -> int:
+
+def get_role_for_new_user(invited_as: int, realm_creation: bool = False) -> int:
     if realm_creation or invited_as == PreregistrationUser.INVITE_AS['REALM_OWNER']:
         return UserProfile.ROLE_REALM_OWNER
     elif invited_as == PreregistrationUser.INVITE_AS['REALM_ADMIN']:
@@ -59,6 +66,7 @@ def get_role_for_new_user(invited_as: int, realm_creation: bool=False) -> int:
         return UserProfile.ROLE_GUEST
     return UserProfile.ROLE_MEMBER
 
+
 # create_user_profile is based on Django's User.objects.create_user,
 # except that we don't save to the database so it can used in
 # bulk_creates
@@ -66,14 +74,21 @@ def get_role_for_new_user(invited_as: int, realm_creation: bool=False) -> int:
 # Only use this for bulk_create -- for normal usage one should use
 # create_user (below) which will also make the Subscription and
 # Recipient objects
-def create_user_profile(realm: Realm, email: str, password: Optional[str],
-                        active: bool, bot_type: Optional[int], full_name: str,
-                        bot_owner: Optional[UserProfile],
-                        is_mirror_dummy: bool, tos_version: Optional[str],
-                        timezone: Optional[str],
-                        tutorial_status: str = UserProfile.TUTORIAL_WAITING,
-                        enter_sends: bool = False,
-                        force_id: Optional[int] = None) -> UserProfile:
+def create_user_profile(
+    realm: Realm,
+    email: str,
+    password: Optional[str],
+    active: bool,
+    bot_type: Optional[int],
+    full_name: str,
+    bot_owner: Optional[UserProfile],
+    is_mirror_dummy: bool,
+    tos_version: Optional[str],
+    timezone: Optional[str],
+    tutorial_status: str = UserProfile.TUTORIAL_WAITING,
+    enter_sends: bool = False,
+    force_id: Optional[int] = None,
+) -> UserProfile:
     now = timezone_now()
     email = UserManager.normalize_email(email)
 
@@ -81,19 +96,27 @@ def create_user_profile(realm: Realm, email: str, password: Optional[str],
     if force_id is not None:
         extra_kwargs['id'] = force_id
 
-    user_profile = UserProfile(is_staff=False, is_active=active,
-                               full_name=full_name,
-                               last_login=now, date_joined=now, realm=realm,
-                               is_bot=bool(bot_type), bot_type=bot_type,
-                               bot_owner=bot_owner, is_mirror_dummy=is_mirror_dummy,
-                               tos_version=tos_version, timezone=timezone,
-                               tutorial_status=tutorial_status,
-                               enter_sends=enter_sends,
-                               onboarding_steps=orjson.dumps([]).decode(),
-                               default_language=realm.default_language,
-                               twenty_four_hour_time=realm.default_twenty_four_hour_time,
-                               delivery_email=email,
-                               **extra_kwargs)
+    user_profile = UserProfile(
+        is_staff=False,
+        is_active=active,
+        full_name=full_name,
+        last_login=now,
+        date_joined=now,
+        realm=realm,
+        is_bot=bool(bot_type),
+        bot_type=bot_type,
+        bot_owner=bot_owner,
+        is_mirror_dummy=is_mirror_dummy,
+        tos_version=tos_version,
+        timezone=timezone,
+        tutorial_status=tutorial_status,
+        enter_sends=enter_sends,
+        onboarding_steps=orjson.dumps([]).decode(),
+        default_language=realm.default_language,
+        twenty_four_hour_time=realm.default_twenty_four_hour_time,
+        delivery_email=email,
+        **extra_kwargs,
+    )
     if bot_type or not active:
         password = None
     if user_profile.email_address_is_realm_public():
@@ -103,23 +126,26 @@ def create_user_profile(realm: Realm, email: str, password: Optional[str],
     user_profile.api_key = generate_api_key()
     return user_profile
 
-def create_user(email: str,
-                password: Optional[str],
-                realm: Realm,
-                full_name: str,
-                active: bool = True,
-                role: Optional[int] = None,
-                bot_type: Optional[int] = None,
-                bot_owner: Optional[UserProfile] = None,
-                tos_version: Optional[str] = None,
-                timezone: str = "",
-                avatar_source: str = UserProfile.AVATAR_FROM_GRAVATAR,
-                is_mirror_dummy: bool = False,
-                default_sending_stream: Optional[Stream] = None,
-                default_events_register_stream: Optional[Stream] = None,
-                default_all_public_streams: Optional[bool] = None,
-                source_profile: Optional[UserProfile] = None,
-                force_id: Optional[int] = None) -> UserProfile:
+
+def create_user(
+    email: str,
+    password: Optional[str],
+    realm: Realm,
+    full_name: str,
+    active: bool = True,
+    role: Optional[int] = None,
+    bot_type: Optional[int] = None,
+    bot_owner: Optional[UserProfile] = None,
+    tos_version: Optional[str] = None,
+    timezone: str = "",
+    avatar_source: str = UserProfile.AVATAR_FROM_GRAVATAR,
+    is_mirror_dummy: bool = False,
+    default_sending_stream: Optional[Stream] = None,
+    default_events_register_stream: Optional[Stream] = None,
+    default_all_public_streams: Optional[bool] = None,
+    source_profile: Optional[UserProfile] = None,
+    force_id: Optional[int] = None,
+) -> UserProfile:
     user_profile = create_user_profile(
         realm,
         email,
@@ -131,7 +157,7 @@ def create_user(email: str,
         is_mirror_dummy,
         tos_version,
         timezone,
-        force_id=force_id
+        force_id=force_id,
     )
     user_profile.avatar_source = avatar_source
     user_profile.timezone = timezone
@@ -162,8 +188,7 @@ def create_user(email: str,
         user_profile.email = get_display_email_address(user_profile)
         user_profile.save(update_fields=['email'])
 
-    recipient = Recipient.objects.create(type_id=user_profile.id,
-                                         type=Recipient.PERSONAL)
+    recipient = Recipient.objects.create(type_id=user_profile.id, type=Recipient.PERSONAL)
     user_profile.recipient = recipient
     user_profile.save(update_fields=["recipient"])
 
diff --git a/zerver/lib/data_types.py b/zerver/lib/data_types.py
index b0f2e8996d..4897cacc09 100644
--- a/zerver/lib/data_types.py
+++ b/zerver/lib/data_types.py
@@ -28,6 +28,7 @@ class DictType:
     accounted for in required_keys and optional_keys, and recursive
     validation of types of fields.
     """
+
     def __init__(
         self,
         required_keys: Sequence[Tuple[str, Any]],
@@ -74,6 +75,7 @@ class DictType:
 @dataclass
 class EnumType:
     """An enum with the set of valid values declared."""
+
     valid_vals: Sequence[Any]
 
     def check_data(self, var_name: str, val: Dict[str, Any]) -> None:
@@ -86,6 +88,7 @@ class EnumType:
 
 class Equals:
     """Type requiring a specific value."""
+
     def __init__(self, expected_value: Any) -> None:
         self.expected_value = expected_value
 
@@ -106,6 +109,7 @@ class Equals:
 class NumberType:
     """A Union[float, int]; needed to align with the `number` type in
     OpenAPI, because isinstance(4, float) == False"""
+
     def check_data(self, var_name: str, val: Optional[Any]) -> None:
         if isinstance(val, int) or isinstance(val, float):
             return
@@ -117,6 +121,7 @@ class NumberType:
 
 class ListType:
     """List with every object having the declared sub_type."""
+
     def __init__(self, sub_type: Any, length: Optional[int] = None) -> None:
         self.sub_type = sub_type
         self.length = length
@@ -137,6 +142,7 @@ class ListType:
 @dataclass
 class StringDictType:
     """Type that validates an object is a Dict[str, str]"""
+
     value_type: Any
 
     def check_data(self, var_name: str, val: Dict[Any, Any]) -> None:
@@ -173,6 +179,7 @@ class OptionalType:
 class TupleType:
     """Deprecated; we'd like to avoid using tuples in our API.  Validates
     the tuple has the sequence of sub_types."""
+
     sub_types: Sequence[Any]
 
     def check_data(self, var_name: str, val: Any) -> None:
@@ -188,9 +195,7 @@ class TupleType:
 
     def schema(self, var_name: str) -> str:
         sub_schemas = "\n".join(
-            sorted(
-                schema(str(i), sub_type) for i, sub_type in enumerate(self.sub_types)
-            )
+            sorted(schema(str(i), sub_type) for i, sub_type in enumerate(self.sub_types))
         )
         return f"{var_name} (tuple):\n{indent(sub_schemas)}"
 
@@ -257,11 +262,14 @@ def event_dict_type(
     assert "type" in rkeys
     assert "id" not in keys
     return DictType(
-        required_keys=list(required_keys) + [("id", int)], optional_keys=optional_keys,
+        required_keys=list(required_keys) + [("id", int)],
+        optional_keys=optional_keys,
     )
 
 
-def make_checker(data_type: DictType,) -> Callable[[str, Dict[str, object]], None]:
+def make_checker(
+    data_type: DictType,
+) -> Callable[[str, Dict[str, object]], None]:
     def f(var_name: str, event: Dict[str, Any]) -> None:
         check_data(data_type, var_name, event)
 
diff --git a/zerver/lib/db.py b/zerver/lib/db.py
index 32d3d89d74..f046a1042c 100644
--- a/zerver/lib/db.py
+++ b/zerver/lib/db.py
@@ -11,31 +11,34 @@ ParamsT = TypeVar('ParamsT')
 
 # Similar to the tracking done in Django's CursorDebugWrapper, but done at the
 # psycopg2 cursor level so it works with SQLAlchemy.
-def wrapper_execute(self: CursorObj,
-                    action: Callable[[Query, ParamsT], CursorObj],
-                    sql: Query,
-                    params: ParamsT) -> CursorObj:
+def wrapper_execute(
+    self: CursorObj, action: Callable[[Query, ParamsT], CursorObj], sql: Query, params: ParamsT
+) -> CursorObj:
     start = time.time()
     try:
         return action(sql, params)
     finally:
         stop = time.time()
         duration = stop - start
-        self.connection.queries.append({
-            'time': f"{duration:.3f}",
-        })
+        self.connection.queries.append(
+            {
+                'time': f"{duration:.3f}",
+            }
+        )
+
 
 class TimeTrackingCursor(cursor):
     """A psycopg2 cursor class that tracks the time spent executing queries."""
 
-    def execute(self, query: Query,
-                vars: Optional[Params]=None) -> 'TimeTrackingCursor':
+    def execute(self, query: Query, vars: Optional[Params] = None) -> 'TimeTrackingCursor':
         return wrapper_execute(self, super().execute, query, vars)
 
-    def executemany(self, query: Query,
-                    vars: Iterable[Params]) -> 'TimeTrackingCursor':  # nocoverage
+    def executemany(
+        self, query: Query, vars: Iterable[Params]
+    ) -> 'TimeTrackingCursor':  # nocoverage
         return wrapper_execute(self, super().executemany, query, vars)
 
+
 class TimeTrackingConnection(connection):
     """A psycopg2 connection class that uses TimeTrackingCursors."""
 
@@ -47,8 +50,10 @@ class TimeTrackingConnection(connection):
         kwargs.setdefault('cursor_factory', TimeTrackingCursor)
         return connection.cursor(self, *args, **kwargs)
 
+
 def reset_queries() -> None:
     from django.db import connections
+
     for conn in connections.all():
         if conn.connection is not None:
             conn.connection.queries = []
diff --git a/zerver/lib/debug.py b/zerver/lib/debug.py
index 3b44bd5261..fe2c8605f5 100644
--- a/zerver/lib/debug.py
+++ b/zerver/lib/debug.py
@@ -23,29 +23,29 @@ logger = logging.getLogger('zulip.debug')
 def interactive_debug(sig: int, frame: FrameType) -> None:
     """Interrupt running process, and provide a python prompt for
     interactive debugging."""
-    d = {'_frame': frame}      # Allow access to frame object.
+    d = {'_frame': frame}  # Allow access to frame object.
     d.update(frame.f_globals)  # Unless shadowed by global
     d.update(frame.f_locals)
 
-    message  = "Signal received : entering python shell.\nTraceback:\n"
+    message = "Signal received : entering python shell.\nTraceback:\n"
     message += ''.join(traceback.format_stack(frame))
     i = code.InteractiveConsole(d)
     i.interact(message)
 
+
 # SIGUSR1 => Just print the stack
 # SIGUSR2 => Print stack + open interactive debugging shell
 def interactive_debug_listen() -> None:
     signal.signal(signal.SIGUSR1, lambda sig, stack: traceback.print_stack(stack))
     signal.signal(signal.SIGUSR2, interactive_debug)
 
+
 def tracemalloc_dump() -> None:
     if not tracemalloc.is_tracing():
-        logger.warning("pid %s: tracemalloc off, nothing to dump",
-                       os.getpid())
+        logger.warning("pid %s: tracemalloc off, nothing to dump", os.getpid())
         return
     # Despite our name for it, `timezone_now` always deals in UTC.
-    basename = "snap.{}.{}".format(os.getpid(),
-                                   timezone_now().strftime("%F-%T"))
+    basename = "snap.{}.{}".format(os.getpid(), timezone_now().strftime("%F-%T"))
     path = os.path.join(settings.TRACEMALLOC_DUMP_DIR, basename)
     os.makedirs(settings.TRACEMALLOC_DUMP_DIR, exist_ok=True)
 
@@ -55,12 +55,15 @@ def tracemalloc_dump() -> None:
     with open(f'/proc/{os.getpid()}/stat', 'rb') as f:
         procstat = f.read().split()
     rss_pages = int(procstat[23])
-    logger.info("tracemalloc dump: tracing %s MiB (%s MiB peak), using %s MiB; rss %s MiB; dumped %s",
-                tracemalloc.get_traced_memory()[0] // 1048576,
-                tracemalloc.get_traced_memory()[1] // 1048576,
-                tracemalloc.get_tracemalloc_memory() // 1048576,
-                rss_pages // 256,
-                basename)
+    logger.info(
+        "tracemalloc dump: tracing %s MiB (%s MiB peak), using %s MiB; rss %s MiB; dumped %s",
+        tracemalloc.get_traced_memory()[0] // 1048576,
+        tracemalloc.get_traced_memory()[1] // 1048576,
+        tracemalloc.get_tracemalloc_memory() // 1048576,
+        rss_pages // 256,
+        basename,
+    )
+
 
 def tracemalloc_listen_sock(sock: socket.socket) -> None:
     logger.debug('pid %s: tracemalloc_listen_sock started!', os.getpid())
@@ -68,8 +71,10 @@ def tracemalloc_listen_sock(sock: socket.socket) -> None:
         sock.recv(1)
         tracemalloc_dump()
 
+
 listener_pid: Optional[int] = None
 
+
 def tracemalloc_listen() -> None:
     global listener_pid
     if listener_pid == os.getpid():
@@ -81,13 +86,13 @@ def tracemalloc_listen() -> None:
     sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
     path = f"/tmp/tracemalloc.{os.getpid()}"
     sock.bind(path)
-    thread = threading.Thread(target=lambda: tracemalloc_listen_sock(sock),
-                              daemon=True)
+    thread = threading.Thread(target=lambda: tracemalloc_listen_sock(sock), daemon=True)
     thread.start()
     logger.debug('pid %s: tracemalloc_listen done: %s', os.getpid(), path)
 
+
 def maybe_tracemalloc_listen() -> None:
-    '''If tracemalloc tracing enabled, listen for requests to dump a snapshot.
+    """If tracemalloc tracing enabled, listen for requests to dump a snapshot.
 
     To trigger once this is listening:
       echo | socat -u stdin unix-sendto:/tmp/tracemalloc.$pid
@@ -101,7 +106,7 @@ def maybe_tracemalloc_listen() -> None:
     https://docs.python.org/3/library/tracemalloc .
     You may also have to add a call to this function somewhere.
 
-    '''
+    """
     if os.environ.get('PYTHONTRACEMALLOC'):
         # If the server was started with `tracemalloc` tracing on, then
         # listen for a signal to dump `tracemalloc` snapshots.
diff --git a/zerver/lib/dev_ldap_directory.py b/zerver/lib/dev_ldap_directory.py
index fcd6d72e5f..668b240fa1 100644
--- a/zerver/lib/dev_ldap_directory.py
+++ b/zerver/lib/dev_ldap_directory.py
@@ -12,10 +12,11 @@ from zerver.lib.storage import static_path
 LDAP_USER_ACCOUNT_CONTROL_NORMAL = '512'
 LDAP_USER_ACCOUNT_CONTROL_DISABLED = '514'
 
-def generate_dev_ldap_dir(mode: str, num_users: int=8) -> Dict[str, Dict[str, Any]]:
+
+def generate_dev_ldap_dir(mode: str, num_users: int = 8) -> Dict[str, Dict[str, Any]]:
     mode = mode.lower()
     ldap_data = []
-    for i in range(1, num_users+1):
+    for i in range(1, num_users + 1):
         name = f'LDAP User {i}'
         email = f'ldapuser{i}@zulip.com'
         phone_number = f'999999999{i}'
@@ -41,21 +42,25 @@ def generate_dev_ldap_dir(mode: str, num_users: int=8) -> Dict[str, Dict[str, An
                 uid=[email],
                 thumbnailPhoto=[profile_images[i % len(profile_images)]],
                 userAccountControl=[LDAP_USER_ACCOUNT_CONTROL_NORMAL],
-                **common_data)
+                **common_data,
+            )
         elif mode == 'b':
             ldap_dir['uid=' + email_username + ',ou=users,dc=zulip,dc=com'] = dict(
                 uid=[email_username],
                 jpegPhoto=[profile_images[i % len(profile_images)]],
-                **common_data)
+                **common_data,
+            )
         elif mode == 'c':
             ldap_dir['uid=' + email_username + ',ou=users,dc=zulip,dc=com'] = dict(
-                uid=[email_username],
-                email=[email],
-                **common_data)
+                uid=[email_username], email=[email], **common_data
+            )
 
     return ldap_dir
 
-def init_fakeldap(directory: Optional[Dict[str, Dict[str, List[str]]]]=None) -> None:  # nocoverage
+
+def init_fakeldap(
+    directory: Optional[Dict[str, Dict[str, List[str]]]] = None
+) -> None:  # nocoverage
     # We only use this in development.  Importing mock inside
     # this function is an import time optimization, which
     # avoids the expensive import of the mock module (slow
@@ -78,5 +83,6 @@ def init_fakeldap(directory: Optional[Dict[str, Dict[str, List[str]]]]=None) ->
     mock_ldap = MockLDAP()
     mock_initialize.return_value = mock_ldap
 
-    mock_ldap.directory = directory or generate_dev_ldap_dir(settings.FAKE_LDAP_MODE,
-                                                             settings.FAKE_LDAP_NUM_USERS)
+    mock_ldap.directory = directory or generate_dev_ldap_dir(
+        settings.FAKE_LDAP_MODE, settings.FAKE_LDAP_NUM_USERS
+    )
diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py
index b2d9808092..4e1359ef51 100644
--- a/zerver/lib/digest.py
+++ b/zerver/lib/digest.py
@@ -36,6 +36,7 @@ MAX_HOT_TOPICS_TO_BE_INCLUDED_IN_DIGEST = 4
 
 TopicKey = Tuple[int, str]
 
+
 class DigestTopic:
     def __init__(self, topic_key: TopicKey) -> None:
         self.topic_key = topic_key
@@ -74,60 +75,74 @@ class DigestTopic:
             "first_few_messages": first_few_messages,
         }
 
+
 # Digests accumulate 2 types of interesting traffic for a user:
 # 1. New streams
 # 2. Interesting stream traffic, as determined by the longest and most
 #    diversely comment upon topics.
 
+
 def should_process_digest(realm_str: str) -> bool:
     if realm_str in settings.SYSTEM_ONLY_REALMS:
         # Don't try to send emails to system-only realms
         return False
     return True
 
+
 # Changes to this should also be reflected in
 # zerver/worker/queue_processors.py:DigestWorker.consume()
 def queue_digest_user_ids(user_ids: List[int], cutoff: datetime.datetime) -> None:
     # Convert cutoff to epoch seconds for transit.
-    event = {
-        "user_ids": user_ids,
-        "cutoff": cutoff.strftime('%s')
-    }
+    event = {"user_ids": user_ids, "cutoff": cutoff.strftime('%s')}
     queue_json_publish("digest_emails", event)
 
+
 def enqueue_emails(cutoff: datetime.datetime) -> None:
     if not settings.SEND_DIGEST_EMAILS:
         return
 
     weekday = timezone_now().weekday()
-    for realm in Realm.objects.filter(deactivated=False, digest_emails_enabled=True, digest_weekday=weekday):
+    for realm in Realm.objects.filter(
+        deactivated=False, digest_emails_enabled=True, digest_weekday=weekday
+    ):
         if should_process_digest(realm.string_id):
             _enqueue_emails_for_realm(realm, cutoff)
 
+
 def _enqueue_emails_for_realm(realm: Realm, cutoff: datetime.datetime) -> None:
     # This should only be called directly by tests.  Use enqueue_emails
     # to process all realms that are set up for processing on any given day.
-    realm_user_ids = set(UserProfile.objects.filter(
-        realm=realm,
-        is_active=True,
-        is_bot=False,
-        enable_digest_emails=True,
-    ).values_list('id', flat=True))
+    realm_user_ids = set(
+        UserProfile.objects.filter(
+            realm=realm,
+            is_active=True,
+            is_bot=False,
+            enable_digest_emails=True,
+        ).values_list('id', flat=True)
+    )
 
     twelve_hours_ago = timezone_now() - datetime.timedelta(hours=12)
 
-    recent_user_ids = set(RealmAuditLog.objects.filter(
-        realm_id=realm.id,
-        event_type=RealmAuditLog.USER_DIGEST_EMAIL_CREATED,
-        event_time__gt=twelve_hours_ago,
-    ).values_list('modified_user_id', flat=True).distinct())
+    recent_user_ids = set(
+        RealmAuditLog.objects.filter(
+            realm_id=realm.id,
+            event_type=RealmAuditLog.USER_DIGEST_EMAIL_CREATED,
+            event_time__gt=twelve_hours_ago,
+        )
+        .values_list('modified_user_id', flat=True)
+        .distinct()
+    )
 
     realm_user_ids -= recent_user_ids
 
-    active_user_ids = set(UserActivityInterval.objects.filter(
-        user_profile_id__in=realm_user_ids,
-        end__gt=cutoff,
-    ).values_list('user_profile_id', flat=True).distinct())
+    active_user_ids = set(
+        UserActivityInterval.objects.filter(
+            user_profile_id__in=realm_user_ids,
+            end__gt=cutoff,
+        )
+        .values_list('user_profile_id', flat=True)
+        .distinct()
+    )
 
     user_ids = list(realm_user_ids - active_user_ids)
     user_ids.sort()
@@ -137,13 +152,14 @@ def _enqueue_emails_for_realm(realm: Realm, cutoff: datetime.datetime) -> None:
     # from the queue takes too long to process.
     chunk_size = 30
     for i in range(0, len(user_ids), chunk_size):
-        chunk_user_ids = user_ids[i:i + chunk_size]
+        chunk_user_ids = user_ids[i : i + chunk_size]
         queue_digest_user_ids(chunk_user_ids, cutoff)
         logger.info(
             "Queuing user_ids for potential digest: %s",
             chunk_user_ids,
         )
 
+
 def get_recent_topics(
     stream_ids: List[int],
     cutoff_date: datetime.datetime,
@@ -153,16 +169,20 @@ def get_recent_topics(
     #   * topic length
     #   * number of senders
 
-    messages = Message.objects.filter(
-        recipient__type=Recipient.STREAM,
-        recipient__type_id__in=stream_ids,
-        date_sent__gt=cutoff_date,
-    ).order_by(
-        'id',  # we will sample the first few messages
-    ).select_related(
-        'recipient',  # we need stream_id
-        'sender',  # we need the sender's full name
-        'sending_client'  # for Message.sent_by_human
+    messages = (
+        Message.objects.filter(
+            recipient__type=Recipient.STREAM,
+            recipient__type_id__in=stream_ids,
+            date_sent__gt=cutoff_date,
+        )
+        .order_by(
+            'id',  # we will sample the first few messages
+        )
+        .select_related(
+            'recipient',  # we need stream_id
+            'sender',  # we need the sender's full name
+            'sending_client',  # for Message.sent_by_human
+        )
     )
 
     digest_topic_map: Dict[TopicKey, DigestTopic] = {}
@@ -178,18 +198,18 @@ def get_recent_topics(
 
     return topics
 
+
 def get_hot_topics(
     all_topics: List[DigestTopic],
     stream_ids: Set[int],
 ) -> List[DigestTopic]:
-    topics = [
-        topic for topic in all_topics
-        if topic.stream_id() in stream_ids
-    ]
+    topics = [topic for topic in all_topics if topic.stream_id() in stream_ids]
 
     hot_topics = heapq.nlargest(2, topics, key=DigestTopic.diversity)
 
-    for topic in heapq.nlargest(MAX_HOT_TOPICS_TO_BE_INCLUDED_IN_DIGEST, topics, key=DigestTopic.length):
+    for topic in heapq.nlargest(
+        MAX_HOT_TOPICS_TO_BE_INCLUDED_IN_DIGEST, topics, key=DigestTopic.length
+    ):
         if topic not in hot_topics:
             hot_topics.append(topic)
         if len(hot_topics) == MAX_HOT_TOPICS_TO_BE_INCLUDED_IN_DIGEST:
@@ -197,10 +217,12 @@ def get_hot_topics(
 
     return hot_topics
 
+
 def get_recent_streams(realm: Realm, threshold: datetime.datetime) -> List[Stream]:
     fields = ["id", "name", "is_web_public", "invite_only"]
     return list(get_active_streams(realm).filter(date_created__gt=threshold).only(*fields))
 
+
 def gather_new_streams(
     realm: Realm,
     recent_streams: List[Stream],  # streams only need id and name
@@ -224,9 +246,11 @@ def gather_new_streams(
 
     return len(new_streams), {"html": streams_html, "plain": streams_plain}
 
+
 def enough_traffic(hot_conversations: str, new_streams: int) -> bool:
     return bool(hot_conversations or new_streams)
 
+
 def get_user_stream_map(user_ids: List[int]) -> Dict[int, Set[int]]:
     rows = Subscription.objects.filter(
         user_profile_id__in=user_ids,
@@ -242,6 +266,7 @@ def get_user_stream_map(user_ids: List[int]) -> Dict[int, Set[int]]:
 
     return dct
 
+
 def get_slim_stream_map(stream_ids: Set[int]) -> Dict[int, Stream]:
     # This can be passed to build_message_list.
     streams = Stream.objects.filter(
@@ -250,9 +275,10 @@ def get_slim_stream_map(stream_ids: Set[int]) -> Dict[int, Stream]:
 
     return {stream.id: stream for stream in streams}
 
+
 def bulk_get_digest_context(users: List[UserProfile], cutoff: float) -> Dict[int, Dict[str, Any]]:
     # We expect a non-empty list of users all from the same realm.
-    assert(users)
+    assert users
     realm = users[0].realm
     for user in users:
         assert user.realm_id == realm.id
@@ -297,15 +323,14 @@ def bulk_get_digest_context(users: List[UserProfile], cutoff: float) -> Dict[int
 
         # Get context data for hot conversations.
         context["hot_conversations"] = [
-            hot_topic.teaser_data(user, stream_map)
-            for hot_topic in hot_topics
+            hot_topic.teaser_data(user, stream_map) for hot_topic in hot_topics
         ]
 
         # Gather new streams.
         new_streams_count, new_streams = gather_new_streams(
             realm=realm,
             recent_streams=recent_streams,
-            can_access_public=user.can_access_public_streams()
+            can_access_public=user.can_access_public_streams(),
         )
         context["new_streams"] = new_streams
         context["new_streams_count"] = new_streams_count
@@ -314,9 +339,11 @@ def bulk_get_digest_context(users: List[UserProfile], cutoff: float) -> Dict[int
 
     return result
 
+
 def get_digest_context(user: UserProfile, cutoff: float) -> Dict[str, Any]:
     return bulk_get_digest_context([user], cutoff)[user.id]
 
+
 @transaction.atomic
 def bulk_handle_digest_email(user_ids: List[int], cutoff: float) -> None:
     # We go directly to the database to get user objects,
@@ -345,6 +372,7 @@ def bulk_handle_digest_email(user_ids: List[int], cutoff: float) -> None:
 
     bulk_write_realm_audit_logs(digest_users)
 
+
 def bulk_write_realm_audit_logs(users: List[UserProfile]) -> None:
     if not users:
         return
@@ -368,7 +396,10 @@ def bulk_write_realm_audit_logs(users: List[UserProfile]) -> None:
 
     RealmAuditLog.objects.bulk_create(log_rows)
 
-def get_modified_streams(user_ids: List[int], cutoff_date: datetime.datetime) -> Dict[int, Set[int]]:
+
+def get_modified_streams(
+    user_ids: List[int], cutoff_date: datetime.datetime
+) -> Dict[int, Set[int]]:
     """Skipping streams where the user's subscription status has changed
     when constructing digests is critical to ensure correctness for
     streams without shared history, guest users, and long-term idle
@@ -388,11 +419,15 @@ def get_modified_streams(user_ids: List[int], cutoff_date: datetime.datetime) ->
     ]
 
     # Get rows where the users' subscriptions have changed.
-    rows = RealmAuditLog.objects.filter(
-        modified_user_id__in=user_ids,
-        event_time__gt=cutoff_date,
-        event_type__in=events,
-    ).values("modified_user_id", "modified_stream_id").distinct()
+    rows = (
+        RealmAuditLog.objects.filter(
+            modified_user_id__in=user_ids,
+            event_time__gt=cutoff_date,
+            event_type__in=events,
+        )
+        .values("modified_user_id", "modified_stream_id")
+        .distinct()
+    )
 
     result: Dict[int, Set[int]] = defaultdict(set)
 
diff --git a/zerver/lib/display_recipient.py b/zerver/lib/display_recipient.py
index cb9967f8a4..103a4375be 100644
--- a/zerver/lib/display_recipient.py
+++ b/zerver/lib/display_recipient.py
@@ -19,14 +19,16 @@ display_recipient_fields = [
     "is_mirror_dummy",
 ]
 
+
 class TinyStreamResult(TypedDict):
     id: int
     name: str
 
-@cache_with_key(lambda *args: display_recipient_cache_key(args[0]),
-                timeout=3600*24*7)
-def get_display_recipient_remote_cache(recipient_id: int, recipient_type: int,
-                                       recipient_type_id: Optional[int]) -> DisplayRecipientT:
+
+@cache_with_key(lambda *args: display_recipient_cache_key(args[0]), timeout=3600 * 24 * 7)
+def get_display_recipient_remote_cache(
+    recipient_id: int, recipient_type: int, recipient_type_id: Optional[int]
+) -> DisplayRecipientT:
     """
     returns: an appropriate object describing the recipient.  For a
     stream this will be the stream name as a string.  For a huddle or
@@ -40,14 +42,20 @@ def get_display_recipient_remote_cache(recipient_id: int, recipient_type: int,
     # The main priority for ordering here is being deterministic.
     # Right now, we order by ID, which matches the ordering of user
     # names in the left sidebar.
-    user_profile_list = UserProfile.objects.filter(
-        subscription__recipient_id=recipient_id,
-    ).order_by('id').values(*display_recipient_fields)
+    user_profile_list = (
+        UserProfile.objects.filter(
+            subscription__recipient_id=recipient_id,
+        )
+        .order_by('id')
+        .values(*display_recipient_fields)
+    )
     return list(user_profile_list)
 
+
 def user_dict_id_fetcher(user_dict: UserDisplayRecipient) -> int:
     return user_dict['id']
 
+
 def bulk_get_user_profile_by_id(uids: List[int]) -> Dict[int, UserDisplayRecipient]:
     return bulk_cached_fetch(
         # Use a separate cache key to protect us from conflicts with
@@ -55,13 +63,16 @@ def bulk_get_user_profile_by_id(uids: List[int]) -> Dict[int, UserDisplayRecipie
         # (Since we fetch only several fields here)
         cache_key_function=display_recipient_bulk_get_users_by_id_cache_key,
         query_function=lambda ids: list(
-            UserProfile.objects.filter(id__in=ids).values(*display_recipient_fields)),
+            UserProfile.objects.filter(id__in=ids).values(*display_recipient_fields)
+        ),
         object_ids=uids,
         id_fetcher=user_dict_id_fetcher,
     )
 
-def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
-                                  ) -> Dict[int, DisplayRecipientT]:
+
+def bulk_fetch_display_recipients(
+    recipient_tuples: Set[Tuple[int, int, int]],
+) -> Dict[int, DisplayRecipientT]:
     """
     Takes set of tuples of the form (recipient_id, recipient_type, recipient_type_id)
     Returns dict mapping recipient_id to corresponding display_recipient
@@ -69,13 +80,11 @@ def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
 
     # Build dict mapping recipient id to (type, type_id) of the corresponding recipient:
     recipient_id_to_type_pair_dict = {
-        recipient[0]: (recipient[1], recipient[2])
-        for recipient in recipient_tuples
+        recipient[0]: (recipient[1], recipient[2]) for recipient in recipient_tuples
     }
     # And the inverse mapping:
     type_pair_to_recipient_id_dict = {
-        (recipient[1], recipient[2]): recipient[0]
-        for recipient in recipient_tuples
+        (recipient[1], recipient[2]): recipient[0] for recipient in recipient_tuples
     }
 
     stream_recipients = {
@@ -107,8 +116,9 @@ def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
     # Now we have to create display_recipients for personal and huddle messages.
     # We do this via generic_bulk_cached_fetch, supplying apprioprate functions to it.
 
-    def personal_and_huddle_query_function(recipient_ids: List[int],
-                                           ) -> List[Tuple[int, List[UserDisplayRecipient]]]:
+    def personal_and_huddle_query_function(
+        recipient_ids: List[int],
+    ) -> List[Tuple[int, List[UserDisplayRecipient]]]:
         """
         Return a list of tuples of the form (recipient_id, [list of UserProfiles])
         where [list of UserProfiles] has users corresponding to the recipient,
@@ -118,17 +128,21 @@ def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
         for this function to work as the query_function in generic_bulk_cached_fetch.
         """
 
-        recipients = [Recipient(
-            id=recipient_id,
-            type=recipient_id_to_type_pair_dict[recipient_id][0],
-            type_id=recipient_id_to_type_pair_dict[recipient_id][1],
-        ) for recipient_id in recipient_ids]
+        recipients = [
+            Recipient(
+                id=recipient_id,
+                type=recipient_id_to_type_pair_dict[recipient_id][0],
+                type_id=recipient_id_to_type_pair_dict[recipient_id][1],
+            )
+            for recipient_id in recipient_ids
+        ]
 
         # Find all user ids whose UserProfiles we will need to fetch:
         user_ids_to_fetch: Set[int] = set()
         huddle_user_ids: Dict[int, List[int]] = {}
-        huddle_user_ids = bulk_get_huddle_user_ids([recipient for recipient in recipients
-                                                    if recipient.type == Recipient.HUDDLE])
+        huddle_user_ids = bulk_get_huddle_user_ids(
+            [recipient for recipient in recipients if recipient.type == Recipient.HUDDLE]
+        )
         for recipient in recipients:
             if recipient.type == Recipient.PERSONAL:
                 user_ids_to_fetch.add(recipient.type_id)
@@ -136,7 +150,9 @@ def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
                 user_ids_to_fetch = user_ids_to_fetch.union(huddle_user_ids[recipient.id])
 
         # Fetch the needed UserProfiles:
-        user_profiles: Dict[int, UserDisplayRecipient] = bulk_get_user_profile_by_id(list(user_ids_to_fetch))
+        user_profiles: Dict[int, UserDisplayRecipient] = bulk_get_user_profile_by_id(
+            list(user_ids_to_fetch)
+        )
 
         # Build the return value:
         result: List[Tuple[int, List[UserDisplayRecipient]]] = []
@@ -144,13 +160,18 @@ def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
             if recipient.type == Recipient.PERSONAL:
                 result.append((recipient.id, [user_profiles[recipient.type_id]]))
             else:
-                result.append((recipient.id, [user_profiles[user_id]
-                                              for user_id in huddle_user_ids[recipient.id]]))
+                result.append(
+                    (
+                        recipient.id,
+                        [user_profiles[user_id] for user_id in huddle_user_ids[recipient.id]],
+                    )
+                )
 
         return result
 
-    def personal_and_huddle_cache_transformer(db_object: Tuple[int, List[UserDisplayRecipient]],
-                                              ) -> List[UserDisplayRecipient]:
+    def personal_and_huddle_cache_transformer(
+        db_object: Tuple[int, List[UserDisplayRecipient]],
+    ) -> List[UserDisplayRecipient]:
         """
         Takes an element of the list returned by the query_function, maps it to the final
         display_recipient list.
@@ -167,7 +188,9 @@ def bulk_fetch_display_recipients(recipient_tuples: Set[Tuple[int, int, int]],
     # ItemT = Tuple[int, List[UserDisplayRecipient]] (recipient_id, list of corresponding users)
     # CacheItemT = List[UserDisplayRecipient] (display_recipient list)
     # ObjKT = int (recipient_id)
-    personal_and_huddle_display_recipients: Dict[int, List[UserDisplayRecipient]] = transformed_bulk_cached_fetch(
+    personal_and_huddle_display_recipients: Dict[
+        int, List[UserDisplayRecipient]
+    ] = transformed_bulk_cached_fetch(
         cache_key_function=display_recipient_cache_key,
         query_function=personal_and_huddle_query_function,
         object_ids=[recipient[0] for recipient in personal_and_huddle_recipients],
diff --git a/zerver/lib/email_mirror.py b/zerver/lib/email_mirror.py
index 8716e5ee84..6e05197cf5 100644
--- a/zerver/lib/email_mirror.py
+++ b/zerver/lib/email_mirror.py
@@ -42,6 +42,7 @@ from zproject.backends import is_user_active
 
 logger = logging.getLogger(__name__)
 
+
 def redact_email_address(error_message: str) -> str:
     if not settings.EMAIL_GATEWAY_EXTRA_PATTERN_HACK:
         domain = settings.EMAIL_GATEWAY_PATTERN.rsplit('@')[-1]
@@ -54,16 +55,18 @@ def redact_email_address(error_message: str) -> str:
         email_address = address_match.group(0)
         # Annotate basic info about the address before scrubbing:
         if is_missed_message_address(email_address):
-            redacted_message = error_message.replace(email_address,
-                                                     f"{email_address} <Missed message address>")
+            redacted_message = error_message.replace(
+                email_address, f"{email_address} <Missed message address>"
+            )
         else:
             try:
                 target_stream_id = decode_stream_email_address(email_address)[0].id
                 annotated_address = f"{email_address} <Address to stream id: {target_stream_id}>"
                 redacted_message = error_message.replace(email_address, annotated_address)
             except ZulipEmailForwardError:
-                redacted_message = error_message.replace(email_address,
-                                                         f"{email_address} <Invalid address>")
+                redacted_message = error_message.replace(
+                    email_address, f"{email_address} <Invalid address>"
+                )
 
         # Scrub the address from the message, to the form XXXXX@example.com:
         string_to_scrub = address_match.groups()[0]
@@ -72,6 +75,7 @@ def redact_email_address(error_message: str) -> str:
 
     return error_message
 
+
 def report_to_zulip(error_message: str) -> None:
     if settings.ERROR_BOT is None:
         return
@@ -84,20 +88,25 @@ def report_to_zulip(error_message: str) -> None:
         f"""~~~\n{error_message}\n~~~""",
     )
 
+
 def log_and_report(email_message: EmailMessage, error_message: str, to: Optional[str]) -> None:
     recipient = to or "No recipient found"
-    error_message = "Sender: {}\nTo: {}\n{}".format(email_message.get("From"),
-                                                    recipient, error_message)
+    error_message = "Sender: {}\nTo: {}\n{}".format(
+        email_message.get("From"), recipient, error_message
+    )
 
     error_message = redact_email_address(error_message)
     logger.error(error_message)
     report_to_zulip(error_message)
 
+
 # Temporary missed message addresses
 
+
 def generate_missed_message_token() -> str:
     return 'mm' + secrets.token_hex(16)
 
+
 def is_missed_message_address(address: str) -> bool:
     try:
         msg_string = get_email_gateway_message_string_from_address(address)
@@ -106,13 +115,15 @@ def is_missed_message_address(address: str) -> bool:
 
     return is_mm_32_format(msg_string)
 
+
 def is_mm_32_format(msg_string: Optional[str]) -> bool:
-    '''
+    """
     Missed message strings are formatted with a little "mm" prefix
     followed by a randomly generated 32-character string.
-    '''
+    """
     return msg_string is not None and msg_string.startswith('mm') and len(msg_string) == 34
 
+
 def get_missed_message_token_from_address(address: str) -> str:
     msg_string = get_email_gateway_message_string_from_address(address)
 
@@ -121,12 +132,14 @@ def get_missed_message_token_from_address(address: str) -> str:
 
     return msg_string
 
+
 def get_usable_missed_message_address(address: str) -> MissedMessageEmailAddress:
     token = get_missed_message_token_from_address(address)
     try:
         mm_address = MissedMessageEmailAddress.objects.select_related().get(
             email_token=token,
-            timestamp__gt=timezone_now() - timedelta(seconds=MissedMessageEmailAddress.EXPIRY_SECONDS),
+            timestamp__gt=timezone_now()
+            - timedelta(seconds=MissedMessageEmailAddress.EXPIRY_SECONDS),
         )
     except MissedMessageEmailAddress.DoesNotExist:
         raise ZulipEmailForwardError("Missed message address expired or doesn't exist.")
@@ -138,20 +151,29 @@ def get_usable_missed_message_address(address: str) -> MissedMessageEmailAddress
 
     return mm_address
 
+
 def create_missed_message_address(user_profile: UserProfile, message: Message) -> str:
     if settings.EMAIL_GATEWAY_PATTERN == '':
-        logger.warning("EMAIL_GATEWAY_PATTERN is an empty string, using "
-                       "NOREPLY_EMAIL_ADDRESS in the 'from' field.")
+        logger.warning(
+            "EMAIL_GATEWAY_PATTERN is an empty string, using "
+            "NOREPLY_EMAIL_ADDRESS in the 'from' field."
+        )
         return FromAddress.NOREPLY
 
-    mm_address = MissedMessageEmailAddress.objects.create(message=message,
-                                                          user_profile=user_profile,
-                                                          email_token=generate_missed_message_token())
+    mm_address = MissedMessageEmailAddress.objects.create(
+        message=message, user_profile=user_profile, email_token=generate_missed_message_token()
+    )
     return str(mm_address)
 
-def construct_zulip_body(message: EmailMessage, realm: Realm, show_sender: bool=False,
-                         include_quotes: bool=False, include_footer: bool=False,
-                         prefer_text: bool=True) -> str:
+
+def construct_zulip_body(
+    message: EmailMessage,
+    realm: Realm,
+    show_sender: bool = False,
+    include_quotes: bool = False,
+    include_footer: bool = False,
+    prefer_text: bool = True,
+) -> str:
     body = extract_body(message, include_quotes, prefer_text)
     # Remove null characters, since Zulip will reject
     body = body.replace("\x00", "")
@@ -170,11 +192,14 @@ def construct_zulip_body(message: EmailMessage, realm: Realm, show_sender: bool=
 
     return body
 
+
 ## Sending the Zulip ##
 
+
 class ZulipEmailForwardUserError(ZulipEmailForwardError):
     pass
 
+
 def send_zulip(sender: UserProfile, stream: Stream, topic: str, content: str) -> None:
     internal_send_stream_message(
         stream.realm,
@@ -182,7 +207,9 @@ def send_zulip(sender: UserProfile, stream: Stream, topic: str, content: str) ->
         stream,
         truncate_topic(topic),
         normalize_body(content),
-        email_gateway=True)
+        email_gateway=True,
+    )
+
 
 def get_message_part_by_type(message: EmailMessage, content_type: str) -> Optional[str]:
     charsets = message.get_charsets()
@@ -200,7 +227,10 @@ def get_message_part_by_type(message: EmailMessage, content_type: str) -> Option
 
     return None
 
-def extract_body(message: EmailMessage, include_quotes: bool=False, prefer_text: bool=True) -> str:
+
+def extract_body(
+    message: EmailMessage, include_quotes: bool = False, prefer_text: bool = True
+) -> str:
     plaintext_content = extract_plaintext_body(message, include_quotes)
     html_content = extract_html_body(message, include_quotes)
 
@@ -223,9 +253,13 @@ def extract_body(message: EmailMessage, include_quotes: bool=False, prefer_text:
             assert plaintext_content  # Needed for mypy. Ensured by the validating block above.
             return plaintext_content
 
+
 talon_initialized = False
-def extract_plaintext_body(message: EmailMessage, include_quotes: bool=False) -> Optional[str]:
+
+
+def extract_plaintext_body(message: EmailMessage, include_quotes: bool = False) -> Optional[str]:
     import talon
+
     global talon_initialized
     if not talon_initialized:
         talon.init()
@@ -240,8 +274,10 @@ def extract_plaintext_body(message: EmailMessage, include_quotes: bool=False) ->
     else:
         return None
 
-def extract_html_body(message: EmailMessage, include_quotes: bool=False) -> Optional[str]:
+
+def extract_html_body(message: EmailMessage, include_quotes: bool = False) -> Optional[str]:
     import talon
+
     global talon_initialized
     if not talon_initialized:  # nocoverage
         talon.init()
@@ -256,6 +292,7 @@ def extract_html_body(message: EmailMessage, include_quotes: bool=False) -> Opti
     else:
         return None
 
+
 def filter_footer(text: str) -> str:
     # Try to filter out obvious footers.
     possible_footers = [line for line in text.split("\n") if line.strip() == "--"]
@@ -266,6 +303,7 @@ def filter_footer(text: str) -> str:
 
     return text.partition("--")[0].strip()
 
+
 def extract_and_upload_attachments(message: EmailMessage, realm: Realm) -> str:
     user_profile = get_system_bot(settings.EMAIL_GATEWAY_BOT)
 
@@ -276,18 +314,26 @@ def extract_and_upload_attachments(message: EmailMessage, realm: Realm) -> str:
         if filename:
             attachment = part.get_payload(decode=True)
             if isinstance(attachment, bytes):
-                s3_url = upload_message_file(filename, len(attachment), content_type,
-                                             attachment,
-                                             user_profile,
-                                             target_realm=realm)
+                s3_url = upload_message_file(
+                    filename,
+                    len(attachment),
+                    content_type,
+                    attachment,
+                    user_profile,
+                    target_realm=realm,
+                )
                 formatted_link = f"[{filename}]({s3_url})"
                 attachment_links.append(formatted_link)
             else:
-                logger.warning("Payload is not bytes (invalid attachment %s in message from %s).",
-                               filename, message.get("From"))
+                logger.warning(
+                    "Payload is not bytes (invalid attachment %s in message from %s).",
+                    filename,
+                    message.get("From"),
+                )
 
     return '\n'.join(attachment_links)
 
+
 def decode_stream_email_address(email: str) -> Tuple[Stream, Dict[str, bool]]:
     token, options = decode_email_address(email)
 
@@ -298,12 +344,20 @@ def decode_stream_email_address(email: str) -> Tuple[Stream, Dict[str, bool]]:
 
     return stream, options
 
+
 def find_emailgateway_recipient(message: EmailMessage) -> str:
     # We can't use Delivered-To; if there is a X-Gm-Original-To
     # it is more accurate, so try to find the most-accurate
     # recipient list in descending priority order
-    recipient_headers = ["X-Gm-Original-To", "Delivered-To", "Envelope-To",
-                         "Resent-To", "Resent-CC", "To", "CC"]
+    recipient_headers = [
+        "X-Gm-Original-To",
+        "Delivered-To",
+        "Envelope-To",
+        "Resent-To",
+        "Resent-CC",
+        "To",
+        "CC",
+    ]
 
     pattern_parts = [re.escape(part) for part in settings.EMAIL_GATEWAY_PATTERN.split('%s')]
     match_email_re = re.compile(".*?".join(pattern_parts))
@@ -321,19 +375,22 @@ def find_emailgateway_recipient(message: EmailMessage) -> str:
 
     raise ZulipEmailForwardError("Missing recipient in mirror email")
 
+
 def strip_from_subject(subject: str) -> str:
     # strips RE and FWD from the subject
     # from: https://stackoverflow.com/questions/9153629/regex-code-for-removing-fwd-re-etc-from-email-subject
     reg = r"([\[\(] *)?\b(RE|FWD?) *([-:;)\]][ :;\])-]*|$)|\]+ *$"
-    stripped = re.sub(reg, "", subject, flags = re.IGNORECASE | re.MULTILINE)
+    stripped = re.sub(reg, "", subject, flags=re.IGNORECASE | re.MULTILINE)
     return stripped.strip()
 
+
 def is_forwarded(subject: str) -> bool:
     # regex taken from strip_from_subject, we use it to detect various forms
     # of FWD at the beginning of the subject.
     reg = r"([\[\(] *)?\b(FWD?) *([-:;)\]][ :;\])-]*|$)|\]+ *$"
     return bool(re.match(reg, subject, flags=re.IGNORECASE))
 
+
 def process_stream_message(to: str, message: EmailMessage) -> None:
     subject_header = message.get("Subject", "")
     subject = strip_from_subject(subject_header) or "(no topic)"
@@ -344,14 +401,14 @@ def process_stream_message(to: str, message: EmailMessage) -> None:
         options['include_quotes'] = is_forwarded(subject_header)
 
     body = construct_zulip_body(message, stream.realm, **options)
-    send_zulip(
-        get_system_bot(settings.EMAIL_GATEWAY_BOT),
-        stream, subject, body)
+    send_zulip(get_system_bot(settings.EMAIL_GATEWAY_BOT), stream, subject, body)
     logger.info(
         "Successfully processed email to %s (%s)",
-        stream.name, stream.realm.string_id,
+        stream.name,
+        stream.realm.string_id,
     )
 
+
 def process_missed_message(to: str, message: EmailMessage) -> None:
     mm_address = get_usable_missed_message_address(to)
     mm_address.increment_times_used()
@@ -374,8 +431,11 @@ def process_missed_message(to: str, message: EmailMessage) -> None:
     if recipient.type == Recipient.STREAM:
         stream = get_stream_by_id_in_realm(recipient.type_id, user_profile.realm)
         internal_send_stream_message(
-            user_profile.realm, user_profile, stream,
-            topic, body,
+            user_profile.realm,
+            user_profile,
+            stream,
+            topic,
+            body,
         )
         recipient_str = stream.name
     elif recipient.type == Recipient.PERSONAL:
@@ -383,24 +443,24 @@ def process_missed_message(to: str, message: EmailMessage) -> None:
         assert not isinstance(display_recipient, str)
         recipient_str = display_recipient[0]['email']
         recipient_user = get_user(recipient_str, user_profile.realm)
-        internal_send_private_message(user_profile.realm, user_profile,
-                                      recipient_user, body)
+        internal_send_private_message(user_profile.realm, user_profile, recipient_user, body)
     elif recipient.type == Recipient.HUDDLE:
         display_recipient = get_display_recipient(recipient)
         assert not isinstance(display_recipient, str)
         emails = [user_dict['email'] for user_dict in display_recipient]
         recipient_str = ', '.join(emails)
-        internal_send_huddle_message(user_profile.realm, user_profile,
-                                     emails, body)
+        internal_send_huddle_message(user_profile.realm, user_profile, emails, body)
     else:
         raise AssertionError("Invalid recipient type!")
 
     logger.info(
         "Successfully processed email from user %s to %s",
-        user_profile.id, recipient_str,
+        user_profile.id,
+        recipient_str,
     )
 
-def process_message(message: EmailMessage, rcpt_to: Optional[str]=None) -> None:
+
+def process_message(message: EmailMessage, rcpt_to: Optional[str] = None) -> None:
     to: Optional[str] = None
 
     try:
@@ -419,12 +479,14 @@ def process_message(message: EmailMessage, rcpt_to: Optional[str]=None) -> None:
     except ZulipEmailForwardError as e:
         log_and_report(message, e.args[0], to)
 
+
 def validate_to_address(rcpt_to: str) -> None:
     if is_missed_message_address(rcpt_to):
         get_usable_missed_message_address(rcpt_to)
     else:
         decode_stream_email_address(rcpt_to)
 
+
 def mirror_email_message(rcpt_to: str, msg_base64: str) -> Dict[str, str]:
     try:
         validate_to_address(rcpt_to)
@@ -443,8 +505,10 @@ def mirror_email_message(rcpt_to: str, msg_base64: str) -> Dict[str, str]:
     )
     return {"status": "success"}
 
+
 # Email mirror rate limiter code:
 
+
 class RateLimitedRealmMirror(RateLimitedObject):
     def __init__(self, realm: Realm) -> None:
         self.realm = realm
@@ -456,6 +520,7 @@ class RateLimitedRealmMirror(RateLimitedObject):
     def rules(self) -> List[Tuple[int, int]]:
         return settings.RATE_LIMITING_MIRROR_REALM_RULES
 
+
 def rate_limit_mirror_by_realm(recipient_realm: Realm) -> None:
     ratelimited = RateLimitedRealmMirror(recipient_realm).rate_limit()[0]
 
diff --git a/zerver/lib/email_mirror_helpers.py b/zerver/lib/email_mirror_helpers.py
index 59ed695385..b1951830b5 100644
--- a/zerver/lib/email_mirror_helpers.py
+++ b/zerver/lib/email_mirror_helpers.py
@@ -13,6 +13,7 @@ def default_option_handler_factory(address_option: str) -> Callable[[Dict[str, A
 
     return option_setter
 
+
 optional_address_tokens = {
     "show-sender": default_option_handler_factory("show-sender"),
     "include-footer": default_option_handler_factory("include-footer"),
@@ -21,9 +22,11 @@ optional_address_tokens = {
     "prefer-html": lambda options: options.update(prefer_text=False),
 }
 
+
 class ZulipEmailForwardError(Exception):
     pass
 
+
 def get_email_gateway_message_string_from_address(address: str) -> str:
     pattern_parts = [re.escape(part) for part in settings.EMAIL_GATEWAY_PATTERN.split('%s')]
     if settings.EMAIL_GATEWAY_EXTRA_PATTERN_HACK:
@@ -38,10 +41,12 @@ def get_email_gateway_message_string_from_address(address: str) -> str:
 
     return msg_string
 
-def encode_email_address(stream: Stream, show_sender: bool=False) -> str:
+
+def encode_email_address(stream: Stream, show_sender: bool = False) -> str:
     return encode_email_address_helper(stream.name, stream.email_token, show_sender)
 
-def encode_email_address_helper(name: str, email_token: str, show_sender: bool=False) -> str:
+
+def encode_email_address_helper(name: str, email_token: str, show_sender: bool = False) -> str:
     # Some deployments may not use the email gateway
     if settings.EMAIL_GATEWAY_PATTERN == '':
         return ''
@@ -69,6 +74,7 @@ def encode_email_address_helper(name: str, email_token: str, show_sender: bool=F
 
     return settings.EMAIL_GATEWAY_PATTERN % (encoded_token,)
 
+
 def decode_email_address(email: str) -> Tuple[str, Dict[str, bool]]:
     # Perform the reverse of encode_email_address. Returns a tuple of
     # (email_token, options)
diff --git a/zerver/lib/email_notifications.py b/zerver/lib/email_notifications.py
index c60ba14f3b..fcbe592f9c 100644
--- a/zerver/lib/email_notifications.py
+++ b/zerver/lib/email_notifications.py
@@ -90,6 +90,7 @@ def relative_to_full_url(base_url: str, content: str) -> str:
 
     return content
 
+
 def fix_emojis(content: str, base_url: str, emojiset: str) -> str:
     def make_emoji_img_elem(emoji_span_elem: CSSSelector) -> Dict[str, Any]:
         # Convert the emoji spans to img tags.
@@ -104,7 +105,8 @@ def fix_emojis(content: str, base_url: str, emojiset: str) -> str:
         alt_code = emoji_span_elem.text
         image_url = base_url + f'/static/generated/emoji/images-{emojiset}-64/{emoji_code}.png'
         img_elem = lxml.html.fromstring(
-            f'<img alt="{alt_code}" src="{image_url}" title="{emoji_name}">')
+            f'<img alt="{alt_code}" src="{image_url}" title="{emoji_name}">'
+        )
         img_elem.set('style', 'height: 20px;')
         img_elem.tail = emoji_span_elem.tail
         return img_elem
@@ -122,6 +124,7 @@ def fix_emojis(content: str, base_url: str, emojiset: str) -> str:
     content = lxml.html.tostring(fragment, encoding="unicode")
     return content
 
+
 def fix_spoilers_in_html(content: str, language: str) -> str:
     with override_language(language):
         spoiler_title: str = _("Open Zulip to see the spoiler content")
@@ -141,13 +144,15 @@ def fix_spoilers_in_html(content: str, language: str) -> str:
             # and .tail do the right thing for us.
             header_content.append(lxml.html.fromstring("<span> </span>"))
         span_elem = lxml.html.fromstring(
-            f'<span class="spoiler-title" title="{spoiler_title}">({spoiler_title})</span')
+            f'<span class="spoiler-title" title="{spoiler_title}">({spoiler_title})</span'
+        )
         header_content.append(span_elem)
         header.drop_tag()
         spoiler_content.drop_tree()
     content = lxml.html.tostring(fragment, encoding="unicode")
     return content
 
+
 def fix_spoilers_in_text(content: str, language: str) -> str:
     with override_language(language):
         spoiler_title: str = _("Open Zulip to see the spoiler content")
@@ -170,6 +175,7 @@ def fix_spoilers_in_text(content: str, language: str) -> str:
             output.append(line)
     return '\n'.join(output)
 
+
 def build_message_list(
     user: UserProfile,
     messages: List[Message],
@@ -194,7 +200,9 @@ def build_message_list(
         # with a simple hyperlink.
         return re.sub(r"\[(\S*)\]\((\S*)\)", r"\2", content)
 
-    def append_sender_to_message(message_plain: str, message_html: str, sender: str) -> Tuple[str, str]:
+    def append_sender_to_message(
+        message_plain: str, message_html: str, sender: str
+    ) -> Tuple[str, str]:
         message_plain = f"{sender}: {message_plain}"
         message_soup = BeautifulSoup(message_html, "html.parser")
         sender_name_soup = BeautifulSoup(f"<b>{sender}</b>: ", "html.parser")
@@ -205,7 +213,7 @@ def build_message_list(
             message_soup.insert(0, sender_name_soup)
         return message_plain, str(message_soup)
 
-    def build_message_payload(message: Message, sender: Optional[str]=None) -> Dict[str, str]:
+    def build_message_payload(message: Message, sender: Optional[str] = None) -> Dict[str, str]:
         plain = message.content
         plain = fix_plaintext_image_urls(plain)
         # There's a small chance of colliding with non-Zulip URLs containing
@@ -213,9 +221,7 @@ def build_message_list(
         # structure of the URL to leverage. We can't use `relative_to_full_url()`
         # function here because it uses a stricter regex which will not work for
         # plain text.
-        plain = re.sub(
-            r"/user_uploads/(\S*)",
-            user.realm.uri + r"/user_uploads/\1", plain)
+        plain = re.sub(r"/user_uploads/(\S*)", user.realm.uri + r"/user_uploads/\1", plain)
         plain = fix_spoilers_in_text(plain, user.default_language)
 
         assert message.rendered_content is not None
@@ -229,8 +235,7 @@ def build_message_list(
 
     def build_sender_payload(message: Message) -> Dict[str, Any]:
         sender = sender_string(message)
-        return {'sender': sender,
-                'content': [build_message_payload(message, sender)]}
+        return {'sender': sender, 'content': [build_message_payload(message, sender)]}
 
     def message_header(message: Message) -> Dict[str, Any]:
         if message.recipient.type == Recipient.PERSONAL:
@@ -240,10 +245,8 @@ def build_message_list(
         elif message.recipient.type == Recipient.HUDDLE:
             display_recipient = get_display_recipient(message.recipient)
             assert not isinstance(display_recipient, str)
-            narrow_link = get_narrow_url(user, message,
-                                         display_recipient=display_recipient)
-            other_recipients = [r['full_name'] for r in display_recipient
-                                if r['id'] != user.id]
+            narrow_link = get_narrow_url(user, message, display_recipient=display_recipient)
+            other_recipients = [r['full_name'] for r in display_recipient if r['id'] != user.id]
             header = "You and {}".format(", ".join(other_recipients))
             header_html = f"<a style='color: #ffffff;' href='{narrow_link}'>{header}</a>"
         else:
@@ -257,9 +260,11 @@ def build_message_list(
             header = f"{stream.name} > {message.topic_name()}"
             stream_link = stream_narrow_url(user.realm, stream)
             header_html = f"<a href='{stream_link}'>{stream.name}</a> > <a href='{narrow_link}'>{message.topic_name()}</a>"
-        return {"plain": header,
-                "html": header_html,
-                "stream_message": message.recipient.type_name() == "stream"}
+        return {
+            "plain": header,
+            "html": header_html,
+            "stream_message": message.recipient.type_name() == "stream",
+        }
 
     # # Collapse message list to
     # [
@@ -304,16 +309,19 @@ def build_message_list(
                 sender_block.append(build_sender_payload(message))
         else:
             # New recipient and sender block
-            recipient_block = {'header': header,
-                               'senders': [build_sender_payload(message)]}
+            recipient_block = {'header': header, 'senders': [build_sender_payload(message)]}
 
             messages_to_render.append(recipient_block)
 
     return messages_to_render
 
-def get_narrow_url(user_profile: UserProfile, message: Message,
-                   display_recipient: Optional[DisplayRecipientT]=None,
-                   stream: Optional[Stream]=None) -> str:
+
+def get_narrow_url(
+    user_profile: UserProfile,
+    message: Message,
+    display_recipient: Optional[DisplayRecipientT] = None,
+    stream: Optional[Stream] = None,
+) -> str:
     """The display_recipient and stream arguments are optional.  If not
     provided, we'll compute them from the message; they exist as a
     performance optimization for cases where the caller needs those
@@ -332,8 +340,7 @@ def get_narrow_url(user_profile: UserProfile, message: Message,
             display_recipient = get_display_recipient(message.recipient)
         assert display_recipient is not None
         assert not isinstance(display_recipient, str)
-        other_user_ids = [r['id'] for r in display_recipient
-                          if r['id'] != user_profile.id]
+        other_user_ids = [r['id'] for r in display_recipient if r['id'] != user_profile.id]
         return huddle_narrow_url(
             realm=user_profile.realm,
             other_user_ids=other_user_ids,
@@ -344,14 +351,18 @@ def get_narrow_url(user_profile: UserProfile, message: Message,
             stream = Stream.objects.only('id', 'name').get(id=message.recipient.type_id)
         return topic_narrow_url(user_profile.realm, stream, message.topic_name())
 
+
 def message_content_allowed_in_missedmessage_emails(user_profile: UserProfile) -> bool:
-    return user_profile.realm.message_content_allowed_in_email_notifications and \
-        user_profile.message_content_in_email_notifications
+    return (
+        user_profile.realm.message_content_allowed_in_email_notifications
+        and user_profile.message_content_in_email_notifications
+    )
+
 
 @statsd_increment("missed_message_reminders")
-def do_send_missedmessage_events_reply_in_zulip(user_profile: UserProfile,
-                                                missed_messages: List[Dict[str, Any]],
-                                                message_count: int) -> None:
+def do_send_missedmessage_events_reply_in_zulip(
+    user_profile: UserProfile, missed_messages: List[Dict[str, Any]], message_count: int
+) -> None:
     """
     Send a reminder email to a user if she's missed some PMs by being offline.
 
@@ -370,7 +381,9 @@ def do_send_missedmessage_events_reply_in_zulip(user_profile: UserProfile,
     if not user_profile.enable_offline_email_notifications:
         return
 
-    recipients = {(msg['message'].recipient_id, msg['message'].topic_name()) for msg in missed_messages}
+    recipients = {
+        (msg['message'].recipient_id, msg['message'].topic_name()) for msg in missed_messages
+    }
     if len(recipients) != 1:
         raise ValueError(
             f'All missed_messages must have the same recipient and topic {recipients!r}',
@@ -408,6 +421,7 @@ def do_send_missedmessage_events_reply_in_zulip(user_profile: UserProfile,
         )
 
     from zerver.lib.email_mirror import create_missed_message_address
+
     reply_to_address = create_missed_message_address(user_profile, missed_messages[0]['message'])
     if reply_to_address == FromAddress.NOREPLY:
         reply_to_name = ""
@@ -420,31 +434,37 @@ def do_send_missedmessage_events_reply_in_zulip(user_profile: UserProfile,
     )
 
     senders = list({m['message'].sender for m in missed_messages})
-    if (missed_messages[0]['message'].recipient.type == Recipient.HUDDLE):
+    if missed_messages[0]['message'].recipient.type == Recipient.HUDDLE:
         display_recipient = get_display_recipient(missed_messages[0]['message'].recipient)
         # Make sure that this is a list of strings, not a string.
         assert not isinstance(display_recipient, str)
-        other_recipients = [r['full_name'] for r in display_recipient
-                            if r['id'] != user_profile.id]
+        other_recipients = [r['full_name'] for r in display_recipient if r['id'] != user_profile.id]
         context.update(group_pm=True)
         if len(other_recipients) == 2:
             huddle_display_name = " and ".join(other_recipients)
             context.update(huddle_display_name=huddle_display_name)
         elif len(other_recipients) == 3:
-            huddle_display_name = f"{other_recipients[0]}, {other_recipients[1]}, and {other_recipients[2]}"
+            huddle_display_name = (
+                f"{other_recipients[0]}, {other_recipients[1]}, and {other_recipients[2]}"
+            )
             context.update(huddle_display_name=huddle_display_name)
         else:
             huddle_display_name = "{}, and {} others".format(
-                ', '.join(other_recipients[:2]), len(other_recipients) - 2)
+                ', '.join(other_recipients[:2]), len(other_recipients) - 2
+            )
             context.update(huddle_display_name=huddle_display_name)
-    elif (missed_messages[0]['message'].recipient.type == Recipient.PERSONAL):
+    elif missed_messages[0]['message'].recipient.type == Recipient.PERSONAL:
         context.update(private_message=True)
-    elif (context['mention'] or context['stream_email_notify']):
+    elif context['mention'] or context['stream_email_notify']:
         # Keep only the senders who actually mentioned the user
         if context['mention']:
-            senders = list({m['message'].sender for m in missed_messages
-                            if m['trigger'] == 'mentioned' or
-                            m['trigger'] == 'wildcard_mentioned'})
+            senders = list(
+                {
+                    m['message'].sender
+                    for m in missed_messages
+                    if m['trigger'] == 'mentioned' or m['trigger'] == 'wildcard_mentioned'
+                }
+            )
         message = missed_messages[0]['message']
         stream = Stream.objects.only('id', 'name').get(id=message.recipient.type_id)
         stream_header = f"{stream.name} > {message.topic_name()}"
@@ -503,14 +523,17 @@ def do_send_missedmessage_events_reply_in_zulip(user_profile: UserProfile,
         'from_name': from_name,
         'from_address': from_address,
         'reply_to_email': str(Address(display_name=reply_to_name, addr_spec=reply_to_address)),
-        'context': context}
+        'context': context,
+    }
     queue_json_publish("email_senders", email_dict)
 
     user_profile.last_reminder = timezone_now()
     user_profile.save(update_fields=['last_reminder'])
 
-def handle_missedmessage_emails(user_profile_id: int,
-                                missed_email_events: Iterable[Dict[str, Any]]) -> None:
+
+def handle_missedmessage_emails(
+    user_profile_id: int, missed_email_events: Iterable[Dict[str, Any]]
+) -> None:
     message_ids = {event.get('message_id'): event.get('trigger') for event in missed_email_events}
 
     user_profile = get_user_profile_by_id(user_profile_id)
@@ -520,9 +543,11 @@ def handle_missedmessage_emails(user_profile_id: int,
     # Note: This query structure automatically filters out any
     # messages that were permanently deleted, since those would now be
     # in the ArchivedMessage table, not the Message table.
-    messages = Message.objects.filter(usermessage__user_profile_id=user_profile,
-                                      id__in=message_ids,
-                                      usermessage__flags=~UserMessage.flags.read)
+    messages = Message.objects.filter(
+        usermessage__user_profile_id=user_profile,
+        id__in=message_ids,
+        usermessage__flags=~UserMessage.flags.read,
+    )
 
     # Cancel missed-message emails for deleted messages
     messages = [um for um in messages if um.content != "(deleted)"]
@@ -542,8 +567,7 @@ def handle_missedmessage_emails(user_profile_id: int,
             messages_by_bucket[(msg.recipient_id, msg.topic_name())].append(msg)
 
     message_count_by_bucket = {
-        bucket_tup: len(msgs)
-        for bucket_tup, msgs in messages_by_bucket.items()
+        bucket_tup: len(msgs) for bucket_tup, msgs in messages_by_bucket.items()
     }
 
     for msg_list in messages_by_bucket.values():
@@ -575,6 +599,7 @@ def handle_missedmessage_emails(user_profile_id: int,
             message_count_by_bucket[bucket_tup],
         )
 
+
 def followup_day2_email_delay(user: UserProfile) -> timedelta:
     days_to_delay = 2
     user_tz = user.timezone
@@ -594,8 +619,10 @@ def followup_day2_email_delay(user: UserProfile) -> timedelta:
     # or comes in while they are dealing with their inbox.
     return timedelta(days=days_to_delay, hours=-1)
 
-def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> None:
+
+def enqueue_welcome_emails(user: UserProfile, realm_creation: bool = False) -> None:
     from zerver.context_processors import common_context
+
     if settings.WELCOME_EMAIL_SENDER is not None:
         # line break to avoid triggering lint rule
         from_name = settings.WELCOME_EMAIL_SENDER['name']
@@ -604,8 +631,11 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> Non
         from_name = None
         from_address = FromAddress.support_placeholder
 
-    other_account_count = UserProfile.objects.filter(
-        delivery_email__iexact=user.delivery_email).exclude(id=user.id).count()
+    other_account_count = (
+        UserProfile.objects.filter(delivery_email__iexact=user.delivery_email)
+        .exclude(id=user.id)
+        .count()
+    )
     unsubscribe_link = one_click_unsubscribe_link(user, "welcome")
     context = common_context(user)
     context.update(
@@ -617,8 +647,9 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> Non
         is_realm_admin=user.role == UserProfile.ROLE_REALM_ADMINISTRATOR,
     )
     if user.is_realm_admin:
-        context['getting_started_link'] = (user.realm.uri +
-                                           '/help/getting-your-organization-started-with-zulip')
+        context['getting_started_link'] = (
+            user.realm.uri + '/help/getting-your-organization-started-with-zulip'
+        )
     else:
         context['getting_started_link'] = "https://zulip.com"
 
@@ -636,13 +667,25 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> Non
                 break
 
     send_future_email(
-        "zerver/emails/followup_day1", user.realm, to_user_ids=[user.id], from_name=from_name,
-        from_address=from_address, context=context)
+        "zerver/emails/followup_day1",
+        user.realm,
+        to_user_ids=[user.id],
+        from_name=from_name,
+        from_address=from_address,
+        context=context,
+    )
 
     if other_account_count == 0:
         send_future_email(
-            "zerver/emails/followup_day2", user.realm, to_user_ids=[user.id], from_name=from_name,
-            from_address=from_address, context=context, delay=followup_day2_email_delay(user))
+            "zerver/emails/followup_day2",
+            user.realm,
+            to_user_ids=[user.id],
+            from_name=from_name,
+            from_address=from_address,
+            context=context,
+            delay=followup_day2_email_delay(user),
+        )
+
 
 def convert_html_to_markdown(html: str) -> str:
     parser = html2text.HTML2Text()
@@ -653,5 +696,4 @@ def convert_html_to_markdown(html: str) -> str:
     # ugly. Run a regex over the resulting description, turning links of the
     # form `![](http://foo.com/image.png?12345)` into
     # `[image.png](http://foo.com/image.png)`.
-    return re.sub("!\\[\\]\\((\\S*)/(\\S*)\\?(\\S*)\\)",
-                  "[\\2](\\1/\\2)", markdown)
+    return re.sub("!\\[\\]\\((\\S*)/(\\S*)\\?(\\S*)\\)", "[\\2](\\1/\\2)", markdown)
diff --git a/zerver/lib/email_validation.py b/zerver/lib/email_validation.py
index dd847691eb..0dc64c1405 100644
--- a/zerver/lib/email_validation.py
+++ b/zerver/lib/email_validation.py
@@ -24,6 +24,7 @@ def validate_disposable(email: str) -> None:
     if is_disposable_domain(email_to_domain(email)):
         raise DisposableEmailError
 
+
 def get_realm_email_validator(realm: Realm) -> Callable[[str], None]:
     if not realm.emails_restricted_to_domains:
         # Should we also do '+' check for non-resticted realms?
@@ -47,21 +48,16 @@ def get_realm_email_validator(realm: Realm) -> Callable[[str], None]:
     query = RealmDomain.objects.filter(realm=realm)
     rows = list(query.values('allow_subdomains', 'domain'))
 
-    allowed_domains = {
-        r['domain'] for r in rows
-    }
+    allowed_domains = {r['domain'] for r in rows}
 
-    allowed_subdomains = {
-        r['domain'] for r in rows
-        if r['allow_subdomains']
-    }
+    allowed_subdomains = {r['domain'] for r in rows if r['allow_subdomains']}
 
     def validate(email: str) -> None:
-        '''
+        """
         We don't have to do a "disposable" check for restricted
         domains, since the realm is already giving us
         a small whitelist.
-        '''
+        """
 
         if '+' in email_to_username(email):
             raise EmailContainsPlusError
@@ -80,18 +76,20 @@ def get_realm_email_validator(realm: Realm) -> Callable[[str], None]:
 
     return validate
 
+
 # Is a user with the given email address allowed to be in the given realm?
 # (This function does not check whether the user has been invited to the realm.
 # So for invite-only realms, this is the test for whether a user can be invited,
 # not whether the user can sign up currently.)
 def email_allowed_for_realm(email: str, realm: Realm) -> None:
-    '''
+    """
     Avoid calling this in a loop!
     Instead, call get_realm_email_validator()
     outside of the loop.
-    '''
+    """
     get_realm_email_validator(realm)(email)
 
+
 def validate_email_is_valid(
     email: str,
     validate_email_allowed_in_realm: Callable[[str], None],
@@ -113,21 +111,23 @@ def validate_email_is_valid(
 
     return None
 
+
 def email_reserved_for_system_bots_error(email: str) -> str:
     return f'{email} is reserved for system bots'
 
+
 def get_existing_user_errors(
     target_realm: Realm,
     emails: Set[str],
-    verbose: bool=False,
+    verbose: bool = False,
 ) -> Dict[str, Tuple[str, bool]]:
-    '''
+    """
     We use this function even for a list of one emails.
 
     It checks "new" emails to make sure that they don't
     already exist.  There's a bit of fiddly logic related
     to cross-realm bots and mirror dummies too.
-    '''
+    """
 
     errors: Dict[str, Tuple[str, bool]] = {}
 
@@ -188,10 +188,11 @@ def get_existing_user_errors(
 
     return errors
 
-def validate_email_not_already_in_realm(target_realm: Realm,
-                                        email: str,
-                                        verbose: bool=True) -> None:
-    '''
+
+def validate_email_not_already_in_realm(
+    target_realm: Realm, email: str, verbose: bool = True
+) -> None:
+    """
     NOTE:
         Only use this to validate that a single email
         is not already used in the realm.
@@ -199,7 +200,7 @@ def validate_email_not_already_in_realm(target_realm: Realm,
         We should start using bulk_check_new_emails()
         for any endpoint that takes multiple emails,
         such as the "invite" interface.
-    '''
+    """
     error_dict = get_existing_user_errors(target_realm, {email}, verbose)
 
     # Loop through errors, the only key should be our email.
diff --git a/zerver/lib/emoji.py b/zerver/lib/emoji.py
index c302f83f9d..14ae0c63d4 100644
--- a/zerver/lib/emoji.py
+++ b/zerver/lib/emoji.py
@@ -30,9 +30,11 @@ EMOTICON_CONVERSIONS = emoji_codes["emoticon_conversions"]
 possible_emoticons = EMOTICON_CONVERSIONS.keys()
 possible_emoticon_regexes = (re.escape(emoticon) for emoticon in possible_emoticons)
 terminal_symbols = ',.;?!()\\[\\] "\'\\n\\t'  # from composebox_typeahead.js
-emoticon_regex = (f'(?<![^{terminal_symbols}])(?P<emoticon>('
-                  + ')|('.join(possible_emoticon_regexes)
-                  + f'))(?![^{terminal_symbols}])')
+emoticon_regex = (
+    f'(?<![^{terminal_symbols}])(?P<emoticon>('
+    + ')|('.join(possible_emoticon_regexes)
+    + f'))(?![^{terminal_symbols}])'
+)
 
 # Translates emoticons to their colon syntax, e.g. `:smiley:`.
 def translate_emoticons(text: str) -> str:
@@ -43,6 +45,7 @@ def translate_emoticons(text: str) -> str:
 
     return translated
 
+
 def emoji_name_to_emoji_code(realm: Realm, emoji_name: str) -> Tuple[str, str]:
     realm_emojis = realm.get_active_emoji()
     realm_emoji = realm_emojis.get(emoji_name)
@@ -54,8 +57,8 @@ def emoji_name_to_emoji_code(realm: Realm, emoji_name: str) -> Tuple[str, str]:
         return name_to_codepoint[emoji_name], Reaction.UNICODE_EMOJI
     raise JsonableError(_("Emoji '{}' does not exist").format(emoji_name))
 
-def check_emoji_request(realm: Realm, emoji_name: str, emoji_code: str,
-                        emoji_type: str) -> None:
+
+def check_emoji_request(realm: Realm, emoji_name: str, emoji_code: str, emoji_type: str) -> None:
     # For a given realm and emoji type, checks whether an emoji
     # code is valid for new reactions, or not.
     if emoji_type == "realm_emoji":
@@ -81,7 +84,8 @@ def check_emoji_request(realm: Realm, emoji_name: str, emoji_code: str,
         # The above are the only valid emoji types
         raise JsonableError(_("Invalid emoji type."))
 
-def check_emoji_admin(user_profile: UserProfile, emoji_name: Optional[str]=None) -> None:
+
+def check_emoji_admin(user_profile: UserProfile, emoji_name: Optional[str] = None) -> None:
     """Raises an exception if the user cannot administer the target realm
     emoji name in their organization."""
 
@@ -96,15 +100,16 @@ def check_emoji_admin(user_profile: UserProfile, emoji_name: Optional[str]=None)
         return
 
     # Additionally, normal users can remove emoji they themselves added
-    emoji = RealmEmoji.objects.filter(realm=user_profile.realm,
-                                      name=emoji_name,
-                                      deactivated=False).first()
-    current_user_is_author = (emoji is not None and
-                              emoji.author is not None and
-                              emoji.author.id == user_profile.id)
+    emoji = RealmEmoji.objects.filter(
+        realm=user_profile.realm, name=emoji_name, deactivated=False
+    ).first()
+    current_user_is_author = (
+        emoji is not None and emoji.author is not None and emoji.author.id == user_profile.id
+    )
     if not user_profile.is_realm_admin and not current_user_is_author:
         raise JsonableError(_("Must be an organization administrator or emoji author"))
 
+
 def check_valid_emoji_name(emoji_name: str) -> None:
     if emoji_name:
         if re.match(r'^[0-9a-z.\-_]+(?<![.\-_])$', emoji_name):
@@ -112,6 +117,7 @@ def check_valid_emoji_name(emoji_name: str) -> None:
         raise JsonableError(_("Invalid characters in emoji name"))
     raise JsonableError(_("Emoji name is missing"))
 
+
 def get_emoji_url(emoji_file_name: str, realm_id: int) -> str:
     return upload_backend.get_emoji_url(emoji_file_name, realm_id)
 
diff --git a/zerver/lib/error_notify.py b/zerver/lib/error_notify.py
index 93a4619df9..b9fb4aeb77 100644
--- a/zerver/lib/error_notify.py
+++ b/zerver/lib/error_notify.py
@@ -19,30 +19,37 @@ def format_email_subject(email_subject: str) -> str:
     """
     return email_subject.replace('\n', '\\n').replace('\r', '\\r')
 
+
 def logger_repr(report: Dict[str, Any]) -> str:
     return "Logger {logger_name}, from module {log_module} line {log_lineno}:".format(**report)
 
+
 def user_info_str(report: Dict[str, Any]) -> str:
     if report.get('user') and report['user'].get('user_full_name'):
-        user_info = "{user[user_full_name]} <{user[user_email]}> ({user[user_role]})".format(**report)
+        user_info = "{user[user_full_name]} <{user[user_email]}> ({user[user_role]})".format(
+            **report
+        )
     else:
         user_info = "Anonymous user (not logged in)"
 
     user_info += " on {host} deployment".format(**report)
     return user_info
 
+
 def deployment_repr(report: Dict[str, Any]) -> str:
     deployment = 'Deployed code:\n'
     for field, val in report['deployment_data'].items():
         deployment += f'- {field}: {val}\n'
     return deployment
 
+
 def notify_browser_error(report: Dict[str, Any]) -> None:
     report = defaultdict(lambda: None, report)
     if settings.ERROR_BOT:
         zulip_browser_error(report)
     email_browser_error(report)
 
+
 def email_browser_error(report: Dict[str, Any]) -> None:
     user_info = user_info_str(report)
     email_subject = f"Browser error for {user_info}"
@@ -61,7 +68,9 @@ User agent: {user_agent}
 href: {href}
 Server path: {server_path}
 Deployed version: {version}
-""".format(**report)
+""".format(
+        **report
+    )
 
     more_info = report['more_info']
     if more_info is not None:
@@ -73,6 +82,7 @@ Deployed version: {version}
 
     mail_admins(email_subject, body)
 
+
 def zulip_browser_error(report: Dict[str, Any]) -> None:
     email_subject = "JS error: {user_email}".format(**report)
 
@@ -93,12 +103,14 @@ def zulip_browser_error(report: Dict[str, Any]) -> None:
         body,
     )
 
-def notify_server_error(report: Dict[str, Any], skip_error_zulip: bool=False) -> None:
+
+def notify_server_error(report: Dict[str, Any], skip_error_zulip: bool = False) -> None:
     report = defaultdict(lambda: None, report)
     email_server_error(report)
     if settings.ERROR_BOT and not skip_error_zulip:
         zulip_server_error(report)
 
+
 def zulip_server_error(report: Dict[str, Any]) -> None:
     email_subject = '{node}: {message}'.format(**report)
 
@@ -112,7 +124,9 @@ Request info:
 ~~~~
 - path: {path}
 - {method}: {data}
-""".format(**report)
+""".format(
+            **report
+        )
         for field in ["REMOTE_ADDR", "QUERY_STRING", "SERVER_NAME"]:
             val = report.get(field.lower())
             if field == "QUERY_STRING":
@@ -144,6 +158,7 @@ Error generated by {user_info}
         message,
     )
 
+
 def email_server_error(report: Dict[str, Any]) -> None:
     email_subject = '{node}: {message}'.format(**report)
 
@@ -156,7 +171,9 @@ def email_server_error(report: Dict[str, Any]) -> None:
 Request info:
 - path: {path}
 - {method}: {data}
-""".format(**report)
+""".format(
+            **report
+        )
         for field in ["REMOTE_ADDR", "QUERY_STRING", "SERVER_NAME"]:
             val = report.get(field.lower())
             if field == "QUERY_STRING":
@@ -177,6 +194,7 @@ Error generated by {user_info}
 
     mail_admins(format_email_subject(email_subject), message, fail_silently=True)
 
+
 def do_report_error(type: str, report: Dict[str, Any]) -> HttpResponse:
     if type == 'browser':
         notify_browser_error(report)
diff --git a/zerver/lib/event_schema.py b/zerver/lib/event_schema.py
index d86935fa61..08d7f735c4 100644
--- a/zerver/lib/event_schema.py
+++ b/zerver/lib/event_schema.py
@@ -303,7 +303,10 @@ hotspots_event = event_dict_type(
     required_keys=[
         # force vertical
         ("type", Equals("hotspots")),
-        ("hotspots", ListType(_hotspot),),
+        (
+            "hotspots",
+            ListType(_hotspot),
+        ),
     ]
 )
 check_hotspots = make_checker(hotspots_event)
@@ -515,7 +518,10 @@ realm_bot_add_event = event_dict_type(
 _check_realm_bot_add = make_checker(realm_bot_add_event)
 
 
-def check_realm_bot_add(var_name: str, event: Dict[str, object],) -> None:
+def check_realm_bot_add(
+    var_name: str,
+    event: Dict[str, object],
+) -> None:
     _check_realm_bot_add(var_name, event)
 
     assert isinstance(event["bot"], dict)
@@ -527,13 +533,9 @@ def check_realm_bot_add(var_name: str, event: Dict[str, object],) -> None:
     if bot_type == UserProfile.DEFAULT_BOT:
         check_data(Equals([]), services_field, services)
     elif bot_type == UserProfile.OUTGOING_WEBHOOK_BOT:
-        check_data(
-            ListType(bot_services_outgoing_type, length=1), services_field, services
-        )
+        check_data(ListType(bot_services_outgoing_type, length=1), services_field, services)
     elif bot_type == UserProfile.EMBEDDED_BOT:
-        check_data(
-            ListType(bot_services_embedded_type, length=1), services_field, services
-        )
+        check_data(ListType(bot_services_embedded_type, length=1), services_field, services)
     else:
         raise AssertionError(f"Unknown bot_type: {bot_type}")
 
@@ -700,7 +702,10 @@ realm_export_event = event_dict_type(
     required_keys=[
         # force vertical
         ("type", Equals("realm_export")),
-        ("exports", ListType(export_type),),
+        (
+            "exports",
+            ListType(export_type),
+        ),
     ]
 )
 _check_realm_export = make_checker(realm_export_event)
@@ -778,7 +783,11 @@ realm_update_event = event_dict_type(
 _check_realm_update = make_checker(realm_update_event)
 
 
-def check_realm_update(var_name: str, event: Dict[str, object], prop: str,) -> None:
+def check_realm_update(
+    var_name: str,
+    event: Dict[str, object],
+    prop: str,
+) -> None:
     """
     Realm updates have these two fields:
 
@@ -1103,7 +1112,10 @@ stream_update_event = event_dict_type(
 _check_stream_update = make_checker(stream_update_event)
 
 
-def check_stream_update(var_name: str, event: Dict[str, object],) -> None:
+def check_stream_update(
+    var_name: str,
+    event: Dict[str, object],
+) -> None:
     _check_stream_update(var_name, event)
     prop = event["property"]
     value = event["value"]
@@ -1271,7 +1283,10 @@ update_display_settings_event = event_dict_type(
 _check_update_display_settings = make_checker(update_display_settings_event)
 
 
-def check_update_display_settings(var_name: str, event: Dict[str, object],) -> None:
+def check_update_display_settings(
+    var_name: str,
+    event: Dict[str, object],
+) -> None:
     """
     Display setting events have a "setting" field that
     is more specifically typed according to the
@@ -1303,7 +1318,9 @@ _check_update_global_notifications = make_checker(update_global_notifications_ev
 
 
 def check_update_global_notifications(
-    var_name: str, event: Dict[str, object], desired_val: Union[bool, int, str],
+    var_name: str,
+    event: Dict[str, object],
+    desired_val: Union[bool, int, str],
 ) -> None:
     """
     See UserProfile.notification_setting_types for
@@ -1357,9 +1374,7 @@ update_message_topic_fields = [
     (TOPIC_NAME, str),
 ]
 
-update_message_optional_fields = (
-    update_message_content_fields + update_message_topic_fields
-)
+update_message_optional_fields = update_message_content_fields + update_message_topic_fields
 
 # The schema here does not include the "embedded"
 # variant of update_message; it is for message
@@ -1502,9 +1517,7 @@ user_group_update_event = event_dict_type(
 _check_user_group_update = make_checker(user_group_update_event)
 
 
-def check_user_group_update(
-    var_name: str, event: Dict[str, object], field: str
-) -> None:
+def check_user_group_update(var_name: str, event: Dict[str, object], field: str) -> None:
     _check_user_group_update(var_name, event)
 
     assert isinstance(event["data"], dict)
@@ -1522,13 +1535,12 @@ user_status_event = event_dict_type(
         # force vertical
         ("away", bool),
         ("status_text", str),
-    ]
+    ],
 )
 _check_user_status = make_checker(user_status_event)
 
-def check_user_status(
-    var_name: str, event: Dict[str, object], fields: Set[str]
-) -> None:
+
+def check_user_status(var_name: str, event: Dict[str, object], fields: Set[str]) -> None:
     _check_user_status(var_name, event)
 
     assert set(event.keys()) == {"id", "type", "user_id"} | fields
diff --git a/zerver/lib/events.py b/zerver/lib/events.py
index 6ee7a2d16c..79cbc41ab0 100644
--- a/zerver/lib/events.py
+++ b/zerver/lib/events.py
@@ -65,22 +65,24 @@ from zproject.backends import email_auth_enabled, password_auth_enabled
 
 
 def add_realm_logo_fields(state: Dict[str, Any], realm: Realm) -> None:
-    state['realm_logo_url'] = get_realm_logo_url(realm, night = False)
-    state['realm_logo_source'] = get_realm_logo_source(realm, night = False)
-    state['realm_night_logo_url'] = get_realm_logo_url(realm, night = True)
-    state['realm_night_logo_source'] = get_realm_logo_source(realm, night = True)
+    state['realm_logo_url'] = get_realm_logo_url(realm, night=False)
+    state['realm_logo_source'] = get_realm_logo_source(realm, night=False)
+    state['realm_night_logo_url'] = get_realm_logo_url(realm, night=True)
+    state['realm_night_logo_source'] = get_realm_logo_source(realm, night=True)
     state['max_logo_file_size'] = settings.MAX_LOGO_FILE_SIZE
 
+
 def always_want(msg_type: str) -> bool:
-    '''
+    """
     This function is used as a helper in
     fetch_initial_state_data, when the user passes
     in None for event_types, and we want to fetch
     info for every event type.  Defining this at module
     level makes it easier to mock.
-    '''
+    """
     return True
 
+
 def fetch_initial_state_data(
     user_profile: Optional[UserProfile],
     *,
@@ -127,7 +129,8 @@ def fetch_initial_state_data(
         fields = custom_profile_fields_for_realm(realm.id)
         state['custom_profile_fields'] = [f.as_dict() for f in fields]
         state['custom_profile_field_types'] = {
-            item[4]: {"id": item[0], "name": str(item[1])} for item in CustomProfileField.ALL_FIELD_TYPES
+            item[4]: {"id": item[0], "name": str(item[1])}
+            for item in CustomProfileField.ALL_FIELD_TYPES
         }
 
     if want('hotspots'):
@@ -143,10 +146,11 @@ def fetch_initial_state_data(
         # remove this parameter from the API.
         user_messages = []
         if user_profile is not None:
-            user_messages = UserMessage.objects \
-                .filter(user_profile=user_profile) \
-                .order_by('-message_id') \
+            user_messages = (
+                UserMessage.objects.filter(user_profile=user_profile)
+                .order_by('-message_id')
                 .values('message_id')[:1]
+            )
         if user_messages:
             state['max_message_id'] = user_messages[0]['message_id']
         else:
@@ -156,7 +160,9 @@ def fetch_initial_state_data(
         state['muted_topics'] = [] if user_profile is None else get_topic_mutes(user_profile)
 
     if want('presence'):
-        state['presences'] = {} if user_profile is None else get_presences_for_realm(realm, slim_presence)
+        state['presences'] = (
+            {} if user_profile is None else get_presences_for_realm(realm, slim_presence)
+        )
 
     if want('realm'):
         for property_name in Realm.property_types:
@@ -171,14 +177,23 @@ def fetch_initial_state_data(
         # access them.  In the future, we may want to move this logic
         # to the frontends, so that we can correctly display what
         # these fields are in the settings.
-        state['realm_allow_message_editing'] = False if user_profile is None else realm.allow_message_editing
-        state['realm_allow_community_topic_editing'] = False if user_profile is None else realm.allow_community_topic_editing
-        state['realm_allow_message_deleting'] = False if user_profile is None else realm.allow_message_deleting
+        state['realm_allow_message_editing'] = (
+            False if user_profile is None else realm.allow_message_editing
+        )
+        state['realm_allow_community_topic_editing'] = (
+            False if user_profile is None else realm.allow_community_topic_editing
+        )
+        state['realm_allow_message_deleting'] = (
+            False if user_profile is None else realm.allow_message_deleting
+        )
 
         state['realm_message_content_edit_limit_seconds'] = realm.message_content_edit_limit_seconds
-        state['realm_message_content_delete_limit_seconds'] = realm.message_content_delete_limit_seconds
-        state['realm_community_topic_editing_limit_seconds'] = \
-            Realm.DEFAULT_COMMUNITY_TOPIC_EDITING_LIMIT_SECONDS
+        state[
+            'realm_message_content_delete_limit_seconds'
+        ] = realm.message_content_delete_limit_seconds
+        state[
+            'realm_community_topic_editing_limit_seconds'
+        ] = Realm.DEFAULT_COMMUNITY_TOPIC_EDITING_LIMIT_SECONDS
 
         # This setting determines whether to send presence and also
         # whether to display of users list in the right sidebar; we
@@ -194,7 +209,9 @@ def fetch_initial_state_data(
         state['realm_uri'] = realm.uri
         state['realm_available_video_chat_providers'] = realm.VIDEO_CHAT_PROVIDERS
         state['settings_send_digest_emails'] = settings.SEND_DIGEST_EMAILS
-        state['realm_digest_emails_enabled'] = realm.digest_emails_enabled and settings.SEND_DIGEST_EMAILS
+        state['realm_digest_emails_enabled'] = (
+            realm.digest_emails_enabled and settings.SEND_DIGEST_EMAILS
+        )
         state['realm_is_zephyr_mirror_realm'] = realm.is_zephyr_mirror_realm
         state['realm_email_auth_enabled'] = email_auth_enabled(realm)
         state['realm_password_auth_enabled'] = password_auth_enabled(realm)
@@ -204,17 +221,17 @@ def fetch_initial_state_data(
         state['zulip_plan_is_not_limited'] = realm.plan_type != Realm.LIMITED
         state['upgrade_text_for_wide_organization_logo'] = str(Realm.UPGRADE_TEXT_STANDARD)
         state['realm_default_external_accounts'] = DEFAULT_EXTERNAL_ACCOUNTS
-        state['jitsi_server_url']                = settings.JITSI_SERVER_URL.rstrip('/')
-        state['development_environment']         = settings.DEVELOPMENT
-        state['server_generation']               = settings.SERVER_GENERATION
-        state['password_min_length']             = settings.PASSWORD_MIN_LENGTH
-        state['password_min_guesses']            = settings.PASSWORD_MIN_GUESSES
-        state['max_file_upload_size_mib']        = settings.MAX_FILE_UPLOAD_SIZE
-        state['max_avatar_file_size_mib']        = settings.MAX_AVATAR_FILE_SIZE
-        state['server_inline_image_preview']     = settings.INLINE_IMAGE_PREVIEW
+        state['jitsi_server_url'] = settings.JITSI_SERVER_URL.rstrip('/')
+        state['development_environment'] = settings.DEVELOPMENT
+        state['server_generation'] = settings.SERVER_GENERATION
+        state['password_min_length'] = settings.PASSWORD_MIN_LENGTH
+        state['password_min_guesses'] = settings.PASSWORD_MIN_GUESSES
+        state['max_file_upload_size_mib'] = settings.MAX_FILE_UPLOAD_SIZE
+        state['max_avatar_file_size_mib'] = settings.MAX_AVATAR_FILE_SIZE
+        state['server_inline_image_preview'] = settings.INLINE_IMAGE_PREVIEW
         state['server_inline_url_embed_preview'] = settings.INLINE_URL_EMBED_PREVIEW
-        state['server_avatar_changes_disabled']  = settings.AVATAR_CHANGES_DISABLED
-        state['server_name_changes_disabled']    = settings.NAME_CHANGES_DISABLED
+        state['server_avatar_changes_disabled'] = settings.AVATAR_CHANGES_DISABLED
+        state['server_name_changes_disabled'] = settings.NAME_CHANGES_DISABLED
 
         if realm.notifications_stream and not realm.notifications_stream.deactivated:
             notifications_stream = realm.notifications_stream
@@ -264,9 +281,12 @@ def fetch_initial_state_data(
             id=0,
         )
     if want('realm_user'):
-        state['raw_users'] = get_raw_user_data(realm, user_profile,
-                                               client_gravatar=client_gravatar,
-                                               user_avatar_url_field_optional=user_avatar_url_field_optional)
+        state['raw_users'] = get_raw_user_data(
+            realm,
+            user_profile,
+            client_gravatar=client_gravatar,
+            user_avatar_url_field_optional=user_avatar_url_field_optional,
+        )
         state['cross_realm_bots'] = list(get_cross_realm_dicts())
 
         # For the user's own avatar URL, we force
@@ -304,8 +324,9 @@ def fetch_initial_state_data(
     if want('realm_embedded_bots'):
         realm_embedded_bots = []
         for bot in EMBEDDED_BOTS:
-            realm_embedded_bots.append({'name': bot.name,
-                                        'config': load_bot_config_template(bot.name)})
+            realm_embedded_bots.append(
+                {'name': bot.name, 'config': load_bot_config_template(bot.name)}
+            )
         state['realm_embedded_bots'] = realm_embedded_bots
 
     # This does not have an apply_events counterpart either since
@@ -313,10 +334,12 @@ def fetch_initial_state_data(
     if want('realm_incoming_webhook_bots'):
         realm_incoming_webhook_bots = []
         for integration in WEBHOOK_INTEGRATIONS:
-            realm_incoming_webhook_bots.append({
-                'name': integration.name,
-                'config': {c[1]: c[0] for c in integration.config_options},
-            })
+            realm_incoming_webhook_bots.append(
+                {
+                    'name': integration.name,
+                    'config': {c[1]: c[0] for c in integration.config_options},
+                }
+            )
         state['realm_incoming_webhook_bots'] = realm_incoming_webhook_bots
 
     if want('recent_private_conversations'):
@@ -332,7 +355,9 @@ def fetch_initial_state_data(
         # intermediate form as a dictionary keyed by recipient_id,
         # which is more efficient to update, and is rewritten to the
         # final format in post_process_state.
-        state['raw_recent_private_conversations'] = {} if user_profile is None else get_recent_private_conversations(user_profile)
+        state['raw_recent_private_conversations'] = (
+            {} if user_profile is None else get_recent_private_conversations(user_profile)
+        )
 
     if want('subscription'):
         if user_profile is not None:
@@ -362,7 +387,9 @@ def fetch_initial_state_data(
             state['raw_unread_msgs'] = extract_unread_data_from_um_rows([], user_profile)
 
     if want('starred_messages'):
-        state['starred_messages'] = [] if user_profile is None else get_starred_message_ids(user_profile)
+        state['starred_messages'] = (
+            [] if user_profile is None else get_starred_message_ids(user_profile)
+        )
 
     if want('stream'):
         if include_streams:
@@ -387,13 +414,15 @@ def fetch_initial_state_data(
             state['realm_default_streams'] = []
         else:
             state['realm_default_streams'] = streams_to_dicts_sorted(
-                get_default_streams_for_realm(realm.id))
+                get_default_streams_for_realm(realm.id)
+            )
     if want('default_stream_groups'):
         if settings_user.is_guest:
             state['realm_default_stream_groups'] = []
         else:
             state['realm_default_stream_groups'] = default_stream_groups_to_dicts_sorted(
-                get_default_stream_groups(realm))
+                get_default_stream_groups(realm)
+            )
 
     if want('stop_words'):
         state['stop_words'] = read_stop_words()
@@ -417,6 +446,7 @@ def fetch_initial_state_data(
 
     return state
 
+
 def apply_events(
     user_profile: UserProfile,
     *,
@@ -447,6 +477,7 @@ def apply_events(
             include_subscribers=include_subscribers,
         )
 
+
 def apply_event(
     user_profile: UserProfile,
     *,
@@ -471,14 +502,16 @@ def apply_event(
                 # Handle maintaining the recent_private_conversations data structure.
                 conversations = state['raw_recent_private_conversations']
                 recipient_id = get_recent_conversations_recipient_id(
-                    user_profile, event['message']['recipient_id'],
-                    event['message']["sender_id"])
+                    user_profile, event['message']['recipient_id'], event['message']["sender_id"]
+                )
 
                 if recipient_id not in conversations:
                     conversations[recipient_id] = dict(
-                        user_ids=sorted(user_dict['id'] for user_dict in
-                                        event['message']['display_recipient'] if
-                                        user_dict['id'] != user_profile.id),
+                        user_ids=sorted(
+                            user_dict['id']
+                            for user_dict in event['message']['display_recipient']
+                            if user_dict['id'] != user_profile.id
+                        ),
                     )
                 conversations[recipient_id]['max_message_id'] = event['message']['id']
             return
@@ -513,10 +546,10 @@ def apply_event(
         elif event['op'] == "remove":
             state['raw_users'][person_user_id]['is_active'] = False
         elif event['op'] == 'update':
-            is_me = (person_user_id == user_profile.id)
+            is_me = person_user_id == user_profile.id
 
             if is_me:
-                if ('avatar_url' in person and 'avatar_url' in state):
+                if 'avatar_url' in person and 'avatar_url' in state:
                     state['avatar_source'] = person['avatar_source']
                     state['avatar_url'] = person['avatar_url']
                     state['avatar_url_medium'] = person['avatar_url_medium']
@@ -555,7 +588,7 @@ def apply_event(
                 # realm.  This is ugly and probably better
                 # solved by removing the all-realm-bots data
                 # given to admin users from this flow.
-                if ('role' in person and 'realm_bots' in state):
+                if 'role' in person and 'realm_bots' in state:
                     prev_state = state['raw_users'][user_profile.id]
                     was_admin = prev_state['is_admin']
                     now_admin = is_administrator_role(person['role'])
@@ -604,8 +637,9 @@ def apply_event(
                     bot['is_active'] = False
 
         if event['op'] == 'delete':
-            state['realm_bots'] = [item for item
-                                   in state['realm_bots'] if item['user_id'] != event['bot']['user_id']]
+            state['realm_bots'] = [
+                item for item in state['realm_bots'] if item['user_id'] != event['bot']['user_id']
+            ]
 
         if event['op'] == 'update':
             for bot in state['realm_bots']:
@@ -641,9 +675,14 @@ def apply_event(
         if event['op'] == 'delete':
             deleted_stream_ids = {stream['stream_id'] for stream in event['streams']}
             if 'streams' in state:
-                state['streams'] = [s for s in state['streams'] if s['stream_id'] not in deleted_stream_ids]
-            state['never_subscribed'] = [stream for stream in state['never_subscribed'] if
-                                         stream['stream_id'] not in deleted_stream_ids]
+                state['streams'] = [
+                    s for s in state['streams'] if s['stream_id'] not in deleted_stream_ids
+                ]
+            state['never_subscribed'] = [
+                stream
+                for stream in state['never_subscribed']
+                if stream['stream_id'] not in deleted_stream_ids
+            ]
 
         if event['op'] == 'update':
             # For legacy reasons, we call stream data 'subscriptions' in
@@ -676,8 +715,10 @@ def apply_event(
                 state['zulip_plan_is_not_limited'] = event['value'] != Realm.LIMITED
                 state['realm_upload_quota'] = event['extra_data']['upload_quota']
 
-            policy_permission_dict = {'create_stream_policy': 'can_create_streams',
-                                      'invite_to_stream_policy': 'can_subscribe_other_users'}
+            policy_permission_dict = {
+                'create_stream_policy': 'can_create_streams',
+                'invite_to_stream_policy': 'can_subscribe_other_users',
+            }
 
             # Tricky interaction: Whether we can create streams and can subscribe other users
             # can get changed here.
@@ -690,7 +731,8 @@ def apply_event(
             if event['property'] in policy_permission_dict.keys():
                 if policy_permission_dict[event['property']] in state:
                     state[policy_permission_dict[event['property']]] = user_profile.has_permission(
-                        event['property'])
+                        event['property']
+                    )
 
         elif event['op'] == "update_dict":
             for key, value in event['data'].items():
@@ -699,7 +741,7 @@ def apply_event(
                 # update the state for whether password authentication
                 # is enabled on this server.
                 if key == 'authentication_methods':
-                    state['realm_password_auth_enabled'] = (value['Email'] or value['LDAP'])
+                    state['realm_password_auth_enabled'] = value['Email'] or value['LDAP']
                     state['realm_email_auth_enabled'] = value['Email']
     elif event['type'] == "subscription":
         if event["op"] == "add":
@@ -748,7 +790,11 @@ def apply_event(
                 stream_ids = set(event["stream_ids"])
                 user_ids = set(event["user_ids"])
 
-                for sub_dict in [state["subscriptions"], state["unsubscribed"], state["never_subscribed"]]:
+                for sub_dict in [
+                    state["subscriptions"],
+                    state["unsubscribed"],
+                    state["never_subscribed"],
+                ]:
                     for sub in sub_dict:
                         if sub["stream_id"] in stream_ids:
                             subscribers = set(sub["subscribers"]) | user_ids
@@ -758,7 +804,11 @@ def apply_event(
                 stream_ids = set(event["stream_ids"])
                 user_ids = set(event["user_ids"])
 
-                for sub_dict in [state["subscriptions"], state["unsubscribed"], state["never_subscribed"]]:
+                for sub_dict in [
+                    state["subscriptions"],
+                    state["unsubscribed"],
+                    state["never_subscribed"],
+                ]:
                     for sub in sub_dict:
                         if sub["stream_id"] in stream_ids:
                             subscribers = set(sub["subscribers"]) - user_ids
@@ -768,8 +818,9 @@ def apply_event(
             user_key = str(event['user_id'])
         else:
             user_key = event['email']
-        state['presences'][user_key] = get_presence_for_user(
-            event['user_id'], slim_presence)[user_key]
+        state['presences'][user_key] = get_presence_for_user(event['user_id'], slim_presence)[
+            user_key
+        ]
     elif event['type'] == "update_message":
         # We don't return messages in /register, so we don't need to
         # do anything for content updates, but we may need to update
@@ -792,8 +843,9 @@ def apply_event(
             message_ids = [event['message_id']]
         else:
             message_ids = event['message_ids']  # nocoverage
-        max_message = Message.objects.filter(
-            usermessage__user_profile=user_profile).order_by('-id').first()
+        max_message = (
+            Message.objects.filter(usermessage__user_profile=user_profile).order_by('-id').first()
+        )
         if max_message:
             state['max_message_id'] = max_message.id
         else:
@@ -807,8 +859,9 @@ def apply_event(
         if 'raw_recent_private_conversations' not in state or event['message_type'] != 'private':
             return
 
-        recipient_id = get_recent_conversations_recipient_id(user_profile, event['recipient_id'],
-                                                             event['sender_id'])
+        recipient_id = get_recent_conversations_recipient_id(
+            user_profile, event['recipient_id'], event['sender_id']
+        )
 
         # Ideally, we'd have test coverage for these two blocks.  To
         # do that, we'll need a test where we delete not-the-latest
@@ -817,7 +870,9 @@ def apply_event(
         if recipient_id not in state['raw_recent_private_conversations']:  # nocoverage
             return
 
-        old_max_message_id = state['raw_recent_private_conversations'][recipient_id]['max_message_id']
+        old_max_message_id = state['raw_recent_private_conversations'][recipient_id][
+            'max_message_id'
+        ]
         if old_max_message_id not in message_ids:  # nocoverage
             return
 
@@ -825,8 +880,7 @@ def apply_event(
         # this recent conversation; we need to recompute that value
         # from scratch.  Definitely don't need to re-query everything,
         # but this case is likely rare enough that it's reasonable to do so.
-        state['raw_recent_private_conversations'] = \
-            get_recent_private_conversations(user_profile)
+        state['raw_recent_private_conversations'] = get_recent_private_conversations(user_profile)
     elif event['type'] == "reaction":
         # The client will get the message with the reactions directly
         pass
@@ -851,8 +905,11 @@ def apply_event(
             if event['op'] == 'add':
                 state['starred_messages'] += event['messages']
             if event['op'] == 'remove':
-                state['starred_messages'] = [message for message in state['starred_messages']
-                                             if not (message in event['messages'])]
+                state['starred_messages'] = [
+                    message
+                    for message in state['starred_messages']
+                    if not (message in event['messages'])
+                ]
     elif event['type'] == "realm_domains":
         if event['op'] == 'add':
             state['realm_domains'].append(event['realm_domain'])
@@ -861,8 +918,11 @@ def apply_event(
                 if realm_domain['domain'] == event['realm_domain']['domain']:
                     realm_domain['allow_subdomains'] = event['realm_domain']['allow_subdomains']
         elif event['op'] == 'remove':
-            state['realm_domains'] = [realm_domain for realm_domain in state['realm_domains']
-                                      if realm_domain['domain'] != event['domain']]
+            state['realm_domains'] = [
+                realm_domain
+                for realm_domain in state['realm_domains']
+                if realm_domain['domain'] != event['domain']
+            ]
     elif event['type'] == "realm_emoji":
         state['realm_emoji'] = event['realm_emoji']
     elif event['type'] == 'realm_export':
@@ -903,8 +963,9 @@ def apply_event(
                     user_group['members'] = list(members - set(event['user_ids']))
                     user_group['members'].sort()
         elif event['op'] == 'remove':
-            state['realm_user_groups'] = [ug for ug in state['realm_user_groups']
-                                          if ug['id'] != event['group_id']]
+            state['realm_user_groups'] = [
+                ug for ug in state['realm_user_groups'] if ug['id'] != event['group_id']
+            ]
     elif event['type'] == 'user_status':
         user_id_str = str(event['user_id'])
         user_status = state['user_status']
@@ -935,6 +996,7 @@ def apply_event(
     else:
         raise AssertionError("Unexpected event type {}".format(event['type']))
 
+
 def do_events_register(
     user_profile: UserProfile,
     user_client: Client,
@@ -948,7 +1010,7 @@ def do_events_register(
     include_streams: bool = True,
     client_capabilities: Dict[str, bool] = {},
     narrow: Iterable[Sequence[str]] = [],
-    fetch_event_types: Optional[Iterable[str]] = None
+    fetch_event_types: Optional[Iterable[str]] = None,
 ) -> Dict[str, Any]:
     # Technically we don't need to check this here because
     # build_narrow_filter will check it, but it's nicer from an error
@@ -957,7 +1019,9 @@ def do_events_register(
 
     notification_settings_null = client_capabilities.get('notification_settings_null', False)
     bulk_message_deletion = client_capabilities.get('bulk_message_deletion', False)
-    user_avatar_url_field_optional = client_capabilities.get('user_avatar_url_field_optional', False)
+    user_avatar_url_field_optional = client_capabilities.get(
+        'user_avatar_url_field_optional', False
+    )
 
     if user_profile.realm.email_address_visibility != Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE:
         # If real email addresses are not available to the user, their
@@ -966,11 +1030,18 @@ def do_events_register(
 
     # Note that we pass event_types, not fetch_event_types here, since
     # that's what controls which future events are sent.
-    queue_id = request_event_queue(user_profile, user_client,
-                                   apply_markdown, client_gravatar, slim_presence,
-                                   queue_lifespan_secs, event_types, all_public_streams,
-                                   narrow=narrow,
-                                   bulk_message_deletion=bulk_message_deletion)
+    queue_id = request_event_queue(
+        user_profile,
+        user_client,
+        apply_markdown,
+        client_gravatar,
+        slim_presence,
+        queue_lifespan_secs,
+        event_types,
+        all_public_streams,
+        narrow=narrow,
+        bulk_message_deletion=bulk_message_deletion,
+    )
 
     if queue_id is None:
         raise JsonableError(_("Could not allocate event queue"))
@@ -1016,9 +1087,11 @@ def do_events_register(
         ret['last_event_id'] = -1
     return ret
 
-def post_process_state(user_profile: Optional[UserProfile], ret: Dict[str, Any],
-                       notification_settings_null: bool) -> None:
-    '''
+
+def post_process_state(
+    user_profile: Optional[UserProfile], ret: Dict[str, Any], notification_settings_null: bool
+) -> None:
+    """
     NOTE:
 
     Below is an example of post-processing initial state data AFTER we
@@ -1028,7 +1101,7 @@ def post_process_state(user_profile: Optional[UserProfile], ret: Dict[str, Any],
 
     Then, only at the end, we put it in the form that's more appropriate
     for client.
-    '''
+    """
     if 'raw_unread_msgs' in ret:
         ret['unread_msgs'] = aggregate_unread_data(ret['raw_unread_msgs'])
         del ret['raw_unread_msgs']
@@ -1060,14 +1133,19 @@ def post_process_state(user_profile: Optional[UserProfile], ret: Dict[str, Any],
 
     if 'raw_recent_private_conversations' in ret:
         # Reformat recent_private_conversations to be a list of dictionaries, rather than a dict.
-        ret['recent_private_conversations'] = sorted((
-            dict(
-                **value,
-            ) for (recipient_id, value) in ret['raw_recent_private_conversations'].items()
-        ), key = lambda x: -x["max_message_id"])
+        ret['recent_private_conversations'] = sorted(
+            (
+                dict(
+                    **value,
+                )
+                for (recipient_id, value) in ret['raw_recent_private_conversations'].items()
+            ),
+            key=lambda x: -x["max_message_id"],
+        )
         del ret['raw_recent_private_conversations']
 
     if not notification_settings_null and 'subscriptions' in ret:
         for stream_dict in ret['subscriptions'] + ret['unsubscribed']:
-            handle_stream_notifications_compatibility(user_profile, stream_dict,
-                                                      notification_settings_null)
+            handle_stream_notifications_compatibility(
+                user_profile, stream_dict, notification_settings_null
+            )
diff --git a/zerver/lib/exceptions.py b/zerver/lib/exceptions.py
index 6245b0fdb0..e9865b8e4a 100644
--- a/zerver/lib/exceptions.py
+++ b/zerver/lib/exceptions.py
@@ -5,6 +5,7 @@ from django.utils.translation import ugettext as _
 
 T = TypeVar("T", bound="AbstractEnum")
 
+
 class AbstractEnum(Enum):
     '''An enumeration whose members are used strictly for their names.'''
 
@@ -24,6 +25,7 @@ class AbstractEnum(Enum):
     def __reduce_ex__(self, proto: object) -> NoReturn:
         raise AssertionError("Not implemented")
 
+
 class ErrorCode(AbstractEnum):
     BAD_REQUEST = ()  # Generic name, from the name of HTTP 400.
     REQUEST_VARIABLE_MISSING = ()
@@ -49,8 +51,9 @@ class ErrorCode(AbstractEnum):
     NONEXISTENT_SUBDOMAIN = ()
     RATE_LIMIT_HIT = ()
 
+
 class JsonableError(Exception):
-    '''A standardized error format we can turn into a nice JSON HTTP response.
+    """A standardized error format we can turn into a nice JSON HTTP response.
 
     This class can be invoked in a couple ways.
 
@@ -82,7 +85,7 @@ class JsonableError(Exception):
        and an error code.
 
     Subclasses may also override `http_status_code`.
-    '''
+    """
 
     # Override this in subclasses, as needed.
     code: ErrorCode = ErrorCode.BAD_REQUEST
@@ -100,12 +103,12 @@ class JsonableError(Exception):
 
     @staticmethod
     def msg_format() -> str:
-        '''Override in subclasses.  Gets the items in `data_fields` as format args.
+        """Override in subclasses.  Gets the items in `data_fields` as format args.
 
         This should return (a translation of) a string literal.
         The reason it's not simply a class attribute is to allow
         translation to work.
-        '''
+        """
         # Secretly this gets one more format arg not in `data_fields`: `_msg`.
         # That's for the sake of the `JsonableError` base logic itself, for
         # the simplest form of use where we just get a plain message string
@@ -122,14 +125,14 @@ class JsonableError(Exception):
 
     @property
     def msg(self) -> str:
-        format_data = dict(((f, getattr(self, f)) for f in self.data_fields),
-                           _msg=getattr(self, '_msg', None))
+        format_data = dict(
+            ((f, getattr(self, f)) for f in self.data_fields), _msg=getattr(self, '_msg', None)
+        )
         return self.msg_format().format(**format_data)
 
     @property
     def data(self) -> Dict[str, Any]:
-        return dict(((f, getattr(self, f)) for f in self.data_fields),
-                    code=self.code.name)
+        return dict(((f, getattr(self, f)) for f in self.data_fields), code=self.code.name)
 
     def to_json(self) -> Dict[str, Any]:
         d = {'result': 'error', 'msg': self.msg}
@@ -139,6 +142,7 @@ class JsonableError(Exception):
     def __str__(self) -> str:
         return self.msg
 
+
 class StreamDoesNotExistError(JsonableError):
     code = ErrorCode.STREAM_DOES_NOT_EXIST
     data_fields = ['stream']
@@ -150,6 +154,7 @@ class StreamDoesNotExistError(JsonableError):
     def msg_format() -> str:
         return _("Stream '{stream}' does not exist")
 
+
 class StreamWithIDDoesNotExistError(JsonableError):
     code = ErrorCode.STREAM_DOES_NOT_EXIST
     data_fields = ['stream_id']
@@ -161,6 +166,7 @@ class StreamWithIDDoesNotExistError(JsonableError):
     def msg_format() -> str:
         return _("Stream with ID '{stream_id}' does not exist")
 
+
 class CannotDeactivateLastUserError(JsonableError):
     code = ErrorCode.CANNOT_DEACTIVATE_LAST_USER
     data_fields = ['is_last_owner', 'entity']
@@ -173,6 +179,7 @@ class CannotDeactivateLastUserError(JsonableError):
     def msg_format() -> str:
         return _("Cannot deactivate the only {entity}.")
 
+
 class InvalidMarkdownIncludeStatement(JsonableError):
     code = ErrorCode.INVALID_MARKDOWN_INCLUDE_STATEMENT
     data_fields = ['include_statement']
@@ -184,11 +191,12 @@ class InvalidMarkdownIncludeStatement(JsonableError):
     def msg_format() -> str:
         return _("Invalid Markdown include statement: {include_statement}")
 
+
 class RateLimited(JsonableError):
     code = ErrorCode.RATE_LIMIT_HIT
     http_status_code = 429
 
-    def __init__(self, secs_to_freedom: Optional[float]=None) -> None:
+    def __init__(self, secs_to_freedom: Optional[float] = None) -> None:
         self.secs_to_freedom = secs_to_freedom
 
     @staticmethod
@@ -210,6 +218,7 @@ class RateLimited(JsonableError):
 
         return data_dict
 
+
 class InvalidJSONError(JsonableError):
     code = ErrorCode.INVALID_JSON
 
@@ -217,6 +226,7 @@ class InvalidJSONError(JsonableError):
     def msg_format() -> str:
         return _("Malformed JSON")
 
+
 class OrganizationMemberRequired(JsonableError):
     code: ErrorCode = ErrorCode.UNAUTHORIZED_PRINCIPAL
 
@@ -227,6 +237,7 @@ class OrganizationMemberRequired(JsonableError):
     def msg_format() -> str:
         return _("Must be an organization member")
 
+
 class OrganizationAdministratorRequired(JsonableError):
     code: ErrorCode = ErrorCode.UNAUTHORIZED_PRINCIPAL
 
@@ -237,6 +248,7 @@ class OrganizationAdministratorRequired(JsonableError):
     def msg_format() -> str:
         return _("Must be an organization administrator")
 
+
 class OrganizationOwnerRequired(JsonableError):
     code: ErrorCode = ErrorCode.UNAUTHORIZED_PRINCIPAL
 
@@ -247,6 +259,7 @@ class OrganizationOwnerRequired(JsonableError):
     def msg_format() -> str:
         return _("Must be an organization owner")
 
+
 class StreamAdministratorRequired(JsonableError):
     code: ErrorCode = ErrorCode.UNAUTHORIZED_PRINCIPAL
 
@@ -257,9 +270,11 @@ class StreamAdministratorRequired(JsonableError):
     def msg_format() -> str:
         return _("Must be an organization or stream administrator")
 
+
 class MarkdownRenderingException(Exception):
     pass
 
+
 class InvalidAPIKeyError(JsonableError):
     code = ErrorCode.INVALID_API_KEY
     http_status_code = 401
@@ -271,11 +286,13 @@ class InvalidAPIKeyError(JsonableError):
     def msg_format() -> str:
         return _("Invalid API key")
 
+
 class InvalidAPIKeyFormatError(InvalidAPIKeyError):
     @staticmethod
     def msg_format() -> str:
         return _("Malformed API key")
 
+
 class UnsupportedWebhookEventType(JsonableError):
     code = ErrorCode.UNSUPPORTED_WEBHOOK_EVENT_TYPE
     data_fields = ['webhook_name', 'event_type']
@@ -288,6 +305,7 @@ class UnsupportedWebhookEventType(JsonableError):
     def msg_format() -> str:
         return _("The '{event_type}' event isn't currently supported by the {webhook_name} webhook")
 
+
 class MissingAuthenticationError(JsonableError):
     code = ErrorCode.UNAUTHENTICATED_USER
     http_status_code = 401
@@ -298,6 +316,7 @@ class MissingAuthenticationError(JsonableError):
     # No msg_format is defined since this exception is caught and
     # converted into json_unauthorized in Zulip's middleware.
 
+
 class InvalidSubdomainError(JsonableError):
     code = ErrorCode.NONEXISTENT_SUBDOMAIN
     http_status_code = 404
@@ -309,6 +328,7 @@ class InvalidSubdomainError(JsonableError):
     def msg_format() -> str:
         return _("Invalid subdomain")
 
+
 class ZephyrMessageAlreadySentException(Exception):
     def __init__(self, message_id: int) -> None:
         self.message_id = message_id
diff --git a/zerver/lib/export.py b/zerver/lib/export.py
index 64b18c26af..6b68254037 100644
--- a/zerver/lib/export.py
+++ b/zerver/lib/export.py
@@ -175,33 +175,27 @@ NON_EXPORTED_TABLES = {
     'zerver_multiuseinvite_streams',
     'zerver_preregistrationuser',
     'zerver_preregistrationuser_streams',
-
     # Missed message addresses are low value to export since
     # missed-message email addresses include the server's hostname and
     # expire after a few days.
     'zerver_missedmessageemailaddress',
-
     # When switching servers, clients will need to re-log in and
     # reregister for push notifications anyway.
     'zerver_pushdevicetoken',
-
     # We don't use these generated Django tables
     'zerver_userprofile_groups',
     'zerver_userprofile_user_permissions',
-
     # These is used for scheduling future activity; it could make
     # sense to export, but is relatively low value.
     'zerver_scheduledemail',
     'zerver_scheduledemail_users',
     'zerver_scheduledmessage',
-
     # These tables are related to a user's 2FA authentication
     # configuration, which will need to be re-setup on the new server.
     'two_factor_phonedevice',
     'otp_static_staticdevice',
     'otp_static_statictoken',
     'otp_totp_totpdevice',
-
     # These archive tables should not be exported (they are to support
     # restoring content accidentally deleted due to software bugs in
     # the retention policy feature)
@@ -212,7 +206,6 @@ NON_EXPORTED_TABLES = {
     'zerver_archivedreaction',
     'zerver_archivedsubmessage',
     'zerver_archivetransaction',
-
     # Social auth tables are not needed post-export, since we don't
     # use any of this state outside of a direct authentication flow.
     'social_auth_association',
@@ -220,27 +213,21 @@ NON_EXPORTED_TABLES = {
     'social_auth_nonce',
     'social_auth_partial',
     'social_auth_usersocialauth',
-
     # We will likely never want to migrate this table, since it's a
     # total of all the realmcount values on the server.  Might need to
     # recompute it after a fillstate import.
     'analytics_installationcount',
-
     # Fillstate will require some cleverness to do the right partial export.
     'analytics_fillstate',
-
     # These are for unfinished features; we'll want to add them to the
     # export before they reach full production status.
     'zerver_defaultstreamgroup',
     'zerver_defaultstreamgroup_streams',
     'zerver_submessage',
-
     # This is low priority, since users can easily just reset themselves to away.
     'zerver_userstatus',
-
     # Drafts don't need to be exported as they are supposed to be more ephemeral.
     'zerver_draft',
-
     # For any tables listed below here, it's a bug that they are not present in the export.
 }
 
@@ -301,17 +288,18 @@ BITHANDLER_FIELDS: Dict[TableName, List[Field]] = {
     'zerver_realm': ['authentication_methods'],
 }
 
+
 def sanity_check_output(data: TableData) -> None:
     # First, we verify that the export tool has a declared
     # configuration for every table declared in the `models.py` files.
     target_models = (
-        list(apps.get_app_config('analytics').get_models(include_auto_created=True)) +
-        list(apps.get_app_config('django_otp').get_models(include_auto_created=True)) +
-        list(apps.get_app_config('otp_static').get_models(include_auto_created=True)) +
-        list(apps.get_app_config('otp_totp').get_models(include_auto_created=True)) +
-        list(apps.get_app_config('social_django').get_models(include_auto_created=True)) +
-        list(apps.get_app_config('two_factor').get_models(include_auto_created=True)) +
-        list(apps.get_app_config('zerver').get_models(include_auto_created=True))
+        list(apps.get_app_config('analytics').get_models(include_auto_created=True))
+        + list(apps.get_app_config('django_otp').get_models(include_auto_created=True))
+        + list(apps.get_app_config('otp_static').get_models(include_auto_created=True))
+        + list(apps.get_app_config('otp_totp').get_models(include_auto_created=True))
+        + list(apps.get_app_config('social_django').get_models(include_auto_created=True))
+        + list(apps.get_app_config('two_factor').get_models(include_auto_created=True))
+        + list(apps.get_app_config('zerver').get_models(include_auto_created=True))
     )
     all_tables_db = {model._meta.db_table for model in target_models}
 
@@ -341,6 +329,7 @@ def sanity_check_output(data: TableData) -> None:
         if table not in data:
             logging.warning('??? NO DATA EXPORTED FOR TABLE %s!!!', table)
 
+
 def write_data_to_file(output_file: Path, data: Any) -> None:
     with open(output_file, "wb") as f:
         # Because we don't pass a default handler, OPT_PASSTHROUGH_DATETIME
@@ -350,11 +339,12 @@ def write_data_to_file(output_file: Path, data: Any) -> None:
         # 8601 strings for historical reasons.
         f.write(orjson.dumps(data, option=orjson.OPT_INDENT_2 | orjson.OPT_PASSTHROUGH_DATETIME))
 
-def make_raw(query: Any, exclude: Optional[List[Field]]=None) -> List[Record]:
-    '''
+
+def make_raw(query: Any, exclude: Optional[List[Field]] = None) -> List[Record]:
+    """
     Takes a Django query and returns a JSONable list
     of dictionaries corresponding to the database rows.
-    '''
+    """
     rows = []
     for instance in query:
         data = model_to_dict(instance, exclude=exclude)
@@ -372,6 +362,7 @@ def make_raw(query: Any, exclude: Optional[List[Field]]=None) -> List[Record]:
 
     return rows
 
+
 def floatify_datetime_fields(data: TableData, table: TableName) -> None:
     for item in data[table]:
         for field in DATE_FIELDS[table]:
@@ -383,16 +374,18 @@ def floatify_datetime_fields(data: TableData, table: TableName) -> None:
                 dt = timezone_make_aware(orig_dt)
             else:
                 dt = orig_dt
-            utc_naive  = dt.replace(tzinfo=None) - dt.utcoffset()
+            utc_naive = dt.replace(tzinfo=None) - dt.utcoffset()
             item[field] = (utc_naive - datetime.datetime(1970, 1, 1)).total_seconds()
 
+
 def listify_bithandler_fields(data: TableData, table: TableName) -> None:
     for item in data[table]:
         for field in BITHANDLER_FIELDS[table]:
             item[field] = list(item[field])
 
+
 class Config:
-    '''A Config object configures a single table for exporting (and, maybe
+    """A Config object configures a single table for exporting (and, maybe
     some day importing as well.  This configuration defines what
     process needs to be followed to correctly extract the set of
     objects to export.
@@ -405,22 +398,25 @@ class Config:
     The parent should be instantiated first.  The child will
     append itself to the parent's list of children.
 
-    '''
+    """
 
-    def __init__(self, table: Optional[str]=None,
-                 model: Optional[Any]=None,
-                 normal_parent: Optional['Config']=None,
-                 virtual_parent: Optional['Config']=None,
-                 filter_args: Optional[FilterArgs]=None,
-                 custom_fetch: Optional[CustomFetch]=None,
-                 custom_tables: Optional[List[TableName]]=None,
-                 concat_and_destroy: Optional[List[TableName]]=None,
-                 id_source: Optional[IdSource]=None,
-                 source_filter: Optional[SourceFilter]=None,
-                 parent_key: Optional[Field]=None,
-                 use_all: bool=False,
-                 is_seeded: bool=False,
-                 exclude: Optional[List[Field]]=None) -> None:
+    def __init__(
+        self,
+        table: Optional[str] = None,
+        model: Optional[Any] = None,
+        normal_parent: Optional['Config'] = None,
+        virtual_parent: Optional['Config'] = None,
+        filter_args: Optional[FilterArgs] = None,
+        custom_fetch: Optional[CustomFetch] = None,
+        custom_tables: Optional[List[TableName]] = None,
+        concat_and_destroy: Optional[List[TableName]] = None,
+        id_source: Optional[IdSource] = None,
+        source_filter: Optional[SourceFilter] = None,
+        parent_key: Optional[Field] = None,
+        use_all: bool = False,
+        is_seeded: bool = False,
+        exclude: Optional[List[Field]] = None,
+    ) -> None:
         assert table or custom_tables
         self.table = table
         self.model = model
@@ -444,39 +440,51 @@ class Config:
             self.parent = None
 
         if virtual_parent is not None and normal_parent is not None:
-            raise AssertionError('''
+            raise AssertionError(
+                '''
                 If you specify a normal_parent, please
                 do not create a virtual_parent.
-                ''')
+                '''
+            )
 
         if normal_parent is not None:
             normal_parent.children.append(self)
         elif virtual_parent is not None:
             virtual_parent.children.append(self)
         elif is_seeded is None:
-            raise AssertionError('''
+            raise AssertionError(
+                '''
                 You must specify a parent if you are
                 not using is_seeded.
-                ''')
+                '''
+            )
 
         if self.id_source is not None:
             if self.virtual_parent is None:
-                raise AssertionError('''
+                raise AssertionError(
+                    '''
                     You must specify a virtual_parent if you are
-                    using id_source.''')
+                    using id_source.'''
+                )
             if self.id_source[0] != self.virtual_parent.table:
-                raise AssertionError(f'''
+                raise AssertionError(
+                    f'''
                     Configuration error.  To populate {self.table}, you
                     want data from {self.id_source[0]}, but that differs from
                     the table name of your virtual parent ({self.virtual_parent.table}),
                     which suggests you many not have set up
                     the ordering correctly.  You may simply
                     need to assign a virtual_parent, or there
-                    may be deeper issues going on.''')
+                    may be deeper issues going on.'''
+                )
 
 
-def export_from_config(response: TableData, config: Config, seed_object: Optional[Any]=None,
-                       context: Optional[Context]=None) -> None:
+def export_from_config(
+    response: TableData,
+    config: Config,
+    seed_object: Optional[Any] = None,
+    context: Optional[Context] = None,
+) -> None:
     table = config.table
     parent = config.parent
     model = config.model
@@ -487,7 +495,9 @@ def export_from_config(response: TableData, config: Config, seed_object: Optiona
     if config.custom_tables:
         exported_tables = config.custom_tables
     else:
-        assert table is not None, '''
+        assert (
+            table is not None
+        ), '''
             You must specify config.custom_tables if you
             are not specifying config.table'''
         exported_tables = [table]
@@ -582,6 +592,7 @@ def export_from_config(response: TableData, config: Config, seed_object: Optiona
             context=context,
         )
 
+
 def get_realm_config() -> Config:
     # This function generates the main Config object that defines how
     # to do a full-realm export of a single realm from a Zulip server.
@@ -821,6 +832,7 @@ def get_realm_config() -> Config:
 
     return realm_config
 
+
 def fetch_user_profile(response: TableData, config: Config, context: Context) -> None:
     realm = context['realm']
     exportable_user_ids = context['exportable_user_ids']
@@ -850,6 +862,7 @@ def fetch_user_profile(response: TableData, config: Config, context: Context) ->
     response['zerver_userprofile'] = normal_rows
     response['zerver_userprofile_mirrordummy'] = dummy_rows
 
+
 def fetch_user_profile_cross_realm(response: TableData, config: Config, context: Context) -> None:
     realm = context['realm']
     response['zerver_userprofile_crossrealm'] = []
@@ -873,11 +886,14 @@ def fetch_user_profile_cross_realm(response: TableData, config: Config, context:
         bot_user_id = get_system_bot(bot_email).id
 
         recipient_id = Recipient.objects.get(type_id=bot_user_id, type=Recipient.PERSONAL).id
-        response['zerver_userprofile_crossrealm'].append(dict(
-            email=bot_default_email,
-            id=bot_user_id,
-            recipient_id=recipient_id,
-        ))
+        response['zerver_userprofile_crossrealm'].append(
+            dict(
+                email=bot_default_email,
+                id=bot_user_id,
+                recipient_id=recipient_id,
+            )
+        )
+
 
 def fetch_attachment_data(response: TableData, realm_id: int, message_ids: Set[int]) -> None:
     filter_args = {'realm_id': realm_id}
@@ -903,13 +919,15 @@ def fetch_attachment_data(response: TableData, realm_id: int, message_ids: Set[i
     attachment row.
     '''
     response['zerver_attachment'] = [
-        row for row in response['zerver_attachment']
-        if row['messages']]
+        row for row in response['zerver_attachment'] if row['messages']
+    ]
+
 
 def fetch_reaction_data(response: TableData, message_ids: Set[int]) -> None:
     query = Reaction.objects.filter(message_id__in=list(message_ids))
     response['zerver_reaction'] = make_raw(list(query))
 
+
 def fetch_huddle_objects(response: TableData, config: Config, context: Context) -> None:
 
     realm = context['realm']
@@ -919,12 +937,15 @@ def fetch_huddle_objects(response: TableData, config: Config, context: Context)
 
     # First we get all huddles involving someone in the realm.
     realm_huddle_subs = Subscription.objects.select_related("recipient").filter(
-        recipient__type=Recipient.HUDDLE, user_profile__in=user_profile_ids)
+        recipient__type=Recipient.HUDDLE, user_profile__in=user_profile_ids
+    )
     realm_huddle_recipient_ids = {sub.recipient_id for sub in realm_huddle_subs}
 
     # Mark all Huddles whose recipient ID contains a cross-realm user.
     unsafe_huddle_recipient_ids = set()
-    for sub in Subscription.objects.select_related().filter(recipient__in=realm_huddle_recipient_ids):
+    for sub in Subscription.objects.select_related().filter(
+        recipient__in=realm_huddle_recipient_ids
+    ):
         if sub.user_profile.realm != realm:
             # In almost every case the other realm will be zulip.com
             unsafe_huddle_recipient_ids.add(sub.recipient_id)
@@ -935,7 +956,9 @@ def fetch_huddle_objects(response: TableData, config: Config, context: Context)
     # to import it on the other end exist (since we're only
     # exporting the users from this realm), at the cost of losing
     # some of these cross-realm messages.
-    huddle_subs = [sub for sub in realm_huddle_subs if sub.recipient_id not in unsafe_huddle_recipient_ids]
+    huddle_subs = [
+        sub for sub in realm_huddle_subs if sub.recipient_id not in unsafe_huddle_recipient_ids
+    ]
     huddle_recipient_ids = {sub.recipient_id for sub in huddle_subs}
     huddle_ids = {sub.recipient.type_id for sub in huddle_subs}
 
@@ -946,15 +969,19 @@ def fetch_huddle_objects(response: TableData, config: Config, context: Context)
     response['_huddle_subscription'] = huddle_subscription_dicts
     response['zerver_huddle'] = make_raw(Huddle.objects.filter(id__in=huddle_ids))
 
-def fetch_usermessages(realm: Realm,
-                       message_ids: Set[int],
-                       user_profile_ids: Set[int],
-                       message_filename: Path,
-                       consent_message_id: Optional[int]=None) -> List[Record]:
+
+def fetch_usermessages(
+    realm: Realm,
+    message_ids: Set[int],
+    user_profile_ids: Set[int],
+    message_filename: Path,
+    consent_message_id: Optional[int] = None,
+) -> List[Record]:
     # UserMessage export security rule: You can export UserMessages
     # for the messages you exported for the users in your realm.
-    user_message_query = UserMessage.objects.filter(user_profile__realm=realm,
-                                                    message_id__in=message_ids)
+    user_message_query = UserMessage.objects.filter(
+        user_profile__realm=realm, message_id__in=message_ids
+    )
     if consent_message_id is not None:
         consented_user_ids = get_consented_user_ids(consent_message_id)
         user_profile_ids = user_profile_ids & consented_user_ids
@@ -969,8 +996,10 @@ def fetch_usermessages(realm: Realm,
     logging.info("Fetched UserMessages for %s", message_filename)
     return user_message_chunk
 
-def export_usermessages_batch(input_path: Path, output_path: Path,
-                              consent_message_id: Optional[int]=None) -> None:
+
+def export_usermessages_batch(
+    input_path: Path, output_path: Path, consent_message_id: Optional[int] = None
+) -> None:
     """As part of the system for doing parallel exports, this runs on one
     batch of Message objects and adds the corresponding UserMessage
     objects. (This is called by the export_usermessage_batch
@@ -982,21 +1011,26 @@ def export_usermessages_batch(input_path: Path, output_path: Path,
     del output['zerver_userprofile_ids']
     realm = Realm.objects.get(id=output['realm_id'])
     del output['realm_id']
-    output['zerver_usermessage'] = fetch_usermessages(realm, set(message_ids), user_profile_ids,
-                                                      output_path, consent_message_id)
+    output['zerver_usermessage'] = fetch_usermessages(
+        realm, set(message_ids), user_profile_ids, output_path, consent_message_id
+    )
     write_message_export(output_path, output)
     os.unlink(input_path)
 
+
 def write_message_export(message_filename: Path, output: MessageOutput) -> None:
     write_data_to_file(output_file=message_filename, data=output)
     logging.info("Dumped to %s", message_filename)
 
-def export_partial_message_files(realm: Realm,
-                                 response: TableData,
-                                 chunk_size: int=MESSAGE_BATCH_CHUNK_SIZE,
-                                 output_dir: Optional[Path]=None,
-                                 public_only: bool=False,
-                                 consent_message_id: Optional[int]=None) -> Set[int]:
+
+def export_partial_message_files(
+    realm: Realm,
+    response: TableData,
+    chunk_size: int = MESSAGE_BATCH_CHUNK_SIZE,
+    output_dir: Optional[Path] = None,
+    public_only: bool = False,
+    consent_message_id: Optional[int] = None,
+) -> Set[int]:
     if output_dir is None:
         output_dir = tempfile.mkdtemp(prefix="zulip-export")
 
@@ -1021,9 +1055,10 @@ def export_partial_message_files(realm: Realm,
         response['zerver_userprofile'],
     )
     ids_of_our_possible_senders = get_ids(
-        response['zerver_userprofile'] +
-        response['zerver_userprofile_mirrordummy'] +
-        response['zerver_userprofile_crossrealm'])
+        response['zerver_userprofile']
+        + response['zerver_userprofile_mirrordummy']
+        + response['zerver_userprofile_crossrealm']
+    )
 
     consented_user_ids: Set[int] = set()
     if consent_message_id is not None:
@@ -1032,15 +1067,18 @@ def export_partial_message_files(realm: Realm,
     if public_only:
         recipient_streams = Stream.objects.filter(realm=realm, invite_only=False)
         recipient_ids = Recipient.objects.filter(
-            type=Recipient.STREAM, type_id__in=recipient_streams).values_list("id", flat=True)
+            type=Recipient.STREAM, type_id__in=recipient_streams
+        ).values_list("id", flat=True)
         recipient_ids_for_us = get_ids(response['zerver_recipient']) & set(recipient_ids)
     elif consent_message_id is not None:
         public_streams = Stream.objects.filter(realm=realm, invite_only=False)
         public_stream_recipient_ids = Recipient.objects.filter(
-            type=Recipient.STREAM, type_id__in=public_streams).values_list("id", flat=True)
+            type=Recipient.STREAM, type_id__in=public_streams
+        ).values_list("id", flat=True)
 
-        consented_recipient_ids = Subscription.objects.filter(user_profile__id__in=consented_user_ids). \
-            values_list("recipient_id", flat=True)
+        consented_recipient_ids = Subscription.objects.filter(
+            user_profile__id__in=consented_user_ids
+        ).values_list("recipient_id", flat=True)
 
         recipient_ids = set(public_stream_recipient_ids) | set(consented_recipient_ids)
         recipient_ids_for_us = get_ids(response['zerver_recipient']) & recipient_ids
@@ -1078,8 +1116,8 @@ def export_partial_message_files(realm: Realm,
         ids_of_non_exported_possible_recipients = ids_of_our_possible_senders - consented_user_ids
 
         recipients_for_them = Recipient.objects.filter(
-            type=Recipient.PERSONAL,
-            type_id__in=ids_of_non_exported_possible_recipients).values("id")
+            type=Recipient.PERSONAL, type_id__in=ids_of_non_exported_possible_recipients
+        ).values("id")
         recipient_ids_for_them = get_ids(recipients_for_them)
 
         messages_we_sent_to_them = Message.objects.filter(
@@ -1108,10 +1146,16 @@ def export_partial_message_files(realm: Realm,
 
     return all_message_ids
 
-def write_message_partial_for_query(realm: Realm, message_query: Any, dump_file_id: int,
-                                    all_message_ids: Set[int], output_dir: Path,
-                                    user_profile_ids: Set[int],
-                                    chunk_size: int=MESSAGE_BATCH_CHUNK_SIZE) -> int:
+
+def write_message_partial_for_query(
+    realm: Realm,
+    message_query: Any,
+    dump_file_id: int,
+    all_message_ids: Set[int],
+    output_dir: Path,
+    user_profile_ids: Set[int],
+    chunk_size: int = MESSAGE_BATCH_CHUNK_SIZE,
+) -> int:
     min_id = -1
 
     while True:
@@ -1150,54 +1194,73 @@ def write_message_partial_for_query(realm: Realm, message_query: Any, dump_file_
 
     return dump_file_id
 
+
 def export_uploads_and_avatars(realm: Realm, output_dir: Path) -> None:
     uploads_output_dir = os.path.join(output_dir, 'uploads')
     avatars_output_dir = os.path.join(output_dir, 'avatars')
     realm_icons_output_dir = os.path.join(output_dir, 'realm_icons')
     emoji_output_dir = os.path.join(output_dir, 'emoji')
 
-    for dir_path in (uploads_output_dir, avatars_output_dir, realm_icons_output_dir, emoji_output_dir):
+    for dir_path in (
+        uploads_output_dir,
+        avatars_output_dir,
+        realm_icons_output_dir,
+        emoji_output_dir,
+    ):
         if not os.path.exists(dir_path):
             os.makedirs(dir_path)
 
     if settings.LOCAL_UPLOADS_DIR:
         # Small installations and developers will usually just store files locally.
-        export_uploads_from_local(realm,
-                                  local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "files"),
-                                  output_dir=uploads_output_dir)
-        export_avatars_from_local(realm,
-                                  local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars"),
-                                  output_dir=avatars_output_dir)
-        export_emoji_from_local(realm,
-                                local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars"),
-                                output_dir=emoji_output_dir)
-        export_realm_icons(realm,
-                           local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR),
-                           output_dir=realm_icons_output_dir)
+        export_uploads_from_local(
+            realm,
+            local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "files"),
+            output_dir=uploads_output_dir,
+        )
+        export_avatars_from_local(
+            realm,
+            local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars"),
+            output_dir=avatars_output_dir,
+        )
+        export_emoji_from_local(
+            realm,
+            local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars"),
+            output_dir=emoji_output_dir,
+        )
+        export_realm_icons(
+            realm,
+            local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR),
+            output_dir=realm_icons_output_dir,
+        )
     else:
         # Some bigger installations will have their data stored on S3.
-        export_files_from_s3(realm,
-                             settings.S3_AVATAR_BUCKET,
-                             output_dir=avatars_output_dir,
-                             processing_avatars=True)
-        export_files_from_s3(realm,
-                             settings.S3_AUTH_UPLOADS_BUCKET,
-                             output_dir=uploads_output_dir)
-        export_files_from_s3(realm,
-                             settings.S3_AVATAR_BUCKET,
-                             output_dir=emoji_output_dir,
-                             processing_emoji=True)
-        export_files_from_s3(realm,
-                             settings.S3_AVATAR_BUCKET,
-                             output_dir=realm_icons_output_dir,
-                             processing_realm_icon_and_logo=True)
+        export_files_from_s3(
+            realm, settings.S3_AVATAR_BUCKET, output_dir=avatars_output_dir, processing_avatars=True
+        )
+        export_files_from_s3(realm, settings.S3_AUTH_UPLOADS_BUCKET, output_dir=uploads_output_dir)
+        export_files_from_s3(
+            realm, settings.S3_AVATAR_BUCKET, output_dir=emoji_output_dir, processing_emoji=True
+        )
+        export_files_from_s3(
+            realm,
+            settings.S3_AVATAR_BUCKET,
+            output_dir=realm_icons_output_dir,
+            processing_realm_icon_and_logo=True,
+        )
 
-def _check_key_metadata(email_gateway_bot: Optional[UserProfile],
-                        key: ServiceResource, processing_avatars: bool,
-                        realm: Realm, user_ids: Set[int]) -> None:
+
+def _check_key_metadata(
+    email_gateway_bot: Optional[UserProfile],
+    key: ServiceResource,
+    processing_avatars: bool,
+    realm: Realm,
+    user_ids: Set[int],
+) -> None:
     # Helper function for export_files_from_s3
     if 'realm_id' in key.metadata and key.metadata['realm_id'] != str(realm.id):
-        if email_gateway_bot is None or key.metadata['user_profile_id'] != str(email_gateway_bot.id):
+        if email_gateway_bot is None or key.metadata['user_profile_id'] != str(
+            email_gateway_bot.id
+        ):
             raise AssertionError(f"Key metadata problem: {key.name} {key.metadata} / {realm.id}")
         # Email gateway bot sends messages, potentially including attachments, cross-realm.
         print(f"File uploaded by email gateway bot: {key.key} / {key.metadata}")
@@ -1209,14 +1272,19 @@ def _check_key_metadata(email_gateway_bot: Optional[UserProfile],
     elif 'realm_id' not in key.metadata:
         raise AssertionError(f"Missing realm_id in key metadata: {key.metadata}")
 
+
 def _get_exported_s3_record(
-        bucket_name: str,
-        key: ServiceResource,
-        processing_emoji: bool) -> Dict[str, Union[str, int]]:
+    bucket_name: str, key: ServiceResource, processing_emoji: bool
+) -> Dict[str, Union[str, int]]:
     # Helper function for export_files_from_s3
-    record = dict(s3_path=key.key, bucket=bucket_name,
-                  size=key.content_length, last_modified=key.last_modified,
-                  content_type=key.content_type, md5=key.e_tag)
+    record = dict(
+        s3_path=key.key,
+        bucket=bucket_name,
+        size=key.content_length,
+        last_modified=key.last_modified,
+        content_type=key.content_type,
+        md5=key.e_tag,
+    )
     record.update(key.metadata)
 
     if processing_emoji:
@@ -1246,8 +1314,14 @@ def _get_exported_s3_record(
 
     return record
 
-def _save_s3_object_to_file(key: ServiceResource, output_dir: str, processing_avatars: bool,
-                            processing_emoji: bool, processing_realm_icon_and_logo: bool) -> None:
+
+def _save_s3_object_to_file(
+    key: ServiceResource,
+    output_dir: str,
+    processing_avatars: bool,
+    processing_emoji: bool,
+    processing_realm_icon_and_logo: bool,
+) -> None:
     # Helper function for export_files_from_s3
     if processing_avatars or processing_emoji or processing_realm_icon_and_logo:
         filename = os.path.join(output_dir, key.key)
@@ -1269,9 +1343,15 @@ def _save_s3_object_to_file(key: ServiceResource, output_dir: str, processing_av
         os.makedirs(dirname)
     key.download_file(filename)
 
-def export_files_from_s3(realm: Realm, bucket_name: str, output_dir: Path,
-                         processing_avatars: bool=False, processing_emoji: bool=False,
-                         processing_realm_icon_and_logo: bool=False) -> None:
+
+def export_files_from_s3(
+    realm: Realm,
+    bucket_name: str,
+    output_dir: Path,
+    processing_avatars: bool = False,
+    processing_emoji: bool = False,
+    processing_realm_icon_and_logo: bool = False,
+) -> None:
     bucket = get_bucket(bucket_name)
     records = []
 
@@ -1309,18 +1389,20 @@ def export_files_from_s3(realm: Realm, bucket_name: str, output_dir: Path,
         record = _get_exported_s3_record(bucket_name, key, processing_emoji)
 
         record['path'] = key.key
-        _save_s3_object_to_file(key, output_dir, processing_avatars, processing_emoji,
-                                processing_realm_icon_and_logo)
+        _save_s3_object_to_file(
+            key, output_dir, processing_avatars, processing_emoji, processing_realm_icon_and_logo
+        )
 
         records.append(record)
         count += 1
 
-        if (count % 100 == 0):
+        if count % 100 == 0:
             logging.info("Finished %s", count)
 
     with open(os.path.join(output_dir, "records.json"), "wb") as records_file:
         records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2))
 
+
 def export_uploads_from_local(realm: Realm, local_dir: Path, output_dir: Path) -> None:
 
     count = 0
@@ -1337,23 +1419,26 @@ def export_uploads_from_local(realm: Realm, local_dir: Path, output_dir: Path) -
         os.makedirs(os.path.dirname(output_path), exist_ok=True)
         shutil.copy2(local_path, output_path)
         stat = os.stat(local_path)
-        record = dict(realm_id=attachment.realm_id,
-                      user_profile_id=attachment.owner.id,
-                      user_profile_email=attachment.owner.email,
-                      s3_path=path_id,
-                      path=path_id,
-                      size=stat.st_size,
-                      last_modified=stat.st_mtime,
-                      content_type=None)
+        record = dict(
+            realm_id=attachment.realm_id,
+            user_profile_id=attachment.owner.id,
+            user_profile_email=attachment.owner.email,
+            s3_path=path_id,
+            path=path_id,
+            size=stat.st_size,
+            last_modified=stat.st_mtime,
+            content_type=None,
+        )
         records.append(record)
 
         count += 1
 
-        if (count % 100 == 0):
+        if count % 100 == 0:
             logging.info("Finished %s", count)
     with open(os.path.join(output_dir, "records.json"), "wb") as records_file:
         records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2))
 
+
 def export_avatars_from_local(realm: Realm, local_dir: Path, output_dir: Path) -> None:
 
     count = 0
@@ -1375,31 +1460,35 @@ def export_avatars_from_local(realm: Realm, local_dir: Path, output_dir: Path) -
         for local_path in glob.glob(wildcard):
             logging.info(
                 'Copying avatar file for user %s from %s',
-                user.email, local_path,
+                user.email,
+                local_path,
             )
             fn = os.path.relpath(local_path, local_dir)
             output_path = os.path.join(output_dir, fn)
             os.makedirs(str(os.path.dirname(output_path)), exist_ok=True)
             shutil.copy2(str(local_path), str(output_path))
             stat = os.stat(local_path)
-            record = dict(realm_id=realm.id,
-                          user_profile_id=user.id,
-                          user_profile_email=user.email,
-                          s3_path=fn,
-                          path=fn,
-                          size=stat.st_size,
-                          last_modified=stat.st_mtime,
-                          content_type=None)
+            record = dict(
+                realm_id=realm.id,
+                user_profile_id=user.id,
+                user_profile_email=user.email,
+                s3_path=fn,
+                path=fn,
+                size=stat.st_size,
+                last_modified=stat.st_mtime,
+                content_type=None,
+            )
             records.append(record)
 
             count += 1
 
-            if (count % 100 == 0):
+            if count % 100 == 0:
                 logging.info("Finished %s", count)
 
     with open(os.path.join(output_dir, "records.json"), "wb") as records_file:
         records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2))
 
+
 def export_realm_icons(realm: Realm, local_dir: Path, output_dir: Path) -> None:
     records = []
     dir_relative_path = zerver.lib.upload.upload_backend.realm_avatar_and_logo_path(realm)
@@ -1410,14 +1499,13 @@ def export_realm_icons(realm: Realm, local_dir: Path, output_dir: Path) -> None:
         output_path = os.path.join(output_dir, icon_relative_path)
         os.makedirs(str(os.path.dirname(output_path)), exist_ok=True)
         shutil.copy2(str(icon_absolute_path), str(output_path))
-        record = dict(realm_id=realm.id,
-                      path=icon_relative_path,
-                      s3_path=icon_relative_path)
+        record = dict(realm_id=realm.id, path=icon_relative_path, s3_path=icon_relative_path)
         records.append(record)
 
     with open(os.path.join(output_dir, "records.json"), "wb") as records_file:
         records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2))
 
+
 def export_emoji_from_local(realm: Realm, local_dir: Path, output_dir: Path) -> None:
 
     count = 0
@@ -1443,21 +1531,24 @@ def export_emoji_from_local(realm: Realm, local_dir: Path, output_dir: Path) ->
         author_id = None
         if author:
             author_id = realm_emoji.author.id
-        record = dict(realm_id=realm.id,
-                      author=author_id,
-                      path=emoji_path,
-                      s3_path=emoji_path,
-                      file_name=realm_emoji.file_name,
-                      name=realm_emoji.name,
-                      deactivated=realm_emoji.deactivated)
+        record = dict(
+            realm_id=realm.id,
+            author=author_id,
+            path=emoji_path,
+            s3_path=emoji_path,
+            file_name=realm_emoji.file_name,
+            name=realm_emoji.name,
+            deactivated=realm_emoji.deactivated,
+        )
         records.append(record)
 
         count += 1
-        if (count % 100 == 0):
+        if count % 100 == 0:
             logging.info("Finished %s", count)
     with open(os.path.join(output_dir, "records.json"), "wb") as records_file:
         records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2))
 
+
 def do_write_stats_file_for_realm_export(output_dir: Path) -> None:
     stats_file = os.path.join(output_dir, 'stats.txt')
     realm_file = os.path.join(output_dir, 'realm.json')
@@ -1480,16 +1571,21 @@ def do_write_stats_file_for_realm_export(output_dir: Path) -> None:
         uploads_file = os.path.join(output_dir, 'uploads/records.json')
 
         for fn in [avatar_file, uploads_file]:
-            f.write(fn+'\n')
+            f.write(fn + '\n')
             with open(fn, "rb") as filename:
                 data = orjson.loads(filename.read())
             f.write(f'{len(data):5} records\n')
             f.write('\n')
 
-def do_export_realm(realm: Realm, output_dir: Path, threads: int,
-                    exportable_user_ids: Optional[Set[int]]=None,
-                    public_only: bool=False,
-                    consent_message_id: Optional[int]=None) -> str:
+
+def do_export_realm(
+    realm: Realm,
+    output_dir: Path,
+    threads: int,
+    exportable_user_ids: Optional[Set[int]] = None,
+    public_only: bool = False,
+    consent_message_id: Optional[int] = None,
+) -> str:
     response: TableData = {}
 
     # We need at least one thread running to export
@@ -1522,9 +1618,13 @@ def do_export_realm(realm: Realm, output_dir: Path, threads: int,
     # This is for performance reasons, of course.  Some installations
     # have millions of messages.
     logging.info("Exporting .partial files messages")
-    message_ids = export_partial_message_files(realm, response, output_dir=output_dir,
-                                               public_only=public_only,
-                                               consent_message_id=consent_message_id)
+    message_ids = export_partial_message_files(
+        realm,
+        response,
+        output_dir=output_dir,
+        public_only=public_only,
+        consent_message_id=consent_message_id,
+    )
     logging.info('%d messages were exported', len(message_ids))
 
     # zerver_reaction
@@ -1544,8 +1644,9 @@ def do_export_realm(realm: Realm, output_dir: Path, threads: int,
     export_attachment_table(realm=realm, output_dir=output_dir, message_ids=message_ids)
 
     # Start parallel jobs to export the UserMessage objects.
-    launch_user_message_subprocesses(threads=threads, output_dir=output_dir,
-                                     consent_message_id=consent_message_id)
+    launch_user_message_subprocesses(
+        threads=threads, output_dir=output_dir, consent_message_id=consent_message_id
+    )
 
     logging.info("Finished exporting %s", realm.string_id)
     create_soft_link(source=output_dir, in_progress=False)
@@ -1562,6 +1663,7 @@ def do_export_realm(realm: Realm, output_dir: Path, threads: int,
     os.chdir(reset_dir)
     return tarball_path
 
+
 def export_attachment_table(realm: Realm, output_dir: Path, message_ids: Set[int]) -> None:
     response: TableData = {}
     fetch_attachment_data(response=response, realm_id=realm.id, message_ids=message_ids)
@@ -1569,7 +1671,8 @@ def export_attachment_table(realm: Realm, output_dir: Path, message_ids: Set[int
     logging.info('Writing attachment table data to %s', output_file)
     write_data_to_file(output_file=output_file, data=response)
 
-def create_soft_link(source: Path, in_progress: bool=True) -> None:
+
+def create_soft_link(source: Path, in_progress: bool = True) -> None:
     is_done = not in_progress
     if settings.DEVELOPMENT:
         in_progress_link = os.path.join(settings.DEPLOY_ROOT, 'var', 'export-in-progress')
@@ -1591,8 +1694,10 @@ def create_soft_link(source: Path, in_progress: bool=True) -> None:
     if is_done:
         logging.info('See %s for output files', new_target)
 
-def launch_user_message_subprocesses(threads: int, output_dir: Path,
-                                     consent_message_id: Optional[int]=None) -> None:
+
+def launch_user_message_subprocesses(
+    threads: int, output_dir: Path, consent_message_id: Optional[int] = None
+) -> None:
     logging.info('Launching %d PARALLEL subprocesses to export UserMessage rows', threads)
     pids = {}
 
@@ -1614,6 +1719,7 @@ def launch_user_message_subprocesses(threads: int, output_dir: Path,
         shard = pids.pop(pid)
         print(f'Shard {shard} finished, status {status}')
 
+
 def do_export_user(user_profile: UserProfile, output_dir: Path) -> None:
     response: TableData = {}
 
@@ -1623,6 +1729,7 @@ def do_export_user(user_profile: UserProfile, output_dir: Path) -> None:
     logging.info("Exporting messages")
     export_messages_single_user(user_profile, output_dir)
 
+
 def export_single_user(user_profile: UserProfile, response: TableData) -> None:
 
     config = get_single_user_config()
@@ -1632,6 +1739,7 @@ def export_single_user(user_profile: UserProfile, response: TableData) -> None:
         seed_object=user_profile,
     )
 
+
 def get_single_user_config() -> Config:
     # This function defines the limited configuration for what data to
     # export when exporting all data that a single Zulip user has
@@ -1682,14 +1790,17 @@ def get_single_user_config() -> Config:
 
     return user_profile_config
 
-def export_messages_single_user(user_profile: UserProfile, output_dir: Path,
-                                chunk_size: int=MESSAGE_BATCH_CHUNK_SIZE) -> None:
+
+def export_messages_single_user(
+    user_profile: UserProfile, output_dir: Path, chunk_size: int = MESSAGE_BATCH_CHUNK_SIZE
+) -> None:
     user_message_query = UserMessage.objects.filter(user_profile=user_profile).order_by("id")
     min_id = -1
     dump_file_id = 1
     while True:
         actual_query = user_message_query.select_related(
-            "message", "message__sending_client").filter(id__gt=min_id)[0:chunk_size]
+            "message", "message__sending_client"
+        ).filter(id__gt=min_id)[0:chunk_size]
         user_message_chunk = list(actual_query)
         user_message_ids = {um.id for um in user_message_chunk}
 
@@ -1717,6 +1828,7 @@ def export_messages_single_user(user_profile: UserProfile, output_dir: Path,
         min_id = max(user_message_ids)
         dump_file_id += 1
 
+
 def export_analytics_tables(realm: Realm, output_dir: Path) -> None:
     response: TableData = {}
 
@@ -1737,6 +1849,7 @@ def export_analytics_tables(realm: Realm, output_dir: Path) -> None:
 
     write_data_to_file(output_file=export_file, data=response)
 
+
 def get_analytics_config() -> Config:
     # The Config function defines what data to export for the
     # analytics.json file in a full-realm export.
@@ -1769,22 +1882,35 @@ def get_analytics_config() -> Config:
 
     return analytics_config
 
-def get_consented_user_ids(consent_message_id: int) -> Set[int]:
-    return set(Reaction.objects.filter(message__id=consent_message_id,
-                                       reaction_type="unicode_emoji",
-                                       # outbox = 1f4e4
-                                       emoji_code="1f4e4").
-               values_list("user_profile", flat=True))
 
-def export_realm_wrapper(realm: Realm, output_dir: str,
-                         threads: int, upload: bool,
-                         public_only: bool,
-                         delete_after_upload: bool,
-                         percent_callback: Optional[Callable[[Any], None]]=None,
-                         consent_message_id: Optional[int]=None) -> Optional[str]:
-    tarball_path = do_export_realm(realm=realm, output_dir=output_dir,
-                                   threads=threads, public_only=public_only,
-                                   consent_message_id=consent_message_id)
+def get_consented_user_ids(consent_message_id: int) -> Set[int]:
+    return set(
+        Reaction.objects.filter(
+            message__id=consent_message_id,
+            reaction_type="unicode_emoji",
+            # outbox = 1f4e4
+            emoji_code="1f4e4",
+        ).values_list("user_profile", flat=True)
+    )
+
+
+def export_realm_wrapper(
+    realm: Realm,
+    output_dir: str,
+    threads: int,
+    upload: bool,
+    public_only: bool,
+    delete_after_upload: bool,
+    percent_callback: Optional[Callable[[Any], None]] = None,
+    consent_message_id: Optional[int] = None,
+) -> Optional[str]:
+    tarball_path = do_export_realm(
+        realm=realm,
+        output_dir=output_dir,
+        threads=threads,
+        public_only=public_only,
+        consent_message_id=consent_message_id,
+    )
     print(f"Finished exporting to {output_dir}")
     print(f"Tarball written to {tarball_path}")
 
@@ -1796,7 +1922,8 @@ def export_realm_wrapper(realm: Realm, output_dir: str,
     # that in the future.
     print("Uploading export tarball...")
     public_url = zerver.lib.upload.upload_backend.upload_export_tarball(
-        realm, tarball_path, percent_callback=percent_callback)
+        realm, tarball_path, percent_callback=percent_callback
+    )
     print()
     print(f"Uploaded to {public_url}")
 
@@ -1805,9 +1932,11 @@ def export_realm_wrapper(realm: Realm, output_dir: str,
         print(f"Successfully deleted the tarball at {tarball_path}")
     return public_url
 
+
 def get_realm_exports_serialized(user: UserProfile) -> List[Dict[str, Any]]:
-    all_exports = RealmAuditLog.objects.filter(realm=user.realm,
-                                               event_type=RealmAuditLog.REALM_EXPORTED)
+    all_exports = RealmAuditLog.objects.filter(
+        realm=user.realm, event_type=RealmAuditLog.REALM_EXPORTED
+    )
     exports_dict = {}
     for export in all_exports:
         pending = True
@@ -1825,7 +1954,8 @@ def get_realm_exports_serialized(user: UserProfile) -> List[Dict[str, Any]]:
 
             if export_path and not deleted_timestamp:
                 export_url = zerver.lib.upload.upload_backend.get_export_tarball_url(
-                    user.realm, export_path)
+                    user.realm, export_path
+                )
 
         exports_dict[export.id] = dict(
             id=export.id,
diff --git a/zerver/lib/external_accounts.py b/zerver/lib/external_accounts.py
index 88e44e5255..9d501b7511 100644
--- a/zerver/lib/external_accounts.py
+++ b/zerver/lib/external_accounts.py
@@ -34,6 +34,7 @@ DEFAULT_EXTERNAL_ACCOUNTS = {
     },
 }
 
+
 def validate_external_account_field_data(field_data: ProfileFieldData) -> ProfileFieldData:
     field_validator = check_dict_only(
         [('subtype', check_required_string)],
diff --git a/zerver/lib/fix_unreads.py b/zerver/lib/fix_unreads.py
index 2596998138..4af873617c 100644
--- a/zerver/lib/fix_unreads.py
+++ b/zerver/lib/fix_unreads.py
@@ -21,13 +21,17 @@ migration runs.
 logger = logging.getLogger('zulip.fix_unreads')
 logger.setLevel(logging.WARNING)
 
-def build_topic_mute_checker(cursor: CursorObj, user_profile: UserProfile) -> Callable[[int, str], bool]:
-    '''
+
+def build_topic_mute_checker(
+    cursor: CursorObj, user_profile: UserProfile
+) -> Callable[[int, str], bool]:
+    """
     This function is similar to the function of the same name
     in zerver/lib/topic_mutes.py, but it works without the ORM,
     so that we can use it in migrations.
-    '''
-    query = SQL('''
+    """
+    query = SQL(
+        '''
         SELECT
             recipient_id,
             topic_name
@@ -35,26 +39,27 @@ def build_topic_mute_checker(cursor: CursorObj, user_profile: UserProfile) -> Ca
             zerver_mutedtopic
         WHERE
             user_profile_id = %s
-    ''')
+    '''
+    )
     cursor.execute(query, [user_profile.id])
     rows = cursor.fetchall()
 
-    tups = {
-        (recipient_id, topic_name.lower())
-        for (recipient_id, topic_name) in rows
-    }
+    tups = {(recipient_id, topic_name.lower()) for (recipient_id, topic_name) in rows}
 
     def is_muted(recipient_id: int, topic: str) -> bool:
         return (recipient_id, topic.lower()) in tups
 
     return is_muted
 
+
 def update_unread_flags(cursor: CursorObj, user_message_ids: List[int]) -> None:
-    query = SQL('''
+    query = SQL(
+        '''
         UPDATE zerver_usermessage
         SET flags = flags | 1
         WHERE id IN %(user_message_ids)s
-    ''')
+    '''
+    )
 
     cursor.execute(query, {"user_message_ids": tuple(user_message_ids)})
 
@@ -72,7 +77,8 @@ def fix_unsubscribed(cursor: CursorObj, user_profile: UserProfile) -> None:
     recipient_ids = []
 
     def find_recipients() -> None:
-        query = SQL('''
+        query = SQL(
+            '''
             SELECT
                 zerver_subscription.recipient_id
             FROM
@@ -85,7 +91,8 @@ def fix_unsubscribed(cursor: CursorObj, user_profile: UserProfile) -> None:
                 zerver_recipient.type = 2 AND
                 (NOT zerver_subscription.active)
             )
-        ''')
+        '''
+        )
         cursor.execute(query, {"user_profile_id": user_profile.id})
         rows = cursor.fetchall()
         for row in rows:
@@ -103,7 +110,8 @@ def fix_unsubscribed(cursor: CursorObj, user_profile: UserProfile) -> None:
     user_message_ids = []
 
     def find() -> None:
-        query = SQL('''
+        query = SQL(
+            '''
             SELECT
                 zerver_usermessage.id
             FROM
@@ -116,12 +124,16 @@ def fix_unsubscribed(cursor: CursorObj, user_profile: UserProfile) -> None:
                 (zerver_usermessage.flags & 1) = 0 AND
                 zerver_message.recipient_id in %(recipient_ids)s
             )
-        ''')
+        '''
+        )
 
-        cursor.execute(query, {
-            "user_profile_id": user_profile.id,
-            "recipient_ids": tuple(recipient_ids),
-        })
+        cursor.execute(
+            query,
+            {
+                "user_profile_id": user_profile.id,
+                "recipient_ids": tuple(recipient_ids),
+            },
+        )
         rows = cursor.fetchall()
         for row in rows:
             user_message_ids.append(row[0])
@@ -143,6 +155,7 @@ def fix_unsubscribed(cursor: CursorObj, user_profile: UserProfile) -> None:
         fix,
     )
 
+
 def fix(user_profile: UserProfile) -> None:
     logger.info('\n---\nFixing %s:', user_profile.id)
     with connection.cursor() as cursor:
diff --git a/zerver/lib/generate_test_data.py b/zerver/lib/generate_test_data.py
index bdd19ad807..9da1e12ba2 100644
--- a/zerver/lib/generate_test_data.py
+++ b/zerver/lib/generate_test_data.py
@@ -14,6 +14,7 @@ def load_config() -> Dict[str, Any]:
 
     return config
 
+
 def generate_topics(num_topics: int) -> List[str]:
     config = load_config()["gen_fodder"]
 
@@ -37,6 +38,7 @@ def generate_topics(num_topics: int) -> List[str]:
 
     return topics
 
+
 def load_generators(config: Dict[str, Any]) -> Dict[str, Any]:
 
     results = {}
@@ -60,6 +62,7 @@ def load_generators(config: Dict[str, Any]) -> Dict[str, Any]:
 
     return results
 
+
 def parse_file(config: Dict[str, Any], gens: Dict[str, Any], corpus_file: str) -> List[str]:
 
     # First, load the entire file into a dictionary,
@@ -74,6 +77,7 @@ def parse_file(config: Dict[str, Any], gens: Dict[str, Any], corpus_file: str) -
 
     return paragraphs
 
+
 def get_flair_gen(length: int) -> List[str]:
 
     # Grab the percentages from the config file
@@ -88,6 +92,7 @@ def get_flair_gen(length: int) -> List[str]:
     random.shuffle(result)
     return result
 
+
 def add_flair(paragraphs: List[str], gens: Dict[str, Any]) -> List[str]:
 
     # roll the dice and see what kind of flair we should add, if any
@@ -134,6 +139,7 @@ def add_flair(paragraphs: List[str], gens: Dict[str, Any]) -> List[str]:
 
     return results
 
+
 def add_md(mode: str, text: str) -> str:
 
     # mode means: bold, italic, etc.
@@ -149,6 +155,7 @@ def add_md(mode: str, text: str) -> str:
 
     return " ".join(vals).strip()
 
+
 def add_emoji(text: str, emoji: str) -> str:
 
     vals = text.split()
@@ -157,6 +164,7 @@ def add_emoji(text: str, emoji: str) -> str:
     vals[start] = vals[start] + " " + emoji + " "
     return " ".join(vals)
 
+
 def add_link(text: str, link: str) -> str:
 
     vals = text.split()
@@ -166,12 +174,13 @@ def add_link(text: str, link: str) -> str:
 
     return " ".join(vals)
 
+
 def remove_line_breaks(fh: Any) -> List[str]:
 
     # We're going to remove line breaks from paragraphs
-    results = []    # save the dialogs as tuples with (author, dialog)
+    results = []  # save the dialogs as tuples with (author, dialog)
 
-    para = []   # we'll store the lines here to form a paragraph
+    para = []  # we'll store the lines here to form a paragraph
 
     for line in fh:
         text = line.strip()
@@ -187,19 +196,24 @@ def remove_line_breaks(fh: Any) -> List[str]:
 
     return results
 
+
 def write_file(paragraphs: List[str], filename: str) -> None:
 
     with open(filename, "wb") as outfile:
         outfile.write(orjson.dumps(paragraphs))
 
+
 def create_test_data() -> None:
 
-    gens = load_generators(config)   # returns a dictionary of generators
+    gens = load_generators(config)  # returns a dictionary of generators
 
     paragraphs = parse_file(config, gens, config["corpus"]["filename"])
 
-    write_file(paragraphs, os.path.join(get_or_create_dev_uuid_var_path('test-backend'),
-                                        "test_messages.json"))
+    write_file(
+        paragraphs,
+        os.path.join(get_or_create_dev_uuid_var_path('test-backend'), "test_messages.json"),
+    )
+
 
 config = load_config()
 
diff --git a/zerver/lib/github.py b/zerver/lib/github.py
index 218621d254..c590608e27 100644
--- a/zerver/lib/github.py
+++ b/zerver/lib/github.py
@@ -7,6 +7,7 @@ from zerver.lib.cache import cache_with_key
 
 logger = logging.getLogger(__name__)
 
+
 def get_latest_github_release_version_for_repo(repo: str) -> str:
     api_url = f"https://api.github.com/repos/zulip/{repo}/releases/latest"
     try:
@@ -15,6 +16,7 @@ def get_latest_github_release_version_for_repo(repo: str) -> str:
         logger.error("Unable to fetch the latest release version from GitHub %s", api_url)
         return ""
 
+
 def verify_release_download_link(link: str) -> bool:
     try:
         requests.head(link).raise_for_status()
@@ -23,16 +25,19 @@ def verify_release_download_link(link: str) -> bool:
         logger.error("App download link is broken %s", link)
         return False
 
+
 PLATFORM_TO_SETUP_FILE = {
     "linux": "Zulip-{version}-x86_64.AppImage",
     "mac": "Zulip-{version}.dmg",
     "windows": "Zulip-Web-Setup-{version}.exe",
 }
 
+
 class InvalidPlatform(Exception):
     pass
 
-@cache_with_key(lambda platform: f"download_link:{platform}", timeout=60*30)
+
+@cache_with_key(lambda platform: f"download_link:{platform}", timeout=60 * 30)
 def get_latest_github_release_download_link_for_platform(platform: str) -> str:
     if platform not in PLATFORM_TO_SETUP_FILE:
         raise InvalidPlatform()
diff --git a/zerver/lib/home.py b/zerver/lib/home.py
index 2124ddf426..c12dbf849d 100644
--- a/zerver/lib/home.py
+++ b/zerver/lib/home.py
@@ -141,6 +141,7 @@ def build_page_params_for_home_page_load(
         # at the time of request and don't register for any events.
         # TODO: Implement events for web_public_visitor.
         from zerver.lib.events import fetch_initial_state_data, post_process_state
+
         register_ret = fetch_initial_state_data(
             user_profile,
             realm=realm,
@@ -150,7 +151,7 @@ def build_page_params_for_home_page_load(
             user_avatar_url_field_optional=client_capabilities['user_avatar_url_field_optional'],
             slim_presence=False,
             include_subscribers=False,
-            include_streams=False
+            include_streams=False,
         )
 
         post_process_state(user_profile, register_ret, False)
@@ -160,12 +161,10 @@ def build_page_params_for_home_page_load(
     request_language = get_and_set_request_language(
         request,
         register_ret['default_language'],
-        translation.get_language_from_path(request.path_info)
+        translation.get_language_from_path(request.path_info),
     )
 
-    two_fa_enabled = (
-        settings.TWO_FACTOR_AUTHENTICATION_ENABLED and user_profile is not None
-    )
+    two_fa_enabled = settings.TWO_FACTOR_AUTHENTICATION_ENABLED and user_profile is not None
 
     # Pass parameters to the client-side JavaScript code.
     # These end up in a global JavaScript Object named 'page_params'.
@@ -183,9 +182,7 @@ def build_page_params_for_home_page_load(
         # Misc. extra data.
         initial_servertime=time.time(),  # Used for calculating relative presence age
         default_language_name=get_language_name(register_ret["default_language"]),
-        language_list_dbl_col=get_language_list_for_templates(
-            register_ret["default_language"]
-        ),
+        language_list_dbl_col=get_language_list_for_templates(register_ret["default_language"]),
         language_list=get_language_list(),
         needs_tutorial=needs_tutorial,
         first_in_realm=first_in_realm,
@@ -211,19 +208,14 @@ def build_page_params_for_home_page_load(
         recipient = narrow_stream.recipient
         try:
             max_message_id = (
-                Message.objects.filter(recipient=recipient)
-                .order_by("id")
-                .reverse()[0]
-                .id
+                Message.objects.filter(recipient=recipient).order_by("id").reverse()[0].id
             )
         except IndexError:
             max_message_id = -1
         page_params["narrow_stream"] = narrow_stream.name
         if narrow_topic is not None:
             page_params["narrow_topic"] = narrow_topic
-        page_params["narrow"] = [
-            dict(operator=term[0], operand=term[1]) for term in narrow
-        ]
+        page_params["narrow"] = [dict(operator=term[0], operand=term[1]) for term in narrow]
         page_params["max_message_id"] = max_message_id
         page_params["enable_desktop_notifications"] = False
 
diff --git a/zerver/lib/hotspots.py b/zerver/lib/hotspots.py
index 3b968f0bca..9489810244 100644
--- a/zerver/lib/hotspots.py
+++ b/zerver/lib/hotspots.py
@@ -43,6 +43,7 @@ ALL_HOTSPOTS: Dict[str, Dict[str, Promise]] = {
     },
 }
 
+
 def get_next_hotspots(user: UserProfile) -> List[Dict[str, object]]:
     # For manual testing, it can be convenient to set
     # ALWAYS_SEND_ALL_HOTSPOTS=True in `zproject/dev_settings.py` to
@@ -50,34 +51,43 @@ def get_next_hotspots(user: UserProfile) -> List[Dict[str, object]]:
     # ALWAYS_SEND_ALL_HOTSPOTS has some bugs; see ReadTheDocs (link
     # above) for details.
     if settings.ALWAYS_SEND_ALL_HOTSPOTS:
-        return [{
-            'name': hotspot,
-            'title': str(ALL_HOTSPOTS[hotspot]['title']),
-            'description': str(ALL_HOTSPOTS[hotspot]['description']),
-            'delay': 0,
-        } for hotspot in ALL_HOTSPOTS]
+        return [
+            {
+                'name': hotspot,
+                'title': str(ALL_HOTSPOTS[hotspot]['title']),
+                'description': str(ALL_HOTSPOTS[hotspot]['description']),
+                'delay': 0,
+            }
+            for hotspot in ALL_HOTSPOTS
+        ]
 
     if user.tutorial_status == UserProfile.TUTORIAL_FINISHED:
         return []
 
-    seen_hotspots = frozenset(UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True))
+    seen_hotspots = frozenset(
+        UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True)
+    )
     for hotspot in ['intro_reply', 'intro_streams', 'intro_topics', 'intro_gear', 'intro_compose']:
         if hotspot not in seen_hotspots:
-            return [{
-                'name': hotspot,
-                'title': str(ALL_HOTSPOTS[hotspot]['title']),
-                'description': str(ALL_HOTSPOTS[hotspot]['description']),
-                'delay': 0.5,
-            }]
+            return [
+                {
+                    'name': hotspot,
+                    'title': str(ALL_HOTSPOTS[hotspot]['title']),
+                    'description': str(ALL_HOTSPOTS[hotspot]['description']),
+                    'delay': 0.5,
+                }
+            ]
 
     user.tutorial_status = UserProfile.TUTORIAL_FINISHED
     user.save(update_fields=['tutorial_status'])
     return []
 
+
 def copy_hotpots(source_profile: UserProfile, target_profile: UserProfile) -> None:
     for userhotspot in frozenset(UserHotspot.objects.filter(user=source_profile)):
-        UserHotspot.objects.create(user=target_profile, hotspot=userhotspot.hotspot,
-                                   timestamp=userhotspot.timestamp)
+        UserHotspot.objects.create(
+            user=target_profile, hotspot=userhotspot.hotspot, timestamp=userhotspot.timestamp
+        )
 
     target_profile.tutorial_status = source_profile.tutorial_status
     target_profile.onboarding_steps = source_profile.onboarding_steps
diff --git a/zerver/lib/html_diff.py b/zerver/lib/html_diff.py
index ea2e37d65c..9f38fee420 100644
--- a/zerver/lib/html_diff.py
+++ b/zerver/lib/html_diff.py
@@ -7,7 +7,8 @@ from lxml.html.diff import htmldiff
 def highlight_with_class(text: str, klass: str) -> str:
     return f'<span class="{klass}">{text}</span>'
 
-def highlight_html_differences(s1: str, s2: str, msg_id: Optional[int]=None) -> str:
+
+def highlight_html_differences(s1: str, s2: str, msg_id: Optional[int] = None) -> str:
     retval = htmldiff(s1, s2)
     fragment = lxml.html.fromstring(retval)
 
diff --git a/zerver/lib/html_to_text.py b/zerver/lib/html_to_text.py
index 369f742db0..a2c2df3b69 100644
--- a/zerver/lib/html_to_text.py
+++ b/zerver/lib/html_to_text.py
@@ -33,6 +33,7 @@ def html_to_text(content: Union[str, bytes], tags: Mapping[str, str] = {'p': ' |
             break
     return escape(' '.join(text.split()))
 
-@cache_with_key(open_graph_description_cache_key, timeout=3600*24)
+
+@cache_with_key(open_graph_description_cache_key, timeout=3600 * 24)
 def get_content_description(content: bytes, request: HttpRequest) -> str:
     return html_to_text(content)
diff --git a/zerver/lib/i18n.py b/zerver/lib/i18n.py
index 65dbf97d4e..de418fb8ec 100644
--- a/zerver/lib/i18n.py
+++ b/zerver/lib/i18n.py
@@ -20,10 +20,13 @@ def get_language_list() -> List[Dict[str, Any]]:
         languages = orjson.loads(reader.read())
         return languages['name_map']
 
+
 def get_language_list_for_templates(default_language: str) -> List[Dict[str, Dict[str, str]]]:
-    language_list = [lang for lang in get_language_list()
-                     if 'percent_translated' not in lang or
-                        lang['percent_translated'] >= 5.]
+    language_list = [
+        lang
+        for lang in get_language_list()
+        if 'percent_translated' not in lang or lang['percent_translated'] >= 5.0
+    ]
 
     formatted_list = []
     lang_len = len(language_list)
@@ -57,6 +60,7 @@ def get_language_list_for_templates(default_language: str) -> List[Dict[str, Dic
 
     return formatted_list
 
+
 def get_language_name(code: str) -> str:
     for lang in get_language_list():
         if code in (lang['code'], lang['locale']):
@@ -65,11 +69,13 @@ def get_language_name(code: str) -> str:
     logging.error("Unknown language code '%s'", code)
     return "Unknown"
 
+
 def get_available_language_codes() -> List[str]:
     language_list = get_language_list()
     codes = [language['code'] for language in language_list]
     return codes
 
+
 def get_language_translation_data(language: str) -> Dict[str, str]:
     if language == 'en':
         return {}
@@ -82,10 +88,9 @@ def get_language_translation_data(language: str) -> Dict[str, str]:
         print(f'Translation for {language} not found at {path}')
         return {}
 
+
 def get_and_set_request_language(
-    request: HttpRequest,
-    user_configured_language: str,
-    testing_url_language: Optional[str]=None
+    request: HttpRequest, user_configured_language: str, testing_url_language: Optional[str] = None
 ) -> str:
     # We pick a language for the user as follows:
     # * First priority is the language in the URL, for debugging.
diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py
index ab0b5210be..9ac9c137ef 100644
--- a/zerver/lib/import_realm.py
+++ b/zerver/lib/import_realm.py
@@ -68,10 +68,12 @@ from zerver.models import (
     get_user_profile_by_id,
 )
 
-realm_tables = [("zerver_defaultstream", DefaultStream, "defaultstream"),
-                ("zerver_realmemoji", RealmEmoji, "realmemoji"),
-                ("zerver_realmdomain", RealmDomain, "realmdomain"),
-                ("zerver_realmfilter", RealmFilter, "realmfilter")]  # List[Tuple[TableName, Any, str]]
+realm_tables = [
+    ("zerver_defaultstream", DefaultStream, "defaultstream"),
+    ("zerver_realmemoji", RealmEmoji, "realmemoji"),
+    ("zerver_realmdomain", RealmDomain, "realmdomain"),
+    ("zerver_realmfilter", RealmFilter, "realmfilter"),
+]  # List[Tuple[TableName, Any, str]]
 
 
 # ID_MAP is a dictionary that maps table names to dictionaries
@@ -127,20 +129,27 @@ path_maps: Dict[str, Dict[str, str]] = {
     'attachment_path': {},
 }
 
+
 def update_id_map(table: TableName, old_id: int, new_id: int) -> None:
     if table not in ID_MAP:
-        raise Exception(f'''
+        raise Exception(
+            f'''
             Table {table} is not initialized in ID_MAP, which could
             mean that we have not thought through circular
             dependencies.
-            ''')
+            '''
+        )
     ID_MAP[table][old_id] = new_id
 
+
 def fix_datetime_fields(data: TableData, table: TableName) -> None:
     for item in data[table]:
         for field_name in DATE_FIELDS[table]:
             if item[field_name] is not None:
-                item[field_name] = datetime.datetime.fromtimestamp(item[field_name], tz=datetime.timezone.utc)
+                item[field_name] = datetime.datetime.fromtimestamp(
+                    item[field_name], tz=datetime.timezone.utc
+                )
+
 
 def fix_upload_links(data: TableData, message_table: TableName) -> None:
     """
@@ -155,7 +164,10 @@ def fix_upload_links(data: TableData, message_table: TableName) -> None:
                 if key in message['content']:
                     message['content'] = message['content'].replace(key, value)
                     if message['rendered_content']:
-                        message['rendered_content'] = message['rendered_content'].replace(key, value)
+                        message['rendered_content'] = message['rendered_content'].replace(
+                            key, value
+                        )
+
 
 def create_subscription_events(data: TableData, realm_id: int) -> None:
     """
@@ -174,9 +186,7 @@ def create_subscription_events(data: TableData, realm_id: int) -> None:
     event_time = timezone_now()
 
     recipient_id_to_stream_id = {
-        d['id']: d['type_id']
-        for d in data['zerver_recipient']
-        if d['type'] == Recipient.STREAM
+        d['id']: d['type_id'] for d in data['zerver_recipient'] if d['type'] == Recipient.STREAM
     }
 
     for sub in data['zerver_subscription']:
@@ -188,15 +198,20 @@ def create_subscription_events(data: TableData, realm_id: int) -> None:
 
         user_id = sub['user_profile_id']
 
-        all_subscription_logs.append(RealmAuditLog(realm_id=realm_id,
-                                                   acting_user_id=user_id,
-                                                   modified_user_id=user_id,
-                                                   modified_stream_id=stream_id,
-                                                   event_last_message_id=event_last_message_id,
-                                                   event_time=event_time,
-                                                   event_type=RealmAuditLog.SUBSCRIPTION_CREATED))
+        all_subscription_logs.append(
+            RealmAuditLog(
+                realm_id=realm_id,
+                acting_user_id=user_id,
+                modified_user_id=user_id,
+                modified_stream_id=stream_id,
+                event_last_message_id=event_last_message_id,
+                event_time=event_time,
+                event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
+            )
+        )
     RealmAuditLog.objects.bulk_create(all_subscription_logs)
 
+
 def fix_service_tokens(data: TableData, table: TableName) -> None:
     """
     The tokens in the services are created by 'generate_api_key'.
@@ -205,6 +220,7 @@ def fix_service_tokens(data: TableData, table: TableName) -> None:
     for item in data[table]:
         item['token'] = generate_api_key()
 
+
 def process_huddle_hash(data: TableData, table: TableName) -> None:
     """
     Build new huddle hashes with the updated ids of the users
@@ -213,19 +229,22 @@ def process_huddle_hash(data: TableData, table: TableName) -> None:
         user_id_list = id_map_to_list['huddle_to_user_list'][huddle['id']]
         huddle['huddle_hash'] = get_huddle_hash(user_id_list)
 
+
 def get_huddles_from_subscription(data: TableData, table: TableName) -> None:
     """
     Extract the IDs of the user_profiles involved in a huddle from the subscription object
     This helps to generate a unique huddle hash from the updated user_profile ids
     """
     id_map_to_list['huddle_to_user_list'] = {
-        value: [] for value in ID_MAP['recipient_to_huddle_map'].values()}
+        value: [] for value in ID_MAP['recipient_to_huddle_map'].values()
+    }
 
     for subscription in data[table]:
         if subscription['recipient'] in ID_MAP['recipient_to_huddle_map']:
             huddle_id = ID_MAP['recipient_to_huddle_map'][subscription['recipient']]
             id_map_to_list['huddle_to_user_list'][huddle_id].append(subscription['user_profile_id'])
 
+
 def fix_customprofilefield(data: TableData) -> None:
     """
     In CustomProfileField with 'field_type' like 'USER', the IDs need to be
@@ -244,12 +263,14 @@ def fix_customprofilefield(data: TableData) -> None:
                 table='zerver_customprofilefieldvalue',
                 field_name='value',
                 related_table='user_profile',
-                old_id_list=old_user_id_list)
+                old_id_list=old_user_id_list,
+            )
             item['value'] = orjson.dumps(new_id_list).decode()
 
-def fix_message_rendered_content(realm: Realm,
-                                 sender_map: Dict[int, Record],
-                                 messages: List[Record]) -> None:
+
+def fix_message_rendered_content(
+    realm: Realm, sender_map: Dict[int, Record], messages: List[Record]
+) -> None:
     """
     This function sets the rendered_content of all the messages
     after the messages have been imported from a non-Zulip platform.
@@ -331,7 +352,10 @@ def fix_message_rendered_content(realm: Realm,
             # * rendering Markdown failing with the exception being
             #   caught in Markdown (which then returns None, causing the the
             #   rendered_content assert above to fire).
-            logging.warning("Error in Markdown rendering for message ID %s; continuing", message['id'])
+            logging.warning(
+                "Error in Markdown rendering for message ID %s; continuing", message['id']
+            )
+
 
 def current_table_ids(data: TableData, table: TableName) -> List[int]:
     """
@@ -342,6 +366,7 @@ def current_table_ids(data: TableData, table: TableName) -> List[int]:
         id_list.append(item["id"])
     return id_list
 
+
 def idseq(model_class: Any) -> str:
     if model_class == RealmDomain:
         return 'zerver_realmalias_id_seq'
@@ -351,6 +376,7 @@ def idseq(model_class: Any) -> str:
         return 'zerver_botuserconfigdata_id_seq'
     return f'{model_class._meta.db_table}_id_seq'
 
+
 def allocate_ids(model_class: Any, count: int) -> List[int]:
     """
     Increases the sequence number for a given table by the amount of objects being
@@ -359,33 +385,36 @@ def allocate_ids(model_class: Any, count: int) -> List[int]:
     """
     conn = connection.cursor()
     sequence = idseq(model_class)
-    conn.execute("select nextval(%s) from generate_series(1, %s)",
-                 [sequence, count])
+    conn.execute("select nextval(%s) from generate_series(1, %s)", [sequence, count])
     query = conn.fetchall()  # Each element in the result is a tuple like (5,)
     conn.close()
     # convert List[Tuple[int]] to List[int]
     return [item[0] for item in query]
 
+
 def convert_to_id_fields(data: TableData, table: TableName, field_name: Field) -> None:
-    '''
+    """
     When Django gives us dict objects via model_to_dict, the foreign
     key fields are `foo`, but we want `foo_id` for the bulk insert.
     This function handles the simple case where we simply rename
     the fields.  For cases where we need to munge ids in the
     database, see re_map_foreign_keys.
-    '''
+    """
     for item in data[table]:
         item[field_name + "_id"] = item[field_name]
         del item[field_name]
 
-def re_map_foreign_keys(data: TableData,
-                        table: TableName,
-                        field_name: Field,
-                        related_table: TableName,
-                        verbose: bool=False,
-                        id_field: bool=False,
-                        recipient_field: bool=False,
-                        reaction_field: bool=False) -> None:
+
+def re_map_foreign_keys(
+    data: TableData,
+    table: TableName,
+    field_name: Field,
+    related_table: TableName,
+    verbose: bool = False,
+    id_field: bool = False,
+    recipient_field: bool = False,
+    reaction_field: bool = False,
+) -> None:
     """
     This is a wrapper function for all the realm data tables
     and only avatar and attachment records need to be passed through the internal function
@@ -394,20 +423,31 @@ def re_map_foreign_keys(data: TableData,
     """
 
     # See comments in bulk_import_user_message_data.
-    assert('usermessage' not in related_table)
+    assert 'usermessage' not in related_table
 
-    re_map_foreign_keys_internal(data[table], table, field_name, related_table, verbose, id_field,
-                                 recipient_field, reaction_field)
+    re_map_foreign_keys_internal(
+        data[table],
+        table,
+        field_name,
+        related_table,
+        verbose,
+        id_field,
+        recipient_field,
+        reaction_field,
+    )
 
-def re_map_foreign_keys_internal(data_table: List[Record],
-                                 table: TableName,
-                                 field_name: Field,
-                                 related_table: TableName,
-                                 verbose: bool=False,
-                                 id_field: bool=False,
-                                 recipient_field: bool=False,
-                                 reaction_field: bool=False) -> None:
-    '''
+
+def re_map_foreign_keys_internal(
+    data_table: List[Record],
+    table: TableName,
+    field_name: Field,
+    related_table: TableName,
+    verbose: bool = False,
+    id_field: bool = False,
+    recipient_field: bool = False,
+    reaction_field: bool = False,
+) -> None:
+    """
     We occasionally need to assign new ids to rows during the
     import/export process, to accommodate things like existing rows
     already being in tables.  See bulk_import_client for more context.
@@ -415,7 +455,7 @@ def re_map_foreign_keys_internal(data_table: List[Record],
     The tricky part is making sure that foreign key references
     are in sync with the new ids, and this fixer function does
     the re-mapping.  (It also appends `_id` to the field.)
-    '''
+    """
     lookup_table = ID_MAP[related_table]
     for item in data_table:
         old_id = item[field_name]
@@ -441,8 +481,9 @@ def re_map_foreign_keys_internal(data_table: List[Record],
         if old_id in lookup_table:
             new_id = lookup_table[old_id]
             if verbose:
-                logging.info('Remapping %s %s from %s to %s',
-                             table, field_name + '_id', old_id, new_id)
+                logging.info(
+                    'Remapping %s %s from %s to %s', table, field_name + '_id', old_id, new_id
+                )
         else:
             new_id = old_id
         if not id_field:
@@ -454,11 +495,14 @@ def re_map_foreign_keys_internal(data_table: List[Record],
             else:
                 item[field_name] = new_id
 
-def re_map_foreign_keys_many_to_many(data: TableData,
-                                     table: TableName,
-                                     field_name: Field,
-                                     related_table: TableName,
-                                     verbose: bool=False) -> None:
+
+def re_map_foreign_keys_many_to_many(
+    data: TableData,
+    table: TableName,
+    field_name: Field,
+    related_table: TableName,
+    verbose: bool = False,
+) -> None:
     """
     We need to assign new ids to rows during the import/export
     process.
@@ -470,15 +514,19 @@ def re_map_foreign_keys_many_to_many(data: TableData,
     for item in data[table]:
         old_id_list = item[field_name]
         new_id_list = re_map_foreign_keys_many_to_many_internal(
-            table, field_name, related_table, old_id_list, verbose)
+            table, field_name, related_table, old_id_list, verbose
+        )
         item[field_name] = new_id_list
         del item[field_name]
 
-def re_map_foreign_keys_many_to_many_internal(table: TableName,
-                                              field_name: Field,
-                                              related_table: TableName,
-                                              old_id_list: List[int],
-                                              verbose: bool=False) -> List[int]:
+
+def re_map_foreign_keys_many_to_many_internal(
+    table: TableName,
+    field_name: Field,
+    related_table: TableName,
+    old_id_list: List[int],
+    verbose: bool = False,
+) -> List[int]:
     """
     This is an internal function for tables with ManyToMany fields,
     which takes the old ID list of the ManyToMany relation and returns the
@@ -490,26 +538,29 @@ def re_map_foreign_keys_many_to_many_internal(table: TableName,
         if old_id in lookup_table:
             new_id = lookup_table[old_id]
             if verbose:
-                logging.info('Remapping %s %s from %s to %s',
-                             table, field_name + '_id', old_id, new_id)
+                logging.info(
+                    'Remapping %s %s from %s to %s', table, field_name + '_id', old_id, new_id
+                )
         else:
             new_id = old_id
         new_id_list.append(new_id)
     return new_id_list
 
+
 def fix_bitfield_keys(data: TableData, table: TableName, field_name: Field) -> None:
     for item in data[table]:
         item[field_name] = item[field_name + '_mask']
         del item[field_name + '_mask']
 
+
 def fix_realm_authentication_bitfield(data: TableData, table: TableName, field_name: Field) -> None:
     """Used to fixup the authentication_methods bitfield to be a string"""
     for item in data[table]:
-        values_as_bitstring = ''.join('1' if field[1] else '0' for field in
-                                      item[field_name])
+        values_as_bitstring = ''.join('1' if field[1] else '0' for field in item[field_name])
         values_as_int = int(values_as_bitstring, 2)
         item[field_name] = values_as_int
 
+
 def remove_denormalized_recipient_column_from_data(data: TableData) -> None:
     """
     The recipient column shouldn't be imported, we'll set the correct values
@@ -527,17 +578,19 @@ def remove_denormalized_recipient_column_from_data(data: TableData) -> None:
         if 'recipient' in huddle_dict:
             del huddle_dict['recipient']
 
+
 def get_db_table(model_class: Any) -> str:
     """E.g. (RealmDomain -> 'zerver_realmdomain')"""
     return model_class._meta.db_table
 
+
 def update_model_ids(model: Any, data: TableData, related_table: TableName) -> None:
     table = get_db_table(model)
 
     # Important: remapping usermessage rows is
     # not only unnessary, it's expensive and can cause
     # memory errors. We don't even use ids from ID_MAP.
-    assert('usermessage' not in table)
+    assert 'usermessage' not in table
 
     old_id_list = current_table_ids(data, table)
     allocated_id_list = allocate_ids(model, len(data[table]))
@@ -545,6 +598,7 @@ def update_model_ids(model: Any, data: TableData, related_table: TableName) -> N
         update_id_map(related_table, old_id_list[item], allocated_id_list[item])
     re_map_foreign_keys(data, table, 'id', related_table=related_table, id_field=True)
 
+
 def bulk_import_user_message_data(data: TableData, dump_file_id: int) -> None:
     model = UserMessage
     table = 'zerver_usermessage'
@@ -559,8 +613,8 @@ def bulk_import_user_message_data(data: TableData, dump_file_id: int) -> None:
     def process_batch(items: List[Dict[str, Any]]) -> None:
         ums = [
             UserMessageLite(
-                user_profile_id = item['user_profile_id'],
-                message_id = item['message_id'],
+                user_profile_id=item['user_profile_id'],
+                message_id=item['message_id'],
                 flags=item['flags'],
             )
             for item in items
@@ -577,7 +631,8 @@ def bulk_import_user_message_data(data: TableData, dump_file_id: int) -> None:
 
     logging.info("Successfully imported %s from %s[%s].", model, table, dump_file_id)
 
-def bulk_import_model(data: TableData, model: Any, dump_file_id: Optional[str]=None) -> None:
+
+def bulk_import_model(data: TableData, model: Any, dump_file_id: Optional[str] = None) -> None:
     table = get_db_table(model)
     # TODO, deprecate dump_file_id
     model.objects.bulk_create(model(**item) for item in data[table])
@@ -586,6 +641,7 @@ def bulk_import_model(data: TableData, model: Any, dump_file_id: Optional[str]=N
     else:
         logging.info("Successfully imported %s from %s[%s].", model, table, dump_file_id)
 
+
 # Client is a table shared by multiple realms, so in order to
 # correctly import multiple realms into the same server, we need to
 # check if a Client object already exists, and so we need to support
@@ -598,14 +654,17 @@ def bulk_import_client(data: TableData, model: Any, table: TableName) -> None:
             client = Client.objects.create(name=item['name'])
         update_id_map(table='client', old_id=item['id'], new_id=client.id)
 
+
 def process_avatars(record: Dict[str, Any]) -> None:
     from zerver.lib.upload import upload_backend
+
     if record['s3_path'].endswith('.original'):
         user_profile = get_user_profile_by_id(record['user_profile_id'])
         if settings.LOCAL_UPLOADS_DIR is not None:
             avatar_path = user_avatar_path_from_ids(user_profile.id, record['realm_id'])
-            medium_file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars",
-                                            avatar_path) + '-medium.png'
+            medium_file_path = (
+                os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", avatar_path) + '-medium.png'
+            )
             if os.path.exists(medium_file_path):
                 # We remove the image here primarily to deal with
                 # issues when running the import script multiple
@@ -622,10 +681,19 @@ def process_avatars(record: Dict[str, Any]) -> None:
                 user_profile.id,
             )
             # Delete the record of the avatar to avoid 404s.
-            do_change_avatar_fields(user_profile, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=None)
+            do_change_avatar_fields(
+                user_profile, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=None
+            )
 
-def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_avatars: bool=False,
-                   processing_emojis: bool=False, processing_realm_icons: bool=False) -> None:
+
+def import_uploads(
+    realm: Realm,
+    import_dir: Path,
+    processes: int,
+    processing_avatars: bool = False,
+    processing_emojis: bool = False,
+    processing_realm_icons: bool = False,
+) -> None:
     if processing_avatars and processing_emojis:
         raise AssertionError("Cannot import avatars and emojis at the same time!")
     if processing_avatars:
@@ -642,11 +710,13 @@ def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_av
         records: List[Dict[str, Any]] = orjson.loads(records_file.read())
     timestamp = datetime_to_timestamp(timezone_now())
 
-    re_map_foreign_keys_internal(records, 'records', 'realm_id', related_table="realm",
-                                 id_field=True)
+    re_map_foreign_keys_internal(
+        records, 'records', 'realm_id', related_table="realm", id_field=True
+    )
     if not processing_emojis and not processing_realm_icons:
-        re_map_foreign_keys_internal(records, 'records', 'user_profile_id',
-                                     related_table="user_profile", id_field=True)
+        re_map_foreign_keys_internal(
+            records, 'records', 'user_profile_id', related_table="user_profile", id_field=True
+        )
 
     s3_uploads = settings.LOCAL_UPLOADS_DIR is None
 
@@ -679,8 +749,8 @@ def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_av
         elif processing_emojis:
             # For emojis we follow the function 'upload_emoji_image'
             relative_path = RealmEmoji.PATH_ID_TEMPLATE.format(
-                realm_id=record['realm_id'],
-                emoji_file_name=record['file_name'])
+                realm_id=record['realm_id'], emoji_file_name=record['file_name']
+            )
             record['last_modified'] = timestamp
         elif processing_realm_icons:
             icon_name = os.path.basename(record["path"])
@@ -689,11 +759,13 @@ def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_av
         else:
             # Should be kept in sync with its equivalent in zerver/lib/uploads in the
             # function 'upload_message_file'
-            relative_path = "/".join([
-                str(record['realm_id']),
-                secrets.token_urlsafe(18),
-                sanitize_name(os.path.basename(record['path'])),
-            ])
+            relative_path = "/".join(
+                [
+                    str(record['realm_id']),
+                    secrets.token_urlsafe(18),
+                    sanitize_name(os.path.basename(record['path'])),
+                ]
+            )
             path_maps['attachment_path'][record['s3_path']] = relative_path
 
         if s3_uploads:
@@ -731,10 +803,10 @@ def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_av
                     # directly anyway.
                     content_type = 'application/octet-stream'
 
-            key.upload_file(os.path.join(import_dir, record['path']),
-                            ExtraArgs={
-                                'ContentType': content_type,
-                                'Metadata': metadata})
+            key.upload_file(
+                os.path.join(import_dir, record['path']),
+                ExtraArgs={'ContentType': content_type, 'Metadata': metadata},
+            )
         else:
             if processing_avatars or processing_emojis or processing_realm_icons:
                 file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", relative_path)
@@ -760,6 +832,7 @@ def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_av
                 for out in p.imap_unordered(process_avatars, records):
                     pass
 
+
 # Importing data suffers from a difficult ordering problem because of
 # models that reference each other circularly.  Here is a correct order.
 #
@@ -778,7 +851,7 @@ def import_uploads(realm: Realm, import_dir: Path, processes: int, processing_av
 # Because the Python object => JSON conversion process is not fully
 # faithful, we have to use a set of fixers (e.g. on DateTime objects
 # and Foreign Keys) to do the import correctly.
-def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm:
+def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Realm:
     logging.info("Importing realm dump %s", import_dir)
     if not os.path.exists(import_dir):
         raise Exception("Missing import directory!")
@@ -863,12 +936,15 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
     update_model_ids(UserProfile, data, 'user_profile')
     re_map_foreign_keys(data, 'zerver_userprofile', 'realm', related_table="realm")
     re_map_foreign_keys(data, 'zerver_userprofile', 'bot_owner', related_table="user_profile")
-    re_map_foreign_keys(data, 'zerver_userprofile', 'default_sending_stream',
-                        related_table="stream")
-    re_map_foreign_keys(data, 'zerver_userprofile', 'default_events_register_stream',
-                        related_table="stream")
-    re_map_foreign_keys(data, 'zerver_userprofile', 'last_active_message_id',
-                        related_table="message", id_field=True)
+    re_map_foreign_keys(
+        data, 'zerver_userprofile', 'default_sending_stream', related_table="stream"
+    )
+    re_map_foreign_keys(
+        data, 'zerver_userprofile', 'default_events_register_stream', related_table="stream"
+    )
+    re_map_foreign_keys(
+        data, 'zerver_userprofile', 'last_active_message_id', related_table="message", id_field=True
+    )
     for user_profile_dict in data['zerver_userprofile']:
         user_profile_dict['password'] = None
         user_profile_dict['api_key'] = generate_api_key()
@@ -899,12 +975,30 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
         # tables below.
         # TODO: double-check this.
 
-    re_map_foreign_keys(data, 'zerver_recipient', 'type_id', related_table="stream",
-                        recipient_field=True, id_field=True)
-    re_map_foreign_keys(data, 'zerver_recipient', 'type_id', related_table="user_profile",
-                        recipient_field=True, id_field=True)
-    re_map_foreign_keys(data, 'zerver_recipient', 'type_id', related_table="huddle",
-                        recipient_field=True, id_field=True)
+    re_map_foreign_keys(
+        data,
+        'zerver_recipient',
+        'type_id',
+        related_table="stream",
+        recipient_field=True,
+        id_field=True,
+    )
+    re_map_foreign_keys(
+        data,
+        'zerver_recipient',
+        'type_id',
+        related_table="user_profile",
+        recipient_field=True,
+        id_field=True,
+    )
+    re_map_foreign_keys(
+        data,
+        'zerver_recipient',
+        'type_id',
+        related_table="huddle",
+        recipient_field=True,
+        id_field=True,
+    )
     update_model_ids(Recipient, data, 'recipient')
     bulk_import_model(data, Recipient)
     bulk_set_users_or_streams_recipient_fields(Stream, Stream.objects.filter(realm=realm))
@@ -919,12 +1013,13 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
     if 'zerver_realmauditlog' in data:
         fix_datetime_fields(data, 'zerver_realmauditlog')
         re_map_foreign_keys(data, 'zerver_realmauditlog', 'realm', related_table="realm")
-        re_map_foreign_keys(data, 'zerver_realmauditlog', 'modified_user',
-                            related_table='user_profile')
-        re_map_foreign_keys(data, 'zerver_realmauditlog', 'acting_user',
-                            related_table='user_profile')
-        re_map_foreign_keys(data, 'zerver_realmauditlog', 'modified_stream',
-                            related_table="stream")
+        re_map_foreign_keys(
+            data, 'zerver_realmauditlog', 'modified_user', related_table='user_profile'
+        )
+        re_map_foreign_keys(
+            data, 'zerver_realmauditlog', 'acting_user', related_table='user_profile'
+        )
+        re_map_foreign_keys(data, 'zerver_realmauditlog', 'modified_stream', related_table="stream")
         update_model_ids(RealmAuditLog, data, related_table="realmauditlog")
         bulk_import_model(data, RealmAuditLog)
     else:
@@ -971,25 +1066,32 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
 
     if 'zerver_usergroup' in data:
         re_map_foreign_keys(data, 'zerver_usergroup', 'realm', related_table='realm')
-        re_map_foreign_keys_many_to_many(data, 'zerver_usergroup',
-                                         'members', related_table='user_profile')
+        re_map_foreign_keys_many_to_many(
+            data, 'zerver_usergroup', 'members', related_table='user_profile'
+        )
         update_model_ids(UserGroup, data, 'usergroup')
         bulk_import_model(data, UserGroup)
 
-        re_map_foreign_keys(data, 'zerver_usergroupmembership',
-                            'user_group', related_table='usergroup')
-        re_map_foreign_keys(data, 'zerver_usergroupmembership',
-                            'user_profile', related_table='user_profile')
+        re_map_foreign_keys(
+            data, 'zerver_usergroupmembership', 'user_group', related_table='usergroup'
+        )
+        re_map_foreign_keys(
+            data, 'zerver_usergroupmembership', 'user_profile', related_table='user_profile'
+        )
         update_model_ids(UserGroupMembership, data, 'usergroupmembership')
         bulk_import_model(data, UserGroupMembership)
 
     if 'zerver_botstoragedata' in data:
-        re_map_foreign_keys(data, 'zerver_botstoragedata', 'bot_profile', related_table='user_profile')
+        re_map_foreign_keys(
+            data, 'zerver_botstoragedata', 'bot_profile', related_table='user_profile'
+        )
         update_model_ids(BotStorageData, data, 'botstoragedata')
         bulk_import_model(data, BotStorageData)
 
     if 'zerver_botconfigdata' in data:
-        re_map_foreign_keys(data, 'zerver_botconfigdata', 'bot_profile', related_table='user_profile')
+        re_map_foreign_keys(
+            data, 'zerver_botconfigdata', 'bot_profile', related_table='user_profile'
+        )
         update_model_ids(BotConfigData, data, 'botconfigdata')
         bulk_import_model(data, BotConfigData)
 
@@ -1007,7 +1109,9 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
     bulk_import_model(data, UserActivity)
 
     fix_datetime_fields(data, 'zerver_useractivityinterval')
-    re_map_foreign_keys(data, 'zerver_useractivityinterval', 'user_profile', related_table="user_profile")
+    re_map_foreign_keys(
+        data, 'zerver_useractivityinterval', 'user_profile', related_table="user_profile"
+    )
     update_model_ids(UserActivityInterval, data, 'useractivityinterval')
     bulk_import_model(data, UserActivityInterval)
 
@@ -1015,10 +1119,12 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
     update_model_ids(CustomProfileField, data, related_table="customprofilefield")
     bulk_import_model(data, CustomProfileField)
 
-    re_map_foreign_keys(data, 'zerver_customprofilefieldvalue', 'user_profile',
-                        related_table="user_profile")
-    re_map_foreign_keys(data, 'zerver_customprofilefieldvalue', 'field',
-                        related_table="customprofilefield")
+    re_map_foreign_keys(
+        data, 'zerver_customprofilefieldvalue', 'user_profile', related_table="user_profile"
+    )
+    re_map_foreign_keys(
+        data, 'zerver_customprofilefieldvalue', 'field', related_table="customprofilefield"
+    )
     fix_customprofilefield(data)
     update_model_ids(CustomProfileFieldValue, data, related_table="customprofilefieldvalue")
     bulk_import_model(data, CustomProfileFieldValue)
@@ -1034,21 +1140,25 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
         import_uploads(realm, os.path.join(import_dir, "emoji"), processes, processing_emojis=True)
 
     if os.path.exists(os.path.join(import_dir, "realm_icons")):
-        import_uploads(realm, os.path.join(import_dir, "realm_icons"), processes,
-                       processing_realm_icons=True)
+        import_uploads(
+            realm, os.path.join(import_dir, "realm_icons"), processes, processing_realm_icons=True
+        )
 
-    sender_map = {
-        user['id']: user
-        for user in data['zerver_userprofile']
-    }
+    sender_map = {user['id']: user for user in data['zerver_userprofile']}
 
     # Import zerver_message and zerver_usermessage
     import_message_data(realm=realm, sender_map=sender_map, import_dir=import_dir)
 
     re_map_foreign_keys(data, 'zerver_reaction', 'message', related_table="message")
     re_map_foreign_keys(data, 'zerver_reaction', 'user_profile', related_table="user_profile")
-    re_map_foreign_keys(data, 'zerver_reaction', 'emoji_code', related_table="realmemoji", id_field=True,
-                        reaction_field=True)
+    re_map_foreign_keys(
+        data,
+        'zerver_reaction',
+        'emoji_code',
+        related_table="realmemoji",
+        id_field=True,
+        reaction_field=True,
+    )
     update_model_ids(Reaction, data, 'reaction')
     bulk_import_model(data, Reaction)
 
@@ -1083,25 +1193,30 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
         do_change_plan_type(realm, Realm.SELF_HOSTED)
     return realm
 
+
 # create_users and do_import_system_bots differ from their equivalent
 # in zerver/lib/server_initialization.py because here we check if the
 # bots don't already exist and only then create a user for these bots.
 def do_import_system_bots(realm: Any) -> None:
-    internal_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
-                     for bot in settings.INTERNAL_BOTS]
+    internal_bots = [
+        (bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
+        for bot in settings.INTERNAL_BOTS
+    ]
     create_users(realm, internal_bots, bot_type=UserProfile.DEFAULT_BOT)
     print("Finished importing system bots.")
 
-def create_users(realm: Realm, name_list: Iterable[Tuple[str, str]],
-                 bot_type: Optional[int]=None) -> None:
+
+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:
         if not UserProfile.objects.filter(email=email):
             user_set.add((email, full_name, True))
     bulk_create_users(realm, user_set, bot_type)
 
-def update_message_foreign_keys(import_dir: Path,
-                                sort_by_date: bool) -> None:
+
+def update_message_foreign_keys(import_dir: Path, sort_by_date: bool) -> None:
     old_id_list = get_incoming_message_ids(
         import_dir=import_dir,
         sort_by_date=sort_by_date,
@@ -1121,9 +1236,9 @@ def update_message_foreign_keys(import_dir: Path,
     # We don't touch user_message keys here; that happens later when
     # we're actually read the files a second time to get actual data.
 
-def get_incoming_message_ids(import_dir: Path,
-                             sort_by_date: bool) -> List[int]:
-    '''
+
+def get_incoming_message_ids(import_dir: Path, sort_by_date: bool) -> List[int]:
+    """
     This function reads in our entire collection of message
     ids, which can be millions of integers for some installations.
     And then we sort the list.  This is necessary to ensure
@@ -1132,7 +1247,7 @@ def get_incoming_message_ids(import_dir: Path,
     utilities that convert third party chat data.  We also
     need to move our ids to a new range if we're dealing
     with a server that has data for other realms.
-    '''
+    """
 
     if sort_by_date:
         tups: List[Tuple[int, int]] = []
@@ -1179,9 +1294,8 @@ def get_incoming_message_ids(import_dir: Path,
 
     return message_ids
 
-def import_message_data(realm: Realm,
-                        sender_map: Dict[int, Record],
-                        import_dir: Path) -> None:
+
+def import_message_data(realm: Realm, sender_map: Dict[int, Record], import_dir: Path) -> None:
     dump_file_id = 1
     while True:
         message_filename = os.path.join(import_dir, f"messages-{dump_file_id:06}.json")
@@ -1207,7 +1321,7 @@ def import_message_data(realm: Realm,
             row['id'] = message_id_map[row['id']]
 
         for row in data['zerver_usermessage']:
-            assert(row['message'] in message_id_map)
+            assert row['message'] in message_id_map
 
         fix_message_rendered_content(
             realm=realm,
@@ -1224,12 +1338,15 @@ def import_message_data(realm: Realm,
         # guaranteed to have already imported all the Message objects
         # for this batch of UserMessage objects.
         re_map_foreign_keys(data, 'zerver_usermessage', 'message', related_table="message")
-        re_map_foreign_keys(data, 'zerver_usermessage', 'user_profile', related_table="user_profile")
+        re_map_foreign_keys(
+            data, 'zerver_usermessage', 'user_profile', related_table="user_profile"
+        )
         fix_bitfield_keys(data, 'zerver_usermessage', 'flags')
 
         bulk_import_user_message_data(data, dump_file_id)
         dump_file_id += 1
 
+
 def import_attachments(data: TableData) -> None:
 
     # Clean up the data in zerver_attachment that is not
@@ -1289,9 +1406,11 @@ def import_attachments(data: TableData) -> None:
     # TODO: Do this the kosher Django way.  We may find a
     # better way to do this in Django 1.9 particularly.
     with connection.cursor() as cursor:
-        sql_template = SQL('''
+        sql_template = SQL(
+            '''
             INSERT INTO {m2m_table_name} ({parent_id}, {child_id}) VALUES %s
-        ''').format(
+        '''
+        ).format(
             m2m_table_name=Identifier(m2m_table_name),
             parent_id=Identifier(parent_id),
             child_id=Identifier(child_id),
@@ -1301,6 +1420,7 @@ def import_attachments(data: TableData) -> None:
 
     logging.info('Successfully imported M2M table %s', m2m_table_name)
 
+
 def import_analytics_data(realm: Realm, import_dir: Path) -> None:
     analytics_filename = os.path.join(import_dir, "analytics.json")
     if not os.path.exists(analytics_filename):
diff --git a/zerver/lib/initial_password.py b/zerver/lib/initial_password.py
index e53a088ef1..0da895a264 100644
--- a/zerver/lib/initial_password.py
+++ b/zerver/lib/initial_password.py
@@ -7,7 +7,7 @@ from django.conf import settings
 
 def initial_password(email: str) -> Optional[str]:
     """Given an email address, returns the initial password for that account, as
-       created by populate_db."""
+    created by populate_db."""
 
     if settings.INITIAL_PASSWORD_SALT is not None:
         encoded_key = (settings.INITIAL_PASSWORD_SALT + email).encode("utf-8")
diff --git a/zerver/lib/integrations.py b/zerver/lib/integrations.py
index d057802e9f..5543070d2f 100644
--- a/zerver/lib/integrations.py
+++ b/zerver/lib/integrations.py
@@ -48,16 +48,25 @@ CATEGORIES: Dict[str, Promise] = {
     'bots': ugettext_lazy('Interactive bots'),
 }
 
+
 class Integration:
     DEFAULT_LOGO_STATIC_PATH_PNG = 'images/integrations/logos/{name}.png'
     DEFAULT_LOGO_STATIC_PATH_SVG = 'images/integrations/logos/{name}.svg'
     DEFAULT_BOT_AVATAR_PATH = 'images/integrations/bot_avatars/{name}.png'
 
-    def __init__(self, name: str, client_name: str, categories: List[str],
-                 logo: Optional[str]=None, secondary_line_text: Optional[str]=None,
-                 display_name: Optional[str]=None, doc: Optional[str]=None,
-                 stream_name: Optional[str]=None, legacy: bool=False,
-                 config_options: Sequence[Tuple[str, str, Validator[object]]]=[]) -> None:
+    def __init__(
+        self,
+        name: str,
+        client_name: str,
+        categories: List[str],
+        logo: Optional[str] = None,
+        secondary_line_text: Optional[str] = None,
+        display_name: Optional[str] = None,
+        doc: Optional[str] = None,
+        stream_name: Optional[str] = None,
+        legacy: bool = False,
+        config_options: Sequence[Tuple[str, str, Validator[object]]] = [],
+    ) -> None:
         self.name = name
         self.client_name = client_name
         self.secondary_line_text = secondary_line_text
@@ -72,8 +81,11 @@ class Integration:
         for category in categories:
             if category not in CATEGORIES:
                 raise KeyError(  # nocoverage
-                    'INTEGRATIONS: ' + name + ' - category \'' +
-                    category + '\' is not a key in CATEGORIES.',
+                    'INTEGRATIONS: '
+                    + name
+                    + ' - category \''
+                    + category
+                    + '\' is not a key in CATEGORIES.',
                 )
         self.categories = list(map((lambda c: CATEGORIES[c]), categories))
 
@@ -114,15 +126,22 @@ class Integration:
 
         return None
 
+
 class BotIntegration(Integration):
     DEFAULT_LOGO_STATIC_PATH_PNG = 'generated/bots/{name}/logo.png'
     DEFAULT_LOGO_STATIC_PATH_SVG = 'generated/bots/{name}/logo.svg'
     ZULIP_LOGO_STATIC_PATH_PNG = 'images/logo/zulip-icon-128x128.png'
     DEFAULT_DOC_PATH = '{name}/doc.md'
 
-    def __init__(self, name: str, categories: List[str], logo: Optional[str]=None,
-                 secondary_line_text: Optional[str]=None, display_name: Optional[str]=None,
-                 doc: Optional[str]=None) -> None:
+    def __init__(
+        self,
+        name: str,
+        categories: List[str],
+        logo: Optional[str] = None,
+        secondary_line_text: Optional[str] = None,
+        display_name: Optional[str] = None,
+        doc: Optional[str] = None,
+    ) -> None:
         super().__init__(
             name,
             client_name=name,
@@ -148,18 +167,28 @@ class BotIntegration(Integration):
             doc = self.DEFAULT_DOC_PATH.format(name=name)
         self.doc = doc
 
+
 class WebhookIntegration(Integration):
     DEFAULT_FUNCTION_PATH = 'zerver.webhooks.{name}.view.api_{name}_webhook'
     DEFAULT_URL = 'api/v1/external/{name}'
     DEFAULT_CLIENT_NAME = 'Zulip{name}Webhook'
     DEFAULT_DOC_PATH = '{name}/doc.{ext}'
 
-    def __init__(self, name: str, categories: List[str], client_name: Optional[str]=None,
-                 logo: Optional[str]=None, secondary_line_text: Optional[str]=None,
-                 function: Optional[str]=None, url: Optional[str]=None,
-                 display_name: Optional[str]=None, doc: Optional[str]=None,
-                 stream_name: Optional[str]=None, legacy: bool=False,
-                 config_options: Sequence[Tuple[str, str, Validator[object]]]=[]) -> None:
+    def __init__(
+        self,
+        name: str,
+        categories: List[str],
+        client_name: Optional[str] = None,
+        logo: Optional[str] = None,
+        secondary_line_text: Optional[str] = None,
+        function: Optional[str] = None,
+        url: Optional[str] = None,
+        display_name: Optional[str] = None,
+        doc: Optional[str] = None,
+        stream_name: Optional[str] = None,
+        legacy: bool = False,
+        config_options: Sequence[Tuple[str, str, Validator[object]]] = [],
+    ) -> None:
         if client_name is None:
             client_name = self.DEFAULT_CLIENT_NAME.format(name=name.title())
         super().__init__(
@@ -195,12 +224,14 @@ class WebhookIntegration(Integration):
     def url_object(self) -> RegexPattern:
         return url(self.url, self.function)
 
+
 def split_fixture_path(path: str) -> Tuple[str, str]:
     path, fixture_name = os.path.split(path)
     fixture_name, _ = os.path.splitext(fixture_name)
     integration_name = os.path.split(os.path.dirname(path))[-1]
     return integration_name, fixture_name
 
+
 @dataclass
 class ScreenshotConfig:
     fixture_name: str
@@ -213,8 +244,10 @@ class ScreenshotConfig:
     use_basic_auth: bool = False
     custom_headers: Dict[str, str] = field(default_factory=dict)
 
-def get_fixture_and_image_paths(integration: WebhookIntegration,
-                                screenshot_config: ScreenshotConfig) -> Tuple[str, str]:
+
+def get_fixture_and_image_paths(
+    integration: WebhookIntegration, screenshot_config: ScreenshotConfig
+) -> Tuple[str, str]:
     fixture_dir = os.path.join('zerver', 'webhooks', integration.name, 'fixtures')
     fixture_path = os.path.join(fixture_dir, screenshot_config.fixture_name)
     image_dir = screenshot_config.image_dir or integration.name
@@ -222,13 +255,20 @@ def get_fixture_and_image_paths(integration: WebhookIntegration,
     image_path = os.path.join('static/images/integrations', image_dir, image_name)
     return fixture_path, image_path
 
+
 class HubotIntegration(Integration):
     GIT_URL_TEMPLATE = "https://github.com/hubot-scripts/hubot-{}"
 
-    def __init__(self, name: str, categories: List[str],
-                 display_name: Optional[str]=None, logo: Optional[str]=None,
-                 logo_alt: Optional[str]=None, git_url: Optional[str]=None,
-                 legacy: bool=False) -> None:
+    def __init__(
+        self,
+        name: str,
+        categories: List[str],
+        display_name: Optional[str] = None,
+        logo: Optional[str] = None,
+        logo_alt: Optional[str] = None,
+        git_url: Optional[str] = None,
+        legacy: bool = False,
+    ) -> None:
         if logo_alt is None:
             logo_alt = f"{name.title()} logo"
         self.logo_alt = logo_alt
@@ -238,24 +278,29 @@ class HubotIntegration(Integration):
         self.hubot_docs_url = git_url
 
         super().__init__(
-            name, name, categories,
-            logo=logo, display_name=display_name,
-            doc = 'zerver/integrations/hubot_common.md',
+            name,
+            name,
+            categories,
+            logo=logo,
+            display_name=display_name,
+            doc='zerver/integrations/hubot_common.md',
             legacy=legacy,
         )
 
+
 class EmbeddedBotIntegration(Integration):
-    '''
+    """
     This class acts as a registry for bots verified as safe
     and valid such that these are capable of being deployed on the server.
-    '''
+    """
+
     DEFAULT_CLIENT_NAME = 'Zulip{name}EmbeddedBot'
 
     def __init__(self, name: str, *args: Any, **kwargs: Any) -> None:
         assert kwargs.get("client_name") is None
         client_name = self.DEFAULT_CLIENT_NAME.format(name=name.title())
-        super().__init__(
-            name, client_name, *args, **kwargs)
+        super().__init__(name, client_name, *args, **kwargs)
+
 
 EMBEDDED_BOTS: List[EmbeddedBotIntegration] = [
     EmbeddedBotIntegration('converter', []),
@@ -400,12 +445,13 @@ WEBHOOK_INTEGRATIONS: List[WebhookIntegration] = [
     WebhookIntegration('zapier', ['meta-integration']),
     WebhookIntegration('zendesk', ['customer-support']),
     WebhookIntegration('zabbix', ['monitoring'], display_name='Zabbix'),
-    WebhookIntegration('gci', ['misc'], display_name='Google Code-in',
-                       stream_name='gci'),
+    WebhookIntegration('gci', ['misc'], display_name='Google Code-in', stream_name='gci'),
 ]
 
 INTEGRATIONS: Dict[str, Integration] = {
-    'asana': Integration('asana', 'asana', ['project-management'], doc='zerver/integrations/asana.md'),
+    'asana': Integration(
+        'asana', 'asana', ['project-management'], doc='zerver/integrations/asana.md'
+    ),
     'capistrano': Integration(
         'capistrano',
         'capistrano',
@@ -413,16 +459,19 @@ INTEGRATIONS: Dict[str, Integration] = {
         display_name='Capistrano',
         doc='zerver/integrations/capistrano.md',
     ),
-    'codebase': Integration('codebase', 'codebase', ['version-control'],
-                            doc='zerver/integrations/codebase.md'),
-    'discourse': Integration('discourse', 'discourse', ['communication'],
-                             doc='zerver/integrations/discourse.md'),
-    'email': Integration('email', 'email', ['communication'],
-                         doc='zerver/integrations/email.md'),
-    'errbot': Integration('errbot', 'errbot', ['meta-integration', 'bots'],
-                          doc='zerver/integrations/errbot.md'),
-    'git': Integration('git', 'git', ['version-control'],
-                       stream_name='commits', doc='zerver/integrations/git.md'),
+    'codebase': Integration(
+        'codebase', 'codebase', ['version-control'], doc='zerver/integrations/codebase.md'
+    ),
+    'discourse': Integration(
+        'discourse', 'discourse', ['communication'], doc='zerver/integrations/discourse.md'
+    ),
+    'email': Integration('email', 'email', ['communication'], doc='zerver/integrations/email.md'),
+    'errbot': Integration(
+        'errbot', 'errbot', ['meta-integration', 'bots'], doc='zerver/integrations/errbot.md'
+    ),
+    'git': Integration(
+        'git', 'git', ['version-control'], stream_name='commits', doc='zerver/integrations/git.md'
+    ),
     'google-calendar': Integration(
         'google-calendar',
         'google-calendar',
@@ -430,9 +479,12 @@ INTEGRATIONS: Dict[str, Integration] = {
         display_name='Google Calendar',
         doc='zerver/integrations/google-calendar.md',
     ),
-    'hubot': Integration('hubot', 'hubot', ['meta-integration', 'bots'], doc='zerver/integrations/hubot.md'),
-    'irc': Integration('irc', 'irc', ['communication'], display_name='IRC',
-                       doc='zerver/integrations/irc.md'),
+    'hubot': Integration(
+        'hubot', 'hubot', ['meta-integration', 'bots'], doc='zerver/integrations/hubot.md'
+    ),
+    'irc': Integration(
+        'irc', 'irc', ['communication'], display_name='IRC', doc='zerver/integrations/irc.md'
+    ),
     'jenkins': Integration(
         'jenkins',
         'jenkins',
@@ -451,8 +503,9 @@ INTEGRATIONS: Dict[str, Integration] = {
         stream_name='jira',
         legacy=True,
     ),
-    'matrix': Integration('matrix', 'matrix', ['communication'],
-                          doc='zerver/integrations/matrix.md'),
+    'matrix': Integration(
+        'matrix', 'matrix', ['communication'], doc='zerver/integrations/matrix.md'
+    ),
     'mercurial': Integration(
         'mercurial',
         'mercurial',
@@ -470,15 +523,19 @@ INTEGRATIONS: Dict[str, Integration] = {
         doc='zerver/integrations/openshift.md',
         stream_name='deployments',
     ),
-    'perforce': Integration('perforce', 'perforce', ['version-control'],
-                            doc='zerver/integrations/perforce.md'),
-    'phabricator': Integration('phabricator', 'phabricator', ['version-control'],
-                               doc='zerver/integrations/phabricator.md'),
+    'perforce': Integration(
+        'perforce', 'perforce', ['version-control'], doc='zerver/integrations/perforce.md'
+    ),
+    'phabricator': Integration(
+        'phabricator', 'phabricator', ['version-control'], doc='zerver/integrations/phabricator.md'
+    ),
     'puppet': Integration('puppet', 'puppet', ['deployment'], doc='zerver/integrations/puppet.md'),
-    'redmine': Integration('redmine', 'redmine', ['project-management'],
-                           doc='zerver/integrations/redmine.md'),
-    'rss': Integration('rss', 'rss', ['communication'],
-                       display_name='RSS', doc='zerver/integrations/rss.md'),
+    'redmine': Integration(
+        'redmine', 'redmine', ['project-management'], doc='zerver/integrations/redmine.md'
+    ),
+    'rss': Integration(
+        'rss', 'rss', ['communication'], display_name='RSS', doc='zerver/integrations/rss.md'
+    ),
     'svn': Integration('svn', 'svn', ['version-control'], doc='zerver/integrations/svn.md'),
     'trac': Integration('trac', 'trac', ['project-management'], doc='zerver/integrations/trac.md'),
     'trello-plugin': Integration(
@@ -492,36 +549,54 @@ INTEGRATIONS: Dict[str, Integration] = {
         stream_name='trello',
         legacy=True,
     ),
-    'twitter': Integration('twitter', 'twitter', ['customer-support', 'marketing'],
-                           # _ needed to get around adblock plus
-                           logo='images/integrations/logos/twitte_r.svg',
-                           doc='zerver/integrations/twitter.md'),
+    'twitter': Integration(
+        'twitter',
+        'twitter',
+        ['customer-support', 'marketing'],
+        # _ needed to get around adblock plus
+        logo='images/integrations/logos/twitte_r.svg',
+        doc='zerver/integrations/twitter.md',
+    ),
 }
 
 BOT_INTEGRATIONS: List[BotIntegration] = [
-    BotIntegration('github_detail', ['version-control', 'bots'],
-                   display_name='GitHub Detail'),
-    BotIntegration('xkcd', ['bots', 'misc'], display_name='xkcd',
-                   logo='images/integrations/logos/xkcd.png'),
+    BotIntegration('github_detail', ['version-control', 'bots'], display_name='GitHub Detail'),
+    BotIntegration(
+        'xkcd', ['bots', 'misc'], display_name='xkcd', logo='images/integrations/logos/xkcd.png'
+    ),
 ]
 
 HUBOT_INTEGRATIONS: List[HubotIntegration] = [
-    HubotIntegration('assembla', ['version-control', 'project-management'],
-                     display_name='Assembla', logo_alt='Assembla'),
+    HubotIntegration(
+        'assembla',
+        ['version-control', 'project-management'],
+        display_name='Assembla',
+        logo_alt='Assembla',
+    ),
     HubotIntegration('bonusly', ['hr']),
     HubotIntegration('chartbeat', ['marketing'], display_name='Chartbeat'),
-    HubotIntegration('darksky', ['misc'], display_name='Dark Sky',
-                     logo_alt='Dark Sky logo'),
-    HubotIntegration('instagram', ['misc'], display_name='Instagram',
-                     # _ needed to get around adblock plus
-                     logo='images/integrations/logos/instagra_m.svg'),
-    HubotIntegration('mailchimp', ['communication', 'marketing'],
-                     display_name='MailChimp'),
-    HubotIntegration('google-translate', ['misc'],
-                     display_name="Google Translate", logo_alt='Google Translate logo'),
-    HubotIntegration('youtube', ['misc'], display_name='YouTube',
-                     # _ needed to get around adblock plus
-                     logo='images/integrations/logos/youtub_e.svg'),
+    HubotIntegration('darksky', ['misc'], display_name='Dark Sky', logo_alt='Dark Sky logo'),
+    HubotIntegration(
+        'instagram',
+        ['misc'],
+        display_name='Instagram',
+        # _ needed to get around adblock plus
+        logo='images/integrations/logos/instagra_m.svg',
+    ),
+    HubotIntegration('mailchimp', ['communication', 'marketing'], display_name='MailChimp'),
+    HubotIntegration(
+        'google-translate',
+        ['misc'],
+        display_name="Google Translate",
+        logo_alt='Google Translate logo',
+    ),
+    HubotIntegration(
+        'youtube',
+        ['misc'],
+        display_name='YouTube',
+        # _ needed to get around adblock plus
+        logo='images/integrations/logos/youtub_e.svg',
+    ),
 ]
 
 for hubot_integration in HUBOT_INTEGRATIONS:
@@ -536,34 +611,47 @@ for bot_integration in BOT_INTEGRATIONS:
 # Add integrations that don't have automated screenshots here
 NO_SCREENSHOT_WEBHOOKS = {
     'beeminder',  # FIXME: fixture's goal.losedate needs to be modified dynamically
-    'ifttt',   # Docs don't have a screenshot
-    'slack_incoming',   # Docs don't have a screenshot
-    'zapier',   # Docs don't have a screenshot
+    'ifttt',  # Docs don't have a screenshot
+    'slack_incoming',  # Docs don't have a screenshot
+    'zapier',  # Docs don't have a screenshot
 }
 
 
 DOC_SCREENSHOT_CONFIG: Dict[str, List[ScreenshotConfig]] = {
     'airbrake': [ScreenshotConfig('error_message.json')],
-    'alertmanager': [ScreenshotConfig('alert.json', extra_params={'name': 'topic', 'desc': 'description'})],
+    'alertmanager': [
+        ScreenshotConfig('alert.json', extra_params={'name': 'topic', 'desc': 'description'})
+    ],
     'ansibletower': [ScreenshotConfig('job_successful_multiple_hosts.json')],
     'appfollow': [ScreenshotConfig('review.json')],
     'appveyor': [ScreenshotConfig('appveyor_build_success.json')],
     'basecamp': [ScreenshotConfig('doc_active.json')],
-    'beanstalk': [ScreenshotConfig('git_multiple.json', use_basic_auth=True, payload_as_query_param=True)],
+    'beanstalk': [
+        ScreenshotConfig('git_multiple.json', use_basic_auth=True, payload_as_query_param=True)
+    ],
     # 'beeminder': [ScreenshotConfig('derail_worried.json')],
     'bitbucket': [
-        ScreenshotConfig('push.json', '002.png', use_basic_auth=True,
-                         payload_as_query_param=True)],
+        ScreenshotConfig('push.json', '002.png', use_basic_auth=True, payload_as_query_param=True)
+    ],
     'bitbucket2': [
-        ScreenshotConfig('issue_created.json', '003.png', 'bitbucket',
-                         bot_name='Bitbucket Bot')],
+        ScreenshotConfig('issue_created.json', '003.png', 'bitbucket', bot_name='Bitbucket Bot')
+    ],
     'bitbucket3': [
-        ScreenshotConfig('repo_push_update_single_branch.json', '004.png', 'bitbucket',
-                         bot_name='Bitbucket Server Bot')],
+        ScreenshotConfig(
+            'repo_push_update_single_branch.json',
+            '004.png',
+            'bitbucket',
+            bot_name='Bitbucket Server Bot',
+        )
+    ],
     'buildbot': [ScreenshotConfig('started.json')],
     'canarytoken': [ScreenshotConfig('canarytoken_real.json')],
-    'circleci': [ScreenshotConfig('github_bionic_production_build_success_multiple_parties.json', image_name='001.png'),
-                 ScreenshotConfig('bitbucket_private_repo_pull_request_failure.json', image_name='002.png')],
+    'circleci': [
+        ScreenshotConfig(
+            'github_bionic_production_build_success_multiple_parties.json', image_name='001.png'
+        ),
+        ScreenshotConfig('bitbucket_private_repo_pull_request_failure.json', image_name='002.png'),
+    ],
     'clubhouse': [ScreenshotConfig('story_create.json')],
     'codeship': [ScreenshotConfig('error_build.json')],
     'crashlytics': [ScreenshotConfig('issue_message.json')],
@@ -573,7 +661,9 @@ DOC_SCREENSHOT_CONFIG: Dict[str, List[ScreenshotConfig]] = {
     'dropbox': [ScreenshotConfig('file_updated.json')],
     'errbit': [ScreenshotConfig('error_message.json')],
     'flock': [ScreenshotConfig('messages.json')],
-    'freshdesk': [ScreenshotConfig('ticket_created.json', image_name='004.png', use_basic_auth=True)],
+    'freshdesk': [
+        ScreenshotConfig('ticket_created.json', image_name='004.png', use_basic_auth=True)
+    ],
     'front': [ScreenshotConfig('inbound_message.json')],
     'gci': [ScreenshotConfig('task_abandoned_by_student.json')],
     'gitea': [ScreenshotConfig('pull_request__merged.json')],
@@ -586,8 +676,13 @@ DOC_SCREENSHOT_CONFIG: Dict[str, List[ScreenshotConfig]] = {
     'greenhouse': [ScreenshotConfig('candidate_stage_change.json', image_name='000.png')],
     'groove': [ScreenshotConfig('ticket_started.json')],
     'harbor': [ScreenshotConfig('scanning_completed.json')],
-    'hellosign': [ScreenshotConfig('signatures_signed_by_one_signatory.json',
-                                   payload_as_query_param=True, payload_param_name='json')],
+    'hellosign': [
+        ScreenshotConfig(
+            'signatures_signed_by_one_signatory.json',
+            payload_as_query_param=True,
+            payload_param_name='json',
+        )
+    ],
     'helloworld': [ScreenshotConfig('hello.json')],
     'heroku': [ScreenshotConfig('deploy.txt')],
     'homeassistant': [ScreenshotConfig('reqwithtitle.json', image_name='003.png')],
@@ -607,8 +702,10 @@ DOC_SCREENSHOT_CONFIG: Dict[str, List[ScreenshotConfig]] = {
     'raygun': [ScreenshotConfig('new_error.json')],
     'reviewboard': [ScreenshotConfig('review_request_published.json')],
     'semaphore': [ScreenshotConfig('pull_request.json')],
-    'sentry': [ScreenshotConfig('event_for_exception_python.json'),
-               ScreenshotConfig('issue_assigned_to_team.json', '002.png')],
+    'sentry': [
+        ScreenshotConfig('event_for_exception_python.json'),
+        ScreenshotConfig('issue_assigned_to_team.json', '002.png'),
+    ],
     'slack': [ScreenshotConfig('message_info.txt')],
     'solano': [ScreenshotConfig('build_001.json')],
     'splunk': [ScreenshotConfig('search_one_result.json')],
@@ -617,19 +714,40 @@ DOC_SCREENSHOT_CONFIG: Dict[str, List[ScreenshotConfig]] = {
     'taiga': [ScreenshotConfig('userstory_changed_status.json')],
     'teamcity': [ScreenshotConfig('success.json'), ScreenshotConfig('personal.json', '002.png')],
     'thinkst': [ScreenshotConfig('canary_consolidated_port_scan.json')],
-    'transifex': [ScreenshotConfig('', extra_params={'project': 'Zulip Mobile',
-                                                     'language': 'en',
-                                                     'resource': 'file',
-                                                     'reviewed': '100'})],
+    'transifex': [
+        ScreenshotConfig(
+            '',
+            extra_params={
+                'project': 'Zulip Mobile',
+                'language': 'en',
+                'resource': 'file',
+                'reviewed': '100',
+            },
+        )
+    ],
     'travis': [ScreenshotConfig('build.json', payload_as_query_param=True)],
     'trello': [ScreenshotConfig('adding_comment_to_card.json')],
     'updown': [ScreenshotConfig('check_multiple_events.json')],
     'wordpress': [ScreenshotConfig('publish_post.txt', 'wordpress_post_created.png')],
-    'yo': [ScreenshotConfig('', '002.png', 'yo-app', extra_params={'email': 'iago@zulip.com',
-                                                                   'username': 'Cordelia'})],
+    'yo': [
+        ScreenshotConfig(
+            '',
+            '002.png',
+            'yo-app',
+            extra_params={'email': 'iago@zulip.com', 'username': 'Cordelia'},
+        )
+    ],
     'zabbix': [ScreenshotConfig('zabbix_alert.json')],
-    'zendesk': [ScreenshotConfig('', '007.png', use_basic_auth=True,
-                                 extra_params={'ticket_title': 'Test ticket',
-                                               'ticket_id': '4',
-                                               'message': 'Test Message'})],
+    'zendesk': [
+        ScreenshotConfig(
+            '',
+            '007.png',
+            use_basic_auth=True,
+            extra_params={
+                'ticket_title': 'Test ticket',
+                'ticket_id': '4',
+                'message': 'Test Message',
+            },
+        )
+    ],
 }
diff --git a/zerver/lib/logging_util.py b/zerver/lib/logging_util.py
index 7c0bd1aaf2..dafbc5c3eb 100644
--- a/zerver/lib/logging_util.py
+++ b/zerver/lib/logging_util.py
@@ -28,6 +28,7 @@ class _RateLimitFilter:
     Adapted from https://djangosnippets.org/snippets/2242/.
 
     """
+
     last_error = datetime.min.replace(tzinfo=timezone.utc)
     # This thread-local variable is used to detect recursive
     # exceptions during exception handling (primarily intended for
@@ -71,8 +72,7 @@ class _RateLimitFilter:
         try:
             # Track duplicate errors
             duplicate = False
-            rate = getattr(settings, f'{self.__class__.__name__.upper()}_LIMIT',
-                           600)  # seconds
+            rate = getattr(settings, f'{self.__class__.__name__.upper()}_LIMIT', 600)  # seconds
 
             if rate > 0:
                 (use_cache, should_reset_handling_exception) = self.can_use_remote_cache()
@@ -87,7 +87,7 @@ class _RateLimitFilter:
                         cache.set(key, 1, rate)
                 else:
                     min_date = timezone_now() - timedelta(seconds=rate)
-                    duplicate = (self.last_error >= min_date)
+                    duplicate = self.last_error >= min_date
                     if not duplicate:
                         self.last_error = timezone_now()
 
@@ -96,25 +96,32 @@ class _RateLimitFilter:
             if should_reset_handling_exception:
                 self.handling_exception.value = False
 
+
 class ZulipLimiter(_RateLimitFilter):
     pass
 
+
 class EmailLimiter(_RateLimitFilter):
     pass
 
+
 class ReturnTrue(logging.Filter):
     def filter(self, record: logging.LogRecord) -> bool:
         return True
 
+
 class ReturnEnabled(logging.Filter):
     def filter(self, record: logging.LogRecord) -> bool:
         return settings.LOGGING_ENABLED
 
+
 class RequireReallyDeployed(logging.Filter):
     def filter(self, record: logging.LogRecord) -> bool:
         from django.conf import settings
+
         return settings.PRODUCTION
 
+
 def skip_200_and_304(record: logging.LogRecord) -> bool:
     # Apparently, `status_code` is added by Django and is not an actual
     # attribute of LogRecord; as a result, mypy throws an error if we
@@ -124,6 +131,7 @@ def skip_200_and_304(record: logging.LogRecord) -> bool:
 
     return True
 
+
 def skip_site_packages_logs(record: logging.LogRecord) -> bool:
     # This skips the log records that are generated from libraries
     # installed in site packages.
@@ -132,12 +140,13 @@ def skip_site_packages_logs(record: logging.LogRecord) -> bool:
         return False
     return True
 
+
 def find_log_caller_module(record: logging.LogRecord) -> Optional[str]:
-    '''Find the module name corresponding to where this record was logged.
+    """Find the module name corresponding to where this record was logged.
 
     Sadly `record.module` is just the innermost component of the full
     module name, so we have to go reconstruct this ourselves.
-    '''
+    """
     # Repeat a search similar to that in logging.Logger.findCaller.
     # The logging call should still be on the stack somewhere; search until
     # we find something in the same source file, and that should give the
@@ -150,11 +159,13 @@ def find_log_caller_module(record: logging.LogRecord) -> Optional[str]:
             return None
         f = f.f_back
 
+
 logger_nicknames = {
     'root': '',  # This one is more like undoing a nickname.
     'zulip.requests': 'zr',  # Super common.
 }
 
+
 def find_log_origin(record: logging.LogRecord) -> str:
     logger_name = logger_nicknames.get(record.name, record.name)
 
@@ -170,24 +181,28 @@ def find_log_origin(record: logging.LogRecord) -> str:
         # In multi-sharded Tornado, it's often valuable to have which shard is
         # responsible for the request in the logs.
         from zerver.tornado.ioloop_logging import logging_data
+
         shard = logging_data.get('port', 'unknown')
         logger_name = f"{logger_name}:{shard}"
 
     return logger_name
 
+
 log_level_abbrevs = {
-    'DEBUG':    'DEBG',
-    'INFO':     'INFO',
-    'WARNING':  'WARN',
-    'ERROR':    'ERR',
+    'DEBUG': 'DEBG',
+    'INFO': 'INFO',
+    'WARNING': 'WARN',
+    'ERROR': 'ERR',
     'CRITICAL': 'CRIT',
 }
 
+
 def abbrev_log_levelname(levelname: str) -> str:
     # It's unlikely someone will set a custom log level with a custom name,
     # but it's an option, so we shouldn't crash if someone does.
     return log_level_abbrevs.get(levelname, levelname[:4])
 
+
 class ZulipFormatter(logging.Formatter):
     # Used in the base implementation.  Default uses `,`.
     default_msec_format = '%s.%03d'
@@ -211,6 +226,7 @@ class ZulipFormatter(logging.Formatter):
             setattr(record, 'zulip_decorated', True)
         return super().format(record)
 
+
 class ZulipWebhookFormatter(ZulipFormatter):
     def _compute_fmt(self) -> str:
         basic = super()._compute_fmt()
@@ -229,6 +245,7 @@ class ZulipWebhookFormatter(ZulipFormatter):
 
     def format(self, record: logging.LogRecord) -> str:
         from zerver.lib.request import get_current_request
+
         request = get_current_request()
         if not request:
             setattr(record, 'user', None)
@@ -255,7 +272,8 @@ class ZulipWebhookFormatter(ZulipFormatter):
         for header in request.META.keys():
             if header.lower().startswith('http_x'):
                 header_text += custom_header_template.format(
-                    header=header, value=request.META[header])
+                    header=header, value=request.META[header]
+                )
 
         header_message = header_text if header_text else None
 
@@ -267,10 +285,12 @@ class ZulipWebhookFormatter(ZulipFormatter):
         setattr(record, 'payload', payload)
         return super().format(record)
 
-def log_to_file(logger: Logger,
-                filename: str,
-                log_format: str="%(asctime)s %(levelname)-8s %(message)s",
-                ) -> None:
+
+def log_to_file(
+    logger: Logger,
+    filename: str,
+    log_format: str = "%(asctime)s %(levelname)-8s %(message)s",
+) -> None:
     """Note: `filename` should be declared in zproject/computed_settings.py with zulip_path."""
     formatter = logging.Formatter(log_format)
     handler = logging.FileHandler(filename)
diff --git a/zerver/lib/management.py b/zerver/lib/management.py
index 67e4aa9fde..f9aee064f4 100644
--- a/zerver/lib/management.py
+++ b/zerver/lib/management.py
@@ -17,6 +17,7 @@ def is_integer_string(val: str) -> bool:
     except ValueError:
         return False
 
+
 def check_config() -> None:
     for (setting_name, default) in settings.REQUIRED_SETTINGS:
         # if required setting is the same as default OR is not found in settings,
@@ -29,10 +30,12 @@ def check_config() -> None:
 
         raise CommandError(f"Error: You must set {setting_name} in /etc/zulip/settings.py.")
 
+
 def sleep_forever() -> None:
     while True:  # nocoverage
         signal.pause()
 
+
 class ZulipBaseCommand(BaseCommand):
 
     # Fix support for multi-line usage
@@ -41,29 +44,24 @@ class ZulipBaseCommand(BaseCommand):
         parser.formatter_class = RawTextHelpFormatter
         return parser
 
-    def add_realm_args(self, parser: ArgumentParser, required: bool=False,
-                       help: Optional[str]=None) -> None:
+    def add_realm_args(
+        self, parser: ArgumentParser, required: bool = False, help: Optional[str] = None
+    ) -> None:
         if help is None:
             help = """The numeric or string ID (subdomain) of the Zulip organization to modify.
 You can use the command list_realms to find ID of the realms in this server."""
 
-        parser.add_argument(
-            '-r', '--realm',
-            dest='realm_id',
-            required=required,
-            help=help)
+        parser.add_argument('-r', '--realm', dest='realm_id', required=required, help=help)
 
-    def add_user_list_args(self, parser: ArgumentParser,
-                           help: str='A comma-separated list of email addresses.',
-                           all_users_help: str="All users in realm.") -> None:
-        parser.add_argument(
-            '-u', '--users',
-            help=help)
+    def add_user_list_args(
+        self,
+        parser: ArgumentParser,
+        help: str = 'A comma-separated list of email addresses.',
+        all_users_help: str = "All users in realm.",
+    ) -> None:
+        parser.add_argument('-u', '--users', help=help)
 
-        parser.add_argument(
-            '-a', '--all-users',
-            action="store_true",
-            help=all_users_help)
+        parser.add_argument('-a', '--all-users', action="store_true", help=all_users_help)
 
     def get_realm(self, options: Dict[str, Any]) -> Optional[Realm]:
         val = options["realm_id"]
@@ -78,11 +76,17 @@ You can use the command list_realms to find ID of the realms in this server."""
                 return Realm.objects.get(id=val)
             return Realm.objects.get(string_id=val)
         except Realm.DoesNotExist:
-            raise CommandError("There is no realm with id '{}'. Aborting.".format(options["realm_id"]))
+            raise CommandError(
+                "There is no realm with id '{}'. Aborting.".format(options["realm_id"])
+            )
 
-    def get_users(self, options: Dict[str, Any], realm: Optional[Realm],
-                  is_bot: Optional[bool]=None,
-                  include_deactivated: bool=False) -> List[UserProfile]:
+    def get_users(
+        self,
+        options: Dict[str, Any],
+        realm: Optional[Realm],
+        is_bot: Optional[bool] = None,
+        include_deactivated: bool = False,
+    ) -> List[UserProfile]:
         if "all_users" in options:
             all_users = options["all_users"]
 
@@ -118,9 +122,12 @@ You can use the command list_realms to find ID of the realms in this server."""
         if realm is not None:
             try:
                 return UserProfile.objects.select_related().get(
-                    delivery_email__iexact=email.strip(), realm=realm)
+                    delivery_email__iexact=email.strip(), realm=realm
+                )
             except UserProfile.DoesNotExist:
-                raise CommandError(f"The realm '{realm}' does not contain a user with email '{email}'")
+                raise CommandError(
+                    f"The realm '{realm}' does not contain a user with email '{email}'"
+                )
 
         # Realm is None in the remaining code path.  Here, we
         # optimistically try to see if there is exactly one user with
@@ -128,9 +135,11 @@ You can use the command list_realms to find ID of the realms in this server."""
         try:
             return UserProfile.objects.select_related().get(delivery_email__iexact=email.strip())
         except MultipleObjectsReturned:
-            raise CommandError("This Zulip server contains multiple users with that email " +
-                               "(in different realms); please pass `--realm` "
-                               "to specify which one to modify.")
+            raise CommandError(
+                "This Zulip server contains multiple users with that email "
+                + "(in different realms); please pass `--realm` "
+                "to specify which one to modify."
+            )
         except UserProfile.DoesNotExist:
             raise CommandError(f"This Zulip server does not contain a user with email '{email}'")
 
diff --git a/zerver/lib/markdown/__init__.py b/zerver/lib/markdown/__init__.py
index 47d7e92451..c4633d5a74 100644
--- a/zerver/lib/markdown/__init__.py
+++ b/zerver/lib/markdown/__init__.py
@@ -67,13 +67,14 @@ from zerver.models import (
 
 ReturnT = TypeVar('ReturnT')
 
+
 def one_time(method: Callable[[], ReturnT]) -> Callable[[], ReturnT]:
-    '''
-        Use this decorator with extreme caution.
-        The function you wrap should have no dependency
-        on any arguments (no args, no kwargs) nor should
-        it depend on any global state.
-    '''
+    """
+    Use this decorator with extreme caution.
+    The function you wrap should have no dependency
+    on any arguments (no args, no kwargs) nor should
+    it depend on any global state.
+    """
     val = None
 
     def cache_wrapper() -> ReturnT:
@@ -81,19 +82,23 @@ def one_time(method: Callable[[], ReturnT]) -> Callable[[], ReturnT]:
         if val is None:
             val = method()
         return val
+
     return cache_wrapper
 
+
 class FullNameInfo(TypedDict):
     id: int
     email: str
     full_name: str
 
+
 class LinkInfo(TypedDict):
     parent: Element
     title: Optional[str]
     index: Optional[int]
     remove: Optional[Element]
 
+
 DbData = Dict[str, Any]
 
 # Format version of the Markdown rendering; stored along with rendered
@@ -105,18 +110,21 @@ ElementStringNone = Union[Element, Optional[str]]
 
 EMOJI_REGEX = r'(?P<syntax>:[\w\-\+]+:)'
 
+
 def verbose_compile(pattern: str) -> Any:
     return re.compile(
         f"^(.*?){pattern}(.*?)$",
         re.DOTALL | re.UNICODE | re.VERBOSE,
     )
 
+
 def normal_compile(pattern: str) -> Any:
     return re.compile(
         fr"^(.*?){pattern}(.*)$",
         re.DOTALL | re.UNICODE,
     )
 
+
 STREAM_LINK_REGEX = r"""
                      (?<![^\s'"\(,:<])            # Start after whitespace or specified chars
                      \#\*\*                       # and after hash sign followed by double asterisks
@@ -124,10 +132,12 @@ STREAM_LINK_REGEX = r"""
                      \*\*                         # ends by double asterisks
                     """
 
+
 @one_time
 def get_compiled_stream_link_regex() -> Pattern:
     return verbose_compile(STREAM_LINK_REGEX)
 
+
 STREAM_TOPIC_LINK_REGEX = r"""
                      (?<![^\s'"\(,:<])             # Start after whitespace or specified chars
                      \#\*\*                        # and after hash sign followed by double asterisks
@@ -137,12 +147,15 @@ STREAM_TOPIC_LINK_REGEX = r"""
                      \*\*                          # ends by double asterisks
                    """
 
+
 @one_time
 def get_compiled_stream_topic_link_regex() -> Pattern:
     return verbose_compile(STREAM_TOPIC_LINK_REGEX)
 
+
 LINK_REGEX: Pattern = None
 
+
 def get_web_link_regex() -> str:
     # We create this one time, but not at startup.  So the
     # first message rendered in any process will have some
@@ -202,6 +215,7 @@ def get_web_link_regex() -> str:
     LINK_REGEX = verbose_compile(REGEX)
     return LINK_REGEX
 
+
 def clear_state_for_testing() -> None:
     # The link regex never changes in production, but our tests
     # try out both sides of ENABLE_FILE_LINKS, so we need
@@ -209,8 +223,10 @@ def clear_state_for_testing() -> None:
     global LINK_REGEX
     LINK_REGEX = None
 
+
 markdown_logger = logging.getLogger()
 
+
 def rewrite_local_links_to_relative(db_data: Optional[DbData], link: str) -> str:
     """If the link points to a local destination (e.g. #narrow/...),
     generate a relative link that will open it in the current window.
@@ -220,16 +236,16 @@ def rewrite_local_links_to_relative(db_data: Optional[DbData], link: str) -> str
         realm_uri_prefix = db_data['realm_uri'] + "/"
         if (
             link.startswith(realm_uri_prefix)
-            and urllib.parse.urljoin(realm_uri_prefix, link[len(realm_uri_prefix):])
-            == link
+            and urllib.parse.urljoin(realm_uri_prefix, link[len(realm_uri_prefix) :]) == link
         ):
-            return link[len(realm_uri_prefix):]
+            return link[len(realm_uri_prefix) :]
 
     return link
 
-def url_embed_preview_enabled(message: Optional[Message]=None,
-                              realm: Optional[Realm]=None,
-                              no_previews: bool=False) -> bool:
+
+def url_embed_preview_enabled(
+    message: Optional[Message] = None, realm: Optional[Realm] = None, no_previews: bool = False
+) -> bool:
     if not settings.INLINE_URL_EMBED_PREVIEW:
         return False
 
@@ -248,9 +264,10 @@ def url_embed_preview_enabled(message: Optional[Message]=None,
 
     return realm.inline_url_embed_preview
 
-def image_preview_enabled(message: Optional[Message]=None,
-                          realm: Optional[Realm]=None,
-                          no_previews: bool=False) -> bool:
+
+def image_preview_enabled(
+    message: Optional[Message] = None, realm: Optional[Realm] = None, no_previews: bool = False
+) -> bool:
     if not settings.INLINE_IMAGE_PREVIEW:
         return False
 
@@ -269,6 +286,7 @@ def image_preview_enabled(message: Optional[Message]=None,
 
     return realm.inline_image_preview
 
+
 def list_of_tlds() -> List[str]:
     # Skip a few overly-common false-positives from file extensions
     common_false_positives = set(['java', 'md', 'mov', 'py', 'zip'])
@@ -277,9 +295,10 @@ def list_of_tlds() -> List[str]:
     tlds.sort(key=len, reverse=True)
     return tlds
 
-def walk_tree(root: Element,
-              processor: Callable[[Element], Optional[_T]],
-              stop_after_first: bool=False) -> List[_T]:
+
+def walk_tree(
+    root: Element, processor: Callable[[Element], Optional[_T]], stop_after_first: bool = False
+) -> List[_T]:
     results = []
     queue = deque([root])
 
@@ -297,6 +316,7 @@ def walk_tree(root: Element,
 
     return results
 
+
 @dataclass
 class ElementFamily:
     grandparent: Optional[Element]
@@ -304,8 +324,10 @@ class ElementFamily:
     child: Element
     in_blockquote: bool
 
+
 T = TypeVar("T")
 
+
 class ResultWithFamily(Generic[T]):
     family: ElementFamily
     result: T
@@ -314,6 +336,7 @@ class ResultWithFamily(Generic[T]):
         self.family = family
         self.result = result
 
+
 class ElementPair:
     parent: Optional["ElementPair"]
     value: Element
@@ -322,9 +345,11 @@ class ElementPair:
         self.parent = parent
         self.value = value
 
-def walk_tree_with_family(root: Element,
-                          processor: Callable[[Element], Optional[_T]],
-                          ) -> List[ResultWithFamily[_T]]:
+
+def walk_tree_with_family(
+    root: Element,
+    processor: Callable[[Element], Optional[_T]],
+) -> List[ResultWithFamily[_T]]:
     results = []
 
     queue = deque([ElementPair(parent=None, value=root)])
@@ -347,13 +372,16 @@ def walk_tree_with_family(root: Element,
                     in_blockquote=has_blockquote_ancestor(currElementPair),
                 )
 
-                results.append(ResultWithFamily(
-                    family=family,
-                    result=result,
-                ))
+                results.append(
+                    ResultWithFamily(
+                        family=family,
+                        result=result,
+                    )
+                )
 
     return results
 
+
 def has_blockquote_ancestor(element_pair: Optional[ElementPair]) -> bool:
     if element_pair is None:
         return False
@@ -362,10 +390,12 @@ def has_blockquote_ancestor(element_pair: Optional[ElementPair]) -> bool:
     else:
         return has_blockquote_ancestor(element_pair.parent)
 
+
 @cache_with_key(lambda tweet_id: tweet_id, cache_name="database", with_statsd_key="tweet_data")
 def fetch_tweet_data(tweet_id: str) -> Optional[Dict[str, Any]]:
     if settings.TEST_SUITE:
         from . import testing_mocks
+
         res = testing_mocks.twitter(tweet_id)
     else:
         creds = {
@@ -426,11 +456,13 @@ def fetch_tweet_data(tweet_id: str) -> Optional[Dict[str, Any]]:
             return None
     return res
 
+
 HEAD_START_RE = re.compile('^head[ >]')
 HEAD_END_RE = re.compile('^/head[ >]')
 META_START_RE = re.compile('^meta[ >]')
 META_END_RE = re.compile('^/meta[ >]')
 
+
 def fetch_open_graph_image(url: str) -> Optional[Dict[str, Any]]:
     in_head = False
     # HTML will auto close meta tags, when we start the next tag add
@@ -495,6 +527,7 @@ def fetch_open_graph_image(url: str) -> Optional[Dict[str, Any]]:
         desc = og_desc.get('content')
     return {'image': image, 'title': title, 'desc': desc}
 
+
 def get_tweet_id(url: str) -> Optional[str]:
     parsed_url = urllib.parse.urlparse(url)
     if not (parsed_url.netloc == 'twitter.com' or parsed_url.netloc.endswith('.twitter.com')):
@@ -505,11 +538,14 @@ def get_tweet_id(url: str) -> Optional[str]:
     if parsed_url.path == '/' and len(parsed_url.fragment) > 5:
         to_match = parsed_url.fragment
 
-    tweet_id_match = re.match(r'^!?/.*?/status(es)?/(?P<tweetid>\d{10,30})(/photo/[0-9])?/?$', to_match)
+    tweet_id_match = re.match(
+        r'^!?/.*?/status(es)?/(?P<tweetid>\d{10,30})(/photo/[0-9])?/?$', to_match
+    )
     if not tweet_id_match:
         return None
     return tweet_id_match.group("tweetid")
 
+
 class InlineHttpsProcessor(markdown.treeprocessors.Treeprocessor):
     def run(self, root: Element) -> None:
         # Get all URLs from the blob
@@ -522,8 +558,10 @@ class InlineHttpsProcessor(markdown.treeprocessors.Treeprocessor):
                 continue
             img.set("src", get_camo_url(url))
 
+
 class BacktickInlineProcessor(markdown.inlinepatterns.BacktickInlineProcessor):
     """ Return a `<code>` element containing the matching text. """
+
     def handleMatch(self, m: Match[str], data: str) -> Tuple[Union[None, Element], int, int]:
         # Let upstream's implementation do its job as it is, we'll
         # just replace the text to not strip the group because it
@@ -535,6 +573,7 @@ class BacktickInlineProcessor(markdown.inlinepatterns.BacktickInlineProcessor):
             el.text = markdown.util.AtomicString(markdown.util.code_escape(m.group(3)))
         return el, start, end
 
+
 class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
     TWITTER_MAX_IMAGE_HEIGHT = 400
     TWITTER_MAX_TO_PREVIEW = 3
@@ -544,16 +583,16 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         markdown.treeprocessors.Treeprocessor.__init__(self, md)
 
     def add_a(
-            self,
-            root: Element,
-            url: str,
-            link: str,
-            title: Optional[str]=None,
-            desc: Optional[str]=None,
-            class_attr: str="message_inline_image",
-            data_id: Optional[str]=None,
-            insertion_index: Optional[int]=None,
-            already_thumbnailed: bool=False,
+        self,
+        root: Element,
+        url: str,
+        link: str,
+        title: Optional[str] = None,
+        desc: Optional[str] = None,
+        class_attr: str = "message_inline_image",
+        data_id: Optional[str] = None,
+        insertion_index: Optional[int] = None,
+        already_thumbnailed: bool = False,
     ) -> None:
         desc = desc if desc is not None else ""
 
@@ -575,7 +614,11 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         if data_id is not None:
             a.set("data-id", data_id)
         img = SubElement(a, "img")
-        if settings.THUMBNAIL_IMAGES and (not already_thumbnailed) and user_uploads_or_external(url):
+        if (
+            settings.THUMBNAIL_IMAGES
+            and (not already_thumbnailed)
+            and user_uploads_or_external(url)
+        ):
             # See docs/thumbnailing.md for some high-level documentation.
             #
             # We strip leading '/' from relative URLs here to ensure
@@ -609,9 +652,16 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
             image = extracted_data['image']
             title = extracted_data.get('title')
             description = extracted_data.get('description')
-            self.add_a(root, image, link, title, description,
-                       "embed-video message_inline_image",
-                       html, already_thumbnailed=True)
+            self.add_a(
+                root,
+                image,
+                link,
+                title,
+                description,
+                "embed-video message_inline_image",
+                html,
+                already_thumbnailed=True,
+            )
             return True
 
         return False
@@ -661,13 +711,14 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         # Add specific per-site cases to convert image-preview URLs to image URLs.
         # See https://github.com/zulip/zulip/issues/4658 for more information
         parsed_url = urllib.parse.urlparse(url)
-        if (parsed_url.netloc == 'github.com' or parsed_url.netloc.endswith('.github.com')):
+        if parsed_url.netloc == 'github.com' or parsed_url.netloc.endswith('.github.com'):
             # https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png ->
             # https://raw.githubusercontent.com/zulip/zulip/master/static/images/logo/zulip-icon-128x128.png
             split_path = parsed_url.path.split('/')
             if len(split_path) > 3 and split_path[3] == "blob":
-                return urllib.parse.urljoin('https://raw.githubusercontent.com',
-                                            '/'.join(split_path[0:3] + split_path[4:]))
+                return urllib.parse.urljoin(
+                    'https://raw.githubusercontent.com', '/'.join(split_path[0:3] + split_path[4:])
+                )
 
         return url
 
@@ -705,12 +756,12 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
     def dropbox_image(self, url: str) -> Optional[Dict[str, Any]]:
         # TODO: The returned Dict could possibly be a TypedDict in future.
         parsed_url = urllib.parse.urlparse(url)
-        if (parsed_url.netloc == 'dropbox.com' or parsed_url.netloc.endswith('.dropbox.com')):
+        if parsed_url.netloc == 'dropbox.com' or parsed_url.netloc.endswith('.dropbox.com'):
             is_album = parsed_url.path.startswith('/sc/') or parsed_url.path.startswith('/photos/')
             # Only allow preview Dropbox shared links
-            if not (parsed_url.path.startswith('/s/') or
-                    parsed_url.path.startswith('/sh/') or
-                    is_album):
+            if not (
+                parsed_url.path.startswith('/s/') or parsed_url.path.startswith('/sh/') or is_album
+            ):
                 return None
 
             # Try to retrieve open graph protocol info for a preview
@@ -758,11 +809,15 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         # If it matches, match.group(2) is the video id.
         schema_re = r'(?:https?://)'
         host_re = r'(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)'
-        param_re = r'(?:(?:(?:v|embed)/)|' + \
-            r'(?:(?:(?:watch|playlist)(?:_popup|_videos)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v(?:ideo_ids)?=))'
+        param_re = (
+            r'(?:(?:(?:v|embed)/)|'
+            + r'(?:(?:(?:watch|playlist)(?:_popup|_videos)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v(?:ideo_ids)?=))'
+        )
         id_re = r'([0-9A-Za-z_-]+)'
         youtube_re = r'^({schema_re}?{host_re}{param_re}?)?{id_re}(?(1).+)?$'
-        youtube_re = youtube_re.format(schema_re=schema_re, host_re=host_re, id_re=id_re, param_re=param_re)
+        youtube_re = youtube_re.format(
+            schema_re=schema_re, host_re=host_re, id_re=id_re, param_re=param_re
+        )
         match = re.match(youtube_re, url)
         # URLs of the form youtube.com/playlist?list=<list-id> are incorrectly matched
         if match is None or match.group(2) == 'playlist':
@@ -785,12 +840,14 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
     def vimeo_id(self, url: str) -> Optional[str]:
         if not self.md.image_preview_enabled:
             return None
-        #(http|https)?:\/\/(www\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|)(\d+)(?:|\/\?)
+        # (http|https)?:\/\/(www\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|)(\d+)(?:|\/\?)
         # If it matches, match.group('id') is the video id.
 
-        vimeo_re = r'^((http|https)?:\/\/(www\.)?vimeo.com\/' + \
-                   r'(?:channels\/(?:\w+\/)?|groups\/' + \
-                   r'([^\/]*)\/videos\/|)(\d+)(?:|\/\?))$'
+        vimeo_re = (
+            r'^((http|https)?:\/\/(www\.)?vimeo.com\/'
+            + r'(?:channels\/(?:\w+\/)?|groups\/'
+            + r'([^\/]*)\/videos\/|)(\d+)(?:|\/\?))$'
+        )
         match = re.match(vimeo_re, url)
         if match is None:
             return None
@@ -802,10 +859,13 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
             return f"Vimeo - {title}"
         return None
 
-    def twitter_text(self, text: str,
-                     urls: List[Dict[str, str]],
-                     user_mentions: List[Dict[str, Any]],
-                     media: List[Dict[str, Any]]) -> Element:
+    def twitter_text(
+        self,
+        text: str,
+        urls: List[Dict[str, str]],
+        user_mentions: List[Dict[str, Any]],
+        media: List[Dict[str, Any]],
+    ) -> Element:
         """
         Use data from the Twitter API to turn links, mentions and media into A
         tags. Also convert Unicode emojis to images.
@@ -833,50 +893,58 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
             short_url = url_data["url"]
             full_url = url_data["expanded_url"]
             for match in re.finditer(re.escape(short_url), text, re.IGNORECASE):
-                to_process.append({
-                    'type': 'url',
-                    'start': match.start(),
-                    'end': match.end(),
-                    'url': short_url,
-                    'text': full_url,
-                })
+                to_process.append(
+                    {
+                        'type': 'url',
+                        'start': match.start(),
+                        'end': match.end(),
+                        'url': short_url,
+                        'text': full_url,
+                    }
+                )
         # Build dicts for mentions
         for user_mention in user_mentions:
             screen_name = user_mention['screen_name']
             mention_string = '@' + screen_name
             for match in re.finditer(re.escape(mention_string), text, re.IGNORECASE):
-                to_process.append({
-                    'type': 'mention',
-                    'start': match.start(),
-                    'end': match.end(),
-                    'url': 'https://twitter.com/' + urllib.parse.quote(screen_name),
-                    'text': mention_string,
-                })
+                to_process.append(
+                    {
+                        'type': 'mention',
+                        'start': match.start(),
+                        'end': match.end(),
+                        'url': 'https://twitter.com/' + urllib.parse.quote(screen_name),
+                        'text': mention_string,
+                    }
+                )
         # Build dicts for media
         for media_item in media:
             short_url = media_item['url']
             expanded_url = media_item['expanded_url']
             for match in re.finditer(re.escape(short_url), text, re.IGNORECASE):
-                to_process.append({
-                    'type': 'media',
-                    'start': match.start(),
-                    'end': match.end(),
-                    'url': short_url,
-                    'text': expanded_url,
-                })
+                to_process.append(
+                    {
+                        'type': 'media',
+                        'start': match.start(),
+                        'end': match.end(),
+                        'url': short_url,
+                        'text': expanded_url,
+                    }
+                )
         # Build dicts for emojis
         for match in re.finditer(unicode_emoji_regex, text, re.IGNORECASE):
             orig_syntax = match.group('syntax')
             codepoint = unicode_emoji_to_codepoint(orig_syntax)
             if codepoint in codepoint_to_name:
                 display_string = ':' + codepoint_to_name[codepoint] + ':'
-                to_process.append({
-                    'type': 'emoji',
-                    'start': match.start(),
-                    'end': match.end(),
-                    'codepoint': codepoint,
-                    'title': display_string,
-                })
+                to_process.append(
+                    {
+                        'type': 'emoji',
+                        'start': match.start(),
+                        'end': match.end(),
+                        'codepoint': codepoint,
+                        'title': display_string,
+                    }
+                )
 
         to_process.sort(key=lambda x: x['start'])
         p = current_node = Element('p')
@@ -898,7 +966,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 continue
             # Add text from the end of last link to the start of the current
             # link
-            set_text(text[current_index:item['start']])
+            set_text(text[current_index : item['start']])
             current_index = item['end']
             if item['type'] != 'emoji':
                 elem = url_to_a(db_data, item['url'], item['text'])
@@ -956,8 +1024,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 # Find the image size that is smaller than
                 # TWITTER_MAX_IMAGE_HEIGHT px tall or the smallest
                 size_name_tuples = list(media_item['sizes'].items())
-                size_name_tuples.sort(reverse=True,
-                                      key=lambda x: x[1]['h'])
+                size_name_tuples.sort(reverse=True, key=lambda x: x[1]['h'])
                 for size_name, size in size_name_tuples:
                     if size['h'] < self.TWITTER_MAX_IMAGE_HEIGHT:
                         break
@@ -1022,10 +1089,12 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
             # Append to end of list of grandparent's children as normal
             info['parent'] = grandparent
 
-            if (len(parent) == 1 and
-                    (not parent.text or parent.text == "\n") and
-                    not ahref_element.tail and
-                    url_eq_text):
+            if (
+                len(parent) == 1
+                and (not parent.text or parent.text == "\n")
+                and not ahref_element.tail
+                and url_eq_text
+            ):
                 info['remove'] = parent
 
             if parent_index is not None:
@@ -1041,7 +1110,9 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         info = self.get_inlining_information(root, found_url)
         (url, text) = found_url.result
         actual_url = self.get_actual_image_url(url)
-        self.add_a(info['parent'], actual_url, url, title=info['title'], insertion_index=info['index'])
+        self.add_a(
+            info['parent'], actual_url, url, title=info['title'], insertion_index=info['index']
+        )
         if info['remove'] is not None:
             info['parent'].remove(info['remove'])
 
@@ -1071,11 +1142,21 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         info = self.get_inlining_information(root, found_url)
         (url, text) = found_url.result
         yt_id = self.youtube_id(url)
-        self.add_a(info['parent'], yt_image, url, None, None, "youtube-video message_inline_image",
-                   yt_id, insertion_index=info['index'], already_thumbnailed=True)
+        self.add_a(
+            info['parent'],
+            yt_image,
+            url,
+            None,
+            None,
+            "youtube-video message_inline_image",
+            yt_id,
+            insertion_index=info['index'],
+            already_thumbnailed=True,
+        )
 
-    def find_proper_insertion_index(self, grandparent: Element, parent: Element,
-                                    parent_index_in_grandparent: int) -> int:
+    def find_proper_insertion_index(
+        self, grandparent: Element, parent: Element, parent_index_in_grandparent: int
+    ) -> int:
         # If there are several inline images from same paragraph, ensure that
         # they are in correct (and not opposite) order by inserting after last
         # inline image from paragraph 'parent'
@@ -1089,11 +1170,15 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 return insertion_index
 
             uncle = grandparent[insertion_index]
-            inline_image_classes = ['message_inline_image', 'message_inline_ref', 'inline-preview-twitter']
+            inline_image_classes = [
+                'message_inline_image',
+                'message_inline_ref',
+                'inline-preview-twitter',
+            ]
             if (
-                uncle.tag != 'div' or
-                'class' not in uncle.keys() or
-                uncle.attrib['class'] not in inline_image_classes
+                uncle.tag != 'div'
+                or 'class' not in uncle.keys()
+                or uncle.attrib['class'] not in inline_image_classes
             ):
                 return insertion_index
 
@@ -1110,8 +1195,9 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
         unique_urls = {found_url.result[0] for found_url in found_urls}
         # Collect unique URLs which are not quoted as we don't do
         # inline previews for links inside blockquotes.
-        unique_previewable_urls = {found_url.result[0] for found_url in found_urls
-                                   if not found_url.family.in_blockquote}
+        unique_previewable_urls = {
+            found_url.result[0] for found_url in found_urls if not found_url.family.in_blockquote
+        }
 
         # Set has_link and similar flags whenever a message is processed by Markdown
         if self.md.zulip_message:
@@ -1134,7 +1220,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 if not parsed_url.path.startswith("/user_uploads/"):
                     continue
 
-                path_id = parsed_url.path[len("/user_uploads/"):]
+                path_id = parsed_url.path[len("/user_uploads/") :]
                 self.md.zulip_message.potential_attachment_path_ids.append(path_id)
 
         if len(found_urls) == 0:
@@ -1167,11 +1253,15 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                 if is_image:
                     class_attr = "message_inline_image"
                     # Not making use of title and description of images
-                self.add_a(root, dropbox_image['image'], url,
-                           title=dropbox_image.get('title'),
-                           desc=dropbox_image.get('desc', ""),
-                           class_attr=class_attr,
-                           already_thumbnailed=True)
+                self.add_a(
+                    root,
+                    dropbox_image['image'],
+                    url,
+                    title=dropbox_image.get('title'),
+                    desc=dropbox_image.get('desc', ""),
+                    class_attr=class_attr,
+                    already_thumbnailed=True,
+                )
                 continue
 
             if self.is_image(url):
@@ -1235,6 +1325,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
                         else:
                             found_url.family.child.text = text
 
+
 class Timestamp(markdown.inlinepatterns.Pattern):
     def handleMatch(self, match: Match[str]) -> Optional[Element]:
         time_input_string = match.group('time')
@@ -1251,7 +1342,8 @@ class Timestamp(markdown.inlinepatterns.Pattern):
             error_element = Element('span')
             error_element.set('class', 'timestamp-error')
             error_element.text = markdown.util.AtomicString(
-                f"Invalid time format: {time_input_string}")
+                f"Invalid time format: {time_input_string}"
+            )
             return error_element
 
         # Use HTML5 <time> element for valid timestamps.
@@ -1266,6 +1358,7 @@ class Timestamp(markdown.inlinepatterns.Pattern):
         time_element.text = markdown.util.AtomicString(time_input_string)
         return time_element
 
+
 # All of our emojis(non ZWJ sequences) belong to one of these Unicode blocks:
 # \U0001f100-\U0001f1ff - Enclosed Alphanumeric Supplement
 # \U0001f200-\U0001f2ff - Enclosed Ideographic Supplement
@@ -1287,17 +1380,19 @@ class Timestamp(markdown.inlinepatterns.Pattern):
 # \u2b00-\u2bff         - Miscellaneous Symbols and Arrows
 # \u3000-\u303f         - CJK Symbols and Punctuation
 # \u3200-\u32ff         - Enclosed CJK Letters and Months
-unicode_emoji_regex = '(?P<syntax>['\
-    '\U0001F100-\U0001F64F'    \
-    '\U0001F680-\U0001F6FF'    \
-    '\U0001F900-\U0001F9FF'    \
-    '\u2000-\u206F'            \
-    '\u2300-\u27BF'            \
-    '\u2900-\u297F'            \
-    '\u2B00-\u2BFF'            \
-    '\u3000-\u303F'            \
-    '\u3200-\u32FF'            \
+unicode_emoji_regex = (
+    '(?P<syntax>['
+    '\U0001F100-\U0001F64F'
+    '\U0001F680-\U0001F6FF'
+    '\U0001F900-\U0001F9FF'
+    '\u2000-\u206F'
+    '\u2300-\u27BF'
+    '\u2900-\u297F'
+    '\u2B00-\u2BFF'
+    '\u3000-\u303F'
+    '\u3200-\u32FF'
     '])'
+)
 # The equivalent JS regex is \ud83c[\udd00-\udfff]|\ud83d[\udc00-\ude4f]|\ud83d[\ude80-\udeff]|
 # \ud83e[\udd00-\uddff]|[\u2000-\u206f]|[\u2300-\u27bf]|[\u2b00-\u2bff]|[\u3000-\u303f]|
 # [\u3200-\u32ff]. See below comments for explanation. The JS regex is used by marked.js for
@@ -1311,6 +1406,7 @@ unicode_emoji_regex = '(?P<syntax>['\
 # For more information, please refer to the following article:
 # http://crocodillon.com/blog/parsing-emoji-unicode-in-javascript
 
+
 def make_emoji(codepoint: str, display_string: str) -> Element:
     # Replace underscore in emoji's title with space
     title = display_string[1:-1].replace("_", " ")
@@ -1322,6 +1418,7 @@ def make_emoji(codepoint: str, display_string: str) -> Element:
     span.text = markdown.util.AtomicString(display_string)
     return span
 
+
 def make_realm_emoji(src: str, display_string: str) -> Element:
     elt = Element('img')
     elt.set('src', src)
@@ -1330,6 +1427,7 @@ def make_realm_emoji(src: str, display_string: str) -> Element:
     elt.set("title", display_string[1:-1].replace("_", " "))
     return elt
 
+
 def unicode_emoji_to_codepoint(unicode_emoji: str) -> str:
     codepoint = hex(ord(unicode_emoji))[2:]
     # Unicode codepoints are minimum of length 4, padded
@@ -1338,6 +1436,7 @@ def unicode_emoji_to_codepoint(unicode_emoji: str) -> str:
         codepoint = '0' + codepoint
     return codepoint
 
+
 class EmoticonTranslation(markdown.inlinepatterns.Pattern):
     """ Translates emoticons like `:)` into emoji like `:smile:`. """
 
@@ -1351,6 +1450,7 @@ class EmoticonTranslation(markdown.inlinepatterns.Pattern):
         name = translated[1:-1]
         return make_emoji(name_to_codepoint[name], translated)
 
+
 class UnicodeEmoji(markdown.inlinepatterns.Pattern):
     def handleMatch(self, match: Match[str]) -> Optional[Element]:
         orig_syntax = match.group('syntax')
@@ -1361,6 +1461,7 @@ class UnicodeEmoji(markdown.inlinepatterns.Pattern):
         else:
             return None
 
+
 class Emoji(markdown.inlinepatterns.Pattern):
     def handleMatch(self, match: Match[str]) -> Optional[Element]:
         orig_syntax = match.group("syntax")
@@ -1374,15 +1475,19 @@ class Emoji(markdown.inlinepatterns.Pattern):
         if self.md.zulip_message and name in active_realm_emoji:
             return make_realm_emoji(active_realm_emoji[name]['source_url'], orig_syntax)
         elif name == 'zulip':
-            return make_realm_emoji('/static/generated/emoji/images/emoji/unicode/zulip.png', orig_syntax)
+            return make_realm_emoji(
+                '/static/generated/emoji/images/emoji/unicode/zulip.png', orig_syntax
+            )
         elif name in name_to_codepoint:
             return make_emoji(name_to_codepoint[name], orig_syntax)
         else:
             return orig_syntax
 
+
 def content_has_emoji_syntax(content: str) -> bool:
     return re.search(EMOJI_REGEX, content) is not None
 
+
 class Tex(markdown.inlinepatterns.Pattern):
     def handleMatch(self, match: Match[str]) -> Element:
         rendered = render_tex(match.group('body'), is_inline=True)
@@ -1460,7 +1565,10 @@ def sanitize_url(url: str) -> Optional[str]:
     # URL passes all tests. Return URL as-is.
     return urllib.parse.urlunparse((scheme, netloc, path, params, query, fragment))
 
-def url_to_a(db_data: Optional[DbData], url: str, text: Optional[str]=None) -> Union[Element, str]:
+
+def url_to_a(
+    db_data: Optional[DbData], url: str, text: Optional[str] = None
+) -> Union[Element, str]:
     a = Element('a')
 
     href = sanitize_url(url)
@@ -1476,6 +1584,7 @@ def url_to_a(db_data: Optional[DbData], url: str, text: Optional[str]=None) -> U
     a.text = text
     return a
 
+
 class CompiledPattern(markdown.inlinepatterns.Pattern):
     def __init__(self, compiled_re: Pattern, md: markdown.Markdown) -> None:
         # This is similar to the superclass's small __init__ function,
@@ -1484,18 +1593,21 @@ class CompiledPattern(markdown.inlinepatterns.Pattern):
         self.compiled_re = compiled_re
         self.md = md
 
+
 class AutoLink(CompiledPattern):
     def handleMatch(self, match: Match[str]) -> ElementStringNone:
         url = match.group('url')
         db_data = self.md.zulip_db_data
         return url_to_a(db_data, url)
 
+
 class OListProcessor(sane_lists.SaneOListProcessor):
     def __init__(self, parser: Any) -> None:
         parser.md.tab_length = 2
         super().__init__(parser)
         parser.md.tab_length = 4
 
+
 class UListProcessor(sane_lists.SaneUListProcessor):
     """ Unordered lists, but with 2-space indent """
 
@@ -1504,10 +1616,11 @@ class UListProcessor(sane_lists.SaneUListProcessor):
         super().__init__(parser)
         parser.md.tab_length = 4
 
-class ListIndentProcessor(markdown.blockprocessors.ListIndentProcessor):
-    """ Process unordered list blocks.
 
-        Based on markdown.blockprocessors.ListIndentProcessor, but with 2-space indent
+class ListIndentProcessor(markdown.blockprocessors.ListIndentProcessor):
+    """Process unordered list blocks.
+
+    Based on markdown.blockprocessors.ListIndentProcessor, but with 2-space indent
     """
 
     def __init__(self, parser: Any) -> None:
@@ -1519,25 +1632,26 @@ class ListIndentProcessor(markdown.blockprocessors.ListIndentProcessor):
         super().__init__(parser)
         parser.md.tab_length = 4
 
-class HashHeaderProcessor(markdown.blockprocessors.HashHeaderProcessor):
-    """ Process hash headers.
 
-        Based on markdown.blockprocessors.HashHeaderProcessor, but requires space for heading.
+class HashHeaderProcessor(markdown.blockprocessors.HashHeaderProcessor):
+    """Process hash headers.
+
+    Based on markdown.blockprocessors.HashHeaderProcessor, but requires space for heading.
     """
 
     # Original regex for hashheader is
     # RE = re.compile(r'(?:^|\n)(?P<level>#{1,6})(?P<header>(?:\\.|[^\\])*?)#*(?:\n|$)')
     RE = re.compile(r'(?:^|\n)(?P<level>#{1,6})\s(?P<header>(?:\\.|[^\\])*?)#*(?:\n|$)')
 
-class BlockQuoteProcessor(markdown.blockprocessors.BlockQuoteProcessor):
-    """ Process block quotes.
 
-        Based on markdown.blockprocessors.BlockQuoteProcessor, but with 2-space indent
+class BlockQuoteProcessor(markdown.blockprocessors.BlockQuoteProcessor):
+    """Process block quotes.
+
+    Based on markdown.blockprocessors.BlockQuoteProcessor, but with 2-space indent
     """
 
     # Original regex for blockquote is RE = re.compile(r'(^|\n)[ ]{0,3}>[ ]?(.*)')
-    RE = re.compile(r'(^|\n)(?!(?:[ ]{0,3}>\s*(?:$|\n))*(?:$|\n))'
-                    r'[ ]{0,3}>[ ]?(.*)')
+    RE = re.compile(r'(^|\n)(?!(?:[ ]{0,3}>\s*(?:$|\n))*(?:$|\n))' r'[ ]{0,3}>[ ]?(.*)')
     mention_re = re.compile(mention.find_mentions)
 
     # run() is very slightly forked from the base class; see notes below.
@@ -1545,13 +1659,11 @@ class BlockQuoteProcessor(markdown.blockprocessors.BlockQuoteProcessor):
         block = blocks.pop(0)
         m = self.RE.search(block)
         if m:
-            before = block[:m.start()]  # Lines before blockquote
+            before = block[: m.start()]  # Lines before blockquote
             # Pass lines before blockquote in recursively for parsing forst.
             self.parser.parseBlocks(parent, [before])
             # Remove ``> `` from beginning of each line.
-            block = '\n'.join(
-                [self.clean(line) for line in block[m.start():].split('\n')]
-            )
+            block = '\n'.join([self.clean(line) for line in block[m.start() :].split('\n')])
 
         # Zulip modification: The next line is patched to match
         # CommonMark rather than original Markdown.  In original
@@ -1575,18 +1687,20 @@ class BlockQuoteProcessor(markdown.blockprocessors.BlockQuoteProcessor):
         # And then run the upstream processor's code for removing the '>'
         return super().clean(line)
 
+
 @dataclass
 class Fence:
     fence_str: str
     is_code: bool
 
-class MarkdownListPreprocessor(markdown.preprocessors.Preprocessor):
-    """ Allows list blocks that come directly after another block
-        to be rendered as a list.
 
-        Detects paragraphs that have a matching list item that comes
-        directly after a line of text, and inserts a newline between
-        to satisfy Markdown"""
+class MarkdownListPreprocessor(markdown.preprocessors.Preprocessor):
+    """Allows list blocks that come directly after another block
+    to be rendered as a list.
+
+    Detects paragraphs that have a matching list item that comes
+    directly after a line of text, and inserts a newline between
+    to satisfy Markdown"""
 
     LI_RE = re.compile(r'^[ ]*([*+-]|\d\.)[ ]+(.*)', re.MULTILINE)
 
@@ -1604,7 +1718,9 @@ class MarkdownListPreprocessor(markdown.preprocessors.Preprocessor):
                 fence_str = m.group('fence')
                 is_code = not m.group('lang') in ('quote', 'quoted')
                 has_open_fences = not len(open_fences) == 0
-                matches_last_fence = fence_str == open_fences[-1].fence_str if has_open_fences else False
+                matches_last_fence = (
+                    fence_str == open_fences[-1].fence_str if has_open_fences else False
+                )
                 closes_last_fence = not m.group('lang') and matches_last_fence
 
                 if closes_last_fence:
@@ -1618,18 +1734,22 @@ class MarkdownListPreprocessor(markdown.preprocessors.Preprocessor):
             # hanging off any block (including a list of another type), add
             # a newline.
             li1 = self.LI_RE.match(lines[i])
-            li2 = self.LI_RE.match(lines[i+1])
+            li2 = self.LI_RE.match(lines[i + 1])
             if not in_code_fence and lines[i]:
-                if (li2 and not li1) or (li1 and li2 and
-                                         (len(li1.group(1)) == 1) != (len(li2.group(1)) == 1)):
-                    copy.insert(i+inserts+1, '')
+                if (li2 and not li1) or (
+                    li1 and li2 and (len(li1.group(1)) == 1) != (len(li2.group(1)) == 1)
+                ):
+                    copy.insert(i + inserts + 1, '')
                     inserts += 1
         return copy
 
+
 # Name for the outer capture group we use to separate whitespace and
 # other delimiters from the actual content.  This value won't be an
 # option in user-entered capture groups.
 OUTER_CAPTURE_GROUP = "linkifier_actual_match"
+
+
 def prepare_realm_pattern(source: str) -> str:
     """Augment a realm filter so it only matches after start-of-string,
     whitespace, or opening delimiters, won't match if there are word
@@ -1637,23 +1757,30 @@ def prepare_realm_pattern(source: str) -> str:
     OUTER_CAPTURE_GROUP."""
     return fr"""(?<![^\s'"\(,:<])(?P<{OUTER_CAPTURE_GROUP}>{source})(?!\w)"""
 
+
 # Given a regular expression pattern, linkifies groups that match it
 # using the provided format string to construct the URL.
 class RealmFilterPattern(markdown.inlinepatterns.Pattern):
     """ Applied a given realm filter to the input """
 
-    def __init__(self, source_pattern: str,
-                 format_string: str,
-                 markdown_instance: Optional[markdown.Markdown]=None) -> None:
+    def __init__(
+        self,
+        source_pattern: str,
+        format_string: str,
+        markdown_instance: Optional[markdown.Markdown] = None,
+    ) -> None:
         self.pattern = prepare_realm_pattern(source_pattern)
         self.format_string = format_string
         markdown.inlinepatterns.Pattern.__init__(self, self.pattern, markdown_instance)
 
     def handleMatch(self, m: Match[str]) -> Union[Element, str]:
         db_data = self.md.zulip_db_data
-        return url_to_a(db_data,
-                        self.format_string % m.groupdict(),
-                        markdown.util.AtomicString(m.group(OUTER_CAPTURE_GROUP)))
+        return url_to_a(
+            db_data,
+            self.format_string % m.groupdict(),
+            markdown.util.AtomicString(m.group(OUTER_CAPTURE_GROUP)),
+        )
+
 
 class UserMentionPattern(markdown.inlinepatterns.Pattern):
     def handleMatch(self, m: Match[str]) -> Optional[Element]:
@@ -1700,6 +1827,7 @@ class UserMentionPattern(markdown.inlinepatterns.Pattern):
             return el
         return None
 
+
 class UserGroupMentionPattern(markdown.inlinepatterns.Pattern):
     def handleMatch(self, m: Match[str]) -> Optional[Element]:
         match = m.group(2)
@@ -1725,6 +1853,7 @@ class UserGroupMentionPattern(markdown.inlinepatterns.Pattern):
             return el
         return None
 
+
 class StreamPattern(CompiledPattern):
     def find_stream_by_name(self, name: Match[str]) -> Optional[Dict[str, Any]]:
         db_data = self.md.zulip_db_data
@@ -1755,6 +1884,7 @@ class StreamPattern(CompiledPattern):
             return el
         return None
 
+
 class StreamTopicPattern(CompiledPattern):
     def find_stream_by_name(self, name: Match[str]) -> Optional[Dict[str, Any]]:
         db_data = self.md.zulip_db_data
@@ -1783,17 +1913,33 @@ class StreamTopicPattern(CompiledPattern):
             return el
         return None
 
+
 def possible_linked_stream_names(content: str) -> Set[str]:
     matches = re.findall(STREAM_LINK_REGEX, content, re.VERBOSE)
     for match in re.finditer(STREAM_TOPIC_LINK_REGEX, content, re.VERBOSE):
         matches.append(match.group('stream_name'))
     return set(matches)
 
+
 class AlertWordNotificationProcessor(markdown.preprocessors.Preprocessor):
 
     allowed_before_punctuation = {' ', '\n', '(', '"', '.', ',', '\'', ';', '[', '*', '`', '>'}
-    allowed_after_punctuation = {' ', '\n', ')', '",', '?', ':', '.', ',', '\'', ';', ']', '!',
-                                 '*', '`'}
+    allowed_after_punctuation = {
+        ' ',
+        '\n',
+        ')',
+        '",',
+        '?',
+        ':',
+        '.',
+        ',',
+        '\'',
+        ';',
+        ']',
+        '!',
+        '*',
+        '`',
+    }
 
     def check_valid_start_position(self, content: str, index: int) -> bool:
         if index <= 0 or content[index] in self.allowed_before_punctuation:
@@ -1819,12 +1965,16 @@ class AlertWordNotificationProcessor(markdown.preprocessors.Preprocessor):
 
             if realm_alert_words_automaton is not None:
                 content = '\n'.join(lines).lower()
-                for end_index, (original_value, user_ids) in realm_alert_words_automaton.iter(content):
-                    if self.check_valid_start_position(content, end_index - len(original_value)) and \
-                       self.check_valid_end_position(content, end_index + 1):
+                for end_index, (original_value, user_ids) in realm_alert_words_automaton.iter(
+                    content
+                ):
+                    if self.check_valid_start_position(
+                        content, end_index - len(original_value)
+                    ) and self.check_valid_end_position(content, end_index + 1):
                         self.md.zulip_message.user_ids_with_alert_words.update(user_ids)
         return lines
 
+
 class LinkInlineProcessor(markdown.inlinepatterns.LinkInlineProcessor):
     def zulip_specific_link_changes(self, el: Element) -> Union[None, Element]:
         href = el.get('href')
@@ -1858,6 +2008,7 @@ class LinkInlineProcessor(markdown.inlinepatterns.LinkInlineProcessor):
             el = self.zulip_specific_link_changes(el)
         return el, match_start, index
 
+
 def get_sub_registry(r: markdown.util.Registry, keys: List[str]) -> markdown.util.Registry:
     # Registry is a new class added by Python-Markdown to replace OrderedDict.
     # Since Registry doesn't support .keys(), it is easier to make a new
@@ -1867,11 +2018,13 @@ def get_sub_registry(r: markdown.util.Registry, keys: List[str]) -> markdown.uti
         new_r.register(r[k], k, r.get_index_for_name(k))
     return new_r
 
+
 # These are used as keys ("realm_filters_keys") to md_engines and the respective
 # realm filter caches
 DEFAULT_MARKDOWN_KEY = -1
 ZEPHYR_MIRROR_MARKDOWN_KEY = -2
 
+
 class Markdown(markdown.Markdown):
     zulip_message: Optional[Message]
     zulip_realm: Optional[Realm]
@@ -1924,9 +2077,13 @@ class Markdown(markdown.Markdown):
         # reference - references don't make sense in a chat context.
         preprocessors = markdown.util.Registry()
         preprocessors.register(MarkdownListPreprocessor(self), 'hanging_lists', 35)
-        preprocessors.register(markdown.preprocessors.NormalizeWhitespace(self), 'normalize_whitespace', 30)
+        preprocessors.register(
+            markdown.preprocessors.NormalizeWhitespace(self), 'normalize_whitespace', 30
+        )
         preprocessors.register(fenced_code.FencedBlockPreprocessor(self), 'fenced_code_block', 25)
-        preprocessors.register(AlertWordNotificationProcessor(self), 'custom_text_notifications', 20)
+        preprocessors.register(
+            AlertWordNotificationProcessor(self), 'custom_text_notifications', 20
+        )
         return preprocessors
 
     def build_block_parser(self) -> BlockParser:
@@ -1938,17 +2095,23 @@ class Markdown(markdown.Markdown):
         # ulist - replaced by ours
         # quote - replaced by ours
         parser = BlockParser(self)
-        parser.blockprocessors.register(markdown.blockprocessors.EmptyBlockProcessor(parser), 'empty', 95)
+        parser.blockprocessors.register(
+            markdown.blockprocessors.EmptyBlockProcessor(parser), 'empty', 95
+        )
         parser.blockprocessors.register(ListIndentProcessor(parser), 'indent', 90)
         if not self.email_gateway:
-            parser.blockprocessors.register(markdown.blockprocessors.CodeBlockProcessor(parser), 'code', 85)
+            parser.blockprocessors.register(
+                markdown.blockprocessors.CodeBlockProcessor(parser), 'code', 85
+            )
         parser.blockprocessors.register(HashHeaderProcessor(parser), 'hashheader', 80)
         # We get priority 75 from 'table' extension
         parser.blockprocessors.register(markdown.blockprocessors.HRProcessor(parser), 'hr', 70)
         parser.blockprocessors.register(OListProcessor(parser), 'olist', 65)
         parser.blockprocessors.register(UListProcessor(parser), 'ulist', 60)
         parser.blockprocessors.register(BlockQuoteProcessor(parser), 'quote', 55)
-        parser.blockprocessors.register(markdown.blockprocessors.ParagraphProcessor(parser), 'paragraph', 50)
+        parser.blockprocessors.register(
+            markdown.blockprocessors.ParagraphProcessor(parser), 'paragraph', 50
+        )
         return parser
 
     def build_inlinepatterns(self) -> markdown.util.Registry:
@@ -1986,32 +2149,43 @@ class Markdown(markdown.Markdown):
         # space for us to add our own.
         reg = markdown.util.Registry()
         reg.register(BacktickInlineProcessor(markdown.inlinepatterns.BACKTICK_RE), 'backtick', 105)
-        reg.register(markdown.inlinepatterns.DoubleTagPattern(STRONG_EM_RE, 'strong,em'), 'strong_em', 100)
+        reg.register(
+            markdown.inlinepatterns.DoubleTagPattern(STRONG_EM_RE, 'strong,em'), 'strong_em', 100
+        )
         reg.register(UserMentionPattern(mention.find_mentions, self), 'usermention', 95)
         reg.register(Tex(r'\B(?<!\$)\$\$(?P<body>[^\n_$](\\\$|[^$\n])*)\$\$(?!\$)\B'), 'tex', 90)
         reg.register(StreamTopicPattern(get_compiled_stream_topic_link_regex(), self), 'topic', 87)
         reg.register(StreamPattern(get_compiled_stream_link_regex(), self), 'stream', 85)
         reg.register(Timestamp(r'<time:(?P<time>[^>]*?)>'), 'timestamp', 75)
-        reg.register(UserGroupMentionPattern(mention.user_group_mentions, self), 'usergroupmention', 65)
+        reg.register(
+            UserGroupMentionPattern(mention.user_group_mentions, self), 'usergroupmention', 65
+        )
         reg.register(LinkInlineProcessor(markdown.inlinepatterns.LINK_RE, self), 'link', 60)
         reg.register(AutoLink(get_web_link_regex(), self), 'autolink', 55)
         # Reserve priority 45-54 for realm filters
         reg = self.register_realm_filters(reg)
         reg.register(markdown.inlinepatterns.HtmlInlineProcessor(ENTITY_RE, self), 'entity', 40)
-        reg.register(markdown.inlinepatterns.SimpleTagPattern(r'(\*\*)([^\n]+?)\2', 'strong'), 'strong', 35)
+        reg.register(
+            markdown.inlinepatterns.SimpleTagPattern(r'(\*\*)([^\n]+?)\2', 'strong'), 'strong', 35
+        )
         reg.register(markdown.inlinepatterns.SimpleTagPattern(EMPHASIS_RE, 'em'), 'emphasis', 30)
         reg.register(markdown.inlinepatterns.SimpleTagPattern(DEL_RE, 'del'), 'del', 25)
-        reg.register(markdown.inlinepatterns.SimpleTextInlineProcessor(NOT_STRONG_RE), 'not_strong', 20)
+        reg.register(
+            markdown.inlinepatterns.SimpleTextInlineProcessor(NOT_STRONG_RE), 'not_strong', 20
+        )
         reg.register(Emoji(EMOJI_REGEX, self), 'emoji', 15)
         reg.register(EmoticonTranslation(emoticon_regex, self), 'translate_emoticons', 10)
         # We get priority 5 from 'nl2br' extension
         reg.register(UnicodeEmoji(unicode_emoji_regex), 'unicodeemoji', 0)
         return reg
 
-    def register_realm_filters(self, inlinePatterns: markdown.util.Registry) -> markdown.util.Registry:
+    def register_realm_filters(
+        self, inlinePatterns: markdown.util.Registry
+    ) -> markdown.util.Registry:
         for (pattern, format_string, id) in self.realm_filters:
-            inlinePatterns.register(RealmFilterPattern(pattern, format_string, self),
-                                    f'realm_filters/{pattern}', 45)
+            inlinePatterns.register(
+                RealmFilterPattern(pattern, format_string, self), f'realm_filters/{pattern}', 45
+            )
         return inlinePatterns
 
     def build_treeprocessors(self) -> markdown.util.Registry:
@@ -2020,7 +2194,9 @@ class Markdown(markdown.Markdown):
         # We get priority 30 from 'hilite' extension
         treeprocessors.register(markdown.treeprocessors.InlineProcessor(self), 'inline', 25)
         treeprocessors.register(markdown.treeprocessors.PrettifyTreeprocessor(self), 'prettify', 20)
-        treeprocessors.register(InlineInterestingLinkProcessor(self), 'inline_interesting_links', 15)
+        treeprocessors.register(
+            InlineInterestingLinkProcessor(self), 'inline_interesting_links', 15
+        )
         if settings.CAMO_URI:
             treeprocessors.register(InlineHttpsProcessor(self), 'rewrite_to_https', 10)
         return treeprocessors
@@ -2029,7 +2205,9 @@ class Markdown(markdown.Markdown):
         # These are the default python-markdown processors, unmodified.
         postprocessors = markdown.util.Registry()
         postprocessors.register(markdown.postprocessors.RawHtmlPostprocessor(self), 'raw_html', 20)
-        postprocessors.register(markdown.postprocessors.AndSubstitutePostprocessor(), 'amp_substitute', 15)
+        postprocessors.register(
+            markdown.postprocessors.AndSubstitutePostprocessor(), 'amp_substitute', 15
+        )
         postprocessors.register(markdown.postprocessors.UnescapePostprocessor(), 'unescape', 10)
         return postprocessors
 
@@ -2040,17 +2218,24 @@ class Markdown(markdown.Markdown):
             # inline_interesting_links is a treeprocessor and thus is
             # not removed
             self.inlinePatterns = get_sub_registry(self.inlinePatterns, ['autolink'])
-            self.treeprocessors = get_sub_registry(self.treeprocessors, ['inline_interesting_links',
-                                                                         'rewrite_to_https'])
+            self.treeprocessors = get_sub_registry(
+                self.treeprocessors, ['inline_interesting_links', 'rewrite_to_https']
+            )
             # insert new 'inline' processor because we have changed self.inlinePatterns
             # but InlineProcessor copies md as self.md in __init__.
-            self.treeprocessors.register(markdown.treeprocessors.InlineProcessor(self), 'inline', 25)
+            self.treeprocessors.register(
+                markdown.treeprocessors.InlineProcessor(self), 'inline', 25
+            )
             self.preprocessors = get_sub_registry(self.preprocessors, ['custom_text_notifications'])
-            self.parser.blockprocessors = get_sub_registry(self.parser.blockprocessors, ['paragraph'])
+            self.parser.blockprocessors = get_sub_registry(
+                self.parser.blockprocessors, ['paragraph']
+            )
+
 
 md_engines: Dict[Tuple[int, bool], Markdown] = {}
 realm_filter_data: Dict[int, List[Tuple[str, str, int]]] = {}
 
+
 def make_md_engine(realm_filters_key: int, email_gateway: bool) -> None:
     md_engine_key = (realm_filters_key, email_gateway)
     if md_engine_key in md_engines:
@@ -2063,6 +2248,7 @@ def make_md_engine(realm_filters_key: int, email_gateway: bool) -> None:
         email_gateway=email_gateway,
     )
 
+
 # Split the topic name into multiple sections so that we can easily use
 # our common single link matching regex on it.
 basic_link_splitter = re.compile(r'[ !;\?\),\'\"]')
@@ -2096,6 +2282,7 @@ def topic_links(realm_filters_key: int, topic_name: str) -> List[str]:
 
     return matches
 
+
 def maybe_update_markdown_engines(realm_filters_key: Optional[int], email_gateway: bool) -> None:
     # If realm_filters_key is None, load all filters
     global realm_filter_data
@@ -2110,8 +2297,10 @@ def maybe_update_markdown_engines(realm_filters_key: Optional[int], email_gatewa
         make_md_engine(ZEPHYR_MIRROR_MARKDOWN_KEY, False)
     else:
         realm_filters = realm_filters_for_realm(realm_filters_key)
-        if realm_filters_key not in realm_filter_data or    \
-                realm_filter_data[realm_filters_key] != realm_filters:
+        if (
+            realm_filters_key not in realm_filter_data
+            or realm_filter_data[realm_filters_key] != realm_filters
+        ):
             # Realm filters data has changed, update `realm_filter_data` and any
             # of the existing Markdown engines using this set of realm filters.
             realm_filter_data[realm_filters_key] = realm_filters
@@ -2124,6 +2313,7 @@ def maybe_update_markdown_engines(realm_filters_key: Optional[int], email_gatewa
             # Markdown engine corresponding to this key doesn't exists so create one.
             make_md_engine(realm_filters_key, email_gateway)
 
+
 # We want to log Markdown parser failures, but shouldn't log the actual input
 # message for privacy reasons.  The compromise is to replace all alphanumeric
 # characters with 'x'.
@@ -2131,9 +2321,12 @@ def maybe_update_markdown_engines(realm_filters_key: Optional[int], email_gatewa
 # We also use repr() to improve reproducibility, and to escape terminal control
 # codes, which can do surprisingly nasty things.
 _privacy_re = re.compile('\\w', flags=re.UNICODE)
+
+
 def privacy_clean_markdown(content: str) -> str:
     return repr(_privacy_re.sub('x', content))
 
+
 def get_possible_mentions_info(realm_id: int, mention_texts: Set[str]) -> List[FullNameInfo]:
     if not mention_texts:
         return []
@@ -2149,44 +2342,38 @@ def get_possible_mentions_info(realm_id: int, mention_texts: Set[str]) -> List[F
         else:
             full_names.add(mention_text)
 
-    q_list = {
-        Q(full_name__iexact=full_name)
-        for full_name in full_names
-    }
+    q_list = {Q(full_name__iexact=full_name) for full_name in full_names}
 
-    rows = UserProfile.objects.filter(
-        realm_id=realm_id,
-        is_active=True,
-    ).filter(
-        functools.reduce(lambda a, b: a | b, q_list),
-    ).values(
-        'id',
-        'full_name',
-        'email',
+    rows = (
+        UserProfile.objects.filter(
+            realm_id=realm_id,
+            is_active=True,
+        )
+        .filter(
+            functools.reduce(lambda a, b: a | b, q_list),
+        )
+        .values(
+            'id',
+            'full_name',
+            'email',
+        )
     )
     return list(rows)
 
+
 class MentionData:
     def __init__(self, realm_id: int, content: str) -> None:
         mention_texts, has_wildcards = possible_mentions(content)
         possible_mentions_info = get_possible_mentions_info(realm_id, mention_texts)
-        self.full_name_info = {
-            row['full_name'].lower(): row
-            for row in possible_mentions_info
-        }
-        self.user_id_info = {
-            row['id']: row
-            for row in possible_mentions_info
-        }
+        self.full_name_info = {row['full_name'].lower(): row for row in possible_mentions_info}
+        self.user_id_info = {row['id']: row for row in possible_mentions_info}
         self.init_user_group_data(realm_id=realm_id, content=content)
         self.has_wildcards = has_wildcards
 
     def message_has_wildcards(self) -> bool:
         return self.has_wildcards
 
-    def init_user_group_data(self,
-                             realm_id: int,
-                             content: str) -> None:
+    def init_user_group_data(self, realm_id: int, content: str) -> None:
         user_group_names = possible_user_group_mentions(content)
         self.user_group_name_info = get_user_group_name_info(realm_id, user_group_names)
         self.user_group_members: Dict[int, List[int]] = defaultdict(list)
@@ -2227,49 +2414,50 @@ class MentionData:
     def get_group_members(self, user_group_id: int) -> List[int]:
         return self.user_group_members.get(user_group_id, [])
 
+
 def get_user_group_name_info(realm_id: int, user_group_names: Set[str]) -> Dict[str, UserGroup]:
     if not user_group_names:
         return {}
 
-    rows = UserGroup.objects.filter(realm_id=realm_id,
-                                    name__in=user_group_names)
+    rows = UserGroup.objects.filter(realm_id=realm_id, name__in=user_group_names)
     dct = {row.name.lower(): row for row in rows}
     return dct
 
+
 def get_stream_name_info(realm: Realm, stream_names: Set[str]) -> Dict[str, FullNameInfo]:
     if not stream_names:
         return {}
 
-    q_list = {
-        Q(name=name)
-        for name in stream_names
-    }
+    q_list = {Q(name=name) for name in stream_names}
 
-    rows = get_active_streams(
-        realm=realm,
-    ).filter(
-        functools.reduce(lambda a, b: a | b, q_list),
-    ).values(
-        'id',
-        'name',
+    rows = (
+        get_active_streams(
+            realm=realm,
+        )
+        .filter(
+            functools.reduce(lambda a, b: a | b, q_list),
+        )
+        .values(
+            'id',
+            'name',
+        )
     )
 
-    dct = {
-        row['name']: row
-        for row in rows
-    }
+    dct = {row['name']: row for row in rows}
     return dct
 
 
-def do_convert(content: str,
-               realm_alert_words_automaton: Optional[ahocorasick.Automaton] = None,
-               message: Optional[Message]=None,
-               message_realm: Optional[Realm]=None,
-               sent_by_bot: bool=False,
-               translate_emoticons: bool=False,
-               mention_data: Optional[MentionData]=None,
-               email_gateway: bool=False,
-               no_previews: bool=False) -> str:
+def do_convert(
+    content: str,
+    realm_alert_words_automaton: Optional[ahocorasick.Automaton] = None,
+    message: Optional[Message] = None,
+    message_realm: Optional[Realm] = None,
+    sent_by_bot: bool = False,
+    translate_emoticons: bool = False,
+    mention_data: Optional[MentionData] = None,
+    email_gateway: bool = False,
+    no_previews: bool = False,
+) -> str:
     """Convert Markdown to HTML, with Zulip-specific settings and hacks."""
     # This logic is a bit convoluted, but the overall goal is to support a range of use cases:
     # * Nothing is passed in other than content -> just run default options (e.g. for docs)
@@ -2312,10 +2500,10 @@ def do_convert(content: str,
     _md_engine.zulip_message = message
     _md_engine.zulip_realm = message_realm
     _md_engine.zulip_db_data = None  # for now
-    _md_engine.image_preview_enabled = image_preview_enabled(
-        message, message_realm, no_previews)
+    _md_engine.image_preview_enabled = image_preview_enabled(message, message_realm, no_previews)
     _md_engine.url_embed_preview_enabled = url_embed_preview_enabled(
-        message, message_realm, no_previews)
+        message, message_realm, no_previews
+    )
 
     # Pre-fetch data from the DB that is used in the Markdown thread
     if message_realm is not None:
@@ -2383,40 +2571,55 @@ def do_convert(content: str,
         _md_engine.zulip_realm = None
         _md_engine.zulip_db_data = None
 
+
 markdown_time_start = 0.0
 markdown_total_time = 0.0
 markdown_total_requests = 0
 
+
 def get_markdown_time() -> float:
     return markdown_total_time
 
+
 def get_markdown_requests() -> int:
     return markdown_total_requests
 
+
 def markdown_stats_start() -> None:
     global markdown_time_start
     markdown_time_start = time.time()
 
+
 def markdown_stats_finish() -> None:
     global markdown_total_time
     global markdown_total_requests
     global markdown_time_start
     markdown_total_requests += 1
-    markdown_total_time += (time.time() - markdown_time_start)
+    markdown_total_time += time.time() - markdown_time_start
 
-def markdown_convert(content: str,
-                     realm_alert_words_automaton: Optional[ahocorasick.Automaton] = None,
-                     message: Optional[Message]=None,
-                     message_realm: Optional[Realm]=None,
-                     sent_by_bot: bool=False,
-                     translate_emoticons: bool=False,
-                     mention_data: Optional[MentionData]=None,
-                     email_gateway: bool=False,
-                     no_previews: bool=False) -> str:
+
+def markdown_convert(
+    content: str,
+    realm_alert_words_automaton: Optional[ahocorasick.Automaton] = None,
+    message: Optional[Message] = None,
+    message_realm: Optional[Realm] = None,
+    sent_by_bot: bool = False,
+    translate_emoticons: bool = False,
+    mention_data: Optional[MentionData] = None,
+    email_gateway: bool = False,
+    no_previews: bool = False,
+) -> str:
     markdown_stats_start()
-    ret = do_convert(content, realm_alert_words_automaton,
-                     message, message_realm, sent_by_bot,
-                     translate_emoticons, mention_data, email_gateway,
-                     no_previews=no_previews)
+    ret = do_convert(
+        content,
+        realm_alert_words_automaton,
+        message,
+        message_realm,
+        sent_by_bot,
+        translate_emoticons,
+        mention_data,
+        email_gateway,
+        no_previews=no_previews,
+    )
     markdown_stats_finish()
     return ret
diff --git a/zerver/lib/markdown/api_arguments_table_generator.py b/zerver/lib/markdown/api_arguments_table_generator.py
index d186debab9..7da237afcd 100644
--- a/zerver/lib/markdown/api_arguments_table_generator.py
+++ b/zerver/lib/markdown/api_arguments_table_generator.py
@@ -16,7 +16,10 @@ REGEXP = re.compile(r'\{generate_api_arguments_table\|\s*(.+?)\s*\|\s*(.+)\s*\}'
 class MarkdownArgumentsTableGenerator(Extension):
     def __init__(self, configs: Mapping[str, Any] = {}) -> None:
         self.config = {
-            'base_path': ['.', 'Default location from which to evaluate relative paths for the JSON files.'],
+            'base_path': [
+                '.',
+                'Default location from which to evaluate relative paths for the JSON files.',
+            ],
         }
         for key, value in configs.items():
             self.setConfig(key, value)
@@ -81,7 +84,7 @@ class APIArgumentsTablePreprocessor(Preprocessor):
                 preceding = line_split[0]
                 following = line_split[-1]
                 text = [preceding, *text, following]
-                lines = lines[:loc] + text + lines[loc+1:]
+                lines = lines[:loc] + text + lines[loc + 1 :]
                 break
             else:
                 done = True
@@ -104,8 +107,7 @@ class APIArgumentsTablePreprocessor(Preprocessor):
         arguments = sorted(arguments, key=lambda argument: 'deprecated' in argument)
         for argument in arguments:
             description = argument['description']
-            oneof = ['`' + str(item) + '`'
-                     for item in argument.get('schema', {}).get('enum', [])]
+            oneof = ['`' + str(item) + '`' for item in argument.get('schema', {}).get('enum', [])]
             if oneof:
                 description += '\nMust be one of: {}.'.format(', '.join(oneof))
 
@@ -139,26 +141,30 @@ class APIArgumentsTablePreprocessor(Preprocessor):
 
             # Test to make sure deprecated parameters are marked so.
             if likely_deprecated_parameter(description):
-                assert(argument['deprecated'])
+                assert argument['deprecated']
             if argument.get('deprecated', False):
                 deprecated_block = '<span class="api-argument-deprecated">Deprecated</span>'
             else:
                 deprecated_block = ''
 
-            table.append(argument_template.format(
-                argument=argument.get('argument') or argument.get('name'),
-                example=escape_html(example),
-                required=required_block,
-                deprecated=deprecated_block,
-                description=md_engine.convert(description),
-                type=data_type
-            ))
+            table.append(
+                argument_template.format(
+                    argument=argument.get('argument') or argument.get('name'),
+                    example=escape_html(example),
+                    required=required_block,
+                    deprecated=deprecated_block,
+                    description=md_engine.convert(description),
+                    type=data_type,
+                )
+            )
 
         return table
 
+
 def makeExtension(*args: Any, **kwargs: str) -> MarkdownArgumentsTableGenerator:
     return MarkdownArgumentsTableGenerator(kwargs)
 
+
 def generate_data_type(schema: Mapping[str, Any]) -> str:
     data_type = ""
     if 'oneOf' in schema:
diff --git a/zerver/lib/markdown/api_return_values_table_generator.py b/zerver/lib/markdown/api_return_values_table_generator.py
index 6b6d1191c0..0477f14eff 100644
--- a/zerver/lib/markdown/api_return_values_table_generator.py
+++ b/zerver/lib/markdown/api_return_values_table_generator.py
@@ -13,6 +13,7 @@ from .api_arguments_table_generator import generate_data_type
 
 REGEXP = re.compile(r'\{generate_return_values_table\|\s*(.+?)\s*\|\s*(.+)\s*\}')
 
+
 class MarkdownReturnValuesTableGenerator(Extension):
     def __init__(self, configs: Mapping[str, Any] = {}) -> None:
         self.config: Dict[str, Any] = {}
@@ -55,14 +56,15 @@ class APIReturnValuesTablePreprocessor(Preprocessor):
                 preceding = line_split[0]
                 following = line_split[-1]
                 text = [preceding, *text, following]
-                lines = lines[:loc] + text + lines[loc+1:]
+                lines = lines[:loc] + text + lines[loc + 1 :]
                 break
             else:
                 done = True
         return lines
 
-    def render_desc(self, description: str, spacing: int, data_type: str,
-                    return_value: Optional[str]=None) -> str:
+    def render_desc(
+        self, description: str, spacing: int, data_type: str, return_value: Optional[str] = None
+    ) -> str:
         description = description.replace('\n', '\n' + ((spacing + 4) * ' '))
         if return_value is None:
             # HACK: It's not clear how to use OpenAPI data to identify
@@ -80,8 +82,26 @@ class APIReturnValuesTablePreprocessor(Preprocessor):
             if len(arr) == 1 or '\n' in arr[0]:
                 return (spacing * " ") + "* " + description
             (key_name, key_description) = arr
-            return (spacing * " ") + "* " + key_name + ": " + '<span class="api-field-type">' + data_type + "</span> "  + key_description
-        return (spacing * " ") + "* `" + return_value + "`: " + '<span class="api-field-type">' + data_type + "</span> "  + description
+            return (
+                (spacing * " ")
+                + "* "
+                + key_name
+                + ": "
+                + '<span class="api-field-type">'
+                + data_type
+                + "</span> "
+                + key_description
+            )
+        return (
+            (spacing * " ")
+            + "* `"
+            + return_value
+            + "`: "
+            + '<span class="api-field-type">'
+            + data_type
+            + "</span> "
+            + description
+        )
 
     def render_table(self, return_values: Dict[str, Any], spacing: int) -> List[str]:
         IGNORE = ["result", "msg"]
@@ -96,8 +116,11 @@ class APIReturnValuesTablePreprocessor(Preprocessor):
                 # specialized description for that particular case. The description used
                 # right below is the main description.
                 data_type = generate_data_type(return_values[return_value])
-                ans.append(self.render_desc(return_values[return_value]['description'],
-                                            spacing, data_type, return_value))
+                ans.append(
+                    self.render_desc(
+                        return_values[return_value]['description'], spacing, data_type, return_value
+                    )
+                )
                 for element in return_values[return_value]['oneOf']:
                     if 'description' not in element:
                         continue
@@ -113,28 +136,41 @@ class APIReturnValuesTablePreprocessor(Preprocessor):
             data_type = generate_data_type(return_values[return_value])
             # Test to make sure deprecated keys are marked appropriately.
             if likely_deprecated_parameter(description):
-                assert(return_values[return_value]['deprecated'])
+                assert return_values[return_value]['deprecated']
             ans.append(self.render_desc(description, spacing, data_type, return_value))
             if 'properties' in return_values[return_value]:
                 ans += self.render_table(return_values[return_value]['properties'], spacing + 4)
             if return_values[return_value].get('additionalProperties', False):
                 data_type = generate_data_type(return_values[return_value]['additionalProperties'])
-                ans.append(self.render_desc(return_values[return_value]['additionalProperties']
-                                            ['description'], spacing + 4, data_type))
+                ans.append(
+                    self.render_desc(
+                        return_values[return_value]['additionalProperties']['description'],
+                        spacing + 4,
+                        data_type,
+                    )
+                )
                 if 'properties' in return_values[return_value]['additionalProperties']:
-                    ans += self.render_table(return_values[return_value]['additionalProperties']
-                                             ['properties'], spacing + 8)
-            if ('items' in return_values[return_value] and
-                    'properties' in return_values[return_value]['items']):
-                ans += self.render_table(return_values[return_value]['items']['properties'], spacing + 4)
+                    ans += self.render_table(
+                        return_values[return_value]['additionalProperties']['properties'],
+                        spacing + 8,
+                    )
+            if (
+                'items' in return_values[return_value]
+                and 'properties' in return_values[return_value]['items']
+            ):
+                ans += self.render_table(
+                    return_values[return_value]['items']['properties'], spacing + 4
+                )
         return ans
 
     def render_events(self, events_dict: Dict[str, Any]) -> List[str]:
         text: List[str] = []
         # Use argument section design for better visuals
         # Directly using `###` for subheading causes errors so use h3 with made up id.
-        argument_template = ('<div class="api-argument"><p class="api-argument-name"><h3 id="{h3_id}">' +
-                             ' {event_type} {op}</h3></p></div> \n{description}\n\n\n')
+        argument_template = (
+            '<div class="api-argument"><p class="api-argument-name"><h3 id="{h3_id}">'
+            + ' {event_type} {op}</h3></p></div> \n{description}\n\n\n'
+        )
         for events in events_dict['oneOf']:
             # `id` is present in every event so it will be redundant to display
             # it every time. So remove it from the dictionary.
@@ -151,8 +187,11 @@ class APIReturnValuesTablePreprocessor(Preprocessor):
                 h3_id += '-' + op_str
                 op_str = f'<span class="api-argument-deprecated">op: {op_str}</span>'
             description = events['description']
-            text.append(argument_template.format(event_type=event_type_str, op=op_str,
-                        description=description, h3_id=h3_id))
+            text.append(
+                argument_template.format(
+                    event_type=event_type_str, op=op_str, description=description, h3_id=h3_id
+                )
+            )
             text += self.render_table(events['properties'], 0)
             # This part is for adding examples of individual events
             text.append('**Example**')
@@ -161,5 +200,7 @@ class APIReturnValuesTablePreprocessor(Preprocessor):
             text.append(example)
             text.append('```\n\n')
         return text
+
+
 def makeExtension(*args: Any, **kwargs: str) -> MarkdownReturnValuesTableGenerator:
     return MarkdownReturnValuesTableGenerator(kwargs)
diff --git a/zerver/lib/markdown/fenced_code.py b/zerver/lib/markdown/fenced_code.py
index fa962d7eb7..971900280a 100644
--- a/zerver/lib/markdown/fenced_code.py
+++ b/zerver/lib/markdown/fenced_code.py
@@ -91,7 +91,8 @@ from zerver.lib.exceptions import MarkdownRenderingException
 from zerver.lib.tex import render_tex
 
 # Global vars
-FENCE_RE = re.compile("""
+FENCE_RE = re.compile(
+    """
     # ~~~ or ```
     (?P<fence>
         ^(?:~{3,}|`{3,})
@@ -115,12 +116,15 @@ FENCE_RE = re.compile("""
         \\}?
     ) # header for features that use fenced block header syntax (like spoilers)
     $
-    """, re.VERBOSE)
+    """,
+    re.VERBOSE,
+)
 
 
 CODE_WRAP = '<pre><code{}>{}\n</code></pre>'
 LANG_TAG = ' class="{}"'
 
+
 def validate_curl_content(lines: List[str]) -> None:
     error_msg = """
 Missing required -X argument in curl command:
@@ -139,6 +143,7 @@ CODE_VALIDATORS = {
     'curl': validate_curl_content,
 }
 
+
 class FencedCodeExtension(Extension):
     def __init__(self, config: Mapping[str, Any] = {}) -> None:
         self.config = {
@@ -155,7 +160,8 @@ class FencedCodeExtension(Extension):
         """ Add FencedBlockPreprocessor to the Markdown instance. """
         md.registerExtension(self)
         processor = FencedBlockPreprocessor(
-            md, run_content_validators=self.config['run_content_validators'][0])
+            md, run_content_validators=self.config['run_content_validators'][0]
+        )
         md.preprocessors.register(processor, 'fenced_code_block', 25)
 
 
@@ -166,10 +172,16 @@ class BaseHandler:
     def done(self) -> None:
         raise NotImplementedError()
 
-def generic_handler(processor: Any, output: MutableSequence[str],
-                    fence: str, lang: str, header: str,
-                    run_content_validators: bool=False,
-                    default_language: Optional[str]=None) -> BaseHandler:
+
+def generic_handler(
+    processor: Any,
+    output: MutableSequence[str],
+    fence: str,
+    lang: str,
+    header: str,
+    run_content_validators: bool = False,
+    default_language: Optional[str] = None,
+) -> BaseHandler:
     lang = lang.lower()
     if lang in ('quote', 'quoted'):
         return QuoteHandler(processor, output, fence, default_language)
@@ -180,9 +192,14 @@ def generic_handler(processor: Any, output: MutableSequence[str],
     else:
         return CodeHandler(processor, output, fence, lang, run_content_validators)
 
-def check_for_new_fence(processor: Any, output: MutableSequence[str], line: str,
-                        run_content_validators: bool=False,
-                        default_language: Optional[str]=None) -> None:
+
+def check_for_new_fence(
+    processor: Any,
+    output: MutableSequence[str],
+    line: str,
+    run_content_validators: bool = False,
+    default_language: Optional[str] = None,
+) -> None:
     m = FENCE_RE.match(line)
     if m:
         fence = m.group('fence')
@@ -190,31 +207,45 @@ def check_for_new_fence(processor: Any, output: MutableSequence[str], line: str,
         header = m.group('header')
         if not lang and default_language:
             lang = default_language
-        handler = generic_handler(processor, output, fence, lang, header,
-                                  run_content_validators, default_language)
+        handler = generic_handler(
+            processor, output, fence, lang, header, run_content_validators, default_language
+        )
         processor.push(handler)
     else:
         output.append(line)
 
+
 class OuterHandler(BaseHandler):
-    def __init__(self, processor: Any, output: MutableSequence[str],
-                 run_content_validators: bool=False,
-                 default_language: Optional[str]=None) -> None:
+    def __init__(
+        self,
+        processor: Any,
+        output: MutableSequence[str],
+        run_content_validators: bool = False,
+        default_language: Optional[str] = None,
+    ) -> None:
         self.output = output
         self.processor = processor
         self.run_content_validators = run_content_validators
         self.default_language = default_language
 
     def handle_line(self, line: str) -> None:
-        check_for_new_fence(self.processor, self.output, line,
-                            self.run_content_validators, self.default_language)
+        check_for_new_fence(
+            self.processor, self.output, line, self.run_content_validators, self.default_language
+        )
 
     def done(self) -> None:
         self.processor.pop()
 
+
 class CodeHandler(BaseHandler):
-    def __init__(self, processor: Any, output: MutableSequence[str],
-                 fence: str, lang: str, run_content_validators: bool=False) -> None:
+    def __init__(
+        self,
+        processor: Any,
+        output: MutableSequence[str],
+        fence: str,
+        lang: str,
+        run_content_validators: bool = False,
+    ) -> None:
         self.processor = processor
         self.output = output
         self.fence = fence
@@ -244,9 +275,15 @@ class CodeHandler(BaseHandler):
         self.output.append('')
         self.processor.pop()
 
+
 class QuoteHandler(BaseHandler):
-    def __init__(self, processor: Any, output: MutableSequence[str],
-                 fence: str, default_language: Optional[str]=None) -> None:
+    def __init__(
+        self,
+        processor: Any,
+        output: MutableSequence[str],
+        fence: str,
+        default_language: Optional[str] = None,
+    ) -> None:
         self.processor = processor
         self.output = output
         self.fence = fence
@@ -257,7 +294,9 @@ class QuoteHandler(BaseHandler):
         if line.rstrip() == self.fence:
             self.done()
         else:
-            check_for_new_fence(self.processor, self.lines, line, default_language=self.default_language)
+            check_for_new_fence(
+                self.processor, self.lines, line, default_language=self.default_language
+            )
 
     def done(self) -> None:
         text = '\n'.join(self.lines)
@@ -270,8 +309,9 @@ class QuoteHandler(BaseHandler):
 
 
 class SpoilerHandler(BaseHandler):
-    def __init__(self, processor: Any, output: MutableSequence[str],
-                 fence: str, spoiler_header: str) -> None:
+    def __init__(
+        self, processor: Any, output: MutableSequence[str], fence: str, spoiler_header: str
+    ) -> None:
         self.processor = processor
         self.output = output
         self.fence = fence
@@ -299,6 +339,7 @@ class SpoilerHandler(BaseHandler):
         self.output.append('')
         self.processor.pop()
 
+
 class TexHandler(BaseHandler):
     def __init__(self, processor: Any, output: MutableSequence[str], fence: str) -> None:
         self.processor = processor
@@ -324,7 +365,7 @@ class TexHandler(BaseHandler):
 
 
 class FencedBlockPreprocessor(Preprocessor):
-    def __init__(self, md: Markdown, run_content_validators: bool=False) -> None:
+    def __init__(self, md: Markdown, run_content_validators: bool = False) -> None:
         super().__init__(md)
 
         self.checked_for_codehilite = False
@@ -384,14 +425,16 @@ class FencedBlockPreprocessor(Preprocessor):
         # If config is not empty, then the codehighlite extension
         # is enabled, so we call it to highlite the code
         if self.codehilite_conf:
-            highliter = CodeHilite(text,
-                                   linenums=self.codehilite_conf['linenums'][0],
-                                   guess_lang=self.codehilite_conf['guess_lang'][0],
-                                   css_class=self.codehilite_conf['css_class'][0],
-                                   style=self.codehilite_conf['pygments_style'][0],
-                                   use_pygments=self.codehilite_conf['use_pygments'][0],
-                                   lang=(lang or None),
-                                   noclasses=self.codehilite_conf['noclasses'][0])
+            highliter = CodeHilite(
+                text,
+                linenums=self.codehilite_conf['linenums'][0],
+                guess_lang=self.codehilite_conf['guess_lang'][0],
+                css_class=self.codehilite_conf['css_class'][0],
+                style=self.codehilite_conf['pygments_style'][0],
+                use_pygments=self.codehilite_conf['use_pygments'][0],
+                lang=(lang or None),
+                noclasses=self.codehilite_conf['noclasses'][0],
+            )
 
             code = highliter.hilite().rstrip('\n')
         else:
@@ -452,8 +495,7 @@ class FencedBlockPreprocessor(Preprocessor):
             if html is not None:
                 tex_paragraphs.append(html)
             else:
-                tex_paragraphs.append('<span class="tex-error">' +
-                                      escape(paragraph) + '</span>')
+                tex_paragraphs.append('<span class="tex-error">' + escape(paragraph) + '</span>')
         return "\n\n".join(tex_paragraphs)
 
     def placeholder(self, code: str) -> str:
@@ -471,6 +513,8 @@ class FencedBlockPreprocessor(Preprocessor):
 def makeExtension(*args: Any, **kwargs: None) -> FencedCodeExtension:
     return FencedCodeExtension(kwargs)
 
+
 if __name__ == "__main__":
     import doctest
+
     doctest.testmod()
diff --git a/zerver/lib/markdown/help_emoticon_translations_table.py b/zerver/lib/markdown/help_emoticon_translations_table.py
index 62c7882e4d..1f5f1a6f42 100644
--- a/zerver/lib/markdown/help_emoticon_translations_table.py
+++ b/zerver/lib/markdown/help_emoticon_translations_table.py
@@ -36,6 +36,7 @@ ROW_HTML = """\
 </tr>
 """
 
+
 class EmoticonTranslationsHelpExtension(Extension):
     def extendMarkdown(self, md: Markdown) -> None:
         """ Add SettingHelpExtension to the Markdown instance. """
@@ -49,19 +50,22 @@ class EmoticonTranslation(Preprocessor):
             match = REGEXP.search(line)
             if match:
                 text = self.handleMatch(match)
-                lines = lines[:loc] + text + lines[loc+1:]
+                lines = lines[:loc] + text + lines[loc + 1 :]
                 break
         return lines
 
     def handleMatch(self, match: Match[str]) -> List[str]:
         rows = [
-            ROW_HTML.format(emoticon=emoticon,
-                            name=name.strip(':'),
-                            codepoint=name_to_codepoint[name.strip(':')])
+            ROW_HTML.format(
+                emoticon=emoticon,
+                name=name.strip(':'),
+                codepoint=name_to_codepoint[name.strip(':')],
+            )
             for emoticon, name in EMOTICON_CONVERSIONS.items()
         ]
         body = ''.join(rows).strip()
         return TABLE_HTML.format(body=body).strip().splitlines()
 
+
 def makeExtension(*args: Any, **kwargs: Any) -> EmoticonTranslationsHelpExtension:
     return EmoticonTranslationsHelpExtension(*args, **kwargs)
diff --git a/zerver/lib/markdown/help_relative_links.py b/zerver/lib/markdown/help_relative_links.py
index 7bdda972b6..b1b4afbbc9 100644
--- a/zerver/lib/markdown/help_relative_links.py
+++ b/zerver/lib/markdown/help_relative_links.py
@@ -34,6 +34,7 @@ gear_instructions = """
 1. Select {item}.
 """
 
+
 def gear_handle_match(key: str) -> str:
     if relative_help_links:
         item = f'[{gear_info[key][0]}]({gear_info[key][1]})'
@@ -54,6 +55,7 @@ stream_instructions_no_link = """
 1. Click **Manage streams**.
 """
 
+
 def stream_handle_match(key: str) -> str:
     if relative_help_links:
         return f"1. Go to [{stream_info[key][0]}]({stream_info[key][1]})."
@@ -67,18 +69,22 @@ LINK_TYPE_HANDLERS = {
     'stream': stream_handle_match,
 }
 
+
 class RelativeLinksHelpExtension(Extension):
     def extendMarkdown(self, md: Markdown) -> None:
         """ Add RelativeLinksHelpExtension to the Markdown instance. """
         md.registerExtension(self)
         md.preprocessors.register(RelativeLinks(), 'help_relative_links', 520)
 
+
 relative_help_links: Optional[bool] = None
 
+
 def set_relative_help_links(value: bool) -> None:
     global relative_help_links
     relative_help_links = value
 
+
 class RelativeLinks(Preprocessor):
     def run(self, lines: List[str]) -> List[str]:
         done = False
@@ -97,7 +103,7 @@ class RelativeLinks(Preprocessor):
                     preceding = line_split[0]
                     following = line_split[-1]
                     text = [preceding, *text, following]
-                    lines = lines[:loc] + text + lines[loc+1:]
+                    lines = lines[:loc] + text + lines[loc + 1 :]
                     break
             else:
                 done = True
@@ -106,5 +112,6 @@ class RelativeLinks(Preprocessor):
     def handleMatch(self, match: Match[str]) -> str:
         return LINK_TYPE_HANDLERS[match.group('link_type')](match.group('key'))
 
+
 def makeExtension(*args: Any, **kwargs: Any) -> RelativeLinksHelpExtension:
     return RelativeLinksHelpExtension(*args, **kwargs)
diff --git a/zerver/lib/markdown/help_settings_links.py b/zerver/lib/markdown/help_settings_links.py
index ad3a205614..c370dba687 100644
--- a/zerver/lib/markdown/help_settings_links.py
+++ b/zerver/lib/markdown/help_settings_links.py
@@ -24,33 +24,56 @@ link_mapping = {
     'alert-words': ['Settings', 'Alert words', '/#settings/alert-words'],
     'uploaded-files': ['Settings', 'Uploaded files', '/#settings/uploaded-files'],
     'muted-topics': ['Settings', 'Muted topics', '/#settings/muted-topics'],
-
-    'organization-profile': ['Manage organization', 'Organization profile',
-                             '/#organization/organization-profile'],
-    'organization-settings': ['Manage organization', 'Organization settings',
-                              '/#organization/organization-settings'],
-    'organization-permissions': ['Manage organization', 'Organization permissions',
-                                 '/#organization/organization-permissions'],
-    'emoji-settings': ['Manage organization', 'Custom emoji',
-                       '/#organization/emoji-settings'],
-    'auth-methods': ['Manage organization', 'Authentication methods',
-                     '/#organization/auth-methods'],
-    'user-groups-admin': ['Manage organization', 'User groups',
-                          '/#organization/user-groups-admin'],
+    'organization-profile': [
+        'Manage organization',
+        'Organization profile',
+        '/#organization/organization-profile',
+    ],
+    'organization-settings': [
+        'Manage organization',
+        'Organization settings',
+        '/#organization/organization-settings',
+    ],
+    'organization-permissions': [
+        'Manage organization',
+        'Organization permissions',
+        '/#organization/organization-permissions',
+    ],
+    'emoji-settings': ['Manage organization', 'Custom emoji', '/#organization/emoji-settings'],
+    'auth-methods': [
+        'Manage organization',
+        'Authentication methods',
+        '/#organization/auth-methods',
+    ],
+    'user-groups-admin': ['Manage organization', 'User groups', '/#organization/user-groups-admin'],
     'user-list-admin': ['Manage organization', 'Users', '/#organization/user-list-admin'],
-    'deactivated-users-admin': ['Manage organization', 'Deactivated users',
-                                '/#organization/deactivated-users-admin'],
+    'deactivated-users-admin': [
+        'Manage organization',
+        'Deactivated users',
+        '/#organization/deactivated-users-admin',
+    ],
     'bot-list-admin': ['Manage organization', 'Bots', '/#organization/bot-list-admin'],
-    'default-streams-list': ['Manage organization', 'Default streams',
-                             '/#organization/default-streams-list'],
-    'filter-settings': ['Manage organization', 'Linkifiers',
-                        '/#organization/filter-settings'],
-    'profile-field-settings': ['Manage organization', 'Custom profile fields',
-                               '/#organization/profile-field-settings'],
-    'invites-list-admin': ['Manage organization', 'Invitations',
-                           '/#organization/invites-list-admin'],
-    'data-exports-admin': ['Manage organization', 'Data exports',
-                           '/#organization/data-exports-admin'],
+    'default-streams-list': [
+        'Manage organization',
+        'Default streams',
+        '/#organization/default-streams-list',
+    ],
+    'filter-settings': ['Manage organization', 'Linkifiers', '/#organization/filter-settings'],
+    'profile-field-settings': [
+        'Manage organization',
+        'Custom profile fields',
+        '/#organization/profile-field-settings',
+    ],
+    'invites-list-admin': [
+        'Manage organization',
+        'Invitations',
+        '/#organization/invites-list-admin',
+    ],
+    'data-exports-admin': [
+        'Manage organization',
+        'Data exports',
+        '/#organization/data-exports-admin',
+    ],
 }
 
 settings_markdown = """
@@ -69,12 +92,15 @@ class SettingHelpExtension(Extension):
         md.registerExtension(self)
         md.preprocessors.register(Setting(), 'setting', 515)
 
+
 relative_settings_links: Optional[bool] = None
 
+
 def set_relative_settings_links(value: bool) -> None:
     global relative_settings_links
     relative_settings_links = value
 
+
 class Setting(Preprocessor):
     def run(self, lines: List[str]) -> List[str]:
         done = False
@@ -93,7 +119,7 @@ class Setting(Preprocessor):
                     preceding = line_split[0]
                     following = line_split[-1]
                     text = [preceding, *text, following]
-                    lines = lines[:loc] + text + lines[loc+1:]
+                    lines = lines[:loc] + text + lines[loc + 1 :]
                     break
             else:
                 done = True
@@ -111,5 +137,6 @@ class Setting(Preprocessor):
             setting_reference=f"**{setting_name}**",
         )
 
+
 def makeExtension(*args: Any, **kwargs: Any) -> SettingHelpExtension:
     return SettingHelpExtension(*args, **kwargs)
diff --git a/zerver/lib/markdown/include.py b/zerver/lib/markdown/include.py
index 155e4b7b1b..5ab03c8a03 100644
--- a/zerver/lib/markdown/include.py
+++ b/zerver/lib/markdown/include.py
@@ -18,6 +18,7 @@ class MarkdownIncludeCustom(MarkdownInclude):
             500,
         )
 
+
 class IncludeCustomPreprocessor(IncludePreprocessor):
     """
     This is a custom implementation of the markdown_include
@@ -56,12 +57,13 @@ class IncludeCustomPreprocessor(IncludePreprocessor):
                         text[i] = text[i].rstrip('\r\n')
                     text[0] = line_split[0] + text[0]
                     text[-1] = text[-1] + line_split[2]
-                    lines = lines[:loc] + text + lines[loc+1:]
+                    lines = lines[:loc] + text + lines[loc + 1 :]
                     break
             else:
                 done = True
 
         return lines
 
+
 def makeExtension(*args: Any, **kwargs: str) -> MarkdownIncludeCustom:
     return MarkdownIncludeCustom(kwargs)
diff --git a/zerver/lib/markdown/nested_code_blocks.py b/zerver/lib/markdown/nested_code_blocks.py
index b64337e1cc..81eefefcea 100644
--- a/zerver/lib/markdown/nested_code_blocks.py
+++ b/zerver/lib/markdown/nested_code_blocks.py
@@ -15,6 +15,7 @@ class NestedCodeBlocksRenderer(Extension):
             -500,
         )
 
+
 class NestedCodeBlocksRendererTreeProcessor(markdown.treeprocessors.Treeprocessor):
     def __init__(self, md: markdown.Markdown, config: Mapping[str, Any]) -> None:
         super().__init__(md)
@@ -25,9 +26,7 @@ class NestedCodeBlocksRendererTreeProcessor(markdown.treeprocessors.Treeprocesso
         for block in nested_code_blocks:
             tag, text = block.result
             codehilite_block = self.get_codehilite_block(text)
-            self.replace_element(block.family.grandparent,
-                                 codehilite_block,
-                                 block.family.parent)
+            self.replace_element(block.family.grandparent, codehilite_block, block.family.parent)
 
     def get_code_tags(self, e: Element) -> Optional[Tuple[str, Optional[str]]]:
         if e.tag == "code":
@@ -35,7 +34,8 @@ class NestedCodeBlocksRendererTreeProcessor(markdown.treeprocessors.Treeprocesso
         return None
 
     def get_nested_code_blocks(
-        self, code_tags: List[ResultWithFamily[Tuple[str, Optional[str]]]],
+        self,
+        code_tags: List[ResultWithFamily[Tuple[str, Optional[str]]]],
     ) -> List[ResultWithFamily[Tuple[str, Optional[str]]]]:
         nested_code_blocks = []
         for code_tag in code_tags:
@@ -46,7 +46,11 @@ class NestedCodeBlocksRendererTreeProcessor(markdown.treeprocessors.Treeprocesso
                 # that means that the <code> element inside is its
                 # only thing inside the bullet, we can confidently say
                 # that this is a nested code block
-                if parent.text is None and len(list(parent)) == 1 and len(list(parent.itertext())) == 1:
+                if (
+                    parent.text is None
+                    and len(list(parent)) == 1
+                    and len(list(parent.itertext())) == 1
+                ):
                     nested_code_blocks.append(code_tag)
 
         return nested_code_blocks
@@ -59,9 +63,10 @@ class NestedCodeBlocksRendererTreeProcessor(markdown.treeprocessors.Treeprocesso
         return div
 
     def replace_element(
-            self, parent: Optional[Element],
-            replacement: Element,
-            element_to_replace: Element,
+        self,
+        parent: Optional[Element],
+        replacement: Element,
+        element_to_replace: Element,
     ) -> None:
         if parent is None:
             return
@@ -71,5 +76,6 @@ class NestedCodeBlocksRendererTreeProcessor(markdown.treeprocessors.Treeprocesso
                 parent.insert(index, replacement)
                 parent.remove(element_to_replace)
 
+
 def makeExtension(*args: Any, **kwargs: str) -> NestedCodeBlocksRenderer:
     return NestedCodeBlocksRenderer(**kwargs)
diff --git a/zerver/lib/markdown/tabbed_sections.py b/zerver/lib/markdown/tabbed_sections.py
index 64b1b7c57d..5f824a87ee 100644
--- a/zerver/lib/markdown/tabbed_sections.py
+++ b/zerver/lib/markdown/tabbed_sections.py
@@ -47,39 +47,35 @@ TAB_DISPLAY_NAMES = {
     'js': 'JavaScript',
     'curl': 'curl',
     'zulip-send': 'zulip-send',
-
     'web': 'Web',
     'desktop': 'Desktop',
     'mobile': 'Mobile',
-
     'mm-default': 'Default installation',
     'mm-docker': 'Docker',
     'mm-gitlab-omnibus': 'GitLab Omnibus',
-
     'send-email-invitations': 'Send email invitations',
     'share-an-invite-link': 'Share an invite link',
     'allow-anyone-to-join': 'Allow anyone to join',
     'restrict-by-email-domain': 'Restrict by email domain',
-
     'zoom': 'Zoom',
     'jitsi-meet': 'Jitsi Meet',
     'bigbluebutton': 'Big Blue Button',
     'disable': 'Disabled',
-
     'chrome': 'Chrome',
     'firefox': 'Firefox',
     'desktop-app': 'Desktop app',
-
     'system-proxy-settings': 'System proxy settings',
     'custom-proxy-settings': 'Custom proxy settings',
 }
 
+
 class TabbedSectionsGenerator(Extension):
     def extendMarkdown(self, md: markdown.Markdown) -> None:
         md.preprocessors.register(
             TabbedSectionsPreprocessor(md, self.getConfigs()), 'tabbed_sections', -500
         )
 
+
 class TabbedSectionsPreprocessor(Preprocessor):
     def __init__(self, md: markdown.Markdown, config: Mapping[str, Any]) -> None:
         super().__init__(md)
@@ -91,12 +87,14 @@ class TabbedSectionsPreprocessor(Preprocessor):
                 tab_class = 'has-tabs'
             else:
                 tab_class = 'no-tabs'
-                tab_section['tabs'] = [{'tab_name': 'null_tab',
-                                        'start': tab_section['start_tabs_index']}]
+                tab_section['tabs'] = [
+                    {'tab_name': 'null_tab', 'start': tab_section['start_tabs_index']}
+                ]
             nav_bar = self.generate_nav_bar(tab_section)
             content_blocks = self.generate_content_blocks(tab_section, lines)
             rendered_tabs = CODE_SECTION_TEMPLATE.format(
-                tab_class=tab_class, nav_bar=nav_bar, blocks=content_blocks)
+                tab_class=tab_class, nav_bar=nav_bar, blocks=content_blocks
+            )
 
             start = tab_section['start_tabs_index']
             end = tab_section['end_tabs_index'] + 1
@@ -122,7 +120,8 @@ class TabbedSectionsPreprocessor(Preprocessor):
                 # Wrapping the content in two newlines is necessary here.
                 # If we don't do this, the inner Markdown does not get
                 # rendered properly.
-                content=f'\n{content}\n')
+                content=f'\n{content}\n',
+            )
             tab_content_blocks.append(tab_content_block)
         return '\n'.join(tab_content_blocks)
 
@@ -130,8 +129,8 @@ class TabbedSectionsPreprocessor(Preprocessor):
         li_elements = []
         for tab in tab_section['tabs']:
             li = NAV_LIST_ITEM_TEMPLATE.format(
-                data_language=tab.get('tab_name'),
-                name=TAB_DISPLAY_NAMES.get(tab.get('tab_name')))
+                data_language=tab.get('tab_name'), name=TAB_DISPLAY_NAMES.get(tab.get('tab_name'))
+            )
             li_elements.append(li)
         return NAV_BAR_TEMPLATE.format(tabs='\n'.join(li_elements))
 
@@ -145,8 +144,7 @@ class TabbedSectionsPreprocessor(Preprocessor):
             tab_content_match = TAB_CONTENT_REGEX.search(line)
             if tab_content_match:
                 block.setdefault('tabs', [])
-                tab = {'start': index,
-                       'tab_name': tab_content_match.group(1)}
+                tab = {'start': index, 'tab_name': tab_content_match.group(1)}
                 block['tabs'].append(tab)
 
             end_match = END_TABBED_SECTION_REGEX.search(line)
@@ -155,5 +153,6 @@ class TabbedSectionsPreprocessor(Preprocessor):
                 break
         return block
 
+
 def makeExtension(*args: Any, **kwargs: str) -> TabbedSectionsGenerator:
     return TabbedSectionsGenerator(**kwargs)
diff --git a/zerver/lib/markdown/testing_mocks.py b/zerver/lib/markdown/testing_mocks.py
index aa87ce8fd7..448e64fa7a 100644
--- a/zerver/lib/markdown/testing_mocks.py
+++ b/zerver/lib/markdown/testing_mocks.py
@@ -219,6 +219,7 @@ EMOJI_TWEET = """{
     ]
 }"""
 
+
 def twitter(tweet_id: str) -> Optional[Dict[str, Any]]:
     if tweet_id in ["112652479837110273", "287977969287315456", "287977969287315457"]:
         return orjson.loads(NORMAL_TWEET)
diff --git a/zerver/lib/mdiff.py b/zerver/lib/mdiff.py
index fc81479562..bf091df1d8 100755
--- a/zerver/lib/mdiff.py
+++ b/zerver/lib/mdiff.py
@@ -6,6 +6,7 @@ import subprocess
 class DiffException(Exception):
     pass
 
+
 def diff_strings(output: str, expected_output: str) -> str:
 
     mdiff_path = "frontend_tests/zjsunit/mdiff.js"
diff --git a/zerver/lib/mention.py b/zerver/lib/mention.py
index 2691190dc1..8d6d7d64c4 100644
--- a/zerver/lib/mention.py
+++ b/zerver/lib/mention.py
@@ -8,9 +8,11 @@ user_group_mentions = r'(?<![^\s\'\"\(,:<])@(\*[^\*]+\*)'
 
 wildcards = ['all', 'everyone', 'stream']
 
+
 def user_mention_matches_wildcard(mention: str) -> bool:
     return mention in wildcards
 
+
 def extract_mention_text(m: Tuple[str, str]) -> Tuple[Optional[str], bool]:
     # re.findall provides tuples of match elements; we want the second
     # to get the main mention content.
@@ -22,6 +24,7 @@ def extract_mention_text(m: Tuple[str, str]) -> Tuple[Optional[str], bool]:
         return text, False
     return None, False
 
+
 def possible_mentions(content: str) -> Tuple[Set[str], bool]:
     matches = re.findall(find_mentions, content)
     # mention texts can either be names, or an extended name|id syntax.
@@ -35,9 +38,11 @@ def possible_mentions(content: str) -> Tuple[Set[str], bool]:
             message_has_wildcards = True
     return texts, message_has_wildcards
 
+
 def extract_user_group(matched_text: str) -> str:
     return matched_text[1:-1]
 
+
 def possible_user_group_mentions(content: str) -> Set[str]:
     matches = re.findall(user_group_mentions, content)
     return {extract_user_group(match) for match in matches}
diff --git a/zerver/lib/message.py b/zerver/lib/message.py
index 7b09a37c38..24c74f13c3 100644
--- a/zerver/lib/message.py
+++ b/zerver/lib/message.py
@@ -55,6 +55,7 @@ from zerver.models import (
 
 RealmAlertWord = Dict[int, List[str]]
 
+
 class RawReactionRow(TypedDict):
     emoji_code: str
     emoji_name: str
@@ -64,6 +65,7 @@ class RawReactionRow(TypedDict):
     user_profile__full_name: str
     user_profile__id: int
 
+
 class RawUnreadMessagesResult(TypedDict):
     pm_dict: Dict[int, Any]
     stream_dict: Dict[int, Any]
@@ -72,6 +74,7 @@ class RawUnreadMessagesResult(TypedDict):
     muted_stream_ids: List[int]
     unmuted_stream_msgs: Set[int]
 
+
 class UnreadMessagesResult(TypedDict):
     pms: List[Dict[str, Any]]
     streams: List[Dict[str, Any]]
@@ -79,6 +82,7 @@ class UnreadMessagesResult(TypedDict):
     mentions: List[int]
     count: int
 
+
 @dataclass
 class SendMessageRequest:
     message: Message
@@ -102,17 +106,20 @@ class SendMessageRequest:
     deliver_at: Optional[datetime.datetime] = None
     delivery_type: Optional[str] = None
 
+
 # We won't try to fetch more unread message IDs from the database than
 # this limit.  The limit is super high, in large part because it means
 # client-side code mostly doesn't need to think about the case that a
 # user has more older unread messages that were cut off.
 MAX_UNREAD_MESSAGES = 50000
 
+
 def truncate_content(content: str, max_length: int, truncation_message: str) -> str:
     if len(content) > max_length:
-        content = content[:max_length - len(truncation_message)] + truncation_message
+        content = content[: max_length - len(truncation_message)] + truncation_message
     return content
 
+
 def normalize_body(body: str) -> str:
     body = body.rstrip()
     if len(body) == 0:
@@ -121,15 +128,19 @@ def normalize_body(body: str) -> str:
         raise JsonableError(_("Message must not contain null bytes"))
     return truncate_content(body, MAX_MESSAGE_LENGTH, "\n[message truncated]")
 
+
 def truncate_topic(topic: str) -> str:
     return truncate_content(topic, MAX_TOPIC_NAME_LENGTH, "...")
 
-def messages_for_ids(message_ids: List[int],
-                     user_message_flags: Dict[int, List[str]],
-                     search_fields: Dict[int, Dict[str, str]],
-                     apply_markdown: bool,
-                     client_gravatar: bool,
-                     allow_edit_history: bool) -> List[Dict[str, Any]]:
+
+def messages_for_ids(
+    message_ids: List[int],
+    user_message_flags: Dict[int, List[str]],
+    search_fields: Dict[int, Dict[str, str]],
+    apply_markdown: bool,
+    client_gravatar: bool,
+    allow_edit_history: bool,
+) -> List[Dict[str, Any]]:
 
     cache_transformer = MessageDict.build_dict_from_raw_db_row
     id_fetcher = lambda row: row['id']
@@ -141,7 +152,8 @@ def messages_for_ids(message_ids: List[int],
         id_fetcher=id_fetcher,
         cache_transformer=cache_transformer,
         extractor=extract_message_dict,
-        setter=stringify_message_dict)
+        setter=stringify_message_dict,
+    )
 
     message_list: List[Dict[str, Any]] = []
 
@@ -160,8 +172,10 @@ def messages_for_ids(message_ids: List[int],
 
     return message_list
 
-def sew_messages_and_reactions(messages: List[Dict[str, Any]],
-                               reactions: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+
+def sew_messages_and_reactions(
+    messages: List[Dict[str, Any]], reactions: List[Dict[str, Any]]
+) -> List[Dict[str, Any]]:
     """Given a iterable of messages and reactions stitch reactions
     into messages.
     """
@@ -173,14 +187,14 @@ def sew_messages_and_reactions(messages: List[Dict[str, Any]],
     converted_messages = {message['id']: message for message in messages}
 
     for reaction in reactions:
-        converted_messages[reaction['message_id']]['reactions'].append(
-            reaction)
+        converted_messages[reaction['message_id']]['reactions'].append(reaction)
 
     return list(converted_messages.values())
 
 
-def sew_messages_and_submessages(messages: List[Dict[str, Any]],
-                                 submessages: List[Dict[str, Any]]) -> None:
+def sew_messages_and_submessages(
+    messages: List[Dict[str, Any]], submessages: List[Dict[str, Any]]
+) -> None:
     # This is super similar to sew_messages_and_reactions.
     for message in messages:
         message['submessages'] = []
@@ -193,16 +207,20 @@ def sew_messages_and_submessages(messages: List[Dict[str, Any]],
             message = message_dict[message_id]
             message['submessages'].append(submessage)
 
+
 def extract_message_dict(message_bytes: bytes) -> Dict[str, Any]:
     return orjson.loads(zlib.decompress(message_bytes))
 
+
 def stringify_message_dict(message_dict: Dict[str, Any]) -> bytes:
     return zlib.compress(orjson.dumps(message_dict))
 
-@cache_with_key(to_dict_cache_key, timeout=3600*24)
-def message_to_dict_json(message: Message, realm_id: Optional[int]=None) -> bytes:
+
+@cache_with_key(to_dict_cache_key, timeout=3600 * 24)
+def message_to_dict_json(message: Message, realm_id: Optional[int] = None) -> bytes:
     return MessageDict.to_dict_uncached([message], realm_id)[message.id]
 
+
 def save_message_rendered_content(message: Message, content: str) -> str:
     rendered_content = render_markdown(message, content, realm=message.get_realm())
     message.rendered_content = rendered_content
@@ -210,6 +228,7 @@ def save_message_rendered_content(message: Message, content: str) -> str:
     message.save_rendered_content()
     return rendered_content
 
+
 class MessageDict:
     """MessageDict is the core class responsible for marshalling Message
     objects obtained from the database into a format that can be sent
@@ -231,13 +250,14 @@ class MessageDict:
       dictionaries.
 
     """
+
     @staticmethod
-    def wide_dict(message: Message, realm_id: Optional[int]=None) -> Dict[str, Any]:
-        '''
+    def wide_dict(message: Message, realm_id: Optional[int] = None) -> Dict[str, Any]:
+        """
         The next two lines get the cacheable field related
         to our message object, with the side effect of
         populating the cache.
-        '''
+        """
         json = message_to_dict_json(message, realm_id)
         obj = extract_message_dict(json)
 
@@ -253,15 +273,17 @@ class MessageDict:
         return obj
 
     @staticmethod
-    def post_process_dicts(objs: List[Dict[str, Any]], apply_markdown: bool, client_gravatar: bool) -> None:
-        '''
+    def post_process_dicts(
+        objs: List[Dict[str, Any]], apply_markdown: bool, client_gravatar: bool
+    ) -> None:
+        """
         NOTE: This function mutates the objects in
               the `objs` list, rather than making
               shallow copies.  It might be safer to
               make shallow copies here, but performance
               is somewhat important here, as we are
               often fetching hundreds of messages.
-        '''
+        """
         MessageDict.bulk_hydrate_sender_info(objs)
         MessageDict.bulk_hydrate_recipient_info(objs)
 
@@ -269,16 +291,18 @@ class MessageDict:
             MessageDict.finalize_payload(obj, apply_markdown, client_gravatar, skip_copy=True)
 
     @staticmethod
-    def finalize_payload(obj: Dict[str, Any],
-                         apply_markdown: bool,
-                         client_gravatar: bool,
-                         keep_rendered_content: bool=False,
-                         skip_copy: bool=False) -> Dict[str, Any]:
-        '''
+    def finalize_payload(
+        obj: Dict[str, Any],
+        apply_markdown: bool,
+        client_gravatar: bool,
+        keep_rendered_content: bool = False,
+        skip_copy: bool = False,
+    ) -> Dict[str, Any]:
+        """
         By default, we make a shallow copy of the incoming dict to avoid
         mutation-related bugs.  Code paths that are passing a unique object
         can pass skip_copy=True to avoid this extra work.
-        '''
+        """
         if not skip_copy:
             obj = copy.copy(obj)
 
@@ -302,7 +326,9 @@ class MessageDict:
         return obj
 
     @staticmethod
-    def sew_submessages_and_reactions_to_msgs(messages: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+    def sew_submessages_and_reactions_to_msgs(
+        messages: List[Dict[str, Any]]
+    ) -> List[Dict[str, Any]]:
         msg_ids = [msg['id'] for msg in messages]
         submessages = SubMessage.get_raw_db_rows(msg_ids)
         sew_messages_and_submessages(messages, submessages)
@@ -311,14 +337,17 @@ class MessageDict:
         return sew_messages_and_reactions(messages, reactions)
 
     @staticmethod
-    def to_dict_uncached(messages: List[Message], realm_id: Optional[int]=None) -> Dict[int, bytes]:
+    def to_dict_uncached(
+        messages: List[Message], realm_id: Optional[int] = None
+    ) -> Dict[int, bytes]:
         messages_dict = MessageDict.to_dict_uncached_helper(messages, realm_id)
         encoded_messages = {msg['id']: stringify_message_dict(msg) for msg in messages_dict}
         return encoded_messages
 
     @staticmethod
-    def to_dict_uncached_helper(messages: List[Message],
-                                realm_id: Optional[int]=None) -> List[Dict[str, Any]]:
+    def to_dict_uncached_helper(
+        messages: List[Message], realm_id: Optional[int] = None
+    ) -> List[Dict[str, Any]]:
         # Near duplicate of the build_message_dict + get_raw_db_rows
         # code path that accepts already fetched Message objects
         # rather than message IDs.
@@ -332,23 +361,26 @@ class MessageDict:
                 return Stream.objects.get(id=message.recipient.type_id).realm_id
             return message.sender.realm_id
 
-        message_rows = [{
-            'id': message.id,
-            DB_TOPIC_NAME: message.topic_name(),
-            "date_sent": message.date_sent,
-            "last_edit_time": message.last_edit_time,
-            "edit_history": message.edit_history,
-            "content": message.content,
-            "rendered_content": message.rendered_content,
-            "rendered_content_version": message.rendered_content_version,
-            "recipient_id": message.recipient.id,
-            "recipient__type": message.recipient.type,
-            "recipient__type_id": message.recipient.type_id,
-            "rendering_realm_id": get_rendering_realm_id(message),
-            "sender_id": message.sender.id,
-            "sending_client__name": message.sending_client.name,
-            "sender__realm_id": message.sender.realm_id,
-        } for message in messages]
+        message_rows = [
+            {
+                'id': message.id,
+                DB_TOPIC_NAME: message.topic_name(),
+                "date_sent": message.date_sent,
+                "last_edit_time": message.last_edit_time,
+                "edit_history": message.edit_history,
+                "content": message.content,
+                "rendered_content": message.rendered_content,
+                "rendered_content_version": message.rendered_content_version,
+                "recipient_id": message.recipient.id,
+                "recipient__type": message.recipient.type,
+                "recipient__type_id": message.recipient.type_id,
+                "rendering_realm_id": get_rendering_realm_id(message),
+                "sender_id": message.sender.id,
+                "sending_client__name": message.sending_client.name,
+                "sender__realm_id": message.sender.realm_id,
+            }
+            for message in messages
+        ]
 
         MessageDict.sew_submessages_and_reactions_to_msgs(message_rows)
         return [MessageDict.build_dict_from_raw_db_row(row) for row in message_rows]
@@ -378,60 +410,61 @@ class MessageDict:
 
     @staticmethod
     def build_dict_from_raw_db_row(row: Dict[str, Any]) -> Dict[str, Any]:
-        '''
+        """
         row is a row from a .values() call, and it needs to have
         all the relevant fields populated
-        '''
+        """
         return MessageDict.build_message_dict(
-            message_id = row['id'],
-            last_edit_time = row['last_edit_time'],
-            edit_history = row['edit_history'],
-            content = row['content'],
-            topic_name = row[DB_TOPIC_NAME],
-            date_sent = row['date_sent'],
-            rendered_content = row['rendered_content'],
-            rendered_content_version = row['rendered_content_version'],
-            sender_id = row['sender_id'],
-            sender_realm_id = row['sender__realm_id'],
-            sending_client_name = row['sending_client__name'],
-            rendering_realm_id = row.get('rendering_realm_id', row['sender__realm_id']),
-            recipient_id = row['recipient_id'],
-            recipient_type = row['recipient__type'],
-            recipient_type_id = row['recipient__type_id'],
+            message_id=row['id'],
+            last_edit_time=row['last_edit_time'],
+            edit_history=row['edit_history'],
+            content=row['content'],
+            topic_name=row[DB_TOPIC_NAME],
+            date_sent=row['date_sent'],
+            rendered_content=row['rendered_content'],
+            rendered_content_version=row['rendered_content_version'],
+            sender_id=row['sender_id'],
+            sender_realm_id=row['sender__realm_id'],
+            sending_client_name=row['sending_client__name'],
+            rendering_realm_id=row.get('rendering_realm_id', row['sender__realm_id']),
+            recipient_id=row['recipient_id'],
+            recipient_type=row['recipient__type'],
+            recipient_type_id=row['recipient__type_id'],
             reactions=row['reactions'],
             submessages=row['submessages'],
         )
 
     @staticmethod
     def build_message_dict(
-            message_id: int,
-            last_edit_time: Optional[datetime.datetime],
-            edit_history: Optional[str],
-            content: str,
-            topic_name: str,
-            date_sent: datetime.datetime,
-            rendered_content: Optional[str],
-            rendered_content_version: Optional[int],
-            sender_id: int,
-            sender_realm_id: int,
-            sending_client_name: str,
-            rendering_realm_id: int,
-            recipient_id: int,
-            recipient_type: int,
-            recipient_type_id: int,
-            reactions: List[RawReactionRow],
-            submessages: List[Dict[str, Any]],
+        message_id: int,
+        last_edit_time: Optional[datetime.datetime],
+        edit_history: Optional[str],
+        content: str,
+        topic_name: str,
+        date_sent: datetime.datetime,
+        rendered_content: Optional[str],
+        rendered_content_version: Optional[int],
+        sender_id: int,
+        sender_realm_id: int,
+        sending_client_name: str,
+        rendering_realm_id: int,
+        recipient_id: int,
+        recipient_type: int,
+        recipient_type_id: int,
+        reactions: List[RawReactionRow],
+        submessages: List[Dict[str, Any]],
     ) -> Dict[str, Any]:
 
         obj = dict(
-            id                = message_id,
-            sender_id         = sender_id,
-            content           = content,
-            recipient_type_id = recipient_type_id,
-            recipient_type    = recipient_type,
-            recipient_id      = recipient_id,
-            timestamp         = datetime_to_timestamp(date_sent),
-            client            = sending_client_name)
+            id=message_id,
+            sender_id=sender_id,
+            content=content,
+            recipient_type_id=recipient_type_id,
+            recipient_type=recipient_type,
+            recipient_id=recipient_id,
+            timestamp=datetime_to_timestamp(date_sent),
+            client=sending_client_name,
+        )
 
         obj[TOPIC_NAME] = topic_name
         obj['sender_realm_id'] = sender_realm_id
@@ -446,7 +479,9 @@ class MessageDict:
             assert edit_history is not None
             obj['edit_history'] = orjson.loads(edit_history)
 
-        if Message.need_to_render_content(rendered_content, rendered_content_version, markdown_version):
+        if Message.need_to_render_content(
+            rendered_content, rendered_content_version, markdown_version
+        ):
             # We really shouldn't be rendering objects in this method, but there is
             # a scenario where we upgrade the version of Markdown and fail to run
             # management commands to re-render historical messages, and then we
@@ -467,26 +502,26 @@ class MessageDict:
         if rendered_content is not None:
             obj['rendered_content'] = rendered_content
         else:
-            obj['rendered_content'] = ('<p>[Zulip note: Sorry, we could not ' +
-                                       'understand the formatting of your message]</p>')
+            obj['rendered_content'] = (
+                '<p>[Zulip note: Sorry, we could not '
+                + 'understand the formatting of your message]</p>'
+            )
 
         if rendered_content is not None:
             obj['is_me_message'] = Message.is_status_message(content, rendered_content)
         else:
             obj['is_me_message'] = False
 
-        obj['reactions'] = [ReactionDict.build_dict_from_raw_db_row(reaction)
-                            for reaction in reactions]
+        obj['reactions'] = [
+            ReactionDict.build_dict_from_raw_db_row(reaction) for reaction in reactions
+        ]
         obj['submessages'] = submessages
         return obj
 
     @staticmethod
     def bulk_hydrate_sender_info(objs: List[Dict[str, Any]]) -> None:
 
-        sender_ids = list({
-            obj['sender_id']
-            for obj in objs
-        })
+        sender_ids = list({obj['sender_id'] for obj in objs})
 
         if not sender_ids:
             return
@@ -504,10 +539,7 @@ class MessageDict:
 
         rows = query_for_ids(query, sender_ids, 'zerver_userprofile.id')
 
-        sender_dict = {
-            row['id']: row
-            for row in rows
-        }
+        sender_dict = {row['id']: row for row in rows}
 
         for obj in objs:
             sender_id = obj['sender_id']
@@ -522,12 +554,12 @@ class MessageDict:
 
     @staticmethod
     def hydrate_recipient_info(obj: Dict[str, Any], display_recipient: DisplayRecipientT) -> None:
-        '''
+        """
         This method hyrdrates recipient info with things
         like full names and emails of senders.  Eventually
         our clients should be able to hyrdrate these fields
         themselves with info they already have on users.
-        '''
+        """
 
         recipient_type = obj['recipient_type']
         recipient_type_id = obj['recipient_type_id']
@@ -569,7 +601,8 @@ class MessageDict:
                 obj['recipient_id'],
                 obj['recipient_type'],
                 obj['recipient_type_id'],
-            ) for obj in objs
+            )
+            for obj in objs
         }
         display_recipients = bulk_fetch_display_recipients(recipient_tuples)
 
@@ -594,26 +627,33 @@ class MessageDict:
             client_gravatar=client_gravatar,
         )
 
+
 class ReactionDict:
     @staticmethod
     def build_dict_from_raw_db_row(row: RawReactionRow) -> Dict[str, Any]:
-        return {'emoji_name': row['emoji_name'],
-                'emoji_code': row['emoji_code'],
-                'reaction_type': row['reaction_type'],
-                # TODO: We plan to remove this redundant user dictionary once
-                # clients are updated to support accessing use user_id.  See
-                # https://github.com/zulip/zulip/pull/14711 for details.
-                #
-                # When we do that, we can likely update the `.values()` query to
-                # not fetch the extra user_profile__* fields from the database
-                # as a small performance optimization.
-                'user': {'email': row['user_profile__email'],
-                         'id': row['user_profile__id'],
-                         'full_name': row['user_profile__full_name']},
-                'user_id': row['user_profile__id']}
+        return {
+            'emoji_name': row['emoji_name'],
+            'emoji_code': row['emoji_code'],
+            'reaction_type': row['reaction_type'],
+            # TODO: We plan to remove this redundant user dictionary once
+            # clients are updated to support accessing use user_id.  See
+            # https://github.com/zulip/zulip/pull/14711 for details.
+            #
+            # When we do that, we can likely update the `.values()` query to
+            # not fetch the extra user_profile__* fields from the database
+            # as a small performance optimization.
+            'user': {
+                'email': row['user_profile__email'],
+                'id': row['user_profile__id'],
+                'full_name': row['user_profile__full_name'],
+            },
+            'user_id': row['user_profile__id'],
+        }
 
 
-def access_message(user_profile: UserProfile, message_id: int) -> Tuple[Message, Optional[UserMessage]]:
+def access_message(
+    user_profile: UserProfile, message_id: int
+) -> Tuple[Message, Optional[UserMessage]]:
     """You can access a message by ID in our APIs that either:
     (1) You received or have previously accessed via starring
         (aka have a UserMessage row for).
@@ -633,8 +673,10 @@ def access_message(user_profile: UserProfile, message_id: int) -> Tuple[Message,
         return (message, user_message)
     raise JsonableError(_("Invalid message(s)"))
 
-def has_message_access(user_profile: UserProfile, message: Message,
-                       user_message: Optional[UserMessage]) -> bool:
+
+def has_message_access(
+    user_profile: UserProfile, message: Message, user_message: Optional[UserMessage]
+) -> bool:
     if user_message is None:
         if message.recipient.type != Recipient.STREAM:
             # You can't access private messages you didn't receive
@@ -654,15 +696,17 @@ def has_message_access(user_profile: UserProfile, message: Message,
             # This stream is an invite-only stream where message
             # history is available to subscribers.  So we check if
             # you're subscribed.
-            if not Subscription.objects.filter(user_profile=user_profile, active=True,
-                                               recipient=message.recipient).exists():
+            if not Subscription.objects.filter(
+                user_profile=user_profile, active=True, recipient=message.recipient
+            ).exists():
                 return False
 
             # You are subscribed, so let this fall through to the public stream case.
         elif user_profile.is_guest:
             # Guest users don't get automatic access to public stream messages
-            if not Subscription.objects.filter(user_profile=user_profile, active=True,
-                                               recipient=message.recipient).exists():
+            if not Subscription.objects.filter(
+                user_profile=user_profile, active=True, recipient=message.recipient
+            ).exists():
                 return False
         else:
             # Otherwise, the message was sent to a public stream in
@@ -671,6 +715,7 @@ def has_message_access(user_profile: UserProfile, message: Message,
 
     return True
 
+
 def bulk_access_messages(user_profile: UserProfile, messages: Sequence[Message]) -> List[Message]:
     filtered_messages = []
 
@@ -680,9 +725,11 @@ def bulk_access_messages(user_profile: UserProfile, messages: Sequence[Message])
             filtered_messages.append(message)
     return filtered_messages
 
+
 def bulk_access_messages_expect_usermessage(
-        user_profile_id: int, message_ids: Sequence[int]) -> List[int]:
-    '''
+    user_profile_id: int, message_ids: Sequence[int]
+) -> List[int]:
+    """
     Like bulk_access_messages, but faster and potentially stricter.
 
     Returns a subset of `message_ids` containing only messages the
@@ -694,21 +741,24 @@ def bulk_access_messages_expect_usermessage(
     the user has access (e.g. because it went to a public stream.)
 
     See also: `access_message`, `bulk_access_messages`.
-    '''
+    """
     return UserMessage.objects.filter(
         user_profile_id=user_profile_id,
         message_id__in=message_ids,
     ).values_list('message_id', flat=True)
 
-def render_markdown(message: Message,
-                    content: str,
-                    realm: Optional[Realm]=None,
-                    realm_alert_words_automaton: Optional[ahocorasick.Automaton]=None,
-                    mention_data: Optional[MentionData]=None,
-                    email_gateway: bool=False) -> str:
-    '''
+
+def render_markdown(
+    message: Message,
+    content: str,
+    realm: Optional[Realm] = None,
+    realm_alert_words_automaton: Optional[ahocorasick.Automaton] = None,
+    mention_data: Optional[MentionData] = None,
+    email_gateway: bool = False,
+) -> str:
+    """
     This is basically just a wrapper for do_render_markdown.
-    '''
+    """
 
     if realm is None:
         realm = message.get_realm()
@@ -730,14 +780,17 @@ def render_markdown(message: Message,
 
     return rendered_content
 
-def do_render_markdown(message: Message,
-                       content: str,
-                       realm: Realm,
-                       sent_by_bot: bool,
-                       translate_emoticons: bool,
-                       realm_alert_words_automaton: Optional[ahocorasick.Automaton]=None,
-                       mention_data: Optional[MentionData]=None,
-                       email_gateway: bool=False) -> str:
+
+def do_render_markdown(
+    message: Message,
+    content: str,
+    realm: Realm,
+    sent_by_bot: bool,
+    translate_emoticons: bool,
+    realm_alert_words_automaton: Optional[ahocorasick.Automaton] = None,
+    mention_data: Optional[MentionData] = None,
+    email_gateway: bool = False,
+) -> str:
     """Return HTML for given Markdown. Markdown may add properties to the
     message object such as `mentions_user_ids`, `mentions_user_group_ids`, and
     `mentions_wildcard`.  These are only on this Django object and are not
@@ -764,9 +817,12 @@ def do_render_markdown(message: Message,
     )
     return rendered_content
 
+
 def huddle_users(recipient_id: int) -> str:
     display_recipient: DisplayRecipientT = get_display_recipient_by_id(
-        recipient_id, Recipient.HUDDLE, None,
+        recipient_id,
+        Recipient.HUDDLE,
+        None,
     )
 
     # str is for streams.
@@ -776,9 +832,10 @@ def huddle_users(recipient_id: int) -> str:
     user_ids = sorted(user_ids)
     return ','.join(str(uid) for uid in user_ids)
 
-def aggregate_message_dict(input_dict: Dict[int, Dict[str, Any]],
-                           lookup_fields: List[str],
-                           collect_senders: bool) -> List[Dict[str, Any]]:
+
+def aggregate_message_dict(
+    input_dict: Dict[int, Dict[str, Any]], lookup_fields: List[str], collect_senders: bool
+) -> List[Dict[str, Any]]:
     lookup_dict: Dict[Tuple[Any, ...], Dict[str, Any]] = {}
 
     '''
@@ -838,56 +895,75 @@ def aggregate_message_dict(input_dict: Dict[int, Dict[str, Any]],
 
     return [lookup_dict[k] for k in sorted_keys]
 
+
 def get_inactive_recipient_ids(user_profile: UserProfile) -> List[int]:
-    rows = get_stream_subscriptions_for_user(user_profile).filter(
-        active=False,
-    ).values(
-        'recipient_id',
+    rows = (
+        get_stream_subscriptions_for_user(user_profile)
+        .filter(
+            active=False,
+        )
+        .values(
+            'recipient_id',
+        )
     )
-    inactive_recipient_ids = [
-        row['recipient_id']
-        for row in rows]
+    inactive_recipient_ids = [row['recipient_id'] for row in rows]
     return inactive_recipient_ids
 
+
 def get_muted_stream_ids(user_profile: UserProfile) -> List[int]:
-    rows = get_stream_subscriptions_for_user(user_profile).filter(
-        active=True,
-        is_muted=True,
-    ).values(
-        'recipient__type_id',
+    rows = (
+        get_stream_subscriptions_for_user(user_profile)
+        .filter(
+            active=True,
+            is_muted=True,
+        )
+        .values(
+            'recipient__type_id',
+        )
     )
-    muted_stream_ids = [
-        row['recipient__type_id']
-        for row in rows]
+    muted_stream_ids = [row['recipient__type_id'] for row in rows]
     return muted_stream_ids
 
+
 def get_starred_message_ids(user_profile: UserProfile) -> List[int]:
-    return list(UserMessage.objects.filter(
-        user_profile=user_profile,
-    ).extra(
-        where=[UserMessage.where_starred()],
-    ).order_by(
-        'message_id',
-    ).values_list('message_id', flat=True)[0:10000])
+    return list(
+        UserMessage.objects.filter(
+            user_profile=user_profile,
+        )
+        .extra(
+            where=[UserMessage.where_starred()],
+        )
+        .order_by(
+            'message_id',
+        )
+        .values_list('message_id', flat=True)[0:10000]
+    )
+
 
 def get_raw_unread_data(user_profile: UserProfile) -> RawUnreadMessagesResult:
     excluded_recipient_ids = get_inactive_recipient_ids(user_profile)
 
-    user_msgs = UserMessage.objects.filter(
-        user_profile=user_profile,
-    ).exclude(
-        message__recipient_id__in=excluded_recipient_ids,
-    ).extra(
-        where=[UserMessage.where_unread()],
-    ).values(
-        'message_id',
-        'message__sender_id',
-        MESSAGE__TOPIC,
-        'message__recipient_id',
-        'message__recipient__type',
-        'message__recipient__type_id',
-        'flags',
-    ).order_by("-message_id")
+    user_msgs = (
+        UserMessage.objects.filter(
+            user_profile=user_profile,
+        )
+        .exclude(
+            message__recipient_id__in=excluded_recipient_ids,
+        )
+        .extra(
+            where=[UserMessage.where_unread()],
+        )
+        .values(
+            'message_id',
+            'message__sender_id',
+            MESSAGE__TOPIC,
+            'message__recipient_id',
+            'message__recipient__type',
+            'message__recipient__type_id',
+            'flags',
+        )
+        .order_by("-message_id")
+    )
 
     # Limit unread messages for performance reasons.
     user_msgs = list(user_msgs[:MAX_UNREAD_MESSAGES])
@@ -895,9 +971,9 @@ def get_raw_unread_data(user_profile: UserProfile) -> RawUnreadMessagesResult:
     rows = list(reversed(user_msgs))
     return extract_unread_data_from_um_rows(rows, user_profile)
 
+
 def extract_unread_data_from_um_rows(
-    rows: List[Dict[str, Any]],
-    user_profile: Optional[UserProfile]
+    rows: List[Dict[str, Any]], user_profile: Optional[UserProfile]
 ) -> RawUnreadMessagesResult:
 
     pm_dict: Dict[int, Any] = {}
@@ -997,6 +1073,7 @@ def extract_unread_data_from_um_rows(
 
     return raw_unread_messages
 
+
 def aggregate_unread_data(raw_data: RawUnreadMessagesResult) -> UnreadMessagesResult:
 
     pm_dict = raw_data['pm_dict']
@@ -1037,22 +1114,23 @@ def aggregate_unread_data(raw_data: RawUnreadMessagesResult) -> UnreadMessagesRe
         streams=stream_objects,
         huddles=huddle_objects,
         mentions=mentions,
-        count=count)
+        count=count,
+    )
 
     return result
 
-def apply_unread_message_event(user_profile: UserProfile,
-                               state: RawUnreadMessagesResult,
-                               message: Dict[str, Any],
-                               flags: List[str]) -> None:
+
+def apply_unread_message_event(
+    user_profile: UserProfile,
+    state: RawUnreadMessagesResult,
+    message: Dict[str, Any],
+    flags: List[str],
+) -> None:
     message_id = message['id']
     if message['type'] == 'stream':
         message_type = 'stream'
     elif message['type'] == 'private':
-        others = [
-            recip for recip in message['display_recipient']
-            if recip['id'] != user_profile.id
-        ]
+        others = [recip for recip in message['display_recipient'] if recip['id'] != user_profile.id]
         if len(others) <= 1:
             message_type = 'private'
         else:
@@ -1105,8 +1183,8 @@ def apply_unread_message_event(user_profile: UserProfile,
         if message_id in state['unmuted_stream_msgs']:
             state['mentions'].add(message_id)
 
-def remove_message_id_from_unread_mgs(state: RawUnreadMessagesResult,
-                                      message_id: int) -> None:
+
+def remove_message_id_from_unread_mgs(state: RawUnreadMessagesResult, message_id: int) -> None:
     # The opposite of apply_unread_message_event; removes a read or
     # deleted message from a raw_unread_msgs data structure.
     state['pm_dict'].pop(message_id, None)
@@ -1115,32 +1193,44 @@ def remove_message_id_from_unread_mgs(state: RawUnreadMessagesResult,
     state['unmuted_stream_msgs'].discard(message_id)
     state['mentions'].discard(message_id)
 
+
 def estimate_recent_messages(realm: Realm, hours: int) -> int:
     stat = COUNT_STATS['messages_sent:is_bot:hour']
     d = timezone_now() - datetime.timedelta(hours=hours)
-    return RealmCount.objects.filter(property=stat.property, end_time__gt=d,
-                                     realm=realm).aggregate(Sum('value'))['value__sum'] or 0
+    return (
+        RealmCount.objects.filter(property=stat.property, end_time__gt=d, realm=realm).aggregate(
+            Sum('value')
+        )['value__sum']
+        or 0
+    )
+
 
 def get_first_visible_message_id(realm: Realm) -> int:
     return realm.first_visible_message_id
 
+
 def maybe_update_first_visible_message_id(realm: Realm, lookback_hours: int) -> None:
     recent_messages_count = estimate_recent_messages(realm, lookback_hours)
     if realm.message_visibility_limit is not None and recent_messages_count > 0:
         update_first_visible_message_id(realm)
 
+
 def update_first_visible_message_id(realm: Realm) -> None:
     if realm.message_visibility_limit is None:
         realm.first_visible_message_id = 0
     else:
         try:
-            first_visible_message_id = Message.objects.filter(sender__realm=realm).values('id').\
-                order_by('-id')[realm.message_visibility_limit - 1]["id"]
+            first_visible_message_id = (
+                Message.objects.filter(sender__realm=realm)
+                .values('id')
+                .order_by('-id')[realm.message_visibility_limit - 1]["id"]
+            )
         except IndexError:
             first_visible_message_id = 0
         realm.first_visible_message_id = first_visible_message_id
     realm.save(update_fields=["first_visible_message_id"])
 
+
 def get_last_message_id() -> int:
     # We generally use this function to populate RealmAuditLog, and
     # the max id here is actually systemwide, not per-realm.  I
@@ -1153,9 +1243,10 @@ def get_last_message_id() -> int:
         last_id = -1
     return last_id
 
-def get_recent_conversations_recipient_id(user_profile: UserProfile,
-                                          recipient_id: int,
-                                          sender_id: int) -> int:
+
+def get_recent_conversations_recipient_id(
+    user_profile: UserProfile, recipient_id: int, sender_id: int
+) -> int:
     """Helper for doing lookups of the recipient_id that
     get_recent_private_conversations would have used to record that
     message in its data structure.
@@ -1165,6 +1256,7 @@ def get_recent_conversations_recipient_id(user_profile: UserProfile,
         return UserProfile.objects.values_list('recipient_id', flat=True).get(id=sender_id)
     return recipient_id
 
+
 def get_recent_private_conversations(user_profile: UserProfile) -> Dict[int, Dict[str, Any]]:
     """This function uses some carefully optimized SQL queries, designed
     to use the UserMessage index on private_messages.  It is
@@ -1198,7 +1290,8 @@ def get_recent_private_conversations(user_profile: UserProfile) -> Dict[int, Dic
     recipient_map = {}
     my_recipient_id = user_profile.recipient_id
 
-    query = SQL('''
+    query = SQL(
+        '''
     SELECT
         subquery.recipient_id, MAX(subquery.message_id)
     FROM (
@@ -1233,14 +1326,18 @@ def get_recent_private_conversations(user_profile: UserProfile) -> Dict[int, Dic
         LIMIT %(conversation_limit)s)
     ) AS subquery
     GROUP BY subquery.recipient_id
-    ''')
+    '''
+    )
 
     with connection.cursor() as cursor:
-        cursor.execute(query, {
-            "user_profile_id": user_profile.id,
-            "conversation_limit": RECENT_CONVERSATIONS_LIMIT,
-            "my_recipient_id": my_recipient_id,
-        })
+        cursor.execute(
+            query,
+            {
+                "user_profile_id": user_profile.id,
+                "conversation_limit": RECENT_CONVERSATIONS_LIMIT,
+                "my_recipient_id": my_recipient_id,
+            },
+        )
         rows = cursor.fetchall()
 
     # The resulting rows will be (recipient_id, max_message_id)
@@ -1254,10 +1351,11 @@ def get_recent_private_conversations(user_profile: UserProfile) -> Dict[int, Dic
         )
 
     # Now we need to map all the recipient_id objects to lists of user IDs
-    for (recipient_id, user_profile_id) in Subscription.objects.filter(
-            recipient_id__in=recipient_map.keys()).exclude(
-                user_profile_id=user_profile.id).values_list(
-                    "recipient_id", "user_profile_id"):
+    for (recipient_id, user_profile_id) in (
+        Subscription.objects.filter(recipient_id__in=recipient_map.keys())
+        .exclude(user_profile_id=user_profile.id)
+        .values_list("recipient_id", "user_profile_id")
+    ):
         recipient_map[recipient_id]['user_ids'].append(user_profile_id)
 
     # Sort to prevent test flakes and client bugs.
@@ -1266,6 +1364,7 @@ def get_recent_private_conversations(user_profile: UserProfile) -> Dict[int, Dic
 
     return recipient_map
 
+
 def wildcard_mention_allowed(sender: UserProfile, stream: Stream) -> bool:
     realm = sender.realm
 
diff --git a/zerver/lib/migrate.py b/zerver/lib/migrate.py
index bcb1078569..53d3e7ae6e 100644
--- a/zerver/lib/migrate.py
+++ b/zerver/lib/migrate.py
@@ -7,18 +7,22 @@ from psycopg2.sql import SQL, Composable, Identifier
 CursorObj = TypeVar('CursorObj', bound=cursor)
 
 
-def do_batch_update(cursor: CursorObj,
-                    table: str,
-                    assignments: List[Composable],
-                    batch_size: int=10000,
-                    sleep: float=0.1) -> None:  # nocoverage
+def do_batch_update(
+    cursor: CursorObj,
+    table: str,
+    assignments: List[Composable],
+    batch_size: int = 10000,
+    sleep: float = 0.1,
+) -> None:  # nocoverage
     # The string substitution below is complicated by our need to
     # support multiple PostgreSQL versions.
-    stmt = SQL('''
+    stmt = SQL(
+        '''
         UPDATE {}
         SET {}
         WHERE id >= %s AND id < %s
-    ''').format(
+    '''
+    ).format(
         Identifier(table),
         SQL(', ').join(assignments),
     )
diff --git a/zerver/lib/mobile_auth_otp.py b/zerver/lib/mobile_auth_otp.py
index a2907062a8..86facba7e4 100644
--- a/zerver/lib/mobile_auth_otp.py
+++ b/zerver/lib/mobile_auth_otp.py
@@ -15,29 +15,33 @@ def xor_hex_strings(bytes_a: str, bytes_b: str) -> str:
     """Given two hex strings of equal length, return a hex string with
     the bitwise xor of the two hex strings."""
     assert len(bytes_a) == len(bytes_b)
-    return ''.join(f"{int(x, 16) ^ int(y, 16):x}"
-                   for x, y in zip(bytes_a, bytes_b))
+    return ''.join(f"{int(x, 16) ^ int(y, 16):x}" for x, y in zip(bytes_a, bytes_b))
+
 
 def ascii_to_hex(input_string: str) -> str:
     """Given an ascii string, encode it as a hex string"""
     return input_string.encode().hex()
 
+
 def hex_to_ascii(input_string: str) -> str:
     """Given a hex array, decode it back to a string"""
     return bytes.fromhex(input_string).decode()
 
+
 def otp_encrypt_api_key(api_key: str, otp: str) -> str:
     assert len(otp) == UserProfile.API_KEY_LENGTH * 2
     hex_encoded_api_key = ascii_to_hex(api_key)
     assert len(hex_encoded_api_key) == UserProfile.API_KEY_LENGTH * 2
     return xor_hex_strings(hex_encoded_api_key, otp)
 
+
 def otp_decrypt_api_key(otp_encrypted_api_key: str, otp: str) -> str:
     assert len(otp) == UserProfile.API_KEY_LENGTH * 2
     assert len(otp_encrypted_api_key) == UserProfile.API_KEY_LENGTH * 2
     hex_encoded_api_key = xor_hex_strings(otp_encrypted_api_key, otp)
     return hex_to_ascii(hex_encoded_api_key)
 
+
 def is_valid_otp(otp: str) -> bool:
     try:
         assert len(otp) == UserProfile.API_KEY_LENGTH * 2
diff --git a/zerver/lib/name_restrictions.py b/zerver/lib/name_restrictions.py
index 53b8c67da9..bb66d8ef4f 100644
--- a/zerver/lib/name_restrictions.py
+++ b/zerver/lib/name_restrictions.py
@@ -12,77 +12,354 @@ def is_reserved_subdomain(subdomain: str) -> bool:
         return True
     return False
 
+
 def is_disposable_domain(domain: str) -> bool:
     if domain.lower() in WHITELISTED_EMAIL_DOMAINS:
         return False
     return domain.lower() in DISPOSABLE_DOMAINS
 
+
 ZULIP_RESERVED_SUBDOMAINS = {
     # Zulip terms
-    'stream', 'channel', 'topic', 'thread', 'installation', 'organization', 'realm',
-    'team', 'subdomain', 'activity', 'octopus', 'acme', 'push',
+    'stream',
+    'channel',
+    'topic',
+    'thread',
+    'installation',
+    'organization',
+    'realm',
+    'team',
+    'subdomain',
+    'activity',
+    'octopus',
+    'acme',
+    'push',
     # machines
-    'zulipdev', 'localhost', 'staging', 'prod', 'production', 'testing', 'nagios', 'nginx',
+    'zulipdev',
+    'localhost',
+    'staging',
+    'prod',
+    'production',
+    'testing',
+    'nagios',
+    'nginx',
     # website pages
-    'server', 'client', 'features', 'integration', 'bot', 'blog', 'history', 'story',
-    'stories', 'testimonial', 'compare', 'for', 'vs',
+    'server',
+    'client',
+    'features',
+    'integration',
+    'bot',
+    'blog',
+    'history',
+    'story',
+    'stories',
+    'testimonial',
+    'compare',
+    'for',
+    'vs',
     # competitor pages
-    'slack', 'mattermost', 'rocketchat', 'irc', 'twitter', 'zephyr', 'flowdock', 'spark',
-    'skype', 'microsoft', 'twist', 'ryver', 'matrix', 'discord', 'email', 'usenet',
+    'slack',
+    'mattermost',
+    'rocketchat',
+    'irc',
+    'twitter',
+    'zephyr',
+    'flowdock',
+    'spark',
+    'skype',
+    'microsoft',
+    'twist',
+    'ryver',
+    'matrix',
+    'discord',
+    'email',
+    'usenet',
     # Zulip names
-    'zulip', 'tulip', 'humbug',
+    'zulip',
+    'tulip',
+    'humbug',
     # platforms
-    'plan9', 'electron', 'linux', 'mac', 'windows', 'cli', 'ubuntu', 'android', 'ios',
+    'plan9',
+    'electron',
+    'linux',
+    'mac',
+    'windows',
+    'cli',
+    'ubuntu',
+    'android',
+    'ios',
     # floss
-    'contribute', 'floss', 'foss', 'free', 'opensource', 'open', 'code', 'license',
+    'contribute',
+    'floss',
+    'foss',
+    'free',
+    'opensource',
+    'open',
+    'code',
+    'license',
     # intership programs
-    'intern', 'outreachy', 'gsoc', 'gci', 'externship',
+    'intern',
+    'outreachy',
+    'gsoc',
+    'gci',
+    'externship',
     # Things that sound like security
-    'auth', 'authentication', 'security',
+    'auth',
+    'authentication',
+    'security',
     # tech blogs
-    'engineering', 'infrastructure', 'tooling', 'tools', 'javascript', 'python'}
+    'engineering',
+    'infrastructure',
+    'tooling',
+    'tools',
+    'javascript',
+    'python',
+}
 
 # Most of this list was curated from the following sources:
 # http://wiki.dwscoalition.org/notes/List_of_reserved_subdomains (license: CC-BY-SA 3.0)
 # https://stackoverflow.com/questions/11868191/which-saas-subdomains-to-block (license: CC-BY-SA 2.5)
 GENERIC_RESERVED_SUBDOMAINS = {
-    'about', 'abuse', 'account', 'ad', 'admanager', 'admin', 'admindashboard',
-    'administrator', 'adsense', 'adword', 'affiliate', 'alpha', 'anonymous',
-    'api', 'assets', 'audio', 'badges', 'beta', 'billing', 'biz', 'blog',
-    'board', 'bookmark', 'bot', 'bugs', 'buy', 'cache', 'calendar', 'chat',
-    'clients', 'cname', 'code', 'comment', 'communities', 'community',
-    'contact', 'contributor', 'control', 'coppa', 'copyright', 'cpanel', 'css',
-    'cssproxy', 'customise', 'customize', 'dashboard', 'data', 'demo', 'deploy',
-    'deployment', 'desktop', 'dev', 'devel', 'developer', 'development',
-    'discussion', 'diversity', 'dmca', 'docs', 'donate', 'download', 'e-mail',
-    'email', 'embed', 'embedded', 'example', 'explore', 'faq', 'favorite',
-    'favourites', 'features', 'feed', 'feedback', 'files', 'forum', 'friend',
-    'ftp', 'general', 'gettingstarted', 'gift', 'git', 'global', 'graphs',
-    'guide', 'hack', 'help', 'home', 'hostmaster', 'https', 'icon', 'im',
-    'image', 'img', 'inbox', 'index', 'investors', 'invite', 'invoice', 'ios',
-    'ipad', 'iphone', 'irc', 'jabber', 'jars', 'jobs', 'join', 'js', 'kb',
-    'knowledgebase', 'launchpad', 'legal', 'livejournal', 'lj', 'login', 'logs',
-    'm', 'mail', 'main', 'manage', 'map', 'media', 'memories', 'memory',
-    'merchandise', 'messages', 'mobile', 'my', 'mystore', 'networks', 'new',
-    'newsite', 'official', 'ogg', 'online', 'order', 'paid', 'panel', 'partner',
-    'partnerpage', 'pay', 'payment', 'picture', 'policy', 'pop', 'popular',
-    'portal', 'post', 'postmaster', 'press', 'pricing', 'principles', 'privacy',
-    'private', 'profile', 'public', 'random', 'redirect', 'register',
-    'registration', 'resolver', 'root', 'rss', 's', 'sandbox', 'school',
-    'search', 'secure', 'servers', 'service', 'setting', 'shop', 'shortcuts',
-    'signin', 'signup', 'sitemap', 'sitenews', 'sites', 'sms', 'smtp', 'sorry',
-    'ssl', 'staff', 'stage', 'staging', 'stars', 'stat', 'static', 'statistics',
-    'status', 'store', 'style', 'support', 'surveys', 'svn', 'syn',
-    'syndicated', 'system', 'tag', 'talk', 'team', 'termsofservice', 'test',
-    'testers', 'ticket', 'tool', 'tos', 'trac', 'translate', 'update',
-    'upgrade', 'uploads', 'use', 'user', 'username', 'validation', 'videos',
-    'volunteer', 'web', 'webdisk', 'webmail', 'webmaster', 'whm', 'whois',
-    'wiki', 'www', 'www0', 'www8', 'www9', 'xml', 'xmpp', 'xoxo'}
+    'about',
+    'abuse',
+    'account',
+    'ad',
+    'admanager',
+    'admin',
+    'admindashboard',
+    'administrator',
+    'adsense',
+    'adword',
+    'affiliate',
+    'alpha',
+    'anonymous',
+    'api',
+    'assets',
+    'audio',
+    'badges',
+    'beta',
+    'billing',
+    'biz',
+    'blog',
+    'board',
+    'bookmark',
+    'bot',
+    'bugs',
+    'buy',
+    'cache',
+    'calendar',
+    'chat',
+    'clients',
+    'cname',
+    'code',
+    'comment',
+    'communities',
+    'community',
+    'contact',
+    'contributor',
+    'control',
+    'coppa',
+    'copyright',
+    'cpanel',
+    'css',
+    'cssproxy',
+    'customise',
+    'customize',
+    'dashboard',
+    'data',
+    'demo',
+    'deploy',
+    'deployment',
+    'desktop',
+    'dev',
+    'devel',
+    'developer',
+    'development',
+    'discussion',
+    'diversity',
+    'dmca',
+    'docs',
+    'donate',
+    'download',
+    'e-mail',
+    'email',
+    'embed',
+    'embedded',
+    'example',
+    'explore',
+    'faq',
+    'favorite',
+    'favourites',
+    'features',
+    'feed',
+    'feedback',
+    'files',
+    'forum',
+    'friend',
+    'ftp',
+    'general',
+    'gettingstarted',
+    'gift',
+    'git',
+    'global',
+    'graphs',
+    'guide',
+    'hack',
+    'help',
+    'home',
+    'hostmaster',
+    'https',
+    'icon',
+    'im',
+    'image',
+    'img',
+    'inbox',
+    'index',
+    'investors',
+    'invite',
+    'invoice',
+    'ios',
+    'ipad',
+    'iphone',
+    'irc',
+    'jabber',
+    'jars',
+    'jobs',
+    'join',
+    'js',
+    'kb',
+    'knowledgebase',
+    'launchpad',
+    'legal',
+    'livejournal',
+    'lj',
+    'login',
+    'logs',
+    'm',
+    'mail',
+    'main',
+    'manage',
+    'map',
+    'media',
+    'memories',
+    'memory',
+    'merchandise',
+    'messages',
+    'mobile',
+    'my',
+    'mystore',
+    'networks',
+    'new',
+    'newsite',
+    'official',
+    'ogg',
+    'online',
+    'order',
+    'paid',
+    'panel',
+    'partner',
+    'partnerpage',
+    'pay',
+    'payment',
+    'picture',
+    'policy',
+    'pop',
+    'popular',
+    'portal',
+    'post',
+    'postmaster',
+    'press',
+    'pricing',
+    'principles',
+    'privacy',
+    'private',
+    'profile',
+    'public',
+    'random',
+    'redirect',
+    'register',
+    'registration',
+    'resolver',
+    'root',
+    'rss',
+    's',
+    'sandbox',
+    'school',
+    'search',
+    'secure',
+    'servers',
+    'service',
+    'setting',
+    'shop',
+    'shortcuts',
+    'signin',
+    'signup',
+    'sitemap',
+    'sitenews',
+    'sites',
+    'sms',
+    'smtp',
+    'sorry',
+    'ssl',
+    'staff',
+    'stage',
+    'staging',
+    'stars',
+    'stat',
+    'static',
+    'statistics',
+    'status',
+    'store',
+    'style',
+    'support',
+    'surveys',
+    'svn',
+    'syn',
+    'syndicated',
+    'system',
+    'tag',
+    'talk',
+    'team',
+    'termsofservice',
+    'test',
+    'testers',
+    'ticket',
+    'tool',
+    'tos',
+    'trac',
+    'translate',
+    'update',
+    'upgrade',
+    'uploads',
+    'use',
+    'user',
+    'username',
+    'validation',
+    'videos',
+    'volunteer',
+    'web',
+    'webdisk',
+    'webmail',
+    'webmaster',
+    'whm',
+    'whois',
+    'wiki',
+    'www',
+    'www0',
+    'www8',
+    'www9',
+    'xml',
+    'xmpp',
+    'xoxo',
+}
 
 DISPOSABLE_DOMAINS = set(blacklist)
 
 WHITELISTED_EMAIL_DOMAINS = {
     # Controlled by https://www.abine.com; more legitimate than most
     # disposable domains
-    'opayq.com', 'abinemail.com', 'blurmail.net', 'maskmemail.com',
+    'opayq.com',
+    'abinemail.com',
+    'blurmail.net',
+    'maskmemail.com',
 }
diff --git a/zerver/lib/narrow.py b/zerver/lib/narrow.py
index 2a9ea97593..00a5261c3f 100644
--- a/zerver/lib/narrow.py
+++ b/zerver/lib/narrow.py
@@ -8,21 +8,27 @@ from zerver.lib.request import JsonableError
 from zerver.lib.topic import get_topic_from_message_info
 
 stop_words_list: Optional[List[str]] = None
+
+
 def read_stop_words() -> List[str]:
     global stop_words_list
     if stop_words_list is None:
-        file_path = os.path.join(settings.DEPLOY_ROOT, "puppet/zulip/files/postgresql/zulip_english.stop")
+        file_path = os.path.join(
+            settings.DEPLOY_ROOT, "puppet/zulip/files/postgresql/zulip_english.stop"
+        )
         with open(file_path) as f:
             stop_words_list = f.read().splitlines()
 
     return stop_words_list
 
+
 def check_supported_events_narrow_filter(narrow: Iterable[Sequence[str]]) -> None:
     for element in narrow:
         operator = element[0]
         if operator not in ["stream", "topic", "sender", "is"]:
             raise JsonableError(_("Operator {} not supported.").format(operator))
 
+
 def is_web_public_compatible(narrow: Iterable[Dict[str, Any]]) -> bool:
     for element in narrow:
         operator = element['operator']
@@ -32,6 +38,7 @@ def is_web_public_compatible(narrow: Iterable[Dict[str, Any]]) -> bool:
             return False
     return True
 
+
 def is_web_public_narrow(narrow: Optional[Iterable[Dict[str, Any]]]) -> bool:
     if narrow is None:
         return False
@@ -39,11 +46,16 @@ def is_web_public_narrow(narrow: Optional[Iterable[Dict[str, Any]]]) -> bool:
     for term in narrow:
         # Web public queries are only allowed for limited types of narrows.
         # term == {'operator': 'streams', 'operand': 'web-public', 'negated': False}
-        if term['operator'] == 'streams' and term['operand'] == 'web-public' and term['negated'] is False:
+        if (
+            term['operator'] == 'streams'
+            and term['operand'] == 'web-public'
+            and term['negated'] is False
+        ):
             return True
 
     return False
 
+
 def build_narrow_filter(narrow: Iterable[Sequence[str]]) -> Callable[[Mapping[str, Any]], bool]:
     """Changes to this function should come with corresponding changes to
     BuildNarrowFilterTest."""
@@ -83,4 +95,5 @@ def build_narrow_filter(narrow: Iterable[Sequence[str]]) -> Callable[[Mapping[st
                     return False
 
         return True
+
     return narrow_filter
diff --git a/zerver/lib/onboarding.py b/zerver/lib/onboarding.py
index ee4b69a3c7..6173c95dce 100644
--- a/zerver/lib/onboarding.py
+++ b/zerver/lib/onboarding.py
@@ -17,22 +17,27 @@ from zerver.models import Message, Realm, UserProfile, get_system_bot
 
 
 def missing_any_realm_internal_bots() -> bool:
-    bot_emails = [bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,)
-                  for bot in settings.REALM_INTERNAL_BOTS]
-    bot_counts = dict(UserProfile.objects.filter(email__in=bot_emails)
-                                         .values_list('email')
-                                         .annotate(Count('id')))
+    bot_emails = [
+        bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,)
+        for bot in settings.REALM_INTERNAL_BOTS
+    ]
+    bot_counts = dict(
+        UserProfile.objects.filter(email__in=bot_emails).values_list('email').annotate(Count('id'))
+    )
     realm_count = Realm.objects.count()
     return any(bot_counts.get(email, 0) < realm_count for email in bot_emails)
 
+
 def setup_realm_internal_bots(realm: Realm) -> None:
     """Create this realm's internal bots.
 
     This function is idempotent; it does nothing for a bot that
     already exists.
     """
-    internal_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
-                     for bot in settings.REALM_INTERNAL_BOTS]
+    internal_bots = [
+        (bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
+        for bot in settings.REALM_INTERNAL_BOTS
+    ]
     create_users(realm, internal_bots, bot_type=UserProfile.DEFAULT_BOT)
     bots = UserProfile.objects.filter(
         realm=realm,
@@ -43,6 +48,7 @@ def setup_realm_internal_bots(realm: Realm) -> None:
         bot.bot_owner = bot
         bot.save()
 
+
 def create_if_missing_realm_internal_bots() -> None:
     """This checks if there is any realm internal bot missing.
 
@@ -52,65 +58,65 @@ def create_if_missing_realm_internal_bots() -> None:
         for realm in Realm.objects.all():
             setup_realm_internal_bots(realm)
 
+
 def send_initial_pms(user: UserProfile) -> None:
     organization_setup_text = ""
     if user.is_realm_admin:
         help_url = user.realm.uri + "/help/getting-your-organization-started-with-zulip"
         organization_setup_text = (
-            "* " +
-            _("[Read the guide]({help_url}) for getting your organization started with Zulip") +
-            "\n"
+            "* "
+            + _("[Read the guide]({help_url}) for getting your organization started with Zulip")
+            + "\n"
         ).format(help_url=help_url)
 
     content = (
-        _("Hello, and welcome to Zulip!") +
-        "\n"
-        "\n" +
-        _("This is a private message from me, Welcome Bot.") +
-        " " +
-        _("Here are some tips to get you started:") +
-        "\n"
-        "* " +
-        _("Download our [Desktop and mobile apps]({apps_url})") +
-        "\n"
-        "* " +
-        _("Customize your account and notifications on your [Settings page]({settings_url})") +
-        "\n"
-        "* " +
-        _("Type `?` to check out Zulip's keyboard shortcuts") +
+        _("Hello, and welcome to Zulip!") + "\n"
         "\n"
+        + _("This is a private message from me, Welcome Bot.")
+        + " "
+        + _("Here are some tips to get you started:")
+        + "\n"
+        "* " + _("Download our [Desktop and mobile apps]({apps_url})") + "\n"
+        "* "
+        + _("Customize your account and notifications on your [Settings page]({settings_url})")
+        + "\n"
+        "* " + _("Type `?` to check out Zulip's keyboard shortcuts") + "\n"
         "{organization_setup_text}"
-        "\n" +
-        _("The most important shortcut is `r` to reply.") +
+        "\n" + _("The most important shortcut is `r` to reply.") + "\n"
         "\n"
-        "\n" +
-        _("Practice sending a few messages by replying to this conversation.") +
-        " " +
-        _("If you're not into keyboards, that's okay too; "
-          "clicking anywhere on this message will also do the trick!")
+        + _("Practice sending a few messages by replying to this conversation.")
+        + " "
+        + _(
+            "If you're not into keyboards, that's okay too; "
+            "clicking anywhere on this message will also do the trick!"
+        )
     )
 
-    content = content.format(apps_url="/apps", settings_url="#settings",
-                             organization_setup_text=organization_setup_text)
+    content = content.format(
+        apps_url="/apps", settings_url="#settings", organization_setup_text=organization_setup_text
+    )
+
+    internal_send_private_message(user.realm, get_system_bot(settings.WELCOME_BOT), user, content)
 
-    internal_send_private_message(user.realm, get_system_bot(settings.WELCOME_BOT),
-                                  user, content)
 
 def send_welcome_bot_response(send_request: SendMessageRequest) -> None:
     welcome_bot = get_system_bot(settings.WELCOME_BOT)
     human_recipient_id = send_request.message.sender.recipient_id
     if Message.objects.filter(sender=welcome_bot, recipient_id=human_recipient_id).count() < 2:
         content = (
-            _("Congratulations on your first reply!") +
-            " "
+            _("Congratulations on your first reply!") + " "
             ":tada:"
             "\n"
-            "\n" +
-            _("Feel free to continue using this space to practice your new messaging "
-              "skills. Or, try clicking on some of the stream names to your left!")
+            "\n"
+            + _(
+                "Feel free to continue using this space to practice your new messaging "
+                "skills. Or, try clicking on some of the stream names to your left!"
+            )
         )
         internal_send_private_message(
-            send_request.realm, welcome_bot, send_request.message.sender, content)
+            send_request.realm, welcome_bot, send_request.message.sender, content
+        )
+
 
 def send_initial_realm_messages(realm: Realm) -> None:
     welcome_bot = get_system_bot(settings.WELCOME_BOT)
@@ -118,65 +124,90 @@ def send_initial_realm_messages(realm: Realm) -> None:
     # Order corresponds to the ordering of the streams on the left sidebar, to make the initial Home
     # view slightly less overwhelming
     content_of_private_streams_topic = (
-        _("This is a private stream, as indicated by the lock icon next to the stream name.") +
-        " " +
-        _("Private streams are only visible to stream members.") +
+        _("This is a private stream, as indicated by the lock icon next to the stream name.")
+        + " "
+        + _("Private streams are only visible to stream members.")
+        + "\n"
         "\n"
-        "\n" +
-        _("To manage this stream, go to [Stream settings]({stream_settings_url}) "
-          "and click on `{initial_private_stream_name}`.")
-    ).format(stream_settings_url="#streams/subscribed",
-             initial_private_stream_name=Realm.INITIAL_PRIVATE_STREAM_NAME)
+        + _(
+            "To manage this stream, go to [Stream settings]({stream_settings_url}) "
+            "and click on `{initial_private_stream_name}`."
+        )
+    ).format(
+        stream_settings_url="#streams/subscribed",
+        initial_private_stream_name=Realm.INITIAL_PRIVATE_STREAM_NAME,
+    )
 
     content1_of_topic_demonstration_topic = (
-        _("This is a message on stream #**{default_notification_stream_name}** with the "
-          "topic `topic demonstration`.")
+        _(
+            "This is a message on stream #**{default_notification_stream_name}** with the "
+            "topic `topic demonstration`."
+        )
     ).format(default_notification_stream_name=Realm.DEFAULT_NOTIFICATION_STREAM_NAME)
 
     content2_of_topic_demonstration_topic = (
-        _("Topics are a lightweight tool to keep conversations organized.") +
-        " " +
-        _("You can learn more about topics at [Streams and topics]({about_topics_help_url}).")
+        _("Topics are a lightweight tool to keep conversations organized.")
+        + " "
+        + _("You can learn more about topics at [Streams and topics]({about_topics_help_url}).")
     ).format(about_topics_help_url="/help/about-streams-and-topics")
 
     content_of_swimming_turtles_topic = (
-        _("This is a message on stream #**{default_notification_stream_name}** with the "
-          "topic `swimming turtles`.") +
-        "\n"
+        _(
+            "This is a message on stream #**{default_notification_stream_name}** with the "
+            "topic `swimming turtles`."
+        )
+        + "\n"
         "\n"
         "[](/static/images/cute/turtle.png)"
         "\n"
-        "\n" +
-        _("[Start a new topic]({start_topic_help_url}) any time you're not replying to a \
-        previous message.")
-    ).format(default_notification_stream_name=Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
-             start_topic_help_url="/help/start-a-new-topic")
+        "\n"
+        + _(
+            "[Start a new topic]({start_topic_help_url}) any time you're not replying to a \
+        previous message."
+        )
+    ).format(
+        default_notification_stream_name=Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
+        start_topic_help_url="/help/start-a-new-topic",
+    )
 
     welcome_messages: List[Dict[str, str]] = [
-        {'stream': Realm.INITIAL_PRIVATE_STREAM_NAME,
-         'topic': "private streams",
-         'content': content_of_private_streams_topic},
-        {'stream': Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
-         'topic': "topic demonstration",
-         'content': content1_of_topic_demonstration_topic},
-        {'stream': Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
-         'topic': "topic demonstration",
-         'content': content2_of_topic_demonstration_topic},
-        {'stream': realm.DEFAULT_NOTIFICATION_STREAM_NAME,
-         'topic': "swimming turtles",
-         'content': content_of_swimming_turtles_topic},
+        {
+            'stream': Realm.INITIAL_PRIVATE_STREAM_NAME,
+            'topic': "private streams",
+            'content': content_of_private_streams_topic,
+        },
+        {
+            'stream': Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
+            'topic': "topic demonstration",
+            'content': content1_of_topic_demonstration_topic,
+        },
+        {
+            'stream': Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
+            'topic': "topic demonstration",
+            'content': content2_of_topic_demonstration_topic,
+        },
+        {
+            'stream': realm.DEFAULT_NOTIFICATION_STREAM_NAME,
+            'topic': "swimming turtles",
+            'content': content_of_swimming_turtles_topic,
+        },
     ]
 
-    messages = [internal_prep_stream_message_by_name(
-        realm, welcome_bot, message['stream'], message['topic'], message['content'],
-    ) for message in welcome_messages]
+    messages = [
+        internal_prep_stream_message_by_name(
+            realm,
+            welcome_bot,
+            message['stream'],
+            message['topic'],
+            message['content'],
+        )
+        for message in welcome_messages
+    ]
     message_ids = do_send_messages(messages)
 
     # We find the one of our just-sent messages with turtle.png in it,
     # and react to it.  This is a bit hacky, but works and is kinda a
     # 1-off thing.
-    turtle_message = Message.objects.get(
-        id__in=message_ids,
-        content__icontains='cute/turtle.png')
+    turtle_message = Message.objects.get(id__in=message_ids, content__icontains='cute/turtle.png')
     (emoji_code, reaction_type) = emoji_name_to_emoji_code(realm, 'turtle')
     do_add_reaction(welcome_bot, turtle_message, 'turtle', emoji_code, reaction_type)
diff --git a/zerver/lib/outgoing_webhook.py b/zerver/lib/outgoing_webhook.py
index f6150eca72..276c474611 100644
--- a/zerver/lib/outgoing_webhook.py
+++ b/zerver/lib/outgoing_webhook.py
@@ -26,7 +26,6 @@ from zerver.models import (
 
 
 class OutgoingWebhookServiceInterface(metaclass=abc.ABCMeta):
-
     def __init__(self, token: str, user_profile: UserProfile, service_name: str) -> None:
         self.token: str = token
         self.user_profile: UserProfile = user_profile
@@ -44,10 +43,10 @@ class OutgoingWebhookServiceInterface(metaclass=abc.ABCMeta):
     def process_success(self, response_json: Dict[str, Any]) -> Optional[Dict[str, Any]]:
         raise NotImplementedError
 
-class GenericOutgoingWebhookService(OutgoingWebhookServiceInterface):
 
+class GenericOutgoingWebhookService(OutgoingWebhookServiceInterface):
     def build_bot_request(self, event: Dict[str, Any]) -> Optional[Any]:
-        '''
+        """
         We send a simple version of the message to outgoing
         webhooks, since most of them really only need
         `content` and a few other fields.  We may eventually
@@ -55,7 +54,7 @@ class GenericOutgoingWebhookService(OutgoingWebhookServiceInterface):
         that's not a high priority.  We do send the gravatar
         info to the clients (so they don't have to compute
         it themselves).
-        '''
+        """
         message_dict = MessageDict.finalize_payload(
             event['message'],
             apply_markdown=False,
@@ -63,16 +62,16 @@ class GenericOutgoingWebhookService(OutgoingWebhookServiceInterface):
             keep_rendered_content=True,
         )
 
-        request_data = {"data": event['command'],
-                        "message": message_dict,
-                        "bot_email": self.user_profile.email,
-                        "token": self.token,
-                        "trigger": event['trigger']}
+        request_data = {
+            "data": event['command'],
+            "message": message_dict,
+            "bot_email": self.user_profile.email,
+            "token": self.token,
+            "trigger": event['trigger'],
+        }
         return json.dumps(request_data)
 
-    def send_data_to_server(self,
-                            base_url: str,
-                            request_data: Any) -> Response:
+    def send_data_to_server(self, base_url: str, request_data: Any) -> Response:
         user_agent = 'ZulipOutgoingWebhook/' + ZULIP_VERSION
         headers = {
             'content-type': 'application/json',
@@ -100,32 +99,31 @@ class GenericOutgoingWebhookService(OutgoingWebhookServiceInterface):
 
         return None
 
-class SlackOutgoingWebhookService(OutgoingWebhookServiceInterface):
 
+class SlackOutgoingWebhookService(OutgoingWebhookServiceInterface):
     def build_bot_request(self, event: Dict[str, Any]) -> Optional[Any]:
         if event['message']['type'] == 'private':
             failure_message = "Slack outgoing webhooks don't support private messages."
             fail_with_message(event, failure_message)
             return None
 
-        request_data = [("token", self.token),
-                        ("team_id", event['message']['sender_realm_str']),
-                        ("team_domain", email_to_domain(event['message']['sender_email'])),
-                        ("channel_id", event['message']['stream_id']),
-                        ("channel_name", event['message']['display_recipient']),
-                        ("timestamp", event['message']['timestamp']),
-                        ("user_id", event['message']['sender_id']),
-                        ("user_name", event['message']['sender_full_name']),
-                        ("text", event['command']),
-                        ("trigger_word", event['trigger']),
-                        ("service_id", event['user_profile_id']),
-                        ]
+        request_data = [
+            ("token", self.token),
+            ("team_id", event['message']['sender_realm_str']),
+            ("team_domain", email_to_domain(event['message']['sender_email'])),
+            ("channel_id", event['message']['stream_id']),
+            ("channel_name", event['message']['display_recipient']),
+            ("timestamp", event['message']['timestamp']),
+            ("user_id", event['message']['sender_id']),
+            ("user_name", event['message']['sender_full_name']),
+            ("text", event['command']),
+            ("trigger_word", event['trigger']),
+            ("service_id", event['user_profile_id']),
+        ]
 
         return request_data
 
-    def send_data_to_server(self,
-                            base_url: str,
-                            request_data: Any) -> Response:
+    def send_data_to_server(self, base_url: str, request_data: Any) -> Response:
         response = requests.request('POST', base_url, data=request_data)
         return response
 
@@ -137,26 +135,32 @@ class SlackOutgoingWebhookService(OutgoingWebhookServiceInterface):
 
         return None
 
+
 AVAILABLE_OUTGOING_WEBHOOK_INTERFACES: Dict[str, Any] = {
     GENERIC_INTERFACE: GenericOutgoingWebhookService,
     SLACK_INTERFACE: SlackOutgoingWebhookService,
 }
 
+
 def get_service_interface_class(interface: str) -> Any:
     if interface not in AVAILABLE_OUTGOING_WEBHOOK_INTERFACES:
         return AVAILABLE_OUTGOING_WEBHOOK_INTERFACES[GENERIC_INTERFACE]
     else:
         return AVAILABLE_OUTGOING_WEBHOOK_INTERFACES[interface]
 
+
 def get_outgoing_webhook_service_handler(service: Service) -> Any:
 
     service_interface_class = get_service_interface_class(service.interface_name())
-    service_interface = service_interface_class(token=service.token,
-                                                user_profile=service.user_profile,
-                                                service_name=service.name)
+    service_interface = service_interface_class(
+        token=service.token, user_profile=service.user_profile, service_name=service.name
+    )
     return service_interface
 
-def send_response_message(bot_id: int, message_info: Dict[str, Any], response_data: Dict[str, Any]) -> None:
+
+def send_response_message(
+    bot_id: int, message_info: Dict[str, Any], response_data: Dict[str, Any]
+) -> None:
     """
     bot_id is the user_id of the bot sending the response
 
@@ -203,6 +207,7 @@ def send_response_message(bot_id: int, message_info: Dict[str, Any], response_da
         realm=realm,
     )
 
+
 def fail_with_message(event: Dict[str, Any], failure_message: str) -> None:
     bot_id = event['user_profile_id']
     message_info = event['message']
@@ -210,6 +215,7 @@ def fail_with_message(event: Dict[str, Any], failure_message: str) -> None:
     response_data = dict(content=content)
     send_response_message(bot_id=bot_id, message_info=message_info, response_data=response_data)
 
+
 def get_message_url(event: Dict[str, Any]) -> str:
     bot_user = get_user_profile_by_id(event['user_profile_id'])
     message = event['message']
@@ -220,11 +226,14 @@ def get_message_url(event: Dict[str, Any]) -> str:
         message=message,
     )
 
-def notify_bot_owner(event: Dict[str, Any],
-                     status_code: Optional[int]=None,
-                     response_content: Optional[AnyStr]=None,
-                     failure_message: Optional[str]=None,
-                     exception: Optional[Exception]=None) -> None:
+
+def notify_bot_owner(
+    event: Dict[str, Any],
+    status_code: Optional[int] = None,
+    response_content: Optional[AnyStr] = None,
+    failure_message: Optional[str] = None,
+    exception: Optional[Exception] = None,
+) -> None:
     message_url = get_message_url(event)
     bot_id = event['user_profile_id']
     bot_owner = get_user_profile_by_id(bot_id).bot_owner
@@ -236,10 +245,14 @@ def notify_bot_owner(event: Dict[str, Any],
     if status_code:
         notification_message += f"\nThe webhook got a response with status code *{status_code}*."
     if response_content:
-        notification_message += f"\nThe response contains the following payload:\n```\n{response_content!r}\n```"
+        notification_message += (
+            f"\nThe response contains the following payload:\n```\n{response_content!r}\n```"
+        )
     if exception:
-        notification_message += "\nWhen trying to send a request to the webhook service, an exception " \
-                                f"of type {type(exception).__name__} occurred:\n```\n{exception}\n```"
+        notification_message += (
+            "\nWhen trying to send a request to the webhook service, an exception "
+            f"of type {type(exception).__name__} occurred:\n```\n{exception}\n```"
+        )
 
     message_info = dict(
         type='private',
@@ -248,8 +261,8 @@ def notify_bot_owner(event: Dict[str, Any],
     response_data = dict(content=notification_message)
     send_response_message(bot_id=bot_id, message_info=message_info, response_data=response_data)
 
-def request_retry(event: Dict[str, Any],
-                  failure_message: Optional[str]=None) -> None:
+
+def request_retry(event: Dict[str, Any], failure_message: Optional[str] = None) -> None:
     def failure_processor(event: Dict[str, Any]) -> None:
         """
         The name of the argument is 'event' on purpose. This argument will hide
@@ -261,14 +274,16 @@ def request_retry(event: Dict[str, Any],
         notify_bot_owner(event, failure_message=failure_message)
         logging.warning(
             "Maximum retries exceeded for trigger:%s event:%s",
-            bot_user.email, event['command'],
+            bot_user.email,
+            event['command'],
         )
 
     retry_event('outgoing_webhooks', event, failure_processor)
 
-def process_success_response(event: Dict[str, Any],
-                             service_handler: Any,
-                             response: Response) -> None:
+
+def process_success_response(
+    event: Dict[str, Any], service_handler: Any, response: Response
+) -> None:
     try:
         response_json = json.loads(response.text)
     except json.JSONDecodeError:
@@ -291,10 +306,10 @@ def process_success_response(event: Dict[str, Any],
     response_data = dict(content=content, widget_content=widget_content)
     send_response_message(bot_id=bot_id, message_info=message_info, response_data=response_data)
 
-def do_rest_call(base_url: str,
-                 request_data: Any,
-                 event: Dict[str, Any],
-                 service_handler: Any) -> Optional[Response]:
+
+def do_rest_call(
+    base_url: str, request_data: Any, event: Dict[str, Any], service_handler: Any
+) -> Optional[Response]:
     """Returns response of call if no exception occurs."""
     try:
         response = service_handler.send_data_to_server(
@@ -304,12 +319,16 @@ def do_rest_call(base_url: str,
         if str(response.status_code).startswith('2'):
             process_success_response(event, service_handler, response)
         else:
-            logging.warning("Message %(message_url)s triggered an outgoing webhook, returning status "
-                            "code %(status_code)s.\n Content of response (in quotes): \""
-                            "%(response)s\"",
-                            {'message_url': get_message_url(event),
-                             'status_code': response.status_code,
-                             'response': response.text})
+            logging.warning(
+                "Message %(message_url)s triggered an outgoing webhook, returning status "
+                "code %(status_code)s.\n Content of response (in quotes): \""
+                "%(response)s\"",
+                {
+                    'message_url': get_message_url(event),
+                    'status_code': response.status_code,
+                    'response': response.text,
+                },
+            )
             failure_message = f"Third party responded with {response.status_code}"
             fail_with_message(event, failure_message)
             notify_bot_owner(event, response.status_code, response.content)
@@ -317,15 +336,19 @@ def do_rest_call(base_url: str,
     except requests.exceptions.Timeout:
         logging.info(
             "Trigger event %s on %s timed out. Retrying",
-            event["command"], event['service_name'],
+            event["command"],
+            event['service_name'],
         )
         failure_message = "A timeout occurred."
         request_retry(event, failure_message=failure_message)
         return None
 
     except requests.exceptions.ConnectionError:
-        logging.info("Trigger event %s on %s resulted in a connection error. Retrying",
-                     event["command"], event['service_name'])
+        logging.info(
+            "Trigger event %s on %s resulted in a connection error. Retrying",
+            event["command"],
+            event['service_name'],
+        )
         failure_message = "A connection error occurred. Is my bot server down?"
         request_retry(event, failure_message=failure_message)
         return None
diff --git a/zerver/lib/presence.py b/zerver/lib/presence.py
index b298a3487c..8578fc2412 100644
--- a/zerver/lib/presence.py
+++ b/zerver/lib/presence.py
@@ -10,9 +10,9 @@ from zerver.lib.timestamp import datetime_to_timestamp
 from zerver.models import PushDeviceToken, Realm, UserPresence, UserProfile, query_for_ids
 
 
-def get_status_dicts_for_rows(all_rows: List[Dict[str, Any]],
-                              mobile_user_ids: Set[int],
-                              slim_presence: bool) -> Dict[str, Dict[str, Any]]:
+def get_status_dicts_for_rows(
+    all_rows: List[Dict[str, Any]], mobile_user_ids: Set[int], slim_presence: bool
+) -> Dict[str, Dict[str, Any]]:
 
     # Note that datetime values have sub-second granularity, which is
     # mostly important for avoiding test flakes, but it's also technically
@@ -21,7 +21,7 @@ def get_status_dicts_for_rows(all_rows: List[Dict[str, Any]],
     # here prevents us from having to assume the caller is playing nice.
     all_rows = sorted(
         all_rows,
-        key = lambda row: (row['user_profile__id'], row['timestamp']),
+        key=lambda row: (row['user_profile__id'], row['timestamp']),
     )
 
     if slim_presence:
@@ -44,21 +44,21 @@ def get_status_dicts_for_rows(all_rows: List[Dict[str, Any]],
 
     return user_statuses
 
-def get_modern_user_info(presence_rows: List[Dict[str, Any]],
-                         mobile_user_ids: Set[int]) -> Dict[str, Any]:
+
+def get_modern_user_info(
+    presence_rows: List[Dict[str, Any]], mobile_user_ids: Set[int]
+) -> Dict[str, Any]:
 
     active_timestamp = None
     for row in reversed(presence_rows):
         if row['status'] == UserPresence.ACTIVE:
-            active_timestamp = datetime_to_timestamp(
-                row['timestamp'])
+            active_timestamp = datetime_to_timestamp(row['timestamp'])
             break
 
     idle_timestamp = None
     for row in reversed(presence_rows):
         if row['status'] == UserPresence.IDLE:
-            idle_timestamp = datetime_to_timestamp(
-                row['timestamp'])
+            idle_timestamp = datetime_to_timestamp(row['timestamp'])
             break
 
     # Be stingy about bandwidth, and don't even include
@@ -74,8 +74,10 @@ def get_modern_user_info(presence_rows: List[Dict[str, Any]],
 
     return result
 
-def get_legacy_user_info(presence_rows: List[Dict[str, Any]],
-                         mobile_user_ids: Set[int]) -> Dict[str, Any]:
+
+def get_legacy_user_info(
+    presence_rows: List[Dict[str, Any]], mobile_user_ids: Set[int]
+) -> Dict[str, Any]:
 
     # The format of data here is for legacy users of our API,
     # including old versions of the mobile app.
@@ -87,7 +89,7 @@ def get_legacy_user_info(presence_rows: List[Dict[str, Any]],
         timestamp = datetime_to_timestamp(dt)
         push_enabled = row['user_profile__enable_offline_push_notifications']
         has_push_devices = row['user_profile__id'] in mobile_user_ids
-        pushable = (push_enabled and has_push_devices)
+        pushable = push_enabled and has_push_devices
 
         info = dict(
             client=client_name,
@@ -118,8 +120,10 @@ def get_legacy_user_info(presence_rows: List[Dict[str, Any]],
 
     return result
 
-def get_presence_for_user(user_profile_id: int,
-                          slim_presence: bool=False) -> Dict[str, Dict[str, Any]]:
+
+def get_presence_for_user(
+    user_profile_id: int, slim_presence: bool = False
+) -> Dict[str, Dict[str, Any]]:
     query = UserPresence.objects.filter(user_profile_id=user_profile_id).values(
         'client__name',
         'status',
@@ -138,7 +142,9 @@ def get_presence_for_user(user_profile_id: int,
     return get_status_dicts_for_rows(presence_rows, mobile_user_ids, slim_presence)
 
 
-def get_status_dict_by_realm(realm_id: int, slim_presence: bool = False) -> Dict[str, Dict[str, Any]]:
+def get_status_dict_by_realm(
+    realm_id: int, slim_presence: bool = False
+) -> Dict[str, Dict[str, Any]]:
     two_weeks_ago = timezone_now() - datetime.timedelta(weeks=2)
     query = UserPresence.objects.filter(
         realm_id=realm_id,
@@ -156,9 +162,7 @@ def get_status_dict_by_realm(realm_id: int, slim_presence: bool = False) -> Dict
 
     presence_rows = list(query)
 
-    mobile_query = PushDeviceToken.objects.distinct(
-        'user_id'
-    ).values_list(
+    mobile_query = PushDeviceToken.objects.distinct('user_id').values_list(
         'user_id',
         flat=True,
     )
@@ -182,8 +186,10 @@ def get_status_dict_by_realm(realm_id: int, slim_presence: bool = False) -> Dict
 
     return get_status_dicts_for_rows(presence_rows, mobile_user_ids, slim_presence)
 
-def get_presences_for_realm(realm: Realm,
-                            slim_presence: bool) -> Dict[str, Dict[str, Dict[str, Any]]]:
+
+def get_presences_for_realm(
+    realm: Realm, slim_presence: bool
+) -> Dict[str, Dict[str, Dict[str, Any]]]:
 
     if realm.presence_disabled:
         # Return an empty dict if presence is disabled in this realm
@@ -191,8 +197,10 @@ def get_presences_for_realm(realm: Realm,
 
     return get_status_dict_by_realm(realm.id, slim_presence)
 
-def get_presence_response(requesting_user_profile: UserProfile,
-                          slim_presence: bool) -> Dict[str, Any]:
+
+def get_presence_response(
+    requesting_user_profile: UserProfile, slim_presence: bool
+) -> Dict[str, Any]:
     realm = requesting_user_profile.realm
     server_timestamp = time.time()
     presences = get_presences_for_realm(realm, slim_presence)
diff --git a/zerver/lib/profile.py b/zerver/lib/profile.py
index 4da23909cf..4e2d8e05e6 100644
--- a/zerver/lib/profile.py
+++ b/zerver/lib/profile.py
@@ -4,6 +4,7 @@ from typing import Callable, TypeVar, cast
 
 FuncT = TypeVar('FuncT', bound=Callable[..., object])
 
+
 def profiled(func: FuncT) -> FuncT:
     """
     This decorator should obviously be used only in a dev environment.
@@ -30,4 +31,5 @@ def profiled(func: FuncT) -> FuncT:
         retval = prof.runcall(func_, *args, **kwargs)
         prof.dump_stats(fn)
         return retval
+
     return cast(FuncT, wrapped_func)  # https://github.com/python/mypy/issues/1927
diff --git a/zerver/lib/push_notifications.py b/zerver/lib/push_notifications.py
index ce38ec59aa..6455fb838a 100644
--- a/zerver/lib/push_notifications.py
+++ b/zerver/lib/push_notifications.py
@@ -46,9 +46,11 @@ DeviceToken = Union[PushDeviceToken, "RemotePushDeviceToken"]
 def b64_to_hex(data: str) -> str:
     return base64.b64decode(data).hex()
 
+
 def hex_to_b64(data: str) -> str:
     return base64.b64encode(bytes.fromhex(data)).decode()
 
+
 #
 # Sending to APNs, for iOS
 #
@@ -56,25 +58,30 @@ def hex_to_b64(data: str) -> str:
 _apns_client: Optional["APNsClient"] = None
 _apns_client_initialized = False
 
+
 def get_apns_client() -> 'Optional[APNsClient]':
     # We lazily do this import as part of optimizing Zulip's base
     # import time.
     from apns2.client import APNsClient
+
     global _apns_client, _apns_client_initialized
     if not _apns_client_initialized:
         # NB if called concurrently, this will make excess connections.
         # That's a little sloppy, but harmless unless a server gets
         # hammered with a ton of these all at once after startup.
         if settings.APNS_CERT_FILE is not None:
-            _apns_client = APNsClient(credentials=settings.APNS_CERT_FILE,
-                                      use_sandbox=settings.APNS_SANDBOX)
+            _apns_client = APNsClient(
+                credentials=settings.APNS_CERT_FILE, use_sandbox=settings.APNS_SANDBOX
+            )
         _apns_client_initialized = True
     return _apns_client
 
+
 def apns_enabled() -> bool:
     client = get_apns_client()
     return client is not None
 
+
 def modernize_apns_payload(data: Dict[str, Any]) -> Dict[str, Any]:
     '''Take a payload in an unknown Zulip version's format, and return in current format.'''
     # TODO this isn't super robust as is -- if a buggy remote server
@@ -100,11 +107,14 @@ def modernize_apns_payload(data: Dict[str, Any]) -> Dict[str, Any]:
         # item in `custom.zulip` is `message_ids`.
         return data
 
+
 APNS_MAX_RETRIES = 3
 
+
 @statsd_increment("apple_push_notification")
-def send_apple_push_notification(user_id: int, devices: List[DeviceToken],
-                                 payload_data: Dict[str, Any], remote: bool=False) -> None:
+def send_apple_push_notification(
+    user_id: int, devices: List[DeviceToken], payload_data: Dict[str, Any], remote: bool = False
+) -> None:
     if not devices:
         return
     # We lazily do the APNS imports as part of optimizing Zulip's base
@@ -116,8 +126,10 @@ def send_apple_push_notification(user_id: int, devices: List[DeviceToken],
 
     client = get_apns_client()
     if client is None:
-        logger.debug("APNs: Dropping a notification because nothing configured.  "
-                     "Set PUSH_NOTIFICATION_BOUNCER_URL (or APNS_CERT_FILE).")
+        logger.debug(
+            "APNs: Dropping a notification because nothing configured.  "
+            "Set PUSH_NOTIFICATION_BOUNCER_URL (or APNS_CERT_FILE)."
+        )
         return
 
     if remote:
@@ -126,8 +138,7 @@ def send_apple_push_notification(user_id: int, devices: List[DeviceToken],
     else:
         DeviceTokenClass = PushDeviceToken
 
-    logger.info("APNs: Sending notification for user %d to %d devices",
-                user_id, len(devices))
+    logger.info("APNs: Sending notification for user %d to %d devices", user_id, len(devices))
     payload = APNsPayload(**modernize_apns_payload(payload_data))
     expiration = int(time.time() + 24 * 3600)
     retries_left = APNS_MAX_RETRIES
@@ -138,20 +149,32 @@ def send_apple_push_notification(user_id: int, devices: List[DeviceToken],
             assert client is not None
             try:
                 stream_id = client.send_notification_async(
-                    device.token, payload, topic=settings.APNS_TOPIC,
-                    expiration=expiration)
+                    device.token, payload, topic=settings.APNS_TOPIC, expiration=expiration
+                )
                 return client.get_notification_result(stream_id)
             except HTTP20Error as e:
-                logger.warning("APNs: HTTP error sending for user %d to device %s: %s",
-                               user_id, device.token, e.__class__.__name__)
+                logger.warning(
+                    "APNs: HTTP error sending for user %d to device %s: %s",
+                    user_id,
+                    device.token,
+                    e.__class__.__name__,
+                )
                 return None
             except BrokenPipeError as e:
-                logger.warning("APNs: BrokenPipeError sending for user %d to device %s: %s",
-                               user_id, device.token, e.__class__.__name__)
+                logger.warning(
+                    "APNs: BrokenPipeError sending for user %d to device %s: %s",
+                    user_id,
+                    device.token,
+                    e.__class__.__name__,
+                )
                 return None
             except ConnectionError as e:  # nocoverage
-                logger.warning("APNs: ConnectionError sending for user %d to device %s: %s",
-                               user_id, device.token, e.__class__.__name__)
+                logger.warning(
+                    "APNs: ConnectionError sending for user %d to device %s: %s",
+                    user_id,
+                    device.token,
+                    e.__class__.__name__,
+                )
                 return None
 
         result = attempt_send()
@@ -166,21 +189,23 @@ def send_apple_push_notification(user_id: int, devices: List[DeviceToken],
             # different format, as a tuple of the pair ("Unregistered", 12345132131).
             result = result[0]
         if result == 'Success':
-            logger.info("APNs: Success sending for user %d to device %s",
-                        user_id, device.token)
+            logger.info("APNs: Success sending for user %d to device %s", user_id, device.token)
         elif result in ["Unregistered", "BadDeviceToken", "DeviceTokenNotForTopic"]:
             logger.info("APNs: Removing invalid/expired token %s (%s)", device.token, result)
             # We remove all entries for this token (There
             # could be multiple for different Zulip servers).
             DeviceTokenClass.objects.filter(token=device.token, kind=DeviceTokenClass.APNS).delete()
         else:
-            logger.warning("APNs: Failed to send for user %d to device %s: %s",
-                           user_id, device.token, result)
+            logger.warning(
+                "APNs: Failed to send for user %d to device %s: %s", user_id, device.token, result
+            )
+
 
 #
 # Sending to GCM, for Android
 #
 
+
 def make_gcm_client() -> gcm.GCM:  # nocoverage
     # From GCM upstream's doc for migrating to FCM:
     #
@@ -198,20 +223,24 @@ def make_gcm_client() -> gcm.GCM:  # nocoverage
     gcm.gcm.GCM_URL = 'https://fcm.googleapis.com/fcm/send'
     return gcm.GCM(settings.ANDROID_GCM_API_KEY)
 
+
 if settings.ANDROID_GCM_API_KEY:  # nocoverage
     gcm_client = make_gcm_client()
 else:
     gcm_client = None
 
+
 def gcm_enabled() -> bool:  # nocoverage
     return gcm_client is not None
 
-def send_android_push_notification_to_user(user_profile: UserProfile, data: Dict[str, Any],
-                                           options: Dict[str, Any]) -> None:
-    devices = list(PushDeviceToken.objects.filter(user=user_profile,
-                                                  kind=PushDeviceToken.GCM))
+
+def send_android_push_notification_to_user(
+    user_profile: UserProfile, data: Dict[str, Any], options: Dict[str, Any]
+) -> None:
+    devices = list(PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.GCM))
     send_android_push_notification(devices, data, options)
 
+
 def parse_gcm_options(options: Dict[str, Any], data: Dict[str, Any]) -> str:
     """
     Parse GCM options, supplying defaults, and raising an error if invalid.
@@ -238,23 +267,29 @@ def parse_gcm_options(options: Dict[str, Any], data: Dict[str, Any]) -> str:
         else:  # `'event': 'remove'`, presumably
             priority = 'normal'
     if priority not in ('normal', 'high'):
-        raise JsonableError(_(
-            "Invalid GCM option to bouncer: priority {!r}",
-        ).format(priority))
+        raise JsonableError(
+            _(
+                "Invalid GCM option to bouncer: priority {!r}",
+            ).format(priority)
+        )
 
     if options:
         # We're strict about the API; there is no use case for a newer Zulip
         # server talking to an older bouncer, so we only need to provide
         # one-way compatibility.
-        raise JsonableError(_(
-            "Invalid GCM options to bouncer: {}",
-        ).format(orjson.dumps(options).decode()))
+        raise JsonableError(
+            _(
+                "Invalid GCM options to bouncer: {}",
+            ).format(orjson.dumps(options).decode())
+        )
 
     return priority  # when this grows a second option, can make it a tuple
 
+
 @statsd_increment("android_push_notification")
-def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, Any],
-                                   options: Dict[str, Any], remote: bool=False) -> None:
+def send_android_push_notification(
+    devices: List[DeviceToken], data: Dict[str, Any], options: Dict[str, Any], remote: bool = False
+) -> None:
     """
     Send a GCM message to the given devices.
 
@@ -269,8 +304,10 @@ def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, A
     if not devices:
         return
     if not gcm_client:
-        logger.debug("Skipping sending a GCM push notification since "
-                     "PUSH_NOTIFICATION_BOUNCER_URL and ANDROID_GCM_API_KEY are both unset")
+        logger.debug(
+            "Skipping sending a GCM push notification since "
+            "PUSH_NOTIFICATION_BOUNCER_URL and ANDROID_GCM_API_KEY are both unset"
+        )
         return
 
     reg_ids = [device.token for device in devices]
@@ -279,10 +316,9 @@ def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, A
         # See https://firebase.google.com/docs/cloud-messaging/http-server-ref .
         # Two kwargs `retries` and `session` get eaten by `json_request`;
         # the rest pass through to the GCM server.
-        res = gcm_client.json_request(registration_ids=reg_ids,
-                                      priority=priority,
-                                      data=data,
-                                      retries=10)
+        res = gcm_client.json_request(
+            registration_ids=reg_ids, priority=priority, data=data, retries=10
+        )
     except OSError:
         logger.warning("Error while pushing to GCM", exc_info=True)
         return
@@ -305,17 +341,21 @@ def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, A
             if reg_id == new_reg_id:
                 # I'm not sure if this should happen. In any case, not really actionable.
                 logger.warning("GCM: Got canonical ref but it already matches our ID %s!", reg_id)
-            elif not DeviceTokenClass.objects.filter(token=new_reg_id,
-                                                     kind=DeviceTokenClass.GCM).count():
+            elif not DeviceTokenClass.objects.filter(
+                token=new_reg_id, kind=DeviceTokenClass.GCM
+            ).count():
                 # This case shouldn't happen; any time we get a canonical ref it should have been
                 # previously registered in our system.
                 #
                 # That said, recovery is easy: just update the current PDT object to use the new ID.
                 logger.warning(
                     "GCM: Got canonical ref %s replacing %s but new ID not registered! Updating.",
-                    new_reg_id, reg_id)
-                DeviceTokenClass.objects.filter(
-                    token=reg_id, kind=DeviceTokenClass.GCM).update(token=new_reg_id)
+                    new_reg_id,
+                    reg_id,
+                )
+                DeviceTokenClass.objects.filter(token=reg_id, kind=DeviceTokenClass.GCM).update(
+                    token=new_reg_id
+                )
             else:
                 # Since we know the new ID is registered in our system we can just drop the old one.
                 logger.info("GCM: Got canonical ref %s, dropping %s", new_reg_id, reg_id)
@@ -329,7 +369,9 @@ def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, A
                     logger.info("GCM: Removing %s", reg_id)
                     # We remove all entries for this token (There
                     # could be multiple for different Zulip servers).
-                    DeviceTokenClass.objects.filter(token=reg_id, kind=DeviceTokenClass.GCM).delete()
+                    DeviceTokenClass.objects.filter(
+                        token=reg_id, kind=DeviceTokenClass.GCM
+                    ).delete()
             else:
                 for reg_id in reg_ids:
                     logger.warning("GCM: Delivery to %s failed: %s", reg_id, error)
@@ -337,17 +379,22 @@ def send_android_push_notification(devices: List[DeviceToken], data: Dict[str, A
     # python-gcm handles retrying of the unsent messages.
     # Ref: https://github.com/geeknam/python-gcm/blob/master/gcm/gcm.py#L497
 
+
 #
 # Sending to a bouncer
 #
 
+
 def uses_notification_bouncer() -> bool:
     return settings.PUSH_NOTIFICATION_BOUNCER_URL is not None
 
-def send_notifications_to_bouncer(user_profile_id: int,
-                                  apns_payload: Dict[str, Any],
-                                  gcm_payload: Dict[str, Any],
-                                  gcm_options: Dict[str, Any]) -> None:
+
+def send_notifications_to_bouncer(
+    user_profile_id: int,
+    apns_payload: Dict[str, Any],
+    gcm_payload: Dict[str, Any],
+    gcm_options: Dict[str, Any],
+) -> None:
     post_data = {
         'user_id': user_profile_id,
         'apns_payload': apns_payload,
@@ -357,22 +404,27 @@ def send_notifications_to_bouncer(user_profile_id: int,
     # Calls zilencer.views.remote_server_notify_push
     send_json_to_push_bouncer('POST', 'push/notify', post_data)
 
+
 #
 # Managing device tokens
 #
 
-def num_push_devices_for_user(user_profile: UserProfile, kind: Optional[int]=None) -> PushDeviceToken:
+
+def num_push_devices_for_user(
+    user_profile: UserProfile, kind: Optional[int] = None
+) -> PushDeviceToken:
     if kind is None:
         return PushDeviceToken.objects.filter(user=user_profile).count()
     else:
         return PushDeviceToken.objects.filter(user=user_profile, kind=kind).count()
 
-def add_push_device_token(user_profile: UserProfile,
-                          token_str: str,
-                          kind: int,
-                          ios_app_id: Optional[str]=None) -> PushDeviceToken:
-    logger.info("Registering push device: %d %r %d %r",
-                user_profile.id, token_str, kind, ios_app_id)
+
+def add_push_device_token(
+    user_profile: UserProfile, token_str: str, kind: int, ios_app_id: Optional[str] = None
+) -> PushDeviceToken:
+    logger.info(
+        "Registering push device: %d %r %d %r", user_profile.id, token_str, kind, ios_app_id
+    )
 
     # Regardless of whether we're using the push notifications
     # bouncer, we want to store a PushDeviceToken record locally.
@@ -387,7 +439,8 @@ def add_push_device_token(user_profile: UserProfile,
                 token=token_str,
                 ios_app_id=ios_app_id,
                 # last_updated is to be renamed to date_created.
-                last_updated=timezone_now())
+                last_updated=timezone_now(),
+            )
     except IntegrityError:
         token = PushDeviceToken.objects.get(
             user_id=user_profile.id,
@@ -414,6 +467,7 @@ def add_push_device_token(user_profile: UserProfile,
 
     return token
 
+
 def remove_push_device_token(user_profile: UserProfile, token_str: str, kind: int) -> None:
     try:
         token = PushDeviceToken.objects.get(token=token_str, kind=kind, user=user_profile)
@@ -440,6 +494,7 @@ def remove_push_device_token(user_profile: UserProfile, token_str: str, kind: in
         # Calls zilencer.views.unregister_remote_push_device
         send_to_push_bouncer("POST", "push/unregister", post_data)
 
+
 def clear_push_device_tokens(user_profile_id: int) -> None:
     # Deletes all of a user's PushDeviceTokens.
     if uses_notification_bouncer():
@@ -452,15 +507,19 @@ def clear_push_device_tokens(user_profile_id: int) -> None:
 
     PushDeviceToken.objects.filter(user_id=user_profile_id).delete()
 
+
 #
 # Push notifications in general
 #
 
+
 def push_notifications_enabled() -> bool:
     '''True just if this server has configured a way to send push notifications.'''
-    if (uses_notification_bouncer()
-            and settings.ZULIP_ORG_KEY is not None
-            and settings.ZULIP_ORG_ID is not None):  # nocoverage
+    if (
+        uses_notification_bouncer()
+        and settings.ZULIP_ORG_KEY is not None
+        and settings.ZULIP_ORG_ID is not None
+    ):  # nocoverage
         # We have the needed configuration to send push notifications through
         # the bouncer.  Better yet would be to confirm that this config actually
         # works -- e.g., that we have ever successfully sent to the bouncer --
@@ -477,14 +536,18 @@ def push_notifications_enabled() -> bool:
         return True
     return False
 
+
 def initialize_push_notifications() -> None:
     if not push_notifications_enabled():
         if settings.DEVELOPMENT and not settings.TEST_SUITE:  # nocoverage
             # Avoid unnecessary spam on development environment startup
             return
-        logger.warning("Mobile push notifications are not configured.\n  "
-                       "See https://zulip.readthedocs.io/en/latest/"
-                       "production/mobile-push-notifications.html")
+        logger.warning(
+            "Mobile push notifications are not configured.\n  "
+            "See https://zulip.readthedocs.io/en/latest/"
+            "production/mobile-push-notifications.html"
+        )
+
 
 def get_gcm_alert(message: Message) -> str:
     """
@@ -495,12 +558,14 @@ def get_gcm_alert(message: Message) -> str:
         return f"New private group message from {sender_str}"
     elif message.recipient.type == Recipient.PERSONAL and message.trigger == 'private_message':
         return f"New private message from {sender_str}"
-    elif message.is_stream_message() and (message.trigger == 'mentioned' or
-                                          message.trigger == 'wildcard_mentioned'):
+    elif message.is_stream_message() and (
+        message.trigger == 'mentioned' or message.trigger == 'wildcard_mentioned'
+    ):
         return f"New mention from {sender_str}"
     else:  # message.is_stream_message() and message.trigger == 'stream_push_notify'
         return f"New stream message from {sender_str} in {get_display_recipient(message.recipient)}"
 
+
 def get_mobile_push_content(rendered_content: str) -> str:
     def get_text(elem: lxml.html.HtmlElement) -> str:
         # Convert default emojis to their Unicode equivalent.
@@ -522,8 +587,7 @@ def get_mobile_push_content(rendered_content: str) -> str:
 
     def format_as_quote(quote_text: str) -> str:
         return "".join(
-            f"> {line}\n" for line in quote_text.splitlines()
-            if line  # Remove empty lines
+            f"> {line}\n" for line in quote_text.splitlines() if line  # Remove empty lines
         )
 
     def render_olist(ol: lxml.html.HtmlElement) -> str:
@@ -569,6 +633,7 @@ def get_mobile_push_content(rendered_content: str) -> str:
     plain_text = process(elem)
     return plain_text
 
+
 def truncate_content(content: str) -> Tuple[str, bool]:
     # We use Unicode character 'HORIZONTAL ELLIPSIS' (U+2026) instead
     # of three dots as this saves two extra characters for textual
@@ -578,6 +643,7 @@ def truncate_content(content: str) -> Tuple[str, bool]:
         return content, False
     return content[:200] + "…", True
 
+
 def get_base_payload(user_profile: UserProfile) -> Dict[str, Any]:
     '''Common fields for all notification payloads.'''
     data: Dict[str, Any] = {}
@@ -590,6 +656,7 @@ def get_base_payload(user_profile: UserProfile) -> Dict[str, Any]:
 
     return data
 
+
 def get_message_payload(user_profile: UserProfile, message: Message) -> Dict[str, Any]:
     '''Common fields for `message` payloads, for all platforms.'''
     data = get_base_payload(user_profile)
@@ -610,6 +677,7 @@ def get_message_payload(user_profile: UserProfile, message: Message) -> Dict[str
 
     return data
 
+
 def get_apns_alert_title(message: Message) -> str:
     """
     On an iOS notification, this is the first bolded line.
@@ -623,6 +691,7 @@ def get_apns_alert_title(message: Message) -> str:
     # For personal PMs, we just show the sender name.
     return message.sender.full_name
 
+
 def get_apns_alert_subtitle(message: Message) -> str:
     """
     On an iOS notification, this is the second bolded line.
@@ -636,26 +705,34 @@ def get_apns_alert_subtitle(message: Message) -> str:
     # For group PMs, or regular messages to a stream, just use a colon to indicate this is the sender.
     return message.sender.full_name + ":"
 
-def get_apns_badge_count(user_profile: UserProfile, read_messages_ids: Optional[Sequence[int]]=[]) -> int:
+
+def get_apns_badge_count(
+    user_profile: UserProfile, read_messages_ids: Optional[Sequence[int]] = []
+) -> int:
     # NOTE: We have temporarily set get_apns_badge_count to always
     # return 0 until we can debug a likely mobile app side issue with
     # handling notifications while the app is open.
     return 0
 
-def get_apns_badge_count_future(user_profile: UserProfile, read_messages_ids: Optional[Sequence[int]]=[]) -> int:
+
+def get_apns_badge_count_future(
+    user_profile: UserProfile, read_messages_ids: Optional[Sequence[int]] = []
+) -> int:
     # Future implementation of get_apns_badge_count; unused but
     # we expect to use this once we resolve client-side bugs.
-    return UserMessage.objects.filter(
-        user_profile=user_profile
-    ).extra(
-        where=[UserMessage.where_active_push_notification()]
-    ).exclude(
-        # If we've just marked some messages as read, they're still
-        # marked as having active notifications; we'll clear that flag
-        # only after we've sent that update to the devices.  So we need
-        # to exclude them explicitly from the count.
-        message_id__in=read_messages_ids
-    ).count()
+    return (
+        UserMessage.objects.filter(user_profile=user_profile)
+        .extra(where=[UserMessage.where_active_push_notification()])
+        .exclude(
+            # If we've just marked some messages as read, they're still
+            # marked as having active notifications; we'll clear that flag
+            # only after we've sent that update to the devices.  So we need
+            # to exclude them explicitly from the count.
+            message_id__in=read_messages_ids
+        )
+        .count()
+    )
+
 
 def get_message_payload_apns(user_profile: UserProfile, message: Message) -> Dict[str, Any]:
     '''A `message` payload for iOS, via APNs.'''
@@ -678,8 +755,10 @@ def get_message_payload_apns(user_profile: UserProfile, message: Message) -> Dic
     }
     return apns_data
 
+
 def get_message_payload_gcm(
-        user_profile: UserProfile, message: Message,
+    user_profile: UserProfile,
+    message: Message,
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     '''A `message` payload + options, for Android via GCM/FCM.'''
     data = get_message_payload(user_profile, message)
@@ -698,8 +777,10 @@ def get_message_payload_gcm(
     gcm_options = {'priority': 'high'}
     return data, gcm_options
 
+
 def get_remove_payload_gcm(
-        user_profile: UserProfile, message_ids: List[int],
+    user_profile: UserProfile,
+    message_ids: List[int],
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     '''A `remove` payload + options, for Android via GCM/FCM.'''
     gcm_payload = get_base_payload(user_profile)
@@ -713,6 +794,7 @@ def get_remove_payload_gcm(
     gcm_options = {'priority': 'normal'}
     return gcm_payload, gcm_options
 
+
 def get_remove_payload_apns(user_profile: UserProfile, message_ids: List[int]) -> Dict[str, Any]:
     zulip_data = get_base_payload(user_profile)
     zulip_data.update(
@@ -725,6 +807,7 @@ def get_remove_payload_apns(user_profile: UserProfile, message_ids: List[int]) -
     }
     return apns_data
 
+
 def handle_remove_push_notification(user_profile_id: int, message_ids: List[int]) -> None:
     """This should be called when a message that previously had a
     mobile push notification executed is read.  This triggers a push to the
@@ -737,15 +820,14 @@ def handle_remove_push_notification(user_profile_id: int, message_ids: List[int]
     apns_payload = get_remove_payload_apns(user_profile, message_ids)
 
     if uses_notification_bouncer():
-        send_notifications_to_bouncer(user_profile_id,
-                                      apns_payload,
-                                      gcm_payload,
-                                      gcm_options)
+        send_notifications_to_bouncer(user_profile_id, apns_payload, gcm_payload, gcm_options)
     else:
-        android_devices = list(PushDeviceToken.objects.filter(
-            user=user_profile, kind=PushDeviceToken.GCM))
-        apple_devices = list(PushDeviceToken.objects.filter(
-            user=user_profile, kind=PushDeviceToken.APNS))
+        android_devices = list(
+            PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.GCM)
+        )
+        apple_devices = list(
+            PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.APNS)
+        )
         if android_devices:
             send_android_push_notification(android_devices, gcm_payload, gcm_options)
         if apple_devices:
@@ -754,9 +836,8 @@ def handle_remove_push_notification(user_profile_id: int, message_ids: List[int]
     UserMessage.objects.filter(
         user_profile_id=user_profile_id,
         message_id__in=message_ids,
-    ).update(
-        flags=F('flags').bitand(
-            ~UserMessage.flags.active_mobile_push_notification))
+    ).update(flags=F('flags').bitand(~UserMessage.flags.active_mobile_push_notification))
+
 
 @statsd_increment("push_notifications")
 def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any]) -> None:
@@ -767,8 +848,10 @@ def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any
     if not push_notifications_enabled():
         return
     user_profile = get_user_profile_by_id(user_profile_id)
-    if not (receives_offline_push_notifications(user_profile) or
-            receives_online_notifications(user_profile)):
+    if not (
+        receives_offline_push_notifications(user_profile)
+        or receives_online_notifications(user_profile)
+    ):
         return
 
     try:
@@ -780,7 +863,8 @@ def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any
             return
         logging.info(
             "Unexpected message access failure handling push notifications: %s %s",
-            user_profile.id, missed_message['message_id'],
+            user_profile.id,
+            missed_message['message_id'],
         )
         return
 
@@ -805,7 +889,8 @@ def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any
         if not user_profile.long_term_idle:
             logger.error(
                 "Could not find UserMessage with message_id %s and user_id %s",
-                missed_message['message_id'], user_profile_id,
+                missed_message['message_id'],
+                user_profile_id,
             )
             return
 
@@ -816,17 +901,16 @@ def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any
     logger.info("Sending push notifications to mobile clients for user %s", user_profile_id)
 
     if uses_notification_bouncer():
-        send_notifications_to_bouncer(user_profile_id,
-                                      apns_payload,
-                                      gcm_payload,
-                                      gcm_options)
+        send_notifications_to_bouncer(user_profile_id, apns_payload, gcm_payload, gcm_options)
         return
 
-    android_devices = list(PushDeviceToken.objects.filter(user=user_profile,
-                                                          kind=PushDeviceToken.GCM))
+    android_devices = list(
+        PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.GCM)
+    )
 
-    apple_devices = list(PushDeviceToken.objects.filter(user=user_profile,
-                                                        kind=PushDeviceToken.APNS))
+    apple_devices = list(
+        PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.APNS)
+    )
 
     send_apple_push_notification(user_profile.id, apple_devices, apns_payload)
 
diff --git a/zerver/lib/queue.py b/zerver/lib/queue.py
index 13890adb46..1283a9d99d 100644
--- a/zerver/lib/queue.py
+++ b/zerver/lib/queue.py
@@ -23,10 +23,11 @@ Consumer = Callable[[BlockingChannel, Basic.Deliver, pika.BasicProperties, bytes
 # interface for external files to put things into queues and take them
 # out from bots without having to import pika code all over our codebase.
 class SimpleQueueClient:
-    def __init__(self,
-                 # Disable RabbitMQ heartbeats by default because BlockingConnection can't process them
-                 rabbitmq_heartbeat: Optional[int] = 0,
-                 ) -> None:
+    def __init__(
+        self,
+        # Disable RabbitMQ heartbeats by default because BlockingConnection can't process them
+        rabbitmq_heartbeat: Optional[int] = 0,
+    ) -> None:
         self.log = logging.getLogger('zulip.queue')
         self.queues: Set[str] = set()
         self.channel: Optional[BlockingChannel] = None
@@ -38,7 +39,7 @@ class SimpleQueueClient:
     def _connect(self) -> None:
         start = time.time()
         self.connection = pika.BlockingConnection(self._get_parameters())
-        self.channel    = self.connection.channel()
+        self.channel = self.connection.channel()
         self.log.info(f'SimpleQueueClient connected (connecting took {time.time() - start:.3f}s)')
 
     def _reconnect(self) -> None:
@@ -48,8 +49,7 @@ class SimpleQueueClient:
         self._connect()
 
     def _get_parameters(self) -> pika.ConnectionParameters:
-        credentials = pika.PlainCredentials(settings.RABBITMQ_USERNAME,
-                                            settings.RABBITMQ_PASSWORD)
+        credentials = pika.PlainCredentials(settings.RABBITMQ_USERNAME, settings.RABBITMQ_PASSWORD)
 
         # With BlockingConnection, we are passed
         # self.rabbitmq_heartbeat=0, which asks to explicitly disable
@@ -71,10 +71,12 @@ class SimpleQueueClient:
         if self.rabbitmq_heartbeat == 0:
             tcp_options = dict(TCP_KEEPIDLE=60 * 5)
 
-        return pika.ConnectionParameters(settings.RABBITMQ_HOST,
-                                         heartbeat=self.rabbitmq_heartbeat,
-                                         tcp_options=tcp_options,
-                                         credentials=credentials)
+        return pika.ConnectionParameters(
+            settings.RABBITMQ_HOST,
+            heartbeat=self.rabbitmq_heartbeat,
+            tcp_options=tcp_options,
+            credentials=credentials,
+        )
 
     def _generate_ctag(self, queue_name: str) -> str:
         return f"{queue_name}_{str(random.getrandbits(16))}"
@@ -103,8 +105,8 @@ class SimpleQueueClient:
         return self.channel is not None
 
     def ensure_queue(self, queue_name: str, callback: Callable[[BlockingChannel], None]) -> None:
-        '''Ensure that a given queue has been declared, and then call
-           the callback with no arguments.'''
+        """Ensure that a given queue has been declared, and then call
+        the callback with no arguments."""
         if self.connection is None or not self.connection.is_open:
             self._connect()
 
@@ -120,7 +122,8 @@ class SimpleQueueClient:
                 exchange='',
                 routing_key=queue_name,
                 properties=pika.BasicProperties(delivery_mode=2),
-                body=body)
+                body=body,
+            )
 
             statsd.incr(f"rabbitmq.publish.{queue_name}")
 
@@ -137,11 +140,13 @@ class SimpleQueueClient:
         self._reconnect()
         self.publish(queue_name, data)
 
-    def start_json_consumer(self,
-                            queue_name: str,
-                            callback: Callable[[List[Dict[str, Any]]], None],
-                            batch_size: int=1,
-                            timeout: Optional[int]=None) -> None:
+    def start_json_consumer(
+        self,
+        queue_name: str,
+        callback: Callable[[List[Dict[str, Any]]], None],
+        batch_size: int = 1,
+        timeout: Optional[int] = None,
+    ) -> None:
         if batch_size == 1:
             timeout = None
 
@@ -174,6 +179,7 @@ class SimpleQueueClient:
                     last_process = now
                 if not self.is_consuming:
                     break
+
         self.ensure_queue(queue_name, do_consume)
 
     def local_queue_size(self) -> int:
@@ -186,6 +192,7 @@ class SimpleQueueClient:
         self.is_consuming = False
         self.channel.stop_consuming()
 
+
 # Patch pika.adapters.tornado_connection.TornadoConnection so that a socket error doesn't
 # throw an exception and disconnect the tornado process from the rabbitmq
 # queue. Instead, just re-connect as usual
@@ -193,11 +200,16 @@ class ExceptionFreeTornadoConnection(pika.adapters.tornado_connection.TornadoCon
     def _adapter_disconnect(self) -> None:
         try:
             super()._adapter_disconnect()
-        except (pika.exceptions.ProbableAuthenticationError,
-                pika.exceptions.ProbableAccessDeniedError,
-                pika.exceptions.IncompatibleProtocolError):
-            logging.warning("Caught exception in ExceptionFreeTornadoConnection when \
-calling _adapter_disconnect, ignoring", exc_info=True)
+        except (
+            pika.exceptions.ProbableAuthenticationError,
+            pika.exceptions.ProbableAccessDeniedError,
+            pika.exceptions.IncompatibleProtocolError,
+        ):
+            logging.warning(
+                "Caught exception in ExceptionFreeTornadoConnection when \
+calling _adapter_disconnect, ignoring",
+                exc_info=True,
+            )
 
 
 class TornadoQueueClient(SimpleQueueClient):
@@ -206,7 +218,8 @@ class TornadoQueueClient(SimpleQueueClient):
     def __init__(self) -> None:
         super().__init__(
             # TornadoConnection can process heartbeats, so enable them.
-            rabbitmq_heartbeat=None)
+            rabbitmq_heartbeat=None
+        )
         self._on_open_cbs: List[Callable[[BlockingChannel], None]] = []
         self._connection_failure_count = 0
 
@@ -214,9 +227,9 @@ class TornadoQueueClient(SimpleQueueClient):
         self.log.info("Beginning TornadoQueueClient connection")
         self.connection = ExceptionFreeTornadoConnection(
             self._get_parameters(),
-            on_open_callback = self._on_open,
-            on_open_error_callback = self._on_connection_open_error,
-            on_close_callback = self._on_connection_closed,
+            on_open_callback=self._on_open,
+            on_open_error_callback=self._on_connection_open_error,
+            on_close_callback=self._on_connection_closed,
         )
 
     def _reconnect(self) -> None:
@@ -240,8 +253,9 @@ class TornadoQueueClient(SimpleQueueClient):
     # potentially causing 4 failures.  We add some headroom above that.
     CONNECTION_FAILURES_BEFORE_NOTIFY = 10
 
-    def _on_connection_open_error(self, connection: pika.connection.Connection,
-                                  reason: Exception) -> None:
+    def _on_connection_open_error(
+        self, connection: pika.connection.Connection, reason: Exception
+    ) -> None:
         self._connection_failure_count += 1
         retry_secs = self.CONNECTION_RETRY_SECS
         self.log.log(
@@ -253,8 +267,9 @@ class TornadoQueueClient(SimpleQueueClient):
         )
         ioloop.IOLoop.instance().call_later(retry_secs, self._reconnect)
 
-    def _on_connection_closed(self, connection: pika.connection.Connection,
-                              reason: Exception) -> None:
+    def _on_connection_closed(
+        self, connection: pika.connection.Connection, reason: Exception
+    ) -> None:
         self._connection_failure_count = 1
         retry_secs = self.CONNECTION_RETRY_SECS
         self.log.warning(
@@ -266,8 +281,7 @@ class TornadoQueueClient(SimpleQueueClient):
     def _on_open(self, connection: pika.connection.Connection) -> None:
         self._connection_failure_count = 0
         try:
-            self.connection.channel(
-                on_open_callback = self._on_channel_open)
+            self.connection.channel(on_open_callback=self._on_channel_open)
         except pika.exceptions.ConnectionClosed:
             # The connection didn't stay open long enough for this code to get to it.
             # Let _on_connection_closed deal with trying again.
@@ -299,15 +313,19 @@ class TornadoQueueClient(SimpleQueueClient):
             assert self.channel is not None
             callback(self.channel)
 
-    def start_json_consumer(self,
-                            queue_name: str,
-                            callback: Callable[[List[Dict[str, Any]]], None],
-                            batch_size: int=1,
-                            timeout: Optional[int]=None) -> None:
-        def wrapped_consumer(ch: BlockingChannel,
-                             method: Basic.Deliver,
-                             properties: pika.BasicProperties,
-                             body: bytes) -> None:
+    def start_json_consumer(
+        self,
+        queue_name: str,
+        callback: Callable[[List[Dict[str, Any]]], None],
+        batch_size: int = 1,
+        timeout: Optional[int] = None,
+    ) -> None:
+        def wrapped_consumer(
+            ch: BlockingChannel,
+            method: Basic.Deliver,
+            properties: pika.BasicProperties,
+            body: bytes,
+        ) -> None:
             callback([orjson.loads(body)])
             ch.basic_ack(delivery_tag=method.delivery_tag)
 
@@ -327,7 +345,10 @@ class TornadoQueueClient(SimpleQueueClient):
             ),
         )
 
+
 queue_client: Optional[SimpleQueueClient] = None
+
+
 def get_queue_client() -> SimpleQueueClient:
     global queue_client
     if queue_client is None:
@@ -340,6 +361,7 @@ def get_queue_client() -> SimpleQueueClient:
 
     return queue_client
 
+
 # We using a simple lock to prevent multiple RabbitMQ messages being
 # sent to the SimpleQueueClient at the same time; this is a workaround
 # for an issue with the pika BlockingConnection where using
@@ -347,6 +369,7 @@ def get_queue_client() -> SimpleQueueClient:
 # randomly close.
 queue_lock = threading.RLock()
 
+
 def queue_json_publish(
     queue_name: str,
     event: Dict[str, Any],
@@ -360,11 +383,13 @@ def queue_json_publish(
         else:
             # Must be imported here: A top section import leads to circular imports
             from zerver.worker.queue_processors import get_worker
+
             get_worker(queue_name).consume_single_event(event)
 
-def retry_event(queue_name: str,
-                event: Dict[str, Any],
-                failure_processor: Callable[[Dict[str, Any]], None]) -> None:
+
+def retry_event(
+    queue_name: str, event: Dict[str, Any], failure_processor: Callable[[Dict[str, Any]], None]
+) -> None:
     if 'failed_tries' not in event:
         event['failed_tries'] = 0
     event['failed_tries'] += 1
diff --git a/zerver/lib/rate_limiter.py b/zerver/lib/rate_limiter.py
index 44b97336c0..33a39d6d31 100644
--- a/zerver/lib/rate_limiter.py
+++ b/zerver/lib/rate_limiter.py
@@ -23,11 +23,13 @@ KEY_PREFIX = ''
 
 logger = logging.getLogger(__name__)
 
+
 class RateLimiterLockingException(Exception):
     pass
 
+
 class RateLimitedObject(ABC):
-    def __init__(self, backend: Optional['Type[RateLimiterBackend]']=None) -> None:
+    def __init__(self, backend: Optional['Type[RateLimiterBackend]'] = None) -> None:
         if backend is not None:
             self.backend: Type[RateLimiterBackend] = backend
         else:
@@ -35,21 +37,23 @@ class RateLimitedObject(ABC):
 
     def rate_limit(self) -> Tuple[bool, float]:
         # Returns (ratelimited, secs_to_freedom)
-        return self.backend.rate_limit_entity(self.key(), self.get_rules(),
-                                              self.max_api_calls(),
-                                              self.max_api_window())
+        return self.backend.rate_limit_entity(
+            self.key(), self.get_rules(), self.max_api_calls(), self.max_api_window()
+        )
 
     def rate_limit_request(self, request: HttpRequest) -> None:
         ratelimited, time = self.rate_limit()
 
         if not hasattr(request, '_ratelimits_applied'):
             request._ratelimits_applied = []
-        request._ratelimits_applied.append(RateLimitResult(
-            entity=self,
-            secs_to_freedom=time,
-            remaining=0,
-            over_limit=ratelimited,
-        ))
+        request._ratelimits_applied.append(
+            RateLimitResult(
+                entity=self,
+                secs_to_freedom=time,
+                remaining=0,
+                over_limit=ratelimited,
+            )
+        )
         # Abort this request if the user is over their rate limits
         if ratelimited:
             # Pass information about what kind of entity got limited in the exception:
@@ -103,8 +107,9 @@ class RateLimitedObject(ABC):
     def rules(self) -> List[Tuple[int, int]]:
         pass
 
+
 class RateLimitedUser(RateLimitedObject):
-    def __init__(self, user: UserProfile, domain: str='api_by_user') -> None:
+    def __init__(self, user: UserProfile, domain: str = 'api_by_user') -> None:
         self.user = user
         self.domain = domain
         if settings.RUNNING_INSIDE_TORNADO and domain in settings.RATE_LIMITING_DOMAINS_FOR_TORNADO:
@@ -126,11 +131,13 @@ class RateLimitedUser(RateLimitedObject):
             return result
         return rules[self.domain]
 
+
 def bounce_redis_key_prefix_for_testing(test_name: str) -> None:
     global KEY_PREFIX
     KEY_PREFIX = test_name + ':' + str(os.getpid()) + ':'
 
-def add_ratelimit_rule(range_seconds: int, num_requests: int, domain: str='api_by_user') -> None:
+
+def add_ratelimit_rule(range_seconds: int, num_requests: int, domain: str = 'api_by_user') -> None:
     "Add a rate-limiting rule to the ratelimiter"
     global rules
 
@@ -142,10 +149,14 @@ def add_ratelimit_rule(range_seconds: int, num_requests: int, domain: str='api_b
     rules[domain].append((range_seconds, num_requests))
     rules[domain].sort(key=lambda x: x[0])
 
-def remove_ratelimit_rule(range_seconds: int, num_requests: int, domain: str='api_by_user') -> None:
+
+def remove_ratelimit_rule(
+    range_seconds: int, num_requests: int, domain: str = 'api_by_user'
+) -> None:
     global rules
     rules[domain] = [x for x in rules[domain] if x[0] != range_seconds and x[1] != num_requests]
 
+
 class RateLimiterBackend(ABC):
     @classmethod
     @abstractmethod
@@ -164,17 +175,20 @@ class RateLimiterBackend(ABC):
 
     @classmethod
     @abstractmethod
-    def get_api_calls_left(cls, entity_key: str, range_seconds: int,
-                           max_calls: int) -> Tuple[int, float]:
+    def get_api_calls_left(
+        cls, entity_key: str, range_seconds: int, max_calls: int
+    ) -> Tuple[int, float]:
         pass
 
     @classmethod
     @abstractmethod
-    def rate_limit_entity(cls, entity_key: str, rules: List[Tuple[int, int]],
-                          max_api_calls: int, max_api_window: int) -> Tuple[bool, float]:
+    def rate_limit_entity(
+        cls, entity_key: str, rules: List[Tuple[int, int]], max_api_calls: int, max_api_window: int
+    ) -> Tuple[bool, float]:
         # Returns (ratelimited, secs_to_freedom)
         pass
 
+
 class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
     # reset_times[rule][key] is the time at which the event
     # request from the rate-limited key will be accepted.
@@ -195,8 +209,11 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
         if reset_times_for_rule is None:
             return
 
-        keys_to_delete = [entity_key for entity_key in reset_times_for_rule
-                          if reset_times_for_rule[entity_key] < now]
+        keys_to_delete = [
+            entity_key
+            for entity_key in reset_times_for_rule
+            if reset_times_for_rule[entity_key] < now
+        ]
 
         for entity_key in keys_to_delete:
             del reset_times_for_rule[entity_key]
@@ -205,9 +222,8 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
             del cls.reset_times[(time_window, max_count)]
 
     @classmethod
-    def need_to_limit(cls, entity_key: str, time_window: int,
-                      max_count: int) -> Tuple[bool, float]:
-        '''
+    def need_to_limit(cls, entity_key: str, time_window: int, max_count: int) -> Tuple[bool, float]:
+        """
         Returns a tuple of `(rate_limited, time_till_free)`.
         For simplicity, we have loosened the semantics here from
         - each key may make atmost `count * (t / window)` request within any t
@@ -219,7 +235,7 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
         memory-intensive. This also has the advantage that you can only ever
         lock yourself out completely for `window / count` seconds instead of
         `window` seconds.
-        '''
+        """
         now = time.time()
 
         # Remove all timestamps from `reset_times` that are too old.
@@ -228,8 +244,7 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
             cls._garbage_collect_for_rule(now, time_window, max_count)
 
         reset_times_for_rule = cls.reset_times.setdefault((time_window, max_count), {})
-        new_reset = max(reset_times_for_rule.get(entity_key, now), now) \
-            + time_window / max_count
+        new_reset = max(reset_times_for_rule.get(entity_key, now), now) + time_window / max_count
 
         if new_reset > now + time_window:
             # Compute for how long the bucket will remain filled.
@@ -240,11 +255,13 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
         return False, 0.0
 
     @classmethod
-    def get_api_calls_left(cls, entity_key: str, range_seconds: int,
-                           max_calls: int) -> Tuple[int, float]:
+    def get_api_calls_left(
+        cls, entity_key: str, range_seconds: int, max_calls: int
+    ) -> Tuple[int, float]:
         now = time.time()
-        if (range_seconds, max_calls) in cls.reset_times and \
-                entity_key in cls.reset_times[(range_seconds, max_calls)]:
+        if (range_seconds, max_calls) in cls.reset_times and entity_key in cls.reset_times[
+            (range_seconds, max_calls)
+        ]:
             reset_time = cls.reset_times[(range_seconds, max_calls)][entity_key]
         else:
             return max_calls, 0
@@ -268,8 +285,9 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
         cls.timestamps_blocked_until.pop(entity_key, None)
 
     @classmethod
-    def rate_limit_entity(cls, entity_key: str, rules: List[Tuple[int, int]],
-                          max_api_calls: int, max_api_window: int) -> Tuple[bool, float]:
+    def rate_limit_entity(
+        cls, entity_key: str, rules: List[Tuple[int, int]], max_api_calls: int, max_api_window: int
+    ) -> Tuple[bool, float]:
         now = time.time()
         if entity_key in cls.timestamps_blocked_until:
             # Check whether the key is manually blocked.
@@ -289,11 +307,13 @@ class TornadoInMemoryRateLimiterBackend(RateLimiterBackend):
 
         return ratelimited, time_till_free
 
+
 class RedisRateLimiterBackend(RateLimiterBackend):
     @classmethod
     def get_keys(cls, entity_key: str) -> List[str]:
-        return [f"{KEY_PREFIX}ratelimit:{entity_key}:{keytype}"
-                for keytype in ['list', 'zset', 'block']]
+        return [
+            f"{KEY_PREFIX}ratelimit:{entity_key}:{keytype}" for keytype in ['list', 'zset', 'block']
+        ]
 
     @classmethod
     def block_access(cls, entity_key: str, seconds: int) -> None:
@@ -315,8 +335,9 @@ class RedisRateLimiterBackend(RateLimiterBackend):
             client.delete(key)
 
     @classmethod
-    def get_api_calls_left(cls, entity_key: str, range_seconds: int,
-                           max_calls: int) -> Tuple[int, float]:
+    def get_api_calls_left(
+        cls, entity_key: str, range_seconds: int, max_calls: int
+    ) -> Tuple[int, float]:
         list_key, set_key, _ = cls.get_keys(entity_key)
         # Count the number of values in our sorted set
         # that are between now and the cutoff
@@ -443,8 +464,9 @@ class RedisRateLimiterBackend(RateLimiterBackend):
                     continue
 
     @classmethod
-    def rate_limit_entity(cls, entity_key: str, rules: List[Tuple[int, int]],
-                          max_api_calls: int, max_api_window: int) -> Tuple[bool, float]:
+    def rate_limit_entity(
+        cls, entity_key: str, rules: List[Tuple[int, int]], max_api_calls: int, max_api_window: int
+    ) -> Tuple[bool, float]:
         ratelimited, time = cls.is_ratelimited(entity_key, rules)
 
         if ratelimited:
@@ -460,9 +482,11 @@ class RedisRateLimiterBackend(RateLimiterBackend):
 
         return ratelimited, time
 
+
 class RateLimitResult:
-    def __init__(self, entity: RateLimitedObject, secs_to_freedom: float, over_limit: bool,
-                 remaining: int) -> None:
+    def __init__(
+        self, entity: RateLimitedObject, secs_to_freedom: float, over_limit: bool, remaining: int
+    ) -> None:
         if over_limit:
             assert not remaining
 
diff --git a/zerver/lib/realm_description.py b/zerver/lib/realm_description.py
index 3df0bb26f0..10947fe2fe 100644
--- a/zerver/lib/realm_description.py
+++ b/zerver/lib/realm_description.py
@@ -8,13 +8,13 @@ from zerver.lib.markdown import markdown_convert
 from zerver.models import Realm
 
 
-@cache_with_key(realm_rendered_description_cache_key, timeout=3600*24*7)
+@cache_with_key(realm_rendered_description_cache_key, timeout=3600 * 24 * 7)
 def get_realm_rendered_description(realm: Realm) -> str:
     realm_description_raw = realm.description or "The coolest place in the universe."
-    return markdown_convert(realm_description_raw, message_realm=realm,
-                            no_previews=True)
+    return markdown_convert(realm_description_raw, message_realm=realm, no_previews=True)
 
-@cache_with_key(realm_text_description_cache_key, timeout=3600*24*7)
+
+@cache_with_key(realm_text_description_cache_key, timeout=3600 * 24 * 7)
 def get_realm_text_description(realm: Realm) -> str:
     html_description = get_realm_rendered_description(realm)
     return html_to_text(html_description, {'p': ' | ', 'li': ' * '})
diff --git a/zerver/lib/realm_icon.py b/zerver/lib/realm_icon.py
index 3813d08048..9e0617865f 100644
--- a/zerver/lib/realm_icon.py
+++ b/zerver/lib/realm_icon.py
@@ -8,6 +8,7 @@ from zerver.models import Realm
 def realm_icon_url(realm: Realm) -> str:
     return get_realm_icon_url(realm)
 
+
 def get_realm_icon_url(realm: Realm) -> str:
     if realm.icon_source == 'U':
         return upload_backend.get_realm_icon_url(realm.id, realm.icon_version)
@@ -15,4 +16,4 @@ def get_realm_icon_url(realm: Realm) -> str:
         hash_key = gravatar_hash(realm.string_id)
         return f"https://secure.gravatar.com/avatar/{hash_key}?d=identicon"
     else:
-        return settings.DEFAULT_AVATAR_URI+'?version=0'
+        return settings.DEFAULT_AVATAR_URI + '?version=0'
diff --git a/zerver/lib/realm_logo.py b/zerver/lib/realm_logo.py
index 56b3011a16..882d1fb6ef 100644
--- a/zerver/lib/realm_logo.py
+++ b/zerver/lib/realm_logo.py
@@ -13,6 +13,7 @@ def get_realm_logo_source(realm: Realm, night: bool) -> str:
         return realm.night_logo_source
     return realm.logo_source
 
+
 def get_realm_logo_url(realm: Realm, night: bool) -> str:
     logo_source = get_realm_logo_source(realm, night)
 
@@ -22,11 +23,13 @@ def get_realm_logo_url(realm: Realm, night: bool) -> str:
         else:
             logo_version = realm.logo_version
         return upload_backend.get_realm_logo_url(realm.id, logo_version, night)
-    return settings.DEFAULT_LOGO_URI+'?version=0'
+    return settings.DEFAULT_LOGO_URI + '?version=0'
+
 
 def get_realm_logo_data(realm: Realm, night: bool) -> Dict[str, Any]:
     if night:
-        return dict(night_logo_url=get_realm_logo_url(realm, night),
-                    night_logo_source=realm.night_logo_source)
-    return dict(logo_url=get_realm_logo_url(realm, night),
-                logo_source=realm.logo_source)
+        return dict(
+            night_logo_url=get_realm_logo_url(realm, night),
+            night_logo_source=realm.night_logo_source,
+        )
+    return dict(logo_url=get_realm_logo_url(realm, night), logo_source=realm.logo_source)
diff --git a/zerver/lib/redis_utils.py b/zerver/lib/redis_utils.py
index 0132ba9b6d..9ae79fdcc7 100644
--- a/zerver/lib/redis_utils.py
+++ b/zerver/lib/redis_utils.py
@@ -10,25 +10,37 @@ from django.conf import settings
 # so we want to stay limited to 1024 characters.
 MAX_KEY_LENGTH = 1024
 
+
 class ZulipRedisError(Exception):
     pass
 
+
 class ZulipRedisKeyTooLongError(ZulipRedisError):
     pass
 
+
 class ZulipRedisKeyOfWrongFormatError(ZulipRedisError):
     pass
 
-def get_redis_client() -> "redis.StrictRedis[bytes]":
-    return redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT,
-                             password=settings.REDIS_PASSWORD, db=0,
-                             decode_responses=False)
 
-def put_dict_in_redis(redis_client: "redis.StrictRedis[bytes]", key_format: str,
-                      data_to_store: Mapping[str, Any],
-                      expiration_seconds: int,
-                      token_length: int=64,
-                      token: Optional[str]=None) -> str:
+def get_redis_client() -> "redis.StrictRedis[bytes]":
+    return redis.StrictRedis(
+        host=settings.REDIS_HOST,
+        port=settings.REDIS_PORT,
+        password=settings.REDIS_PASSWORD,
+        db=0,
+        decode_responses=False,
+    )
+
+
+def put_dict_in_redis(
+    redis_client: "redis.StrictRedis[bytes]",
+    key_format: str,
+    data_to_store: Mapping[str, Any],
+    expiration_seconds: int,
+    token_length: int = 64,
+    token: Optional[str] = None,
+) -> str:
     key_length = len(key_format) - len('{token}') + token_length
     if key_length > MAX_KEY_LENGTH:
         raise ZulipRedisKeyTooLongError(
@@ -44,8 +56,12 @@ def put_dict_in_redis(redis_client: "redis.StrictRedis[bytes]", key_format: str,
 
     return key
 
-def get_dict_from_redis(redis_client: "redis.StrictRedis[bytes]", key_format: str, key: str,
-                        ) -> Optional[Dict[str, Any]]:
+
+def get_dict_from_redis(
+    redis_client: "redis.StrictRedis[bytes]",
+    key_format: str,
+    key: str,
+) -> Optional[Dict[str, Any]]:
     # This function requires inputting the intended key_format to validate
     # that the key fits it, as an additionally security measure. This protects
     # against bugs where a caller requests a key based on user input and doesn't
@@ -61,6 +77,7 @@ def get_dict_from_redis(redis_client: "redis.StrictRedis[bytes]", key_format: st
         return None
     return orjson.loads(data)
 
+
 def validate_key_fits_format(key: str, key_format: str) -> None:
     assert "{token}" in key_format
     regex = key_format.format(token=r"[a-zA-Z0-9]+")
diff --git a/zerver/lib/remote_server.py b/zerver/lib/remote_server.py
index ced2bd4446..ea41d4b0f4 100644
--- a/zerver/lib/remote_server.py
+++ b/zerver/lib/remote_server.py
@@ -18,9 +18,11 @@ from zerver.models import RealmAuditLog
 class PushNotificationBouncerException(Exception):
     pass
 
+
 class PushNotificationBouncerRetryLaterError(JsonableError):
     http_status_code = 502
 
+
 def send_to_push_bouncer(
     method: str,
     endpoint: str,
@@ -43,26 +45,26 @@ def send_to_push_bouncer(
       vs. client-side errors like and invalid token.
 
     """
-    url = urllib.parse.urljoin(settings.PUSH_NOTIFICATION_BOUNCER_URL,
-                               '/api/v1/remotes/' + endpoint)
-    api_auth = requests.auth.HTTPBasicAuth(settings.ZULIP_ORG_ID,
-                                           settings.ZULIP_ORG_KEY)
+    url = urllib.parse.urljoin(
+        settings.PUSH_NOTIFICATION_BOUNCER_URL, '/api/v1/remotes/' + endpoint
+    )
+    api_auth = requests.auth.HTTPBasicAuth(settings.ZULIP_ORG_ID, settings.ZULIP_ORG_KEY)
 
     headers = {"User-agent": f"ZulipServer/{ZULIP_VERSION}"}
     headers.update(extra_headers)
 
     try:
-        res = requests.request(method,
-                               url,
-                               data=post_data,
-                               auth=api_auth,
-                               timeout=30,
-                               verify=True,
-                               headers=headers)
-    except (requests.exceptions.Timeout, requests.exceptions.SSLError,
-            requests.exceptions.ConnectionError) as e:
+        res = requests.request(
+            method, url, data=post_data, auth=api_auth, timeout=30, verify=True, headers=headers
+        )
+    except (
+        requests.exceptions.Timeout,
+        requests.exceptions.SSLError,
+        requests.exceptions.ConnectionError,
+    ) as e:
         raise PushNotificationBouncerRetryLaterError(
-            f"{e.__class__.__name__} while trying to connect to push notification bouncer")
+            f"{e.__class__.__name__} while trying to connect to push notification bouncer"
+        )
 
     if res.status_code >= 500:
         # 500s should be resolved by the people who run the push
@@ -79,7 +81,8 @@ def send_to_push_bouncer(
         if 'code' in result_dict and result_dict['code'] == 'INVALID_ZULIP_SERVER':
             # Invalid Zulip server credentials should email this server's admins
             raise PushNotificationBouncerException(
-                _("Push notifications bouncer error: {}").format(msg))
+                _("Push notifications bouncer error: {}").format(msg)
+            )
         else:
             # But most other errors coming from the push bouncer
             # server are client errors (e.g. never-registered token)
@@ -90,11 +93,13 @@ def send_to_push_bouncer(
         # this version of Zulip, so we throw an exception that will
         # email the server admins.
         raise PushNotificationBouncerException(
-            f"Push notification bouncer returned unexpected status code {res.status_code}")
+            f"Push notification bouncer returned unexpected status code {res.status_code}"
+        )
 
     # If we don't throw an exception, it's a successful bounce!
     return orjson.loads(res.content)
 
+
 def send_json_to_push_bouncer(method: str, endpoint: str, post_data: Mapping[str, object]) -> None:
     send_to_push_bouncer(
         method,
@@ -103,34 +108,44 @@ def send_json_to_push_bouncer(method: str, endpoint: str, post_data: Mapping[str
         extra_headers={"Content-type": "application/json"},
     )
 
-REALMAUDITLOG_PUSHED_FIELDS = ['id', 'realm', 'event_time', 'backfilled', 'extra_data', 'event_type']
 
-def build_analytics_data(realm_count_query: Any,
-                         installation_count_query: Any,
-                         realmauditlog_query: Any) -> Tuple[List[Dict[str, Any]],
-                                                            List[Dict[str, Any]],
-                                                            List[Dict[str, Any]]]:
+REALMAUDITLOG_PUSHED_FIELDS = [
+    'id',
+    'realm',
+    'event_time',
+    'backfilled',
+    'extra_data',
+    'event_type',
+]
+
+
+def build_analytics_data(
+    realm_count_query: Any, installation_count_query: Any, realmauditlog_query: Any
+) -> Tuple[List[Dict[str, Any]], List[Dict[str, Any]], List[Dict[str, Any]]]:
     # We limit the batch size on the client side to avoid OOM kills timeouts, etc.
     MAX_CLIENT_BATCH_SIZE = 10000
     data = {}
     data['analytics_realmcount'] = [
-        model_to_dict(row) for row in
-        realm_count_query.order_by("id")[0:MAX_CLIENT_BATCH_SIZE]
+        model_to_dict(row) for row in realm_count_query.order_by("id")[0:MAX_CLIENT_BATCH_SIZE]
     ]
     data['analytics_installationcount'] = [
-        model_to_dict(row) for row in
-        installation_count_query.order_by("id")[0:MAX_CLIENT_BATCH_SIZE]
+        model_to_dict(row)
+        for row in installation_count_query.order_by("id")[0:MAX_CLIENT_BATCH_SIZE]
     ]
     data['zerver_realmauditlog'] = [
-        model_to_dict(row, fields=REALMAUDITLOG_PUSHED_FIELDS) for row in
-        realmauditlog_query.order_by("id")[0:MAX_CLIENT_BATCH_SIZE]
+        model_to_dict(row, fields=REALMAUDITLOG_PUSHED_FIELDS)
+        for row in realmauditlog_query.order_by("id")[0:MAX_CLIENT_BATCH_SIZE]
     ]
 
     floatify_datetime_fields(data, 'analytics_realmcount')
     floatify_datetime_fields(data, 'analytics_installationcount')
     floatify_datetime_fields(data, 'zerver_realmauditlog')
-    return (data['analytics_realmcount'], data['analytics_installationcount'],
-            data['zerver_realmauditlog'])
+    return (
+        data['analytics_realmcount'],
+        data['analytics_installationcount'],
+        data['zerver_realmauditlog'],
+    )
+
 
 def send_analytics_to_remote_server() -> None:
     # first, check what's latest
@@ -145,13 +160,14 @@ def send_analytics_to_remote_server() -> None:
     last_acked_realmauditlog_id = result['last_realmauditlog_id']
 
     (realm_count_data, installation_count_data, realmauditlog_data) = build_analytics_data(
-        realm_count_query=RealmCount.objects.filter(
-            id__gt=last_acked_realm_count_id),
+        realm_count_query=RealmCount.objects.filter(id__gt=last_acked_realm_count_id),
         installation_count_query=InstallationCount.objects.filter(
-            id__gt=last_acked_installation_count_id),
+            id__gt=last_acked_installation_count_id
+        ),
         realmauditlog_query=RealmAuditLog.objects.filter(
-            event_type__in=RealmAuditLog.SYNCED_BILLING_EVENTS,
-            id__gt=last_acked_realmauditlog_id))
+            event_type__in=RealmAuditLog.SYNCED_BILLING_EVENTS, id__gt=last_acked_realmauditlog_id
+        ),
+    )
 
     if len(realm_count_data) + len(installation_count_data) + len(realmauditlog_data) == 0:
         return
diff --git a/zerver/lib/request.py b/zerver/lib/request.py
index 3408d0e95f..504a77bb26 100644
--- a/zerver/lib/request.py
+++ b/zerver/lib/request.py
@@ -38,6 +38,7 @@ class RequestConfusingParmsError(JsonableError):
     def msg_format() -> str:
         return _("Can't decide between '{var_name1}' and '{var_name2}' arguments")
 
+
 class RequestVariableMissingError(JsonableError):
     code = ErrorCode.REQUEST_VARIABLE_MISSING
     data_fields = ['var_name']
@@ -49,6 +50,7 @@ class RequestVariableMissingError(JsonableError):
     def msg_format() -> str:
         return _("Missing '{var_name}' argument")
 
+
 class RequestVariableConversionError(JsonableError):
     code = ErrorCode.REQUEST_VARIABLE_INVALID
     data_fields = ['var_name', 'bad_value']
@@ -61,15 +63,18 @@ class RequestVariableConversionError(JsonableError):
     def msg_format() -> str:
         return _("Bad value for '{var_name}': {bad_value}")
 
+
 # Used in conjunction with @has_request_variables, below
 ResultT = TypeVar('ResultT')
 
+
 class _REQ(Generic[ResultT]):
     # NotSpecified is a sentinel value for determining whether a
     # default value was specified for a request variable.  We can't
     # use None because that could be a valid, user-specified default
     class _NotSpecified:
         pass
+
     NotSpecified = _NotSpecified()
 
     def __init__(
@@ -81,10 +86,10 @@ class _REQ(Generic[ResultT]):
         validator: Optional[Validator[ResultT]] = None,
         str_validator: Optional[Validator[ResultT]] = None,
         argument_type: Optional[str] = None,
-        intentionally_undocumented: bool=False,
-        documentation_pending: bool=False,
+        intentionally_undocumented: bool = False,
+        documentation_pending: bool = False,
         aliases: Sequence[str] = [],
-        path_only: bool=False
+        path_only: bool = False,
     ) -> None:
         """whence: the name of the request variable that should be used
         for this parameter.  Defaults to a request variable of the
@@ -124,8 +129,13 @@ class _REQ(Generic[ResultT]):
         self.documentation_pending = documentation_pending
         self.path_only = path_only
 
-        assert converter is None or (validator is None and str_validator is None), 'converter and validator are mutually exclusive'
-        assert validator is None or str_validator is None, 'validator and str_validator are mutually exclusive'
+        assert converter is None or (
+            validator is None and str_validator is None
+        ), 'converter and validator are mutually exclusive'
+        assert (
+            validator is None or str_validator is None
+        ), 'validator and str_validator are mutually exclusive'
+
 
 # This factory function ensures that mypy can correctly analyze REQ.
 #
@@ -148,10 +158,11 @@ def REQ(
     intentionally_undocumented: bool = ...,
     documentation_pending: bool = ...,
     aliases: Sequence[str] = ...,
-    path_only: bool = ...
+    path_only: bool = ...,
 ) -> ResultT:
     ...
 
+
 # Overload 2: validator
 @overload
 def REQ(
@@ -162,10 +173,11 @@ def REQ(
     intentionally_undocumented: bool = ...,
     documentation_pending: bool = ...,
     aliases: Sequence[str] = ...,
-    path_only: bool = ...
+    path_only: bool = ...,
 ) -> ResultT:
     ...
 
+
 # Overload 3: no converter/validator, default: str or unspecified, argument_type=None
 @overload
 def REQ(
@@ -176,10 +188,11 @@ def REQ(
     intentionally_undocumented: bool = ...,
     documentation_pending: bool = ...,
     aliases: Sequence[str] = ...,
-    path_only: bool = ...
+    path_only: bool = ...,
 ) -> str:
     ...
 
+
 # Overload 4: no converter/validator, default=None, argument_type=None
 @overload
 def REQ(
@@ -190,10 +203,11 @@ def REQ(
     intentionally_undocumented: bool = ...,
     documentation_pending: bool = ...,
     aliases: Sequence[str] = ...,
-    path_only: bool = ...
+    path_only: bool = ...,
 ) -> Optional[str]:
     ...
 
+
 # Overload 5: argument_type="body"
 @overload
 def REQ(
@@ -204,10 +218,11 @@ def REQ(
     intentionally_undocumented: bool = ...,
     documentation_pending: bool = ...,
     aliases: Sequence[str] = ...,
-    path_only: bool = ...
+    path_only: bool = ...,
 ) -> ResultT:
     ...
 
+
 # Implementation
 def REQ(
     whence: Optional[str] = None,
@@ -217,23 +232,27 @@ def REQ(
     validator: Optional[Validator[ResultT]] = None,
     str_validator: Optional[Validator[ResultT]] = None,
     argument_type: Optional[str] = None,
-    intentionally_undocumented: bool=False,
-    documentation_pending: bool=False,
+    intentionally_undocumented: bool = False,
+    documentation_pending: bool = False,
     aliases: Sequence[str] = [],
-    path_only: bool = False
+    path_only: bool = False,
 ) -> ResultT:
-    return cast(ResultT, _REQ(
-        whence,
-        converter=converter,
-        default=default,
-        validator=validator,
-        str_validator=str_validator,
-        argument_type=argument_type,
-        intentionally_undocumented=intentionally_undocumented,
-        documentation_pending=documentation_pending,
-        aliases=aliases,
-        path_only=path_only,
-    ))
+    return cast(
+        ResultT,
+        _REQ(
+            whence,
+            converter=converter,
+            default=default,
+            validator=validator,
+            str_validator=str_validator,
+            argument_type=argument_type,
+            intentionally_undocumented=intentionally_undocumented,
+            documentation_pending=documentation_pending,
+            aliases=aliases,
+            path_only=path_only,
+        ),
+    )
+
 
 arguments_map: Dict[str, List[str]] = defaultdict(list)
 
@@ -259,7 +278,7 @@ def has_request_variables(view_func: ViewFuncT) -> ViewFuncT:
     if default_param_values is None:
         default_param_values = ()
     num_default_params = len(default_param_values)
-    default_param_names = view_func.__code__.co_varnames[num_params - num_default_params:]
+    default_param_names = view_func.__code__.co_varnames[num_params - num_default_params :]
 
     post_params = []
 
@@ -274,9 +293,11 @@ def has_request_variables(view_func: ViewFuncT) -> ViewFuncT:
 
             # Record arguments that should be documented so that our
             # automated OpenAPI docs tests can compare these against the code.
-            if (not value.intentionally_undocumented
-                    and not value.documentation_pending
-                    and not value.path_only):
+            if (
+                not value.intentionally_undocumented
+                and not value.documentation_pending
+                and not value.path_only
+            ):
                 arguments_map[view_func_full_name].append(value.post_var_name)
 
     @wraps(view_func)
@@ -371,6 +392,7 @@ def has_request_variables(view_func: ViewFuncT) -> ViewFuncT:
 
 local = threading.local()
 
+
 def get_current_request() -> Optional[HttpRequest]:
     """Returns the current HttpRequest object; this should only be used by
     logging frameworks, which have no other access to the current
@@ -380,9 +402,11 @@ def get_current_request() -> Optional[HttpRequest]:
     """
     return getattr(local, 'request', None)
 
+
 def set_request(req: HttpRequest) -> None:
     setattr(local, 'request', req)
 
+
 def unset_request() -> None:
     if hasattr(local, 'request'):
         delattr(local, 'request')
diff --git a/zerver/lib/response.py b/zerver/lib/response.py
index 81d14d82ab..3510910f08 100644
--- a/zerver/lib/response.py
+++ b/zerver/lib/response.py
@@ -10,7 +10,7 @@ from zerver.lib.exceptions import JsonableError
 class HttpResponseUnauthorized(HttpResponse):
     status_code = 401
 
-    def __init__(self, realm: str, www_authenticate: Optional[str]=None) -> None:
+    def __init__(self, realm: str, www_authenticate: Optional[str] = None) -> None:
         HttpResponse.__init__(self)
         if www_authenticate is None:
             self["WWW-Authenticate"] = f'Basic realm="{realm}"'
@@ -19,27 +19,31 @@ class HttpResponseUnauthorized(HttpResponse):
         else:
             raise AssertionError("Invalid www_authenticate value!")
 
-def json_unauthorized(message: Optional[str]=None,
-                      www_authenticate: Optional[str]=None) -> HttpResponse:
+
+def json_unauthorized(
+    message: Optional[str] = None, www_authenticate: Optional[str] = None
+) -> HttpResponse:
     if message is None:
         message = _("Not logged in: API authentication or user session required")
     resp = HttpResponseUnauthorized("zulip", www_authenticate=www_authenticate)
     resp.content = orjson.dumps(
-        {"result": "error", "msg": message}, option=orjson.OPT_APPEND_NEWLINE,
+        {"result": "error", "msg": message},
+        option=orjson.OPT_APPEND_NEWLINE,
     )
     return resp
 
+
 def json_method_not_allowed(methods: List[str]) -> HttpResponseNotAllowed:
     resp = HttpResponseNotAllowed(methods)
-    resp.content = orjson.dumps({"result": "error",
-                                 "msg": "Method Not Allowed",
-                                 "allowed_methods": methods})
+    resp.content = orjson.dumps(
+        {"result": "error", "msg": "Method Not Allowed", "allowed_methods": methods}
+    )
     return resp
 
-def json_response(res_type: str="success",
-                  msg: str="",
-                  data: Mapping[str, Any]={},
-                  status: int=200) -> HttpResponse:
+
+def json_response(
+    res_type: str = "success", msg: str = "", data: Mapping[str, Any] = {}, status: int = 200
+) -> HttpResponse:
     content = {"result": res_type, "msg": msg}
     content.update(data)
 
@@ -55,26 +59,28 @@ def json_response(res_type: str="success",
         status=status,
     )
 
-def json_success(data: Mapping[str, Any]={}) -> HttpResponse:
+
+def json_success(data: Mapping[str, Any] = {}) -> HttpResponse:
     return json_response(data=data)
 
+
 def json_response_from_error(exception: JsonableError) -> HttpResponse:
-    '''
+    """
     This should only be needed in middleware; in app code, just raise.
 
     When app code raises a JsonableError, the JsonErrorHandler
     middleware takes care of transforming it into a response by
     calling this function.
-    '''
-    response = json_response('error',
-                             msg=exception.msg,
-                             data=exception.data,
-                             status=exception.http_status_code)
+    """
+    response = json_response(
+        'error', msg=exception.msg, data=exception.data, status=exception.http_status_code
+    )
 
     for header, value in exception.extra_headers.items():
         response[header] = value
 
     return response
 
-def json_error(msg: str, data: Mapping[str, Any]={}, status: int=400) -> HttpResponse:
+
+def json_error(msg: str, data: Mapping[str, Any] = {}, status: int = 400) -> HttpResponse:
     return json_response(res_type="error", msg=msg, data=data, status=status)
diff --git a/zerver/lib/rest.py b/zerver/lib/rest.py
index 6a29088b6d..e8f9e89970 100644
--- a/zerver/lib/rest.py
+++ b/zerver/lib/rest.py
@@ -18,7 +18,8 @@ from zerver.lib.response import json_method_not_allowed
 from zerver.lib.types import ViewFuncT
 
 METHODS = ('GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH')
-FLAGS = ('override_api_url_scheme')
+FLAGS = 'override_api_url_scheme'
+
 
 def default_never_cache_responses(view_func: ViewFuncT) -> ViewFuncT:
     """Patched version of the standard Django never_cache_responses
@@ -26,6 +27,7 @@ def default_never_cache_responses(view_func: ViewFuncT) -> ViewFuncT:
     cached, unless the view code has already set a Cache-Control
     header.
     """
+
     @wraps(view_func)
     def _wrapped_view_func(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
         response = view_func(request, *args, **kwargs)
@@ -34,8 +36,10 @@ def default_never_cache_responses(view_func: ViewFuncT) -> ViewFuncT:
 
         add_never_cache_headers(response)
         return response
+
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 @default_never_cache_responses
 @csrf_exempt
 def rest_dispatch(request: HttpRequest, **kwargs: Any) -> HttpResponse:
@@ -109,21 +113,24 @@ def rest_dispatch(request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
         # for some special views (e.g. serving a file that has been
         # uploaded), we support using the same URL for web and API clients.
-        if ('override_api_url_scheme' in view_flags and
-                request.META.get('HTTP_AUTHORIZATION', None) is not None):
+        if (
+            'override_api_url_scheme' in view_flags
+            and request.META.get('HTTP_AUTHORIZATION', None) is not None
+        ):
             # This request uses standard API based authentication.
             # For override_api_url_scheme views, we skip our normal
             # rate limiting, because there are good reasons clients
             # might need to (e.g.) request a large number of uploaded
             # files or avatars in quick succession.
             target_function = authenticated_rest_api_view(skip_rate_limiting=True)(target_function)
-        elif ('override_api_url_scheme' in view_flags and
-              request.GET.get('api_key') is not None):
+        elif 'override_api_url_scheme' in view_flags and request.GET.get('api_key') is not None:
             # This request uses legacy API authentication.  We
             # unfortunately need that in the React Native mobile apps,
             # because there's no way to set HTTP_AUTHORIZATION in
             # React Native.  See last block for rate limiting notes.
-            target_function = authenticated_uploads_api_view(skip_rate_limiting=True)(target_function)
+            target_function = authenticated_uploads_api_view(skip_rate_limiting=True)(
+                target_function
+            )
         # /json views (web client) validate with a session token (cookie)
         elif not request.path.startswith("/api") and request.user.is_authenticated:
             # Authenticated via sessions framework, only CSRF check needed
@@ -144,8 +151,7 @@ def rest_dispatch(request: HttpRequest, **kwargs: Any) -> HttpResponse:
             # For endpoints that support anonymous web access, we do that.
             # TODO: Allow /api calls when this is stable enough.
             auth_kwargs = dict(allow_unauthenticated=True)
-            target_function = csrf_protect(authenticated_json_view(
-                target_function, **auth_kwargs))
+            target_function = csrf_protect(authenticated_json_view(target_function, **auth_kwargs))
         else:
             # Otherwise, throw an authentication error; our middleware
             # will generate the appropriate HTTP response.
@@ -161,6 +167,7 @@ def rest_dispatch(request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
     return json_method_not_allowed(list(supported_methods.keys()))
 
+
 def rest_path(
     route: str,
     kwargs: Mapping[str, object] = {},
diff --git a/zerver/lib/retention.py b/zerver/lib/retention.py
index 69c6df4222..1cbe67794e 100644
--- a/zerver/lib/retention.py
+++ b/zerver/lib/retention.py
@@ -88,13 +88,14 @@ models_with_message_key: List[Dict[str, Any]] = [
     },
 ]
 
+
 @transaction.atomic(savepoint=False)
 def move_rows(
     base_model: Model,
     raw_query: Composable,
     *,
-    src_db_table: Optional[str]=None,
-    returning_id: bool=False,
+    src_db_table: Optional[str] = None,
+    returning_id: bool = False,
     **kwargs: Composable,
 ) -> List[int]:
     """Core helper for bulk moving rows between a table and its archive table"""
@@ -102,10 +103,7 @@ def move_rows(
         # Use base_model's db_table unless otherwise specified.
         src_db_table = base_model._meta.db_table
 
-    src_fields = [
-        Identifier(src_db_table, field.column)
-        for field in base_model._meta.fields
-    ]
+    src_fields = [Identifier(src_db_table, field.column) for field in base_model._meta.fields]
     dst_fields = [Identifier(field.column) for field in base_model._meta.fields]
     sql_args = {
         'src_fields': SQL(',').join(src_fields),
@@ -121,11 +119,12 @@ def move_rows(
         else:
             return []
 
+
 def run_archiving_in_chunks(
     query: Composable,
     type: int,
-    realm: Optional[Realm]=None,
-    chunk_size: int=MESSAGE_BATCH_SIZE,
+    realm: Optional[Realm] = None,
+    chunk_size: int = MESSAGE_BATCH_SIZE,
     **kwargs: Composable,
 ) -> int:
     # This function is carefully designed to achieve our
@@ -161,8 +160,12 @@ def run_archiving_in_chunks(
         # archiving of the chunk is finished (since Django does some significant additional work
         # when leaving the block).
         if len(new_chunk) > 0:
-            logger.info("Archived %s messages in %.2fs in transaction %s.",
-                        len(new_chunk), total_time, archive_transaction.id)
+            logger.info(
+                "Archived %s messages in %.2fs in transaction %s.",
+                len(new_chunk),
+                total_time,
+                archive_transaction.id,
+            )
 
         # We run the loop, until the query returns fewer results than chunk_size,
         # which means we are done:
@@ -171,18 +174,24 @@ def run_archiving_in_chunks(
 
     return message_count
 
+
 # Note about batching these Message archiving queries:
 # We can simply use LIMIT without worrying about OFFSETs and ordering
 # while executing batches, because any Message already archived (in the previous batch)
 # will not show up in the "SELECT ... FROM zerver_message ..." query for the next batches.
 
-def move_expired_messages_to_archive_by_recipient(recipient: Recipient,
-                                                  message_retention_days: int, realm: Realm,
-                                                  chunk_size: int=MESSAGE_BATCH_SIZE) -> int:
+
+def move_expired_messages_to_archive_by_recipient(
+    recipient: Recipient,
+    message_retention_days: int,
+    realm: Realm,
+    chunk_size: int = MESSAGE_BATCH_SIZE,
+) -> int:
     assert message_retention_days != -1
 
     # This function will archive appropriate messages and their related objects.
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_archivedmessage ({dst_fields}, archive_transaction_id)
         SELECT {src_fields}, {archive_transaction_id}
         FROM zerver_message
@@ -191,7 +200,8 @@ def move_expired_messages_to_archive_by_recipient(recipient: Recipient,
         LIMIT {chunk_size}
     ON CONFLICT (id) DO UPDATE SET archive_transaction_id = {archive_transaction_id}
     RETURNING id
-    """)
+    """
+    )
     check_date = timezone_now() - timedelta(days=message_retention_days)
 
     return run_archiving_in_chunks(
@@ -203,24 +213,26 @@ def move_expired_messages_to_archive_by_recipient(recipient: Recipient,
         chunk_size=chunk_size,
     )
 
-def move_expired_personal_and_huddle_messages_to_archive(realm: Realm,
-                                                         chunk_size: int=MESSAGE_BATCH_SIZE,
-                                                         ) -> int:
+
+def move_expired_personal_and_huddle_messages_to_archive(
+    realm: Realm,
+    chunk_size: int = MESSAGE_BATCH_SIZE,
+) -> int:
     message_retention_days = realm.message_retention_days
     assert message_retention_days != -1
     check_date = timezone_now() - timedelta(days=message_retention_days)
 
     # This function will archive appropriate messages and their related objects.
     cross_realm_bot_ids = [
-        get_user_including_cross_realm(email).id
-        for email in settings.CROSS_REALM_BOT_EMAILS
+        get_user_including_cross_realm(email).id for email in settings.CROSS_REALM_BOT_EMAILS
     ]
     recipient_types = (Recipient.PERSONAL, Recipient.HUDDLE)
 
     # Archive expired personal and huddle Messages in the realm, except cross-realm messages.
     # The condition zerver_userprofile.realm_id = {realm_id} assures the row won't be
     # a message sent by a cross-realm bot, because cross-realm bots have their own separate realm.
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_archivedmessage ({dst_fields}, archive_transaction_id)
         SELECT {src_fields}, {archive_transaction_id}
         FROM zerver_message
@@ -232,7 +244,8 @@ def move_expired_personal_and_huddle_messages_to_archive(realm: Realm,
         LIMIT {chunk_size}
     ON CONFLICT (id) DO UPDATE SET archive_transaction_id = {archive_transaction_id}
     RETURNING id
-    """)
+    """
+    )
 
     message_count = run_archiving_in_chunks(
         query,
@@ -250,7 +263,8 @@ def move_expired_personal_and_huddle_messages_to_archive(realm: Realm,
     # as we don't support them as a feature in Zulip, and the query to
     # find and delete them would be a lot of complexity and potential
     # performance work for a case that doesn't actually happen.
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_archivedmessage ({dst_fields}, archive_transaction_id)
         SELECT {src_fields}, {archive_transaction_id}
         FROM zerver_message
@@ -261,7 +275,8 @@ def move_expired_personal_and_huddle_messages_to_archive(realm: Realm,
         LIMIT {chunk_size}
     ON CONFLICT (id) DO UPDATE SET archive_transaction_id = {archive_transaction_id}
     RETURNING id
-    """)
+    """
+    )
     message_count += run_archiving_in_chunks(
         query,
         type=ArchiveTransaction.RETENTION_POLICY_BASED,
@@ -274,17 +289,20 @@ def move_expired_personal_and_huddle_messages_to_archive(realm: Realm,
 
     return message_count
 
+
 def move_models_with_message_key_to_archive(msg_ids: List[int]) -> None:
     assert len(msg_ids) > 0
 
     for model in models_with_message_key:
-        query = SQL("""
+        query = SQL(
+            """
         INSERT INTO {archive_table_name} ({dst_fields})
             SELECT {src_fields}
             FROM {table_name}
             WHERE {table_name}.message_id IN {message_ids}
         ON CONFLICT (id) DO NOTHING
-        """)
+        """
+        )
         move_rows(
             model['class'],
             query,
@@ -293,6 +311,7 @@ def move_models_with_message_key_to_archive(msg_ids: List[int]) -> None:
             message_ids=Literal(tuple(msg_ids)),
         )
 
+
 # Attachments can't use the common models_with_message_key system,
 # because they can be referenced by more than one Message, and we only
 # want to delete the Attachment if we're deleting the last message
@@ -300,7 +319,8 @@ def move_models_with_message_key_to_archive(msg_ids: List[int]) -> None:
 def move_attachments_to_archive(msg_ids: List[int]) -> None:
     assert len(msg_ids) > 0
 
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_archivedattachment ({dst_fields})
         SELECT {src_fields}
         FROM zerver_attachment
@@ -309,24 +329,28 @@ def move_attachments_to_archive(msg_ids: List[int]) -> None:
         WHERE zerver_attachment_messages.message_id IN {message_ids}
         GROUP BY zerver_attachment.id
     ON CONFLICT (id) DO NOTHING
-    """)
+    """
+    )
     move_rows(Attachment, query, message_ids=Literal(tuple(msg_ids)))
 
 
 def move_attachment_messages_to_archive(msg_ids: List[int]) -> None:
     assert len(msg_ids) > 0
 
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_archivedattachment_messages (id, archivedattachment_id, archivedmessage_id)
         SELECT zerver_attachment_messages.id, zerver_attachment_messages.attachment_id,
             zerver_attachment_messages.message_id
         FROM zerver_attachment_messages
         WHERE  zerver_attachment_messages.message_id IN %(message_ids)s
     ON CONFLICT (id) DO NOTHING
-    """)
+    """
+    )
     with connection.cursor() as cursor:
         cursor.execute(query, dict(message_ids=tuple(msg_ids)))
 
+
 def delete_messages(msg_ids: List[int]) -> None:
     # Important note: This also deletes related objects with a foreign
     # key to Message (due to `on_delete=CASCADE` in our models
@@ -334,6 +358,7 @@ def delete_messages(msg_ids: List[int]) -> None:
     # archiving the messages before doing this step.
     Message.objects.filter(id__in=msg_ids).delete()
 
+
 def delete_expired_attachments(realm: Realm) -> None:
     attachments_deleted, _ = Attachment.objects.filter(
         messages__isnull=True,
@@ -344,22 +369,35 @@ def delete_expired_attachments(realm: Realm) -> None:
     if attachments_deleted > 0:
         logger.info("Cleaned up %s attachments for realm %s", attachments_deleted, realm.string_id)
 
+
 def move_related_objects_to_archive(msg_ids: List[int]) -> None:
     move_models_with_message_key_to_archive(msg_ids)
     move_attachments_to_archive(msg_ids)
     move_attachment_messages_to_archive(msg_ids)
 
-def archive_messages_by_recipient(recipient: Recipient, message_retention_days: int,
-                                  realm: Realm, chunk_size: int=MESSAGE_BATCH_SIZE) -> int:
-    return move_expired_messages_to_archive_by_recipient(recipient, message_retention_days,
-                                                         realm, chunk_size)
 
-def archive_personal_and_huddle_messages(realm: Realm, chunk_size: int=MESSAGE_BATCH_SIZE) -> None:
+def archive_messages_by_recipient(
+    recipient: Recipient,
+    message_retention_days: int,
+    realm: Realm,
+    chunk_size: int = MESSAGE_BATCH_SIZE,
+) -> int:
+    return move_expired_messages_to_archive_by_recipient(
+        recipient, message_retention_days, realm, chunk_size
+    )
+
+
+def archive_personal_and_huddle_messages(
+    realm: Realm, chunk_size: int = MESSAGE_BATCH_SIZE
+) -> None:
     logger.info("Archiving personal and huddle messages for realm %s", realm.string_id)
     message_count = move_expired_personal_and_huddle_messages_to_archive(realm, chunk_size)
     logger.info("Done. Archived %s messages", message_count)
 
-def archive_stream_messages(realm: Realm, streams: List[Stream], chunk_size: int=STREAM_MESSAGE_BATCH_SIZE) -> None:
+
+def archive_stream_messages(
+    realm: Realm, streams: List[Stream], chunk_size: int = STREAM_MESSAGE_BATCH_SIZE
+) -> None:
     if not streams:
         return
 
@@ -377,12 +415,16 @@ def archive_stream_messages(realm: Realm, streams: List[Stream], chunk_size: int
     message_count = 0
     for recipient in recipients:
         message_count += archive_messages_by_recipient(
-            recipient, retention_policy_dict[recipient.type_id], realm, chunk_size,
+            recipient,
+            retention_policy_dict[recipient.type_id],
+            realm,
+            chunk_size,
         )
 
     logger.info("Done. Archived %s messages.", message_count)
 
-def archive_messages(chunk_size: int=MESSAGE_BATCH_SIZE) -> None:
+
+def archive_messages(chunk_size: int = MESSAGE_BATCH_SIZE) -> None:
     logger.info("Starting the archiving process with chunk_size %s", chunk_size)
 
     for realm, streams in get_realms_and_streams_for_archiving():
@@ -393,6 +435,7 @@ def archive_messages(chunk_size: int=MESSAGE_BATCH_SIZE) -> None:
         # Messages have been archived for the realm, now we can clean up attachments:
         delete_expired_attachments(realm)
 
+
 def get_realms_and_streams_for_archiving() -> List[Tuple[Realm, List[Stream]]]:
     """
     This function constructs a list of (realm, streams_of_the_realm) tuples
@@ -414,15 +457,19 @@ def get_realms_and_streams_for_archiving() -> List[Tuple[Realm, List[Stream]]]:
     # Now we find all streams that require archiving.
     # First category are streams in retention-enabled realms,
     # that don't have retention explicitly disabled (through the value -1).
-    query_one = Stream.objects.exclude(message_retention_days=-1) \
-        .exclude(realm__message_retention_days=-1) \
+    query_one = (
+        Stream.objects.exclude(message_retention_days=-1)
+        .exclude(realm__message_retention_days=-1)
         .select_related('realm', 'recipient')
+    )
     # Second category are streams that are in realms without a realm-wide retention policy,
     # but have their own stream-specific policy enabled.
-    query_two = Stream.objects.filter(realm__message_retention_days=-1) \
-        .exclude(message_retention_days__isnull=True) \
-        .exclude(message_retention_days=-1) \
+    query_two = (
+        Stream.objects.filter(realm__message_retention_days=-1)
+        .exclude(message_retention_days__isnull=True)
+        .exclude(message_retention_days=-1)
         .select_related('realm', 'recipient')
+    )
     query = query_one.union(query_two)
 
     for stream in query:
@@ -433,12 +480,17 @@ def get_realms_and_streams_for_archiving() -> List[Tuple[Realm, List[Stream]]]:
 
         realm_id_to_streams_list[realm.id].append(stream)
 
-    return [(realm_id_to_realm[realm_id], realm_id_to_streams_list[realm_id])
-            for realm_id in realm_id_to_realm]
+    return [
+        (realm_id_to_realm[realm_id], realm_id_to_streams_list[realm_id])
+        for realm_id in realm_id_to_realm
+    ]
 
-def move_messages_to_archive(message_ids: List[int], realm: Optional[Realm]=None,
-                             chunk_size: int=MESSAGE_BATCH_SIZE) -> None:
-    query = SQL("""
+
+def move_messages_to_archive(
+    message_ids: List[int], realm: Optional[Realm] = None, chunk_size: int = MESSAGE_BATCH_SIZE
+) -> None:
+    query = SQL(
+        """
     INSERT INTO zerver_archivedmessage ({dst_fields}, archive_transaction_id)
         SELECT {src_fields}, {archive_transaction_id}
         FROM zerver_message
@@ -446,7 +498,8 @@ def move_messages_to_archive(message_ids: List[int], realm: Optional[Realm]=None
         LIMIT {chunk_size}
     ON CONFLICT (id) DO UPDATE SET archive_transaction_id = {archive_transaction_id}
     RETURNING id
-    """)
+    """
+    )
     count = run_archiving_in_chunks(
         query,
         type=ArchiveTransaction.MANUAL,
@@ -458,18 +511,23 @@ def move_messages_to_archive(message_ids: List[int], realm: Optional[Realm]=None
     if count == 0:
         raise Message.DoesNotExist
     # Clean up attachments:
-    archived_attachments = ArchivedAttachment.objects.filter(messages__id__in=message_ids).distinct()
+    archived_attachments = ArchivedAttachment.objects.filter(
+        messages__id__in=message_ids
+    ).distinct()
     Attachment.objects.filter(messages__isnull=True, id__in=archived_attachments).delete()
 
+
 def restore_messages_from_archive(archive_transaction_id: int) -> List[int]:
-    query = SQL("""
+    query = SQL(
+        """
         INSERT INTO zerver_message ({dst_fields})
             SELECT {src_fields}
             FROM zerver_archivedmessage
             WHERE zerver_archivedmessage.archive_transaction_id = {archive_transaction_id}
         ON CONFLICT (id) DO NOTHING
         RETURNING id
-        """)
+        """
+    )
     return move_rows(
         Message,
         query,
@@ -478,16 +536,19 @@ def restore_messages_from_archive(archive_transaction_id: int) -> List[int]:
         archive_transaction_id=Literal(archive_transaction_id),
     )
 
+
 def restore_models_with_message_key_from_archive(archive_transaction_id: int) -> None:
     for model in models_with_message_key:
-        query = SQL("""
+        query = SQL(
+            """
         INSERT INTO {table_name} ({dst_fields})
             SELECT {src_fields}
             FROM {archive_table_name}
             INNER JOIN zerver_archivedmessage ON {archive_table_name}.message_id = zerver_archivedmessage.id
             WHERE zerver_archivedmessage.archive_transaction_id = {archive_transaction_id}
         ON CONFLICT (id) DO NOTHING
-        """)
+        """
+        )
 
         move_rows(
             model['class'],
@@ -498,8 +559,10 @@ def restore_models_with_message_key_from_archive(archive_transaction_id: int) ->
             archive_table_name=Identifier(model['archive_table_name']),
         )
 
+
 def restore_attachments_from_archive(archive_transaction_id: int) -> None:
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_attachment ({dst_fields})
         SELECT {src_fields}
         FROM zerver_archivedattachment
@@ -510,7 +573,8 @@ def restore_attachments_from_archive(archive_transaction_id: int) -> None:
         WHERE zerver_archivedmessage.archive_transaction_id = {archive_transaction_id}
         GROUP BY zerver_archivedattachment.id
     ON CONFLICT (id) DO NOTHING
-    """)
+    """
+    )
     move_rows(
         Attachment,
         query,
@@ -518,8 +582,10 @@ def restore_attachments_from_archive(archive_transaction_id: int) -> None:
         archive_transaction_id=Literal(archive_transaction_id),
     )
 
+
 def restore_attachment_messages_from_archive(archive_transaction_id: int) -> None:
-    query = SQL("""
+    query = SQL(
+        """
     INSERT INTO zerver_attachment_messages (id, attachment_id, message_id)
         SELECT zerver_archivedattachment_messages.id,
             zerver_archivedattachment_messages.archivedattachment_id,
@@ -529,10 +595,12 @@ def restore_attachment_messages_from_archive(archive_transaction_id: int) -> Non
             ON  zerver_archivedattachment_messages.archivedmessage_id = zerver_archivedmessage.id
         WHERE zerver_archivedmessage.archive_transaction_id = %(archive_transaction_id)s
     ON CONFLICT (id) DO NOTHING
-    """)
+    """
+    )
     with connection.cursor() as cursor:
         cursor.execute(query, dict(archive_transaction_id=archive_transaction_id))
 
+
 def restore_data_from_archive(archive_transaction: ArchiveTransaction) -> int:
     logger.info("Restoring %s", archive_transaction)
     # transaction.atomic needs to be used here, rather than being a wrapper on the whole function,
@@ -551,7 +619,10 @@ def restore_data_from_archive(archive_transaction: ArchiveTransaction) -> int:
     logger.info("Finished. Restored %s messages", len(msg_ids))
     return len(msg_ids)
 
-def restore_data_from_archive_by_transactions(archive_transactions: List[ArchiveTransaction]) -> int:
+
+def restore_data_from_archive_by_transactions(
+    archive_transactions: List[ArchiveTransaction],
+) -> int:
     # Looping over the list of ids means we're batching the restoration process by the size of the
     # transactions:
     message_count = 0
@@ -560,44 +631,50 @@ def restore_data_from_archive_by_transactions(archive_transactions: List[Archive
 
     return message_count
 
+
 def restore_data_from_archive_by_realm(realm: Realm) -> None:
     transactions = ArchiveTransaction.objects.exclude(restored=True).filter(
-        realm=realm, type=ArchiveTransaction.RETENTION_POLICY_BASED)
+        realm=realm, type=ArchiveTransaction.RETENTION_POLICY_BASED
+    )
     logger.info("Restoring %s transactions from realm %s", len(transactions), realm.string_id)
     message_count = restore_data_from_archive_by_transactions(transactions)
 
     logger.info("Finished. Restored %s messages from realm %s", message_count, realm.string_id)
 
-def restore_all_data_from_archive(restore_manual_transactions: bool=True) -> None:
+
+def restore_all_data_from_archive(restore_manual_transactions: bool = True) -> None:
     for realm in Realm.objects.all():
         restore_data_from_archive_by_realm(realm)
 
     if restore_manual_transactions:
         restore_data_from_archive_by_transactions(
-            ArchiveTransaction.objects.exclude(restored=True).filter(type=ArchiveTransaction.MANUAL),
+            ArchiveTransaction.objects.exclude(restored=True).filter(
+                type=ArchiveTransaction.MANUAL
+            ),
         )
 
+
 def restore_retention_policy_deletions_for_stream(stream: Stream) -> None:
     """
     Utility function for calling in the Django shell if a stream's policy was
     set to something too aggressive and the administrator wants to restore
     the messages deleted as a result.
     """
-    relevant_transactions = ArchiveTransaction.objects \
-        .filter(archivedmessage__recipient=stream.recipient, type=ArchiveTransaction.RETENTION_POLICY_BASED) \
-        .distinct('id')
+    relevant_transactions = ArchiveTransaction.objects.filter(
+        archivedmessage__recipient=stream.recipient, type=ArchiveTransaction.RETENTION_POLICY_BASED
+    ).distinct('id')
+
+    restore_data_from_archive_by_transactions(list(relevant_transactions))
 
-    restore_data_from_archive_by_transactions(
-        list(relevant_transactions)
-    )
 
 def clean_archived_data() -> None:
     logger.info("Cleaning old archive data.")
     check_date = timezone_now() - timedelta(days=settings.ARCHIVED_DATA_VACUUMING_DELAY_DAYS)
     # Associated archived objects will get deleted through the on_delete=CASCADE property:
     count = 0
-    transaction_ids = list(ArchiveTransaction.objects.filter(
-        timestamp__lt=check_date).values_list("id", flat=True))
+    transaction_ids = list(
+        ArchiveTransaction.objects.filter(timestamp__lt=check_date).values_list("id", flat=True)
+    )
     while len(transaction_ids) > 0:
         transaction_block = transaction_ids[0:TRANSACTION_DELETION_BATCH_SIZE]
         transaction_ids = transaction_ids[TRANSACTION_DELETION_BATCH_SIZE:]
@@ -606,6 +683,7 @@ def clean_archived_data() -> None:
 
     logger.info("Deleted %s old ArchiveTransactions.", count)
 
+
 def parse_message_retention_days(
     value: Union[int, str],
     special_values_map: Mapping[str, Optional[int]],
diff --git a/zerver/lib/send_email.py b/zerver/lib/send_email.py
index 5074cbef51..7e3e73ee2a 100644
--- a/zerver/lib/send_email.py
+++ b/zerver/lib/send_email.py
@@ -29,6 +29,7 @@ from zerver.models import EMAIL_TYPES, Realm, ScheduledEmail, UserProfile, get_u
 logger = logging.getLogger('zulip.send_email')
 log_to_file(logger, settings.EMAIL_LOG_PATH)
 
+
 class FromAddress:
     SUPPORT = parseaddr(settings.ZULIP_ADMINISTRATOR)[1]
     NOREPLY = parseaddr(settings.NOREPLY_EMAIL_ADDRESS)[1]
@@ -41,12 +42,15 @@ class FromAddress:
     @staticmethod
     def tokenized_no_reply_address() -> str:
         if settings.ADD_TOKENS_TO_NOREPLY_ADDRESS:
-            return parseaddr(settings.TOKENIZED_NOREPLY_EMAIL_ADDRESS)[1].format(token=generate_key())
+            return parseaddr(settings.TOKENIZED_NOREPLY_EMAIL_ADDRESS)[1].format(
+                token=generate_key()
+            )
         return FromAddress.NOREPLY
 
     @staticmethod
-    def security_email_from_name(language: Optional[str]=None,
-                                 user_profile: Optional[UserProfile]=None) -> str:
+    def security_email_from_name(
+        language: Optional[str] = None, user_profile: Optional[UserProfile] = None
+    ) -> str:
         if language is None:
             assert user_profile is not None
             language = user_profile.default_language
@@ -54,12 +58,18 @@ class FromAddress:
         with override_language(language):
             return _("Zulip Account Security")
 
-def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
-                to_emails: Optional[List[str]]=None, from_name: Optional[str]=None,
-                from_address: Optional[str]=None, reply_to_email: Optional[str]=None,
-                language: Optional[str]=None, context: Mapping[str, Any]={},
-                realm: Optional[Realm]=None
-                ) -> EmailMultiAlternatives:
+
+def build_email(
+    template_prefix: str,
+    to_user_ids: Optional[List[int]] = None,
+    to_emails: Optional[List[str]] = None,
+    from_name: Optional[str] = None,
+    from_address: Optional[str] = None,
+    reply_to_email: Optional[str] = None,
+    language: Optional[str] = None,
+    context: Mapping[str, Any] = {},
+    realm: Optional[Realm] = None,
+) -> EmailMultiAlternatives:
     # Callers should pass exactly one of to_user_id and to_email.
     assert (to_user_ids is None) ^ (to_emails is None)
     if to_user_ids is not None:
@@ -67,7 +77,10 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
         if realm is None:
             assert len({to_user.realm_id for to_user in to_users}) == 1
             realm = to_users[0].realm
-        to_emails = [str(Address(display_name=to_user.full_name, addr_spec=to_user.delivery_email)) for to_user in to_users]
+        to_emails = [
+            str(Address(display_name=to_user.full_name, addr_spec=to_user.delivery_email))
+            for to_user in to_users
+        ]
 
     extra_headers = {}
     if realm is not None:
@@ -84,11 +97,16 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
     }
 
     def render_templates() -> Tuple[str, str, str]:
-        email_subject = loader.render_to_string(template_prefix + '.subject.txt',
-                                                context=context,
-                                                using='Jinja2_plaintext').strip().replace('\n', '')
-        message = loader.render_to_string(template_prefix + '.txt',
-                                          context=context, using='Jinja2_plaintext')
+        email_subject = (
+            loader.render_to_string(
+                template_prefix + '.subject.txt', context=context, using='Jinja2_plaintext'
+            )
+            .strip()
+            .replace('\n', '')
+        )
+        message = loader.render_to_string(
+            template_prefix + '.txt', context=context, using='Jinja2_plaintext'
+        )
 
         try:
             html_message = loader.render_to_string(template_prefix + '.html', context)
@@ -140,36 +158,56 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
     elif from_address == FromAddress.NOREPLY:
         reply_to = [FromAddress.NOREPLY]
 
-    mail = EmailMultiAlternatives(email_subject, message, from_email, to_emails, reply_to=reply_to,
-                                  headers=extra_headers)
+    mail = EmailMultiAlternatives(
+        email_subject, message, from_email, to_emails, reply_to=reply_to, headers=extra_headers
+    )
     if html_message is not None:
         mail.attach_alternative(html_message, 'text/html')
     return mail
 
+
 class EmailNotDeliveredException(Exception):
     pass
 
+
 class DoubledEmailArgumentException(CommandError):
     def __init__(self, argument_name: str) -> None:
-        msg = f"Argument '{argument_name}' is ambiguously present in both options and email template."
+        msg = (
+            f"Argument '{argument_name}' is ambiguously present in both options and email template."
+        )
         super().__init__(msg)
 
+
 class NoEmailArgumentException(CommandError):
     def __init__(self, argument_name: str) -> None:
         msg = f"Argument '{argument_name}' is required in either options or email template."
         super().__init__(msg)
 
+
 # When changing the arguments to this function, you may need to write a
 # migration to change or remove any emails in ScheduledEmail.
-def send_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
-               to_emails: Optional[List[str]]=None, from_name: Optional[str]=None,
-               from_address: Optional[str]=None, reply_to_email: Optional[str]=None,
-               language: Optional[str]=None, context: Dict[str, Any]={},
-               realm: Optional[Realm]=None) -> None:
-    mail = build_email(template_prefix, to_user_ids=to_user_ids, to_emails=to_emails,
-                       from_name=from_name, from_address=from_address,
-                       reply_to_email=reply_to_email, language=language, context=context,
-                       realm=realm)
+def send_email(
+    template_prefix: str,
+    to_user_ids: Optional[List[int]] = None,
+    to_emails: Optional[List[str]] = None,
+    from_name: Optional[str] = None,
+    from_address: Optional[str] = None,
+    reply_to_email: Optional[str] = None,
+    language: Optional[str] = None,
+    context: Dict[str, Any] = {},
+    realm: Optional[Realm] = None,
+) -> None:
+    mail = build_email(
+        template_prefix,
+        to_user_ids=to_user_ids,
+        to_emails=to_emails,
+        from_name=from_name,
+        from_address=from_address,
+        reply_to_email=reply_to_email,
+        language=language,
+        context=context,
+        realm=realm,
+    )
     template = template_prefix.split("/")[-1]
     logger.info("Sending %s email to %s", template, mail.to)
 
@@ -177,20 +215,41 @@ def send_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
         logger.error("Error sending %s email to %s", template, mail.to)
         raise EmailNotDeliveredException
 
+
 def send_email_from_dict(email_dict: Mapping[str, Any]) -> None:
     send_email(**dict(email_dict))
 
-def send_future_email(template_prefix: str, realm: Realm, to_user_ids: Optional[List[int]]=None,
-                      to_emails: Optional[List[str]]=None, from_name: Optional[str]=None,
-                      from_address: Optional[str]=None, language: Optional[str]=None,
-                      context: Dict[str, Any]={}, delay: datetime.timedelta=datetime.timedelta(0)) -> None:
+
+def send_future_email(
+    template_prefix: str,
+    realm: Realm,
+    to_user_ids: Optional[List[int]] = None,
+    to_emails: Optional[List[str]] = None,
+    from_name: Optional[str] = None,
+    from_address: Optional[str] = None,
+    language: Optional[str] = None,
+    context: Dict[str, Any] = {},
+    delay: datetime.timedelta = datetime.timedelta(0),
+) -> None:
     template_name = template_prefix.split('/')[-1]
-    email_fields = {'template_prefix': template_prefix, 'from_name': from_name, 'from_address': from_address,
-                    'language': language, 'context': context}
+    email_fields = {
+        'template_prefix': template_prefix,
+        'from_name': from_name,
+        'from_address': from_address,
+        'language': language,
+        'context': context,
+    }
 
     if settings.DEVELOPMENT_LOG_EMAILS:
-        send_email(template_prefix, to_user_ids=to_user_ids, to_emails=to_emails, from_name=from_name,
-                   from_address=from_address, language=language, context=context)
+        send_email(
+            template_prefix,
+            to_user_ids=to_user_ids,
+            to_emails=to_emails,
+            from_name=from_name,
+            from_address=from_address,
+            language=language,
+            context=context,
+        )
         # For logging the email
 
     assert (to_user_ids is None) ^ (to_emails is None)
@@ -198,7 +257,8 @@ def send_future_email(template_prefix: str, realm: Realm, to_user_ids: Optional[
         type=EMAIL_TYPES[template_name],
         scheduled_timestamp=timezone_now() + delay,
         realm=realm,
-        data=orjson.dumps(email_fields).decode())
+        data=orjson.dumps(email_fields).decode(),
+    )
 
     # We store the recipients in the ScheduledEmail object itself,
     # rather than the JSON data object, so that we can find and clear
@@ -208,30 +268,45 @@ def send_future_email(template_prefix: str, realm: Realm, to_user_ids: Optional[
             email.users.add(*to_user_ids)
         else:
             assert to_emails is not None
-            assert(len(to_emails) == 1)
+            assert len(to_emails) == 1
             email.address = parseaddr(to_emails[0])[1]
         email.save()
     except Exception as e:
         email.delete()
         raise e
 
-def send_email_to_admins(template_prefix: str, realm: Realm, from_name: Optional[str]=None,
-                         from_address: Optional[str]=None, language: Optional[str]=None,
-                         context: Dict[str, Any]={}) -> None:
+
+def send_email_to_admins(
+    template_prefix: str,
+    realm: Realm,
+    from_name: Optional[str] = None,
+    from_address: Optional[str] = None,
+    language: Optional[str] = None,
+    context: Dict[str, Any] = {},
+) -> None:
     admins = realm.get_human_admin_users()
     admin_user_ids = [admin.id for admin in admins]
-    send_email(template_prefix, to_user_ids=admin_user_ids, from_name=from_name,
-               from_address=from_address, language=language, context=context)
+    send_email(
+        template_prefix,
+        to_user_ids=admin_user_ids,
+        from_name=from_name,
+        from_address=from_address,
+        language=language,
+        context=context,
+    )
+
 
 def clear_scheduled_invitation_emails(email: str) -> None:
     """Unlike most scheduled emails, invitation emails don't have an
     existing user object to key off of, so we filter by address here."""
-    items = ScheduledEmail.objects.filter(address__iexact=email,
-                                          type=ScheduledEmail.INVITATION_REMINDER)
+    items = ScheduledEmail.objects.filter(
+        address__iexact=email, type=ScheduledEmail.INVITATION_REMINDER
+    )
     items.delete()
 
+
 @transaction.atomic()
-def clear_scheduled_emails(user_ids: List[int], email_type: Optional[int]=None) -> None:
+def clear_scheduled_emails(user_ids: List[int], email_type: Optional[int] = None) -> None:
     # We need to obtain a FOR UPDATE lock on the selected rows to keep a concurrent
     # execution of this function (or something else) from deleting them before we access
     # the .users attribute.
@@ -254,6 +329,7 @@ def clear_scheduled_emails(user_ids: List[int], email_type: Optional[int]=None)
             # to decide whether to delete the ScheduledEmail row.
             item.delete()
 
+
 def handle_send_email_format_changes(job: Dict[str, Any]) -> None:
     # Reformat any jobs that used the old to_email
     # and to_user_ids argument formats.
@@ -266,6 +342,7 @@ def handle_send_email_format_changes(job: Dict[str, Any]) -> None:
             job['to_user_ids'] = [job['to_user_id']]
         del job['to_user_id']
 
+
 def deliver_email(email: ScheduledEmail) -> None:
     data = orjson.loads(email.data)
     user_ids = list(email.users.values_list('id', flat=True))
@@ -284,6 +361,7 @@ def deliver_email(email: ScheduledEmail) -> None:
     send_email(**data)
     email.delete()
 
+
 def get_header(option: Optional[str], header: Optional[str], name: str) -> str:
     if option and header:
         raise DoubledEmailArgumentException(name)
@@ -291,6 +369,7 @@ def get_header(option: Optional[str], header: Optional[str], name: str) -> str:
         raise NoEmailArgumentException(name)
     return str(option or header)
 
+
 def send_custom_email(users: List[UserProfile], options: Dict[str, Any]) -> None:
     """
     Can be used directly with from a management shell with
@@ -320,6 +399,7 @@ def send_custom_email(users: List[UserProfile], options: Dict[str, Any]) -> None
         f.write(parsed_email_template.get_payload())
 
     from zerver.templatetags.app_filters import render_markdown_path
+
     rendered_input = render_markdown_path(plain_text_template_path.replace("templates/", ""))
 
     # And then extend it with our standard email headers.
@@ -328,12 +408,10 @@ def send_custom_email(users: List[UserProfile], options: Dict[str, Any]) -> None
             # Note that we're doing a hacky non-Jinja2 substitution here;
             # we do this because the normal render_markdown_path ordering
             # doesn't commute properly with inline_email_css.
-            f.write(base_template.read().replace('{{ rendered_input }}',
-                                                 rendered_input))
+            f.write(base_template.read().replace('{{ rendered_input }}', rendered_input))
 
     with open(subject_path, "w") as f:
-        f.write(get_header(options.get("subject"),
-                           parsed_email_template.get("subject"), "subject"))
+        f.write(get_header(options.get("subject"), parsed_email_template.get("subject"), "subject"))
 
     inline_template(email_filename)
 
@@ -345,10 +423,13 @@ def send_custom_email(users: List[UserProfile], options: Dict[str, Any]) -> None
             'realm_uri': user_profile.realm.uri,
             'realm_name': user_profile.realm.name,
         }
-        send_email(email_id, to_user_ids=[user_profile.id],
-                   from_address=FromAddress.SUPPORT,
-                   reply_to_email=options.get("reply_to"),
-                   from_name=get_header(options.get("from_name"),
-                                        parsed_email_template.get("from"),
-                                        "from_name"),
-                   context=context)
+        send_email(
+            email_id,
+            to_user_ids=[user_profile.id],
+            from_address=FromAddress.SUPPORT,
+            reply_to_email=options.get("reply_to"),
+            from_name=get_header(
+                options.get("from_name"), parsed_email_template.get("from"), "from_name"
+            ),
+            context=context,
+        )
diff --git a/zerver/lib/server_initialization.py b/zerver/lib/server_initialization.py
index 9f953848d5..1afe073a6f 100644
--- a/zerver/lib/server_initialization.py
+++ b/zerver/lib/server_initialization.py
@@ -9,6 +9,7 @@ from zerver.models import Realm, UserProfile, get_client, get_system_bot
 def server_initialized() -> bool:
     return Realm.objects.exists()
 
+
 def create_internal_realm() -> None:
     from zerver.lib.actions import do_change_can_forge_sender
 
@@ -22,8 +23,10 @@ def create_internal_realm() -> None:
     get_client("ZulipMobile")
     get_client("ZulipElectron")
 
-    internal_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
-                     for bot in settings.INTERNAL_BOTS]
+    internal_bots = [
+        (bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
+        for bot in settings.INTERNAL_BOTS
+    ]
     create_users(realm, internal_bots, bot_type=UserProfile.DEFAULT_BOT)
     # Set the owners for these bots to the bots themselves
     bots = UserProfile.objects.filter(email__in=[bot_info[1] for bot_info in internal_bots])
@@ -35,11 +38,17 @@ def create_internal_realm() -> None:
     email_gateway_bot = get_system_bot(settings.EMAIL_GATEWAY_BOT)
     do_change_can_forge_sender(email_gateway_bot, True)
 
-def create_users(realm: Realm, name_list: Iterable[Tuple[str, str]],
-                 tos_version: Optional[str]=None,
-                 bot_type: Optional[int]=None,
-                 bot_owner: Optional[UserProfile]=None) -> None:
+
+def create_users(
+    realm: Realm,
+    name_list: Iterable[Tuple[str, str]],
+    tos_version: Optional[str] = None,
+    bot_type: Optional[int] = None,
+    bot_owner: Optional[UserProfile] = 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=bot_type, bot_owner=bot_owner, tos_version=tos_version)
+    bulk_create_users(
+        realm, user_set, bot_type=bot_type, bot_owner=bot_owner, tos_version=tos_version
+    )
diff --git a/zerver/lib/sessions.py b/zerver/lib/sessions.py
index 4cebe8a259..9ea0c24761 100644
--- a/zerver/lib/sessions.py
+++ b/zerver/lib/sessions.py
@@ -17,8 +17,10 @@ from zerver.models import Realm, UserProfile, get_user_profile_by_id
 class SessionEngine(Protocol):
     SessionStore: Type[SessionBase]
 
+
 session_engine = cast(SessionEngine, import_module(settings.SESSION_ENGINE))
 
+
 def get_session_dict_user(session_dict: Mapping[str, int]) -> Optional[int]:
     # Compare django.contrib.auth._get_user_session_key
     try:
@@ -26,32 +28,37 @@ def get_session_dict_user(session_dict: Mapping[str, int]) -> Optional[int]:
     except KeyError:
         return None
 
+
 def get_session_user(session: Session) -> Optional[int]:
     return get_session_dict_user(session.get_decoded())
 
+
 def user_sessions(user_profile: UserProfile) -> List[Session]:
-    return [s for s in Session.objects.all()
-            if get_session_user(s) == user_profile.id]
+    return [s for s in Session.objects.all() if get_session_user(s) == user_profile.id]
+
 
 def delete_session(session: Session) -> None:
     session_engine.SessionStore(session.session_key).delete()
 
+
 def delete_user_sessions(user_profile: UserProfile) -> None:
     for session in Session.objects.all():
         if get_session_user(session) == user_profile.id:
             delete_session(session)
 
+
 def delete_realm_user_sessions(realm: Realm) -> None:
-    realm_user_ids = [user_profile.id for user_profile in
-                      UserProfile.objects.filter(realm=realm)]
+    realm_user_ids = [user_profile.id for user_profile in UserProfile.objects.filter(realm=realm)]
     for session in Session.objects.filter(expire_date__gte=timezone_now()):
         if get_session_user(session) in realm_user_ids:
             delete_session(session)
 
+
 def delete_all_user_sessions() -> None:
     for session in Session.objects.all():
         delete_session(session)
 
+
 def delete_all_deactivated_user_sessions() -> None:
     for session in Session.objects.all():
         user_profile_id = get_session_user(session)
@@ -62,12 +69,17 @@ def delete_all_deactivated_user_sessions() -> None:
             logging.info("Deactivating session for deactivated user %s", user_profile.id)
             delete_session(session)
 
-def set_expirable_session_var(session: Session, var_name: str, var_value: Any, expiry_seconds: int) -> None:
+
+def set_expirable_session_var(
+    session: Session, var_name: str, var_value: Any, expiry_seconds: int
+) -> None:
     expire_at = datetime_to_timestamp(timezone_now() + timedelta(seconds=expiry_seconds))
     session[var_name] = {'value': var_value, 'expire_at': expire_at}
 
-def get_expirable_session_var(session: Session, var_name: str, default_value: Any=None,
-                              delete: bool=False) -> Any:
+
+def get_expirable_session_var(
+    session: Session, var_name: str, default_value: Any = None, delete: bool = False
+) -> Any:
     if var_name not in session:
         return default_value
 
diff --git a/zerver/lib/soft_deactivation.py b/zerver/lib/soft_deactivation.py
index c67a9a01db..f8b2f7ec2f 100644
--- a/zerver/lib/soft_deactivation.py
+++ b/zerver/lib/soft_deactivation.py
@@ -24,15 +24,16 @@ logger = logging.getLogger("zulip.soft_deactivation")
 log_to_file(logger, settings.SOFT_DEACTIVATION_LOG_PATH)
 BULK_CREATE_BATCH_SIZE = 10000
 
-def filter_by_subscription_history(user_profile: UserProfile,
-                                   all_stream_messages: DefaultDict[int, List[Message]],
-                                   all_stream_subscription_logs: DefaultDict[int, List[RealmAuditLog]],
-                                   ) -> List[UserMessage]:
+
+def filter_by_subscription_history(
+    user_profile: UserProfile,
+    all_stream_messages: DefaultDict[int, List[Message]],
+    all_stream_subscription_logs: DefaultDict[int, List[RealmAuditLog]],
+) -> List[UserMessage]:
     user_messages_to_insert: List[UserMessage] = []
 
     def store_user_message_to_insert(message: Message) -> None:
-        message = UserMessage(user_profile=user_profile,
-                              message_id=message['id'], flags=0)
+        message = UserMessage(user_profile=user_profile, message_id=message['id'], flags=0)
         user_messages_to_insert.append(message)
 
     for (stream_id, stream_messages_raw) in all_stream_messages.items():
@@ -70,8 +71,10 @@ def filter_by_subscription_history(user_profile: UserProfile,
                         store_user_message_to_insert(stream_message)
                     else:
                         break
-            elif log_entry.event_type in (RealmAuditLog.SUBSCRIPTION_ACTIVATED,
-                                          RealmAuditLog.SUBSCRIPTION_CREATED):
+            elif log_entry.event_type in (
+                RealmAuditLog.SUBSCRIPTION_ACTIVATED,
+                RealmAuditLog.SUBSCRIPTION_CREATED,
+            ):
                 initial_msg_count = len(stream_messages)
                 for i, stream_message in enumerate(stream_messages):
                     if stream_message['id'] > log_entry.event_last_message_id:
@@ -89,12 +92,14 @@ def filter_by_subscription_history(user_profile: UserProfile,
             # event was a subscription_deactivated then we don't want to create
             # UserMessage rows for any of the remaining messages.
             if stream_subscription_logs[-1].event_type in (
-                    RealmAuditLog.SUBSCRIPTION_ACTIVATED,
-                    RealmAuditLog.SUBSCRIPTION_CREATED):
+                RealmAuditLog.SUBSCRIPTION_ACTIVATED,
+                RealmAuditLog.SUBSCRIPTION_CREATED,
+            ):
                 for stream_message in stream_messages:
                     store_user_message_to_insert(stream_message)
     return user_messages_to_insert
 
+
 def add_missing_messages(user_profile: UserProfile) -> None:
     """This function takes a soft-deactivated user, and computes and adds
     to the database any UserMessage rows that were not created while
@@ -135,15 +140,20 @@ def add_missing_messages(user_profile: UserProfile) -> None:
 
     """
     assert user_profile.last_active_message_id is not None
-    all_stream_subs = list(Subscription.objects.filter(
-        user_profile=user_profile,
-        recipient__type=Recipient.STREAM).values('recipient_id', 'recipient__type_id'))
+    all_stream_subs = list(
+        Subscription.objects.filter(
+            user_profile=user_profile, recipient__type=Recipient.STREAM
+        ).values('recipient_id', 'recipient__type_id')
+    )
 
     # For Stream messages we need to check messages against data from
     # RealmAuditLog for visibility to user. So we fetch the subscription logs.
     stream_ids = [sub['recipient__type_id'] for sub in all_stream_subs]
-    events = [RealmAuditLog.SUBSCRIPTION_CREATED, RealmAuditLog.SUBSCRIPTION_DEACTIVATED,
-              RealmAuditLog.SUBSCRIPTION_ACTIVATED]
+    events = [
+        RealmAuditLog.SUBSCRIPTION_CREATED,
+        RealmAuditLog.SUBSCRIPTION_DEACTIVATED,
+        RealmAuditLog.SUBSCRIPTION_ACTIVATED,
+    ]
 
     # Important: We order first by event_last_message_id, which is the
     # official ordering, and then tiebreak by RealmAuditLog event ID.
@@ -151,11 +161,13 @@ def add_missing_messages(user_profile: UserProfile) -> None:
     # and then unsubscribed without any messages being sent in the
     # meantime.  Without that tiebreak, we could end up incorrectly
     # processing the ordering of those two subscription changes.
-    subscription_logs = list(RealmAuditLog.objects.select_related(
-        'modified_stream').filter(
-        modified_user=user_profile,
-        modified_stream__id__in=stream_ids,
-        event_type__in=events).order_by('event_last_message_id', 'id'))
+    subscription_logs = list(
+        RealmAuditLog.objects.select_related('modified_stream')
+        .filter(
+            modified_user=user_profile, modified_stream__id__in=stream_ids, event_type__in=events
+        )
+        .order_by('event_last_message_id', 'id')
+    )
 
     all_stream_subscription_logs: DefaultDict[int, List[RealmAuditLog]] = defaultdict(list)
     for log in subscription_logs:
@@ -166,24 +178,32 @@ def add_missing_messages(user_profile: UserProfile) -> None:
         stream_subscription_logs = all_stream_subscription_logs[sub['recipient__type_id']]
         if stream_subscription_logs[-1].event_type == RealmAuditLog.SUBSCRIPTION_DEACTIVATED:
             assert stream_subscription_logs[-1].event_last_message_id is not None
-            if stream_subscription_logs[-1].event_last_message_id <= user_profile.last_active_message_id:
+            if (
+                stream_subscription_logs[-1].event_last_message_id
+                <= user_profile.last_active_message_id
+            ):
                 # We are going to short circuit this iteration as its no use
                 # iterating since user unsubscribed before soft-deactivation
                 continue
         recipient_ids.append(sub['recipient_id'])
 
-    all_stream_msgs = list(Message.objects.filter(
-        recipient__id__in=recipient_ids,
-        id__gt=user_profile.last_active_message_id).order_by('id').values(
-        'id', 'recipient__type_id'))
-    already_created_ums = set(UserMessage.objects.filter(
-        user_profile=user_profile,
-        message__recipient__type=Recipient.STREAM,
-        message__id__gt=user_profile.last_active_message_id).values_list('message__id', flat=True))
+    all_stream_msgs = list(
+        Message.objects.filter(
+            recipient__id__in=recipient_ids, id__gt=user_profile.last_active_message_id
+        )
+        .order_by('id')
+        .values('id', 'recipient__type_id')
+    )
+    already_created_ums = set(
+        UserMessage.objects.filter(
+            user_profile=user_profile,
+            message__recipient__type=Recipient.STREAM,
+            message__id__gt=user_profile.last_active_message_id,
+        ).values_list('message__id', flat=True)
+    )
 
     # Filter those messages for which UserMessage rows have been already created
-    all_stream_msgs = [msg for msg in all_stream_msgs
-                       if msg['id'] not in already_created_ums]
+    all_stream_msgs = [msg for msg in all_stream_msgs if msg['id'] not in already_created_ums]
 
     stream_messages: DefaultDict[int, List[Message]] = defaultdict(list)
     for msg in all_stream_msgs:
@@ -194,32 +214,36 @@ def add_missing_messages(user_profile: UserProfile) -> None:
     # This function does not perform any SQL related task and gets all the data
     # required for its operation in its params.
     user_messages_to_insert = filter_by_subscription_history(
-        user_profile, stream_messages, all_stream_subscription_logs)
+        user_profile, stream_messages, all_stream_subscription_logs
+    )
 
     # Doing a bulk create for all the UserMessage objects stored for creation.
     while len(user_messages_to_insert) > 0:
         messages, user_messages_to_insert = (
             user_messages_to_insert[0:BULK_CREATE_BATCH_SIZE],
-            user_messages_to_insert[BULK_CREATE_BATCH_SIZE:])
+            user_messages_to_insert[BULK_CREATE_BATCH_SIZE:],
+        )
         UserMessage.objects.bulk_create(messages)
         user_profile.last_active_message_id = messages[-1].message_id
         user_profile.save(update_fields=['last_active_message_id'])
 
+
 def do_soft_deactivate_user(user_profile: UserProfile) -> None:
     try:
-        user_profile.last_active_message_id = UserMessage.objects.filter(
-            user_profile=user_profile).order_by(
-                '-message__id')[0].message_id
+        user_profile.last_active_message_id = (
+            UserMessage.objects.filter(user_profile=user_profile)
+            .order_by('-message__id')[0]
+            .message_id
+        )
     except IndexError:  # nocoverage
         # In the unlikely event that a user somehow has never received
         # a message, we just use the overall max message ID.
         user_profile.last_active_message_id = Message.objects.last().id
     user_profile.long_term_idle = True
-    user_profile.save(update_fields=[
-        'long_term_idle',
-        'last_active_message_id'])
+    user_profile.save(update_fields=['long_term_idle', 'last_active_message_id'])
     logger.info('Soft deactivated user %s', user_profile.id)
 
+
 def do_soft_deactivate_users(users: List[UserProfile]) -> List[UserProfile]:
     BATCH_SIZE = 100
     users_soft_deactivated = []
@@ -242,11 +266,16 @@ def do_soft_deactivate_users(users: List[UserProfile]) -> List[UserProfile]:
                 users_soft_deactivated.append(user)
             RealmAuditLog.objects.bulk_create(realm_logs)
 
-        logger.info("Soft-deactivated batch of %s users; %s remain to process", len(user_batch), len(users))
+        logger.info(
+            "Soft-deactivated batch of %s users; %s remain to process", len(user_batch), len(users)
+        )
 
     return users_soft_deactivated
 
-def do_auto_soft_deactivate_users(inactive_for_days: int, realm: Optional[Realm]) -> List[UserProfile]:
+
+def do_auto_soft_deactivate_users(
+    inactive_for_days: int, realm: Optional[Realm]
+) -> List[UserProfile]:
     filter_kwargs: Dict[str, Realm] = {}
     if realm is not None:
         filter_kwargs = dict(user_profile__realm=realm)
@@ -263,6 +292,7 @@ def do_auto_soft_deactivate_users(inactive_for_days: int, realm: Optional[Realm]
     do_catch_up_soft_deactivated_users(users_to_catch_up)
     return users_deactivated
 
+
 def reactivate_user_if_soft_deactivated(user_profile: UserProfile) -> Union[UserProfile, None]:
     if user_profile.long_term_idle:
         add_missing_messages(user_profile)
@@ -278,22 +308,29 @@ def reactivate_user_if_soft_deactivated(user_profile: UserProfile) -> Union[User
         return user_profile
     return None
 
-def get_users_for_soft_deactivation(inactive_for_days: int, filter_kwargs: Any) -> List[UserProfile]:
-    users_activity = list(UserActivity.objects.filter(
-        user_profile__is_active=True,
-        user_profile__is_bot=False,
-        user_profile__long_term_idle=False,
-        **filter_kwargs).values('user_profile_id').annotate(
-        last_visit=Max('last_visit')))
+
+def get_users_for_soft_deactivation(
+    inactive_for_days: int, filter_kwargs: Any
+) -> List[UserProfile]:
+    users_activity = list(
+        UserActivity.objects.filter(
+            user_profile__is_active=True,
+            user_profile__is_bot=False,
+            user_profile__long_term_idle=False,
+            **filter_kwargs,
+        )
+        .values('user_profile_id')
+        .annotate(last_visit=Max('last_visit'))
+    )
     user_ids_to_deactivate = []
     today = timezone_now()
     for user_activity in users_activity:
         if (today - user_activity['last_visit']).days > inactive_for_days:
             user_ids_to_deactivate.append(user_activity['user_profile_id'])
-    users_to_deactivate = list(UserProfile.objects.filter(
-        id__in=user_ids_to_deactivate))
+    users_to_deactivate = list(UserProfile.objects.filter(id__in=user_ids_to_deactivate))
     return users_to_deactivate
 
+
 def do_soft_activate_users(users: List[UserProfile]) -> List[UserProfile]:
     users_soft_activated = []
     for user_profile in users:
@@ -302,6 +339,7 @@ def do_soft_activate_users(users: List[UserProfile]) -> List[UserProfile]:
             users_soft_activated.append(user_activated)
     return users_soft_activated
 
+
 def do_catch_up_soft_deactivated_users(users: List[UserProfile]) -> List[UserProfile]:
     users_caught_up = []
     for user_profile in users:
@@ -311,6 +349,7 @@ def do_catch_up_soft_deactivated_users(users: List[UserProfile]) -> List[UserPro
     logger.info("Caught up %d soft-deactivated users", len(users_caught_up))
     return users_caught_up
 
+
 def get_soft_deactivated_users_for_catch_up(filter_kwargs: Any) -> List[UserProfile]:
     users_to_catch_up = UserProfile.objects.select_related().filter(
         long_term_idle=True,
diff --git a/zerver/lib/sqlalchemy_utils.py b/zerver/lib/sqlalchemy_utils.py
index 38ed3087af..3d24827297 100644
--- a/zerver/lib/sqlalchemy_utils.py
+++ b/zerver/lib/sqlalchemy_utils.py
@@ -26,17 +26,24 @@ class NonClosingPool(sqlalchemy.pool.NullPool):
             _dispatch=self.dispatch,  # type: ignore[attr-defined] # implementation detail
         )
 
+
 sqlalchemy_engine: Optional[Any] = None
+
+
 def get_sqlalchemy_connection() -> sqlalchemy.engine.base.Connection:
     global sqlalchemy_engine
     if sqlalchemy_engine is None:
+
         def get_dj_conn() -> TimeTrackingConnection:
             connection.ensure_connection()
             return connection.connection
-        sqlalchemy_engine = sqlalchemy.create_engine('postgresql://',
-                                                     creator=get_dj_conn,
-                                                     poolclass=NonClosingPool,
-                                                     pool_reset_on_return=False)
+
+        sqlalchemy_engine = sqlalchemy.create_engine(
+            'postgresql://',
+            creator=get_dj_conn,
+            poolclass=NonClosingPool,
+            pool_reset_on_return=False,
+        )
     sa_connection = sqlalchemy_engine.connect()
     sa_connection.execution_options(autocommit=False)
     return sa_connection
diff --git a/zerver/lib/statistics.py b/zerver/lib/statistics.py
index 7b41508e2d..533c4eceaf 100644
--- a/zerver/lib/statistics.py
+++ b/zerver/lib/statistics.py
@@ -6,12 +6,12 @@ from zerver.models import UserActivityInterval, UserProfile
 # Return the amount of Zulip usage for this user between the two
 # given dates
 def seconds_usage_between(user_profile: UserProfile, begin: datetime, end: datetime) -> timedelta:
-    intervals = UserActivityInterval.objects.filter(user_profile=user_profile,
-                                                    end__gte=begin,
-                                                    start__lte=end)
+    intervals = UserActivityInterval.objects.filter(
+        user_profile=user_profile, end__gte=begin, start__lte=end
+    )
     duration = timedelta(0)
     for interval in intervals:
         start = max(begin, interval.start)
         finish = min(end, interval.end)
-        duration += finish-start
+        duration += finish - start
     return duration
diff --git a/zerver/lib/storage.py b/zerver/lib/storage.py
index 5a61ec17fe..2f67c60ee5 100644
--- a/zerver/lib/storage.py
+++ b/zerver/lib/storage.py
@@ -12,12 +12,18 @@ if settings.DEBUG:
 
     def static_path(path: str) -> str:
         return find(path) or "/nonexistent"
+
+
 else:
+
     def static_path(path: str) -> str:
         return os.path.join(settings.STATIC_ROOT, path)
 
+
 class IgnoreBundlesManifestStaticFilesStorage(ManifestStaticFilesStorage):
-    def hashed_name(self, name: str, content: Optional[str]=None, filename: Optional[str]=None) -> str:
+    def hashed_name(
+        self, name: str, content: Optional[str] = None, filename: Optional[str] = None
+    ) -> str:
         ext = os.path.splitext(name)[1]
         if name.startswith("webpack-bundles"):
             # Hack to avoid renaming already-hashnamed webpack bundles
@@ -44,6 +50,7 @@ class IgnoreBundlesManifestStaticFilesStorage(ManifestStaticFilesStorage):
             return name
         return super().hashed_name(name, content, filename)
 
+
 class ZulipStorage(IgnoreBundlesManifestStaticFilesStorage):
     # This is a hack to use staticfiles.json from within the
     # deployment, rather than a directory under STATIC_ROOT.  By doing
diff --git a/zerver/lib/stream_subscription.py b/zerver/lib/stream_subscription.py
index a75b41adcd..2ea96ceb59 100644
--- a/zerver/lib/stream_subscription.py
+++ b/zerver/lib/stream_subscription.py
@@ -15,11 +15,13 @@ class SubInfo:
     sub: Subscription
     stream: Stream
 
+
 @dataclass
 class SubscriberPeerInfo:
     subscribed_ids: Dict[int, Set[int]]
     private_peer_dict: Dict[int, Set[int]]
 
+
 def get_active_subscriptions_for_stream_id(stream_id: int) -> QuerySet:
     # TODO: Change return type to QuerySet[Subscription]
     return Subscription.objects.filter(
@@ -28,6 +30,7 @@ def get_active_subscriptions_for_stream_id(stream_id: int) -> QuerySet:
         active=True,
     )
 
+
 def get_active_subscriptions_for_stream_ids(stream_ids: Set[int]) -> QuerySet:
     # TODO: Change return type to QuerySet[Subscription]
     return Subscription.objects.filter(
@@ -36,6 +39,7 @@ def get_active_subscriptions_for_stream_ids(stream_ids: Set[int]) -> QuerySet:
         active=True,
     )
 
+
 def get_subscribed_stream_ids_for_user(user_profile: UserProfile) -> QuerySet:
     return Subscription.objects.filter(
         user_profile_id=user_profile,
@@ -43,6 +47,7 @@ def get_subscribed_stream_ids_for_user(user_profile: UserProfile) -> QuerySet:
         active=True,
     ).values_list('recipient__type_id', flat=True)
 
+
 def get_stream_subscriptions_for_user(user_profile: UserProfile) -> QuerySet:
     # TODO: Change return type to QuerySet[Subscription]
     return Subscription.objects.filter(
@@ -50,6 +55,7 @@ def get_stream_subscriptions_for_user(user_profile: UserProfile) -> QuerySet:
         recipient__type=Recipient.STREAM,
     )
 
+
 def get_stream_subscriptions_for_users(user_profiles: List[UserProfile]) -> QuerySet:
     # TODO: Change return type to QuerySet[Subscription]
     return Subscription.objects.filter(
@@ -57,6 +63,7 @@ def get_stream_subscriptions_for_users(user_profiles: List[UserProfile]) -> Quer
         recipient__type=Recipient.STREAM,
     )
 
+
 def get_bulk_stream_subscriber_info(
     users: List[UserProfile],
     streams: List[Stream],
@@ -91,19 +98,30 @@ def get_bulk_stream_subscriber_info(
 
     return result
 
+
 def num_subscribers_for_stream_id(stream_id: int) -> int:
-    return get_active_subscriptions_for_stream_id(stream_id).filter(
-        user_profile__is_active=True,
-    ).count()
+    return (
+        get_active_subscriptions_for_stream_id(stream_id)
+        .filter(
+            user_profile__is_active=True,
+        )
+        .count()
+    )
+
 
 def get_user_ids_for_streams(stream_ids: Set[int]) -> Dict[int, Set[int]]:
-    all_subs = get_active_subscriptions_for_stream_ids(stream_ids).filter(
-        user_profile__is_active=True,
-    ).values(
-        'recipient__type_id',
-        'user_profile_id',
-    ).order_by(
-        'recipient__type_id',
+    all_subs = (
+        get_active_subscriptions_for_stream_ids(stream_ids)
+        .filter(
+            user_profile__is_active=True,
+        )
+        .values(
+            'recipient__type_id',
+            'user_profile_id',
+        )
+        .order_by(
+            'recipient__type_id',
+        )
     )
 
     get_stream_id = itemgetter('recipient__type_id')
@@ -115,6 +133,7 @@ def get_user_ids_for_streams(stream_ids: Set[int]) -> Dict[int, Set[int]]:
 
     return result
 
+
 def bulk_get_subscriber_peer_info(
     realm: Realm,
     streams: List[Stream],
@@ -166,6 +185,7 @@ def bulk_get_subscriber_peer_info(
         private_peer_dict=private_peer_dict,
     )
 
+
 def bulk_get_private_peers(
     realm: Realm,
     private_streams: List[Stream],
@@ -194,9 +214,12 @@ def bulk_get_private_peers(
 
     return peer_ids
 
-def handle_stream_notifications_compatibility(user_profile: Optional[UserProfile],
-                                              stream_dict: Dict[str, Any],
-                                              notification_settings_null: bool) -> None:
+
+def handle_stream_notifications_compatibility(
+    user_profile: Optional[UserProfile],
+    stream_dict: Dict[str, Any],
+    notification_settings_null: bool,
+) -> None:
     # Old versions of the mobile apps don't support `None` as a
     # value for the stream-level notifications properties, so we
     # have to handle the normally frontend-side defaults for these
@@ -210,10 +233,16 @@ def handle_stream_notifications_compatibility(user_profile: Optional[UserProfile
     # backwards-compatibility problem in our view.
     assert not notification_settings_null
 
-    for notification_type in ["desktop_notifications", "audible_notifications",
-                              "push_notifications", "email_notifications"]:
+    for notification_type in [
+        "desktop_notifications",
+        "audible_notifications",
+        "push_notifications",
+        "email_notifications",
+    ]:
         # Values of true/false are supported by older clients.
         if stream_dict[notification_type] is not None:
             continue
         target_attr = "enable_stream_" + notification_type
-        stream_dict[notification_type] = False if user_profile is None else getattr(user_profile, target_attr)
+        stream_dict[notification_type] = (
+            False if user_profile is None else getattr(user_profile, target_attr)
+        )
diff --git a/zerver/lib/stream_topic.py b/zerver/lib/stream_topic.py
index e5fd1d4c64..77c0966b42 100644
--- a/zerver/lib/stream_topic.py
+++ b/zerver/lib/stream_topic.py
@@ -7,12 +7,12 @@ from zerver.models import MutedTopic
 
 
 class StreamTopicTarget:
-    '''
+    """
     This class is designed to help us move to a
     StreamTopic table or something similar.  It isolates
     places where we are are still using `topic_name` as
     a key into tables.
-    '''
+    """
 
     def __init__(self, stream_id: int, topic_name: str) -> None:
         self.stream_id = stream_id
@@ -25,10 +25,7 @@ class StreamTopicTarget:
         ).values(
             'user_profile_id',
         )
-        return {
-            row['user_profile_id']
-            for row in query
-        }
+        return {row['user_profile_id'] for row in query}
 
     def get_active_subscriptions(self) -> QuerySet:
         return get_active_subscriptions_for_stream_id(self.stream_id)
diff --git a/zerver/lib/streams.py b/zerver/lib/streams.py
index 1238b1ea3f..dadb61e5f6 100644
--- a/zerver/lib/streams.py
+++ b/zerver/lib/streams.py
@@ -41,6 +41,7 @@ class StreamDict(TypedDict, total=False):
     Note that these fields are just a subset of
     the fields in the Stream model.
     """
+
     name: str
     description: str
     invite_only: bool
@@ -49,10 +50,11 @@ class StreamDict(TypedDict, total=False):
     history_public_to_subscribers: Optional[bool]
     message_retention_days: Optional[int]
 
+
 def get_default_value_for_history_public_to_subscribers(
-        realm: Realm,
-        invite_only: bool,
-        history_public_to_subscribers: Optional[bool],
+    realm: Realm,
+    invite_only: bool,
+    history_public_to_subscribers: Optional[bool],
 ) -> bool:
     if invite_only:
         if history_public_to_subscribers is None:
@@ -70,31 +72,36 @@ def get_default_value_for_history_public_to_subscribers(
 
     return history_public_to_subscribers
 
+
 def render_stream_description(text: str) -> str:
     return markdown_convert(text, no_previews=True)
 
+
 def send_stream_creation_event(stream: Stream, user_ids: List[int]) -> None:
-    event = dict(type="stream", op="create",
-                 streams=[stream.to_dict()])
+    event = dict(type="stream", op="create", streams=[stream.to_dict()])
     send_event(stream.realm, event, user_ids)
 
-def create_stream_if_needed(realm: Realm,
-                            stream_name: str,
-                            *,
-                            invite_only: bool=False,
-                            is_web_public: bool=False,
-                            stream_post_policy: int=Stream.STREAM_POST_POLICY_EVERYONE,
-                            history_public_to_subscribers: Optional[bool]=None,
-                            stream_description: str="",
-                            message_retention_days: Optional[int]=None,
-                            acting_user: Optional[UserProfile]=None) -> Tuple[Stream, bool]:
+
+def create_stream_if_needed(
+    realm: Realm,
+    stream_name: str,
+    *,
+    invite_only: bool = False,
+    is_web_public: bool = False,
+    stream_post_policy: int = Stream.STREAM_POST_POLICY_EVERYONE,
+    history_public_to_subscribers: Optional[bool] = None,
+    stream_description: str = "",
+    message_retention_days: Optional[int] = None,
+    acting_user: Optional[UserProfile] = None,
+) -> Tuple[Stream, bool]:
     history_public_to_subscribers = get_default_value_for_history_public_to_subscribers(
-        realm, invite_only, history_public_to_subscribers)
+        realm, invite_only, history_public_to_subscribers
+    )
 
     (stream, created) = Stream.objects.get_or_create(
         realm=realm,
         name__iexact=stream_name,
-        defaults = dict(
+        defaults=dict(
             name=stream_name,
             description=stream_description,
             invite_only=invite_only,
@@ -116,20 +123,22 @@ def create_stream_if_needed(realm: Realm,
         if stream.is_public():
             send_stream_creation_event(stream, active_non_guest_user_ids(stream.realm_id))
         else:
-            realm_admin_ids = [user.id for user in
-                               stream.realm.get_admin_users_and_bots()]
+            realm_admin_ids = [user.id for user in stream.realm.get_admin_users_and_bots()]
             send_stream_creation_event(stream, realm_admin_ids)
 
         event_time = timezone_now()
-        RealmAuditLog.objects.create(realm=realm, acting_user=acting_user,
-                                     modified_stream=stream, event_type=RealmAuditLog.STREAM_CREATED,
-                                     event_time=event_time)
+        RealmAuditLog.objects.create(
+            realm=realm,
+            acting_user=acting_user,
+            modified_stream=stream,
+            event_type=RealmAuditLog.STREAM_CREATED,
+            event_time=event_time,
+        )
     return stream, created
 
+
 def create_streams_if_needed(
-    realm: Realm,
-    stream_dicts: List[StreamDict],
-    acting_user: Optional[UserProfile]=None
+    realm: Realm, stream_dicts: List[StreamDict], acting_user: Optional[UserProfile] = None
 ) -> Tuple[List[Stream], List[Stream]]:
     """Note that stream_dict["name"] is assumed to already be stripped of
     whitespace"""
@@ -140,11 +149,13 @@ def create_streams_if_needed(
             realm,
             stream_dict["name"],
             invite_only=stream_dict.get("invite_only", False),
-            stream_post_policy=stream_dict.get("stream_post_policy", Stream.STREAM_POST_POLICY_EVERYONE),
+            stream_post_policy=stream_dict.get(
+                "stream_post_policy", Stream.STREAM_POST_POLICY_EVERYONE
+            ),
             history_public_to_subscribers=stream_dict.get("history_public_to_subscribers"),
             stream_description=stream_dict.get("description", ""),
             message_retention_days=stream_dict.get("message_retention_days", None),
-            acting_user=acting_user
+            acting_user=acting_user,
         )
 
         if created:
@@ -154,41 +165,47 @@ def create_streams_if_needed(
 
     return added_streams, existing_streams
 
+
 def check_stream_name(stream_name: str) -> None:
     if stream_name.strip() == "":
         raise JsonableError(_("Invalid stream name '{}'").format(stream_name))
     if len(stream_name) > Stream.MAX_NAME_LENGTH:
-        raise JsonableError(_("Stream name too long (limit: {} characters).").format(Stream.MAX_NAME_LENGTH))
+        raise JsonableError(
+            _("Stream name too long (limit: {} characters).").format(Stream.MAX_NAME_LENGTH)
+        )
     for i in stream_name:
         if ord(i) == 0:
-            raise JsonableError(_("Stream name '{}' contains NULL (0x00) characters.").format(stream_name))
+            raise JsonableError(
+                _("Stream name '{}' contains NULL (0x00) characters.").format(stream_name)
+            )
+
 
 def subscribed_to_stream(user_profile: UserProfile, stream_id: int) -> bool:
     return Subscription.objects.filter(
         user_profile=user_profile,
         active=True,
         recipient__type=Recipient.STREAM,
-        recipient__type_id=stream_id).exists()
+        recipient__type_id=stream_id,
+    ).exists()
 
-def access_stream_for_send_message(sender: UserProfile,
-                                   stream: Stream,
-                                   forwarder_user_profile: Optional[UserProfile]) -> None:
+
+def access_stream_for_send_message(
+    sender: UserProfile, stream: Stream, forwarder_user_profile: Optional[UserProfile]
+) -> None:
     # Our caller is responsible for making sure that `stream` actually
     # matches the realm of the sender.
 
     # Organization admins can send to any stream, irrespective of the stream_post_policy value.
     if sender.is_realm_admin or is_cross_realm_bot_email(sender.delivery_email):
         pass
-    elif sender.is_bot and (sender.bot_owner is not None and
-                            sender.bot_owner.is_realm_admin):
+    elif sender.is_bot and (sender.bot_owner is not None and sender.bot_owner.is_realm_admin):
         pass
     elif stream.stream_post_policy == Stream.STREAM_POST_POLICY_ADMINS:
         raise JsonableError(_("Only organization administrators can send to this stream."))
     elif stream.stream_post_policy != Stream.STREAM_POST_POLICY_EVERYONE and sender.is_guest:
         raise JsonableError(_("Guests cannot send to this stream."))
     elif stream.stream_post_policy == Stream.STREAM_POST_POLICY_RESTRICT_NEW_MEMBERS:
-        if sender.is_bot and (sender.bot_owner is not None and
-                              sender.bot_owner.is_new_member):
+        if sender.is_bot and (sender.bot_owner is not None and sender.bot_owner.is_new_member):
             raise JsonableError(_("New members cannot send to this stream."))
         elif sender.is_new_member:
             raise JsonableError(_("New members cannot send to this stream."))
@@ -208,11 +225,12 @@ def access_stream_for_send_message(sender: UserProfile,
     if sender.can_forge_sender:
         return
 
-    if (forwarder_user_profile is not None and forwarder_user_profile.can_forge_sender):
+    if forwarder_user_profile is not None and forwarder_user_profile.can_forge_sender:
         return
 
-    if sender.is_bot and (sender.bot_owner is not None and
-                          subscribed_to_stream(sender.bot_owner, stream.id)):
+    if sender.is_bot and (
+        sender.bot_owner is not None and subscribed_to_stream(sender.bot_owner, stream.id)
+    ):
         # Bots can send to any stream their owner can.
         return
 
@@ -226,6 +244,7 @@ def access_stream_for_send_message(sender: UserProfile,
     # All other cases are an error.
     raise JsonableError(_("Not authorized to send to stream '{}'").format(stream.name))
 
+
 def check_for_exactly_one_stream_arg(stream_id: Optional[int], stream: Optional[str]) -> None:
     if stream_id is None and stream is None:
         raise JsonableError(_("Please supply 'stream'."))
@@ -233,8 +252,10 @@ def check_for_exactly_one_stream_arg(stream_id: Optional[int], stream: Optional[
     if stream_id is not None and stream is not None:
         raise JsonableError(_("Please choose one: 'stream' or 'stream_id'."))
 
-def check_stream_access_for_delete_or_update(user_profile: UserProfile, stream: Stream,
-                                             sub: Optional[Subscription]=None) -> None:
+
+def check_stream_access_for_delete_or_update(
+    user_profile: UserProfile, stream: Stream, sub: Optional[Subscription] = None
+) -> None:
     error = _("Invalid stream id")
     if stream.realm_id != user_profile.realm_id:
         raise JsonableError(error)
@@ -250,31 +271,34 @@ def check_stream_access_for_delete_or_update(user_profile: UserProfile, stream:
 
     raise StreamAdministratorRequired()
 
-def access_stream_for_delete_or_update(user_profile: UserProfile,
-                                       stream_id: int) -> Tuple[Stream, Optional[Subscription]]:
+
+def access_stream_for_delete_or_update(
+    user_profile: UserProfile, stream_id: int
+) -> Tuple[Stream, Optional[Subscription]]:
     try:
         stream = Stream.objects.get(id=stream_id)
     except Stream.DoesNotExist:
         raise JsonableError(_("Invalid stream id"))
 
     try:
-        sub = Subscription.objects.get(user_profile=user_profile,
-                                       recipient=stream.recipient,
-                                       active=True)
+        sub = Subscription.objects.get(
+            user_profile=user_profile, recipient=stream.recipient, active=True
+        )
     except Subscription.DoesNotExist:
         sub = None
 
     check_stream_access_for_delete_or_update(user_profile, stream, sub)
     return (stream, sub)
 
+
 # Only set allow_realm_admin flag to True when you want to allow realm admin to
 # access unsubscribed private stream content.
 def access_stream_common(
     user_profile: UserProfile,
     stream: Stream,
     error: str,
-    require_active: bool=True,
-    allow_realm_admin: bool=False
+    require_active: bool = True,
+    allow_realm_admin: bool = False,
 ) -> Optional[Subscription]:
     """Common function for backend code where the target use attempts to
     access the target stream, returning all the data fetched along the
@@ -287,9 +311,9 @@ def access_stream_common(
         raise JsonableError(error)
 
     try:
-        sub = Subscription.objects.get(user_profile=user_profile,
-                                       recipient_id=stream.recipient_id,
-                                       active=require_active)
+        sub = Subscription.objects.get(
+            user_profile=user_profile, recipient_id=stream.recipient_id, active=require_active
+        )
     except Subscription.DoesNotExist:
         sub = None
 
@@ -316,10 +340,13 @@ def access_stream_common(
     # an error.
     raise JsonableError(error)
 
-def access_stream_by_id(user_profile: UserProfile,
-                        stream_id: int,
-                        require_active: bool=True,
-                        allow_realm_admin: bool=False) -> Tuple[Stream, Optional[Subscription]]:
+
+def access_stream_by_id(
+    user_profile: UserProfile,
+    stream_id: int,
+    require_active: bool = True,
+    allow_realm_admin: bool = False,
+) -> Tuple[Stream, Optional[Subscription]]:
     stream = get_stream_by_id(stream_id)
 
     error = _("Invalid stream id")
@@ -332,16 +359,23 @@ def access_stream_by_id(user_profile: UserProfile,
     )
     return (stream, sub)
 
+
 def get_public_streams_queryset(realm: Realm) -> 'QuerySet[Stream]':
-    return Stream.objects.filter(realm=realm, invite_only=False,
-                                 history_public_to_subscribers=True)
+    return Stream.objects.filter(realm=realm, invite_only=False, history_public_to_subscribers=True)
+
 
 def get_web_public_streams_queryset(realm: Realm) -> 'QuerySet[Stream]':
     # In theory, is_web_public=True implies invite_only=False and
     # history_public_to_subscribers=True, but it's safer to include
     # this in the query.
-    return Stream.objects.filter(realm=realm, deactivated=False, invite_only=False,
-                                 history_public_to_subscribers=True, is_web_public=True)
+    return Stream.objects.filter(
+        realm=realm,
+        deactivated=False,
+        invite_only=False,
+        history_public_to_subscribers=True,
+        is_web_public=True,
+    )
+
 
 def get_stream_by_id(stream_id: int) -> Stream:
     error = _("Invalid stream id")
@@ -351,6 +385,7 @@ def get_stream_by_id(stream_id: int) -> Stream:
         raise JsonableError(error)
     return stream
 
+
 def check_stream_name_available(realm: Realm, name: str) -> None:
     check_stream_name(name)
     try:
@@ -359,9 +394,10 @@ def check_stream_name_available(realm: Realm, name: str) -> None:
     except Stream.DoesNotExist:
         pass
 
-def access_stream_by_name(user_profile: UserProfile,
-                          stream_name: str,
-                          allow_realm_admin: bool=False) -> Tuple[Stream, Optional[Subscription]]:
+
+def access_stream_by_name(
+    user_profile: UserProfile, stream_name: str, allow_realm_admin: bool = False
+) -> Tuple[Stream, Optional[Subscription]]:
     error = _("Invalid stream name '{}'").format(stream_name)
     try:
         stream = get_realm_stream(stream_name, user_profile.realm_id)
@@ -376,6 +412,7 @@ def access_stream_by_name(user_profile: UserProfile,
     )
     return (stream, sub)
 
+
 def access_web_public_stream(stream_id: int, realm: Realm) -> Stream:
     error = _("Invalid stream id")
     try:
@@ -387,9 +424,10 @@ def access_web_public_stream(stream_id: int, realm: Realm) -> Stream:
         raise JsonableError(error)
     return stream
 
-def access_stream_for_unmute_topic_by_name(user_profile: UserProfile,
-                                           stream_name: str,
-                                           error: str) -> Stream:
+
+def access_stream_for_unmute_topic_by_name(
+    user_profile: UserProfile, stream_name: str, error: str
+) -> Stream:
     """
     It may seem a little silly to have this helper function for unmuting
     topics, but it gets around a linter warning, and it helps to be able
@@ -409,15 +447,17 @@ def access_stream_for_unmute_topic_by_name(user_profile: UserProfile,
         raise JsonableError(error)
     return stream
 
-def access_stream_for_unmute_topic_by_id(user_profile: UserProfile,
-                                         stream_id: int,
-                                         error: str) -> Stream:
+
+def access_stream_for_unmute_topic_by_id(
+    user_profile: UserProfile, stream_id: int, error: str
+) -> Stream:
     try:
         stream = Stream.objects.get(id=stream_id, realm_id=user_profile.realm_id)
     except Stream.DoesNotExist:
         raise JsonableError(error)
     return stream
 
+
 def can_access_stream_history(user_profile: UserProfile, stream: Stream) -> bool:
     """Determine whether the provided user is allowed to access the
     history of the target stream.  The stream is specified by name.
@@ -450,6 +490,7 @@ def can_access_stream_history(user_profile: UserProfile, stream: Stream) -> bool
         return True
     return False
 
+
 def can_access_stream_history_by_name(user_profile: UserProfile, stream_name: str) -> bool:
     try:
         stream = get_stream(stream_name, user_profile.realm)
@@ -457,6 +498,7 @@ def can_access_stream_history_by_name(user_profile: UserProfile, stream_name: st
         return False
     return can_access_stream_history(user_profile, stream)
 
+
 def can_access_stream_history_by_id(user_profile: UserProfile, stream_id: int) -> bool:
     try:
         stream = get_stream_by_id_in_realm(stream_id, user_profile.realm)
@@ -464,13 +506,16 @@ def can_access_stream_history_by_id(user_profile: UserProfile, stream_id: int) -
         return False
     return can_access_stream_history(user_profile, stream)
 
-def filter_stream_authorization(user_profile: UserProfile,
-                                streams: Iterable[Stream]) -> Tuple[List[Stream], List[Stream]]:
+
+def filter_stream_authorization(
+    user_profile: UserProfile, streams: Iterable[Stream]
+) -> Tuple[List[Stream], List[Stream]]:
     recipient_ids = [stream.recipient_id for stream in streams]
-    subscribed_recipient_ids = set(Subscription.objects.filter(
-        user_profile=user_profile,
-        recipient_id__in=recipient_ids,
-        active=True).values_list('recipient_id', flat=True))
+    subscribed_recipient_ids = set(
+        Subscription.objects.filter(
+            user_profile=user_profile, recipient_id__in=recipient_ids, active=True
+        ).values_list('recipient_id', flat=True)
+    )
 
     unauthorized_streams: List[Stream] = []
     for stream in streams:
@@ -488,14 +533,20 @@ def filter_stream_authorization(user_profile: UserProfile,
 
         unauthorized_streams.append(stream)
 
-    authorized_streams = [stream for stream in streams if
-                          stream.id not in {stream.id for stream in unauthorized_streams}]
+    authorized_streams = [
+        stream
+        for stream in streams
+        if stream.id not in {stream.id for stream in unauthorized_streams}
+    ]
     return authorized_streams, unauthorized_streams
 
-def list_to_streams(streams_raw: Iterable[StreamDict],
-                    user_profile: UserProfile,
-                    autocreate: bool=False,
-                    admin_access_required: bool=False) -> Tuple[List[Stream], List[Stream]]:
+
+def list_to_streams(
+    streams_raw: Iterable[StreamDict],
+    user_profile: UserProfile,
+    autocreate: bool = False,
+    admin_access_required: bool = False,
+) -> Tuple[List[Stream], List[Stream]]:
     """Converts list of dicts to a list of Streams, validating input in the process
 
     For each stream name, we validate it to ensure it meets our
@@ -526,9 +577,8 @@ def list_to_streams(streams_raw: Iterable[StreamDict],
     if admin_access_required:
         existing_recipient_ids = [stream.recipient_id for stream in existing_stream_map.values()]
         subs = Subscription.objects.filter(
-            user_profile=user_profile,
-            recipient_id__in=existing_recipient_ids,
-            active=True)
+            user_profile=user_profile, recipient_id__in=existing_recipient_ids, active=True
+        )
         sub_map = {sub.recipient_id: sub for sub in subs}
         for stream in existing_stream_map.values():
             sub = sub_map.get(stream.recipient_id, None)
@@ -554,9 +604,11 @@ def list_to_streams(streams_raw: Iterable[StreamDict],
         if not user_profile.can_create_streams():
             raise JsonableError(_('User cannot create streams.'))
         elif not autocreate:
-            raise JsonableError(_("Stream(s) ({}) do not exist").format(
-                ", ".join(stream_dict["name"] for stream_dict in missing_stream_dicts),
-            ))
+            raise JsonableError(
+                _("Stream(s) ({}) do not exist").format(
+                    ", ".join(stream_dict["name"] for stream_dict in missing_stream_dicts),
+                )
+            )
         elif message_retention_days_not_none:
             if not user_profile.is_realm_owner:
                 raise JsonableError(_('User cannot create stream with this settings.'))
@@ -567,19 +619,21 @@ def list_to_streams(streams_raw: Iterable[StreamDict],
         # else racing to create the same stream.  (This is not an entirely
         # paranoid approach, since often on Zulip two people will discuss
         # creating a new stream, and both people eagerly do it.)
-        created_streams, dup_streams = create_streams_if_needed(realm=user_profile.realm,
-                                                                stream_dicts=missing_stream_dicts,
-                                                                acting_user=user_profile)
+        created_streams, dup_streams = create_streams_if_needed(
+            realm=user_profile.realm, stream_dicts=missing_stream_dicts, acting_user=user_profile
+        )
         existing_streams += dup_streams
 
     return existing_streams, created_streams
 
+
 def access_default_stream_group_by_id(realm: Realm, group_id: int) -> DefaultStreamGroup:
     try:
         return DefaultStreamGroup.objects.get(realm=realm, id=group_id)
     except DefaultStreamGroup.DoesNotExist:
         raise JsonableError(_("Default stream group with id '{}' does not exist.").format(group_id))
 
+
 def get_stream_by_narrow_operand_access_unchecked(operand: Union[str, int], realm: Realm) -> Stream:
     """This is required over access_stream_* in certain cases where
     we need the stream data only to prepare a response that user can access
diff --git a/zerver/lib/subdomains.py b/zerver/lib/subdomains.py
index 824c95937d..4470c7f903 100644
--- a/zerver/lib/subdomains.py
+++ b/zerver/lib/subdomains.py
@@ -24,30 +24,32 @@ def get_subdomain(request: HttpRequest) -> str:
     host = request.get_host().lower()
     return get_subdomain_from_hostname(host)
 
+
 def get_subdomain_from_hostname(host: str) -> str:
-    m = re.search(fr'\.{settings.EXTERNAL_HOST}(:\d+)?$',
-                  host)
+    m = re.search(fr'\.{settings.EXTERNAL_HOST}(:\d+)?$', host)
     if m:
-        subdomain = host[:m.start()]
+        subdomain = host[: m.start()]
         if subdomain in settings.ROOT_SUBDOMAIN_ALIASES:
             return Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
         return subdomain
 
     for subdomain, realm_host in settings.REALM_HOSTS.items():
-        if re.search(fr'^{realm_host}(:\d+)?$',
-                     host):
+        if re.search(fr'^{realm_host}(:\d+)?$', host):
             return subdomain
 
     return Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
 
+
 def is_subdomain_root_or_alias(request: HttpRequest) -> bool:
     return get_subdomain(request) == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
 
+
 def user_matches_subdomain(realm_subdomain: Optional[str], user_profile: UserProfile) -> bool:
     if realm_subdomain is None:
         return True  # nocoverage # This state may no longer be possible.
     return user_profile.realm.subdomain == realm_subdomain
 
+
 def is_root_domain_available() -> bool:
     if settings.ROOT_DOMAIN_LANDING_PAGE:
         return False
diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py
index 6bde0e4277..2bd5c7ee48 100644
--- a/zerver/lib/test_classes.py
+++ b/zerver/lib/test_classes.py
@@ -87,6 +87,7 @@ class UploadSerializeMixin(SerializeMixin):
     for conflicting test cases would have provided better performance
     while providing the required isolation.
     """
+
     lockfile = 'var/upload_lock'
 
     @classmethod
@@ -97,6 +98,7 @@ class UploadSerializeMixin(SerializeMixin):
 
         super().setUpClass(*args, **kwargs)
 
+
 class ZulipTestCase(TestCase):
     # Ensure that the test system just shows us diffs
     maxDiff: Optional[int] = None
@@ -123,11 +125,13 @@ class ZulipTestCase(TestCase):
                 self.mock_ldap.reset()
             self.mock_initialize.stop()
 
-    def run(self, result: Optional[TestResult]=None) -> Optional[TestResult]:  # nocoverage
+    def run(self, result: Optional[TestResult] = None) -> Optional[TestResult]:  # nocoverage
         if not settings.BAN_CONSOLE_OUTPUT:
             return super().run(result)
         extra_output_finder = ExtraConsoleOutputFinder()
-        with TeeStderrAndFindExtraConsoleOutput(extra_output_finder), TeeStdoutAndFindExtraConsoleOutput(extra_output_finder):
+        with TeeStderrAndFindExtraConsoleOutput(
+            extra_output_finder
+        ), TeeStdoutAndFindExtraConsoleOutput(extra_output_finder):
             test_result = super().run(result)
         if extra_output_finder.full_extra_output:
             exception_message = f"""
@@ -180,9 +184,11 @@ Output:
             default_user_agent = "ZulipMobile/26.22.145 (iOS 10.3.1)"
         else:
             # A webapp request; use a browser User-Agent string.
-            default_user_agent = ("Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
-                                  "AppleWebKit/537.36 (KHTML, like Gecko) " +
-                                  "Chrome/79.0.3945.130 Safari/537.36")
+            default_user_agent = (
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                + "AppleWebKit/537.36 (KHTML, like Gecko) "
+                + "Chrome/79.0.3945.130 Safari/537.36"
+            )
         if kwargs.get('skip_user_agent'):
             # Provide a way to disable setting User-Agent if desired.
             assert 'HTTP_USER_AGENT' not in kwargs
@@ -233,13 +239,28 @@ Output:
             # The `data` argument of our function is not used. Hence get `data` argument
             # from url.
             data = query_data
-        response_validated = validate_against_openapi_schema(content, url, method, str(result.status_code))
+        response_validated = validate_against_openapi_schema(
+            content, url, method, str(result.status_code)
+        )
         if response_validated:
-            validate_request(url, method, data, http_headers, json_url, str(result.status_code),
-                             intentionally_undocumented=intentionally_undocumented)
+            validate_request(
+                url,
+                method,
+                data,
+                http_headers,
+                json_url,
+                str(result.status_code),
+                intentionally_undocumented=intentionally_undocumented,
+            )
 
     @instrument_url
-    def client_patch(self, url: str, info: Dict[str, Any]={}, intentionally_undocumented: bool=False, **kwargs: Any) -> HttpResponse:
+    def client_patch(
+        self,
+        url: str,
+        info: Dict[str, Any] = {},
+        intentionally_undocumented: bool = False,
+        **kwargs: Any,
+    ) -> HttpResponse:
         """
         We need to urlencode, since Django's function won't do it for us.
         """
@@ -247,11 +268,20 @@ Output:
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
         result = django_client.patch(url, encoded, **kwargs)
-        self.validate_api_response_openapi(url, "patch", result, info, kwargs, intentionally_undocumented=intentionally_undocumented)
+        self.validate_api_response_openapi(
+            url,
+            "patch",
+            result,
+            info,
+            kwargs,
+            intentionally_undocumented=intentionally_undocumented,
+        )
         return result
 
     @instrument_url
-    def client_patch_multipart(self, url: str, info: Dict[str, Any]={}, **kwargs: Any) -> HttpResponse:
+    def client_patch_multipart(
+        self, url: str, info: Dict[str, Any] = {}, **kwargs: Any
+    ) -> HttpResponse:
         """
         Use this for patch requests that have file uploads or
         that need some sort of multi-part content.  In the future
@@ -263,23 +293,19 @@ Output:
         encoded = encode_multipart(BOUNDARY, info)
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
-        result = django_client.patch(
-            url,
-            encoded,
-            content_type=MULTIPART_CONTENT,
-            **kwargs)
+        result = django_client.patch(url, encoded, content_type=MULTIPART_CONTENT, **kwargs)
         self.validate_api_response_openapi(url, "patch", result, info, kwargs)
         return result
 
     @instrument_url
-    def client_put(self, url: str, info: Dict[str, Any]={}, **kwargs: Any) -> HttpResponse:
+    def client_put(self, url: str, info: Dict[str, Any] = {}, **kwargs: Any) -> HttpResponse:
         encoded = urllib.parse.urlencode(info)
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
         return django_client.put(url, encoded, **kwargs)
 
     @instrument_url
-    def client_delete(self, url: str, info: Dict[str, Any]={}, **kwargs: Any) -> HttpResponse:
+    def client_delete(self, url: str, info: Dict[str, Any] = {}, **kwargs: Any) -> HttpResponse:
         encoded = urllib.parse.urlencode(info)
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
@@ -288,14 +314,14 @@ Output:
         return result
 
     @instrument_url
-    def client_options(self, url: str, info: Dict[str, Any]={}, **kwargs: Any) -> HttpResponse:
+    def client_options(self, url: str, info: Dict[str, Any] = {}, **kwargs: Any) -> HttpResponse:
         encoded = urllib.parse.urlencode(info)
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
         return django_client.options(url, encoded, **kwargs)
 
     @instrument_url
-    def client_head(self, url: str, info: Dict[str, Any]={}, **kwargs: Any) -> HttpResponse:
+    def client_head(self, url: str, info: Dict[str, Any] = {}, **kwargs: Any) -> HttpResponse:
         encoded = urllib.parse.urlencode(info)
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
@@ -312,7 +338,9 @@ Output:
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
         result = django_client.post(url, info, **kwargs)
-        self.validate_api_response_openapi(url, "post", result, info, kwargs, intentionally_undocumented=intentionally_undocumented)
+        self.validate_api_response_openapi(
+            url, "post", result, info, kwargs, intentionally_undocumented=intentionally_undocumented
+        )
         return result
 
     @instrument_url
@@ -335,7 +363,9 @@ Output:
         django_client = self.client  # see WRAPPER_COMMENT
         self.set_http_headers(kwargs)
         result = django_client.get(url, info, **kwargs)
-        self.validate_api_response_openapi(url, "get", result, info, kwargs, intentionally_undocumented=intentionally_undocumented)
+        self.validate_api_response_openapi(
+            url, "get", result, info, kwargs, intentionally_undocumented=intentionally_undocumented
+        )
         return result
 
     example_user_map = dict(
@@ -413,10 +443,9 @@ Output:
     def notification_bot(self) -> UserProfile:
         return get_system_bot(settings.NOTIFICATION_BOT)
 
-    def create_test_bot(self, short_name: str,
-                        user_profile: UserProfile,
-                        full_name: str='Foo Bot',
-                        **extras: Any) -> UserProfile:
+    def create_test_bot(
+        self, short_name: str, user_profile: UserProfile, full_name: str = 'Foo Bot', **extras: Any
+    ) -> UserProfile:
         self.login_user(user_profile)
         bot_info = {
             'short_name': short_name,
@@ -430,9 +459,10 @@ Output:
         return bot_profile
 
     def fail_to_create_test_bot(
-        self, short_name: str,
+        self,
+        short_name: str,
         user_profile: UserProfile,
-        full_name: str='Foo Bot',
+        full_name: str = 'Foo Bot',
         *,
         assert_json_error_msg: str,
         **extras: Any,
@@ -456,7 +486,7 @@ Output:
 
     def check_rendered_logged_in_app(self, result: HttpResponse) -> None:
         """Verifies that a visit of / was a 200 that rendered page_params
-           and not for a logged-out web-public visitor."""
+        and not for a logged-out web-public visitor."""
         self.assertEqual(result.status_code, 200)
         page_params = self._get_page_params(result)
         # It is important to check `is_web_public_visitor` to verify
@@ -466,25 +496,26 @@ Output:
 
     def check_rendered_web_public_visitor(self, result: HttpResponse) -> None:
         """Verifies that a visit of / was a 200 that rendered page_params
-           for a logged-out web-public visitor."""
+        for a logged-out web-public visitor."""
         self.assertEqual(result.status_code, 200)
         page_params = self._get_page_params(result)
         # It is important to check `is_web_public_visitor` to verify
         # that we treated this request to render for a `web_public_visitor`
         self.assertEqual(page_params['is_web_public_visitor'], True)
 
-    def login_with_return(self, email: str, password: Optional[str]=None,
-                          **kwargs: Any) -> HttpResponse:
+    def login_with_return(
+        self, email: str, password: Optional[str] = None, **kwargs: Any
+    ) -> HttpResponse:
         if password is None:
             password = initial_password(email)
-        result = self.client_post('/accounts/login/',
-                                  {'username': email, 'password': password},
-                                  **kwargs)
+        result = self.client_post(
+            '/accounts/login/', {'username': email, 'password': password}, **kwargs
+        )
         self.assertNotEqual(result.status_code, 500)
         return result
 
     def login(self, name: str) -> None:
-        '''
+        """
         Use this for really simple tests where you just need
         to be logged in as some user, but don't need the actual
         user object for anything else.  Try to use 'hamlet' for
@@ -493,14 +524,12 @@ Output:
             self.login('hamlet')
 
         Try to use 'cordelia' or 'othello' as "other" users.
-        '''
+        """
         assert '@' not in name, 'use login_by_email for email logins'
         user = self.example_user(name)
         self.login_user(user)
 
-    def login_by_email(self,
-                       email: str,
-                       password: str) -> None:
+    def login_by_email(self, email: str, password: str) -> None:
         realm = get_realm("zulip")
         request = HttpRequest()
         request.session = self.client.session
@@ -513,9 +542,7 @@ Output:
             ),
         )
 
-    def assert_login_failure(self,
-                             email: str,
-                             password: str) -> None:
+    def assert_login_failure(self, email: str, password: str) -> None:
         realm = get_realm("zulip")
         self.assertFalse(
             self.client.login(
@@ -531,8 +558,9 @@ Output:
         password = initial_password(email)
         request = HttpRequest()
         request.session = self.client.session
-        self.assertTrue(self.client.login(request=request, username=email, password=password,
-                                          realm=realm))
+        self.assertTrue(
+            self.client.login(request=request, username=email, password=password, realm=realm)
+        )
 
     def login_2fa(self, user_profile: UserProfile) -> None:
         """
@@ -552,19 +580,24 @@ Output:
         self.client.logout()
 
     def register(self, email: str, password: str, **kwargs: Any) -> HttpResponse:
-        self.client_post('/accounts/home/', {'email': email},
-                         **kwargs)
+        self.client_post('/accounts/home/', {'email': email}, **kwargs)
         return self.submit_reg_form_for_user(email, password, **kwargs)
 
     def submit_reg_form_for_user(
-            self, email: str, password: str,
-            realm_name: str="Zulip Test",
-            realm_subdomain: str="zuliptest",
-            from_confirmation: str='', full_name: Optional[str]=None,
-            timezone: str='', realm_in_root_domain: Optional[str]=None,
-            default_stream_groups: Sequence[str]=[],
-            source_realm: str='',
-            key: Optional[str]=None, **kwargs: Any) -> HttpResponse:
+        self,
+        email: str,
+        password: str,
+        realm_name: str = "Zulip Test",
+        realm_subdomain: str = "zuliptest",
+        from_confirmation: str = '',
+        full_name: Optional[str] = None,
+        timezone: str = '',
+        realm_in_root_domain: Optional[str] = None,
+        default_stream_groups: Sequence[str] = [],
+        source_realm: str = '',
+        key: Optional[str] = None,
+        **kwargs: Any,
+    ) -> HttpResponse:
         """
         Stage two of the two-step registration process.
 
@@ -595,16 +628,16 @@ Output:
         self,
         email_address: str,
         *,
-        url_pattern: Optional[str]=None,
+        url_pattern: Optional[str] = None,
     ) -> str:
         from django.core.mail import outbox
+
         if url_pattern is None:
             # This is a bit of a crude heuristic, but good enough for most tests.
             url_pattern = settings.EXTERNAL_HOST + r"(\S+)>"
         for message in reversed(outbox):
             if any(
-                addr == email_address or addr.endswith(f" <{email_address}>")
-                for addr in message.to
+                addr == email_address or addr.endswith(f" <{email_address}>") for addr in message.to
             ):
                 match = re.search(url_pattern, message.body)
                 assert match is not None
@@ -630,7 +663,7 @@ Output:
         api_key = user.api_key
         return self.encode_credentials(email, api_key)
 
-    def encode_email(self, email: str, realm: str="zulip") -> str:
+    def encode_email(self, email: str, realm: str = "zulip") -> str:
         # TODO: use encode_user where possible
         assert '@' in email
         user = get_user_by_delivery_email(email, get_realm(realm))
@@ -657,9 +690,13 @@ Output:
         kwargs['HTTP_AUTHORIZATION'] = self.encode_user(user)
         return self.client_get(*args, **kwargs)
 
-    def api_post(self, user: UserProfile, *args: Any, intentionally_undocumented: bool=False, **kwargs: Any) -> HttpResponse:
+    def api_post(
+        self, user: UserProfile, *args: Any, intentionally_undocumented: bool = False, **kwargs: Any
+    ) -> HttpResponse:
         kwargs['HTTP_AUTHORIZATION'] = self.encode_user(user)
-        return self.client_post(*args, intentionally_undocumented=intentionally_undocumented, **kwargs)
+        return self.client_post(
+            *args, intentionally_undocumented=intentionally_undocumented, **kwargs
+        )
 
     def api_patch(self, user: UserProfile, *args: Any, **kwargs: Any) -> HttpResponse:
         kwargs['HTTP_AUTHORIZATION'] = self.encode_user(user)
@@ -676,40 +713,57 @@ Output:
         subs = get_stream_subscriptions_for_user(user_profile).filter(
             active=True,
         )
-        return [
-            check_string("recipient", get_display_recipient(sub.recipient))
-            for sub in subs
-        ]
+        return [check_string("recipient", get_display_recipient(sub.recipient)) for sub in subs]
 
-    def send_personal_message(self, from_user: UserProfile, to_user: UserProfile, content: str="test content",
-                              sending_client_name: str="test suite") -> int:
+    def send_personal_message(
+        self,
+        from_user: UserProfile,
+        to_user: UserProfile,
+        content: str = "test content",
+        sending_client_name: str = "test suite",
+    ) -> int:
         recipient_list = [to_user.id]
         (sending_client, _) = Client.objects.get_or_create(name=sending_client_name)
 
         return check_send_message(
-            from_user, sending_client, 'private', recipient_list, None,
+            from_user,
+            sending_client,
+            'private',
+            recipient_list,
+            None,
             content,
         )
 
-    def send_huddle_message(self,
-                            from_user: UserProfile,
-                            to_users: List[UserProfile],
-                            content: str="test content",
-                            sending_client_name: str="test suite") -> int:
+    def send_huddle_message(
+        self,
+        from_user: UserProfile,
+        to_users: List[UserProfile],
+        content: str = "test content",
+        sending_client_name: str = "test suite",
+    ) -> int:
         to_user_ids = [u.id for u in to_users]
-        assert(len(to_user_ids) >= 2)
+        assert len(to_user_ids) >= 2
 
         (sending_client, _) = Client.objects.get_or_create(name=sending_client_name)
 
         return check_send_message(
-            from_user, sending_client, 'private', to_user_ids, None,
+            from_user,
+            sending_client,
+            'private',
+            to_user_ids,
+            None,
             content,
         )
 
-    def send_stream_message(self, sender: UserProfile, stream_name: str, content: str="test content",
-                            topic_name: str="test",
-                            recipient_realm: Optional[Realm]=None,
-                            sending_client_name: str="test suite") -> int:
+    def send_stream_message(
+        self,
+        sender: UserProfile,
+        stream_name: str,
+        content: str = "test content",
+        topic_name: str = "test",
+        recipient_realm: Optional[Realm] = None,
+        sending_client_name: str = "test suite",
+    ) -> int:
         (sending_client, _) = Client.objects.get_or_create(name=sending_client_name)
 
         return check_send_stream_message(
@@ -721,18 +775,30 @@ Output:
             realm=recipient_realm,
         )
 
-    def get_messages_response(self, anchor: Union[int, str]=1,
-                              num_before: int=100, num_after: int=100,
-                              use_first_unread_anchor: bool=False) -> Dict[str, List[Dict[str, Any]]]:
-        post_params = {"anchor": anchor, "num_before": num_before,
-                       "num_after": num_after,
-                       "use_first_unread_anchor": orjson.dumps(use_first_unread_anchor).decode()}
+    def get_messages_response(
+        self,
+        anchor: Union[int, str] = 1,
+        num_before: int = 100,
+        num_after: int = 100,
+        use_first_unread_anchor: bool = False,
+    ) -> Dict[str, List[Dict[str, Any]]]:
+        post_params = {
+            "anchor": anchor,
+            "num_before": num_before,
+            "num_after": num_after,
+            "use_first_unread_anchor": orjson.dumps(use_first_unread_anchor).decode(),
+        }
         result = self.client_get("/json/messages", dict(post_params))
         data = result.json()
         return data
 
-    def get_messages(self, anchor: Union[str, int]=1, num_before: int=100, num_after: int=100,
-                     use_first_unread_anchor: bool=False) -> List[Dict[str, Any]]:
+    def get_messages(
+        self,
+        anchor: Union[str, int] = 1,
+        num_before: int = 100,
+        num_after: int = 100,
+        use_first_unread_anchor: bool = False,
+    ) -> List[Dict[str, Any]]:
         data = self.get_messages_response(anchor, num_before, num_after, use_first_unread_anchor)
         return data['messages']
 
@@ -765,7 +831,7 @@ Output:
         self.assertNotEqual(json["msg"], "Error parsing JSON in response!")
         return json
 
-    def get_json_error(self, result: HttpResponse, status_code: int=400) -> Dict[str, Any]:
+    def get_json_error(self, result: HttpResponse, status_code: int = 400) -> Dict[str, Any]:
         try:
             json = orjson.loads(result.content)
         except orjson.JSONDecodeError:  # nocoverage
@@ -774,7 +840,7 @@ Output:
         self.assertEqual(json.get("result"), "error")
         return json['msg']
 
-    def assert_json_error(self, result: HttpResponse, msg: str, status_code: int=400) -> None:
+    def assert_json_error(self, result: HttpResponse, msg: str, status_code: int = 400) -> None:
         """
         Invalid POSTs return an error status code and JSON of the form
         {"result": "error", "msg": "reason"}.
@@ -790,22 +856,21 @@ Output:
             print(f"\nexpected length: {count}\nactual length: {actual_count}")
             raise AssertionError('List is unexpected size!')
 
-    def assert_json_error_contains(self, result: HttpResponse, msg_substring: str,
-                                   status_code: int=400) -> None:
+    def assert_json_error_contains(
+        self, result: HttpResponse, msg_substring: str, status_code: int = 400
+    ) -> None:
         self.assertIn(msg_substring, self.get_json_error(result, status_code=status_code))
 
     def assert_in_response(self, substring: str, response: HttpResponse) -> None:
         self.assertIn(substring, response.content.decode('utf-8'))
 
-    def assert_in_success_response(self, substrings: List[str],
-                                   response: HttpResponse) -> None:
+    def assert_in_success_response(self, substrings: List[str], response: HttpResponse) -> None:
         self.assertEqual(response.status_code, 200)
         decoded = response.content.decode('utf-8')
         for substring in substrings:
             self.assertIn(substring, decoded)
 
-    def assert_not_in_success_response(self, substrings: List[str],
-                                       response: HttpResponse) -> None:
+    def assert_not_in_success_response(self, substrings: List[str], response: HttpResponse) -> None:
         self.assertEqual(response.status_code, 200)
         decoded = response.content.decode('utf-8')
         for substring in substrings:
@@ -818,7 +883,7 @@ Output:
         """
         self.assertEqual(get_session_dict_user(self.client.session), user_id)
 
-    def webhook_fixture_data(self, type: str, action: str, file_type: str='json') -> str:
+    def webhook_fixture_data(self, type: str, action: str, file_type: str = 'json') -> str:
         fn = os.path.join(
             os.path.dirname(__file__),
             f"../webhooks/{type}/fixtures/{action}.{file_type}",
@@ -826,26 +891,31 @@ Output:
         with open(fn) as f:
             return f.read()
 
-    def fixture_file_name(self, file_name: str, type: str='') -> str:
+    def fixture_file_name(self, file_name: str, type: str = '') -> str:
         return os.path.join(
             os.path.dirname(__file__),
             f"../tests/fixtures/{type}/{file_name}",
         )
 
-    def fixture_data(self, file_name: str, type: str='') -> str:
+    def fixture_data(self, file_name: str, type: str = '') -> str:
         fn = self.fixture_file_name(file_name, type)
         with open(fn) as f:
             return f.read()
 
-    def make_stream(self, stream_name: str, realm: Optional[Realm]=None,
-                    invite_only: bool=False,
-                    is_web_public: bool=False,
-                    history_public_to_subscribers: Optional[bool]=None) -> Stream:
+    def make_stream(
+        self,
+        stream_name: str,
+        realm: Optional[Realm] = None,
+        invite_only: bool = False,
+        is_web_public: bool = False,
+        history_public_to_subscribers: Optional[bool] = None,
+    ) -> Stream:
         if realm is None:
             realm = get_realm('zulip')
 
         history_public_to_subscribers = get_default_value_for_history_public_to_subscribers(
-            realm, invite_only, history_public_to_subscribers)
+            realm, invite_only, history_public_to_subscribers
+        )
 
         try:
             stream = Stream.objects.create(
@@ -856,11 +926,13 @@ Output:
                 history_public_to_subscribers=history_public_to_subscribers,
             )
         except IntegrityError:  # nocoverage -- this is for bugs in the tests
-            raise Exception(f'''
+            raise Exception(
+                f'''
                 {stream_name} already exists
 
                 Please call make_stream with a stream name
-                that is not already in use.''')
+                that is not already in use.'''
+            )
 
         recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
         stream.recipient = recipient
@@ -869,7 +941,7 @@ Output:
 
     INVALID_STREAM_ID = 999999
 
-    def get_stream_id(self, name: str, realm: Optional[Realm]=None) -> int:
+    def get_stream_id(self, name: str, realm: Optional[Realm] = None) -> int:
         if not realm:
             realm = get_realm('zulip')
         try:
@@ -894,22 +966,28 @@ Output:
         bulk_remove_subscriptions([user_profile], [stream], client)
 
     # Subscribe to a stream by making an API request
-    def common_subscribe_to_streams(self, user: UserProfile, streams: Iterable[str],
-                                    extra_post_data: Dict[str, Any]={}, invite_only: bool=False,
-                                    is_web_public: bool=False,
-                                    allow_fail: bool=False,
-                                    **kwargs: Any) -> HttpResponse:
-        post_data = {'subscriptions': orjson.dumps([{"name": stream} for stream in streams]).decode(),
-                     'is_web_public': orjson.dumps(is_web_public).decode(),
-                     'invite_only': orjson.dumps(invite_only).decode()}
+    def common_subscribe_to_streams(
+        self,
+        user: UserProfile,
+        streams: Iterable[str],
+        extra_post_data: Dict[str, Any] = {},
+        invite_only: bool = False,
+        is_web_public: bool = False,
+        allow_fail: bool = False,
+        **kwargs: Any,
+    ) -> HttpResponse:
+        post_data = {
+            'subscriptions': orjson.dumps([{"name": stream} for stream in streams]).decode(),
+            'is_web_public': orjson.dumps(is_web_public).decode(),
+            'invite_only': orjson.dumps(invite_only).decode(),
+        }
         post_data.update(extra_post_data)
         result = self.api_post(user, "/api/v1/users/me/subscriptions", post_data, **kwargs)
         if not allow_fail:
             self.assert_json_success(result)
         return result
 
-    def check_user_subscribed_only_to_streams(self, user_name: str,
-                                              streams: List[Stream]) -> None:
+    def check_user_subscribed_only_to_streams(self, user_name: str, streams: List[Stream]) -> None:
         streams = sorted(streams, key=lambda x: x.name)
         subscribed_streams = gather_subscriptions(self.nonreg_user(user_name))[0]
 
@@ -953,7 +1031,8 @@ Output:
         msg = self.get_last_message()
 
         if msg.id == prior_msg.id:
-            raise Exception('''
+            raise Exception(
+                '''
                 Your test code called an endpoint that did
                 not write any new messages.  It is probably
                 broken (but still returns 200 due to exception
@@ -962,7 +1041,8 @@ Output:
                 One possible gotcha is that you forgot to
                 subscribe the test user to the stream that
                 the webhook sends to.
-                ''')  # nocoverage
+                '''
+            )  # nocoverage
 
         self.assertEqual(msg.sender.email, user_profile.email)
 
@@ -976,21 +1056,26 @@ Output:
 
     @contextmanager
     def simulated_markdown_failure(self) -> Iterator[None]:
-        '''
+        """
         This raises a failure inside of the try/except block of
         markdown.__init__.do_convert.
-        '''
-        with \
-                self.settings(ERROR_BOT=None), \
-                mock.patch('zerver.lib.markdown.timeout', side_effect=subprocess.CalledProcessError(1, [])), \
-                mock.patch('zerver.lib.markdown.markdown_logger'):
+        """
+        with self.settings(ERROR_BOT=None), mock.patch(
+            'zerver.lib.markdown.timeout', side_effect=subprocess.CalledProcessError(1, [])
+        ), mock.patch('zerver.lib.markdown.markdown_logger'):
             yield
 
-    def create_default_device(self, user_profile: UserProfile,
-                              number: str="+12125550100") -> None:
-        phone_device = PhoneDevice(user=user_profile, name='default',
-                                   confirmed=True, number=number,
-                                   key='abcd', method='sms')
+    def create_default_device(
+        self, user_profile: UserProfile, number: str = "+12125550100"
+    ) -> None:
+        phone_device = PhoneDevice(
+            user=user_profile,
+            name='default',
+            confirmed=True,
+            number=number,
+            key='abcd',
+            method='sms',
+        )
         phone_device.save()
 
     def rm_tree(self, path: str) -> None:
@@ -998,8 +1083,9 @@ Output:
             shutil.rmtree(path)
 
     def make_import_output_dir(self, exported_from: str) -> str:
-        output_dir = tempfile.mkdtemp(dir=settings.TEST_WORKER_DIR,
-                                      prefix="test-" + exported_from + "-import-")
+        output_dir = tempfile.mkdtemp(
+            dir=settings.TEST_WORKER_DIR, prefix="test-" + exported_from + "-import-"
+        )
         os.makedirs(output_dir, exist_ok=True)
         return output_dir
 
@@ -1008,9 +1094,7 @@ Output:
         return values
 
     def find_by_id(self, data: List[Dict[str, Any]], db_id: int) -> Dict[str, Any]:
-        return [
-            r for r in data
-            if r['id'] == db_id][0]
+        return [r for r in data if r['id'] == db_id][0]
 
     def init_default_ldap_database(self) -> None:
         """
@@ -1044,8 +1128,9 @@ Output:
         self.mock_ldap = MockLDAP(directory)
         self.mock_initialize.return_value = self.mock_ldap
 
-    def change_ldap_user_attr(self, username: str, attr_name: str, attr_value: Union[str, bytes],
-                              binary: bool=False) -> None:
+    def change_ldap_user_attr(
+        self, username: str, attr_name: str, attr_value: Union[str, bytes], binary: bool = False
+    ) -> None:
         """
         Method for changing the value of an attribute of a user entry in the mock
         directory. Use option binary=True if you want binary data to be loaded
@@ -1074,6 +1159,7 @@ Output:
     def ldap_password(self, uid: str) -> str:
         return f"{uid}_ldap_password"
 
+
 class WebhookTestCase(ZulipTestCase):
     """
     Common for all webhooks tests
@@ -1082,6 +1168,7 @@ class WebhookTestCase(ZulipTestCase):
     If you create your URL in uncommon way you can override build_webhook_url method
     In case that you need modify body or create it without using fixture you can also override get_body method
     """
+
     STREAM_NAME: Optional[str] = None
     TEST_USER_EMAIL = 'webhook-bot@zulip.com'
     URL_TEMPLATE: str
@@ -1104,7 +1191,7 @@ class WebhookTestCase(ZulipTestCase):
         fixture_name: str,
         expected_topic: str,
         expected_message: str,
-        content_type: Optional[str]="application/json",
+        content_type: Optional[str] = "application/json",
         **kwargs: Any,
     ) -> None:
         """
@@ -1199,8 +1286,7 @@ class WebhookTestCase(ZulipTestCase):
         url = self.URL_TEMPLATE
         if url.find("api_key") >= 0:
             api_key = get_api_key(self.test_user)
-            url = self.URL_TEMPLATE.format(api_key=api_key,
-                                           stream=self.STREAM_NAME)
+            url = self.URL_TEMPLATE.format(api_key=api_key, stream=self.STREAM_NAME)
         else:
             url = self.URL_TEMPLATE.format(stream=self.STREAM_NAME)
 
@@ -1230,12 +1316,14 @@ class WebhookTestCase(ZulipTestCase):
         orjson.loads(body)
         return body
 
+
 class MigrationsTestCase(ZulipTestCase):  # nocoverage
     """
     Test class for database migrations inspired by this blog post:
        https://www.caktusgroup.com/blog/2016/02/02/writing-unit-tests-django-migrations/
     Documented at https://zulip.readthedocs.io/en/latest/subsystems/schema-migrations.html
     """
+
     @property
     def app(self) -> str:
         return apps.get_containing_app_config(type(self).__module__).name
@@ -1244,8 +1332,9 @@ class MigrationsTestCase(ZulipTestCase):  # nocoverage
     migrate_to: Optional[str] = None
 
     def setUp(self) -> None:
-        assert self.migrate_from and self.migrate_to, \
-            f"TestCase '{type(self).__name__}' must define migrate_from and migrate_to properties"
+        assert (
+            self.migrate_from and self.migrate_to
+        ), f"TestCase '{type(self).__name__}' must define migrate_from and migrate_to properties"
         migrate_from: List[Tuple[str, str]] = [(self.app, self.migrate_from)]
         migrate_to: List[Tuple[str, str]] = [(self.app, self.migrate_to)]
         executor = MigrationExecutor(connection)
diff --git a/zerver/lib/test_console_output.py b/zerver/lib/test_console_output.py
index 58b452e20f..4c932f43e3 100644
--- a/zerver/lib/test_console_output.py
+++ b/zerver/lib/test_console_output.py
@@ -8,30 +8,25 @@ from typing import Iterable, Optional, Type, cast
 class ExtraConsoleOutputInTestException(Exception):
     pass
 
+
 class ExtraConsoleOutputFinder:
     def __init__(self) -> None:
         self.latest_test_name = ""
         valid_line_patterns = [
             # Example: Running zerver.tests.test_attachments.AttachmentsTests.test_delete_unauthenticated
             "^Running ",
-
             # Example: ** Test is TOO slow: analytics.tests.test_counts.TestRealmActiveHumans.test_end_to_end (0.581 s)
             "^\\*\\* Test is TOO slow: ",
             "^----------------------------------------------------------------------",
-
             # Example: INFO: URL coverage report is in var/url_coverage.txt
             "^INFO: URL coverage report is in",
-
             # Example: INFO: Try running: ./tools/create-test-api-docs
             "^INFO: Try running:",
-
             # Example: -- Running tests in parallel mode with 4 processes
             "^-- Running tests in",
             "^OK",
-
             # Example: Ran 2139 tests in 115.659s
             "^Ran [0-9]+ tests in",
-
             # Destroying test database for alias 'default'...
             "^Destroying test database for alias ",
             "^Using existing clone",
@@ -55,12 +50,15 @@ class ExtraConsoleOutputFinder:
             if found_extra_output:
                 self.full_extra_output += f'{line}\n'
 
-class TeeStderrAndFindExtraConsoleOutput():
+
+class TeeStderrAndFindExtraConsoleOutput:
     def __init__(self, extra_output_finder: ExtraConsoleOutputFinder) -> None:
         self.stderr_stream = sys.stderr
 
         # get shared console handler instance from any logger that have it
-        self.console_log_handler = cast(logging.StreamHandler, logging.getLogger('django.server').handlers[0])
+        self.console_log_handler = cast(
+            logging.StreamHandler, logging.getLogger('django.server').handlers[0]
+        )
 
         assert isinstance(self.console_log_handler, logging.StreamHandler)
         assert self.console_log_handler.stream == sys.stderr
@@ -70,9 +68,12 @@ class TeeStderrAndFindExtraConsoleOutput():
         sys.stderr = self  # type: ignore[assignment] # Doing tee by swapping stderr stream with custom file like class
         self.console_log_handler.stream = self  # type: ignore[assignment] # Doing tee by swapping stderr stream with custom file like class
 
-    def __exit__(self, exc_type: Optional[Type[BaseException]],
-                 exc_value: Optional[BaseException],
-                 traceback: Optional[TracebackType]) -> None:
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_value: Optional[BaseException],
+        traceback: Optional[TracebackType],
+    ) -> None:
         sys.stderr = self.stderr_stream
         self.console_log_handler.stream = sys.stderr
 
@@ -88,7 +89,8 @@ class TeeStderrAndFindExtraConsoleOutput():
     def flush(self) -> None:
         self.stderr_stream.flush()
 
-class TeeStdoutAndFindExtraConsoleOutput():
+
+class TeeStdoutAndFindExtraConsoleOutput:
     def __init__(self, extra_output_finder: ExtraConsoleOutputFinder) -> None:
         self.stdout_stream = sys.stdout
         self.extra_output_finder = extra_output_finder
@@ -96,9 +98,12 @@ class TeeStdoutAndFindExtraConsoleOutput():
     def __enter__(self) -> None:
         sys.stdout = self  # type: ignore[assignment] # Doing tee by swapping stderr stream with custom file like class
 
-    def __exit__(self, exc_type: Optional[Type[BaseException]],
-                 exc_value: Optional[BaseException],
-                 traceback: Optional[TracebackType]) -> None:
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_value: Optional[BaseException],
+        traceback: Optional[TracebackType],
+    ) -> None:
         sys.stdout = self.stdout_stream
 
     def write(self, data: str) -> None:
diff --git a/zerver/lib/test_fixtures.py b/zerver/lib/test_fixtures.py
index 70016bb940..72f07b4676 100644
--- a/zerver/lib/test_fixtures.py
+++ b/zerver/lib/test_fixtures.py
@@ -57,12 +57,14 @@ VERBOSE_MESSAGE_ABOUT_HASH_TRANSITION = '''
 
 '''
 
+
 def migration_paths() -> List[str]:
     return [
         *glob.glob('*/migrations/*.py'),
         'requirements/dev.txt',
     ]
 
+
 class Database:
     def __init__(self, platform: str, database_name: str, settings: str):
         self.database_name = database_name
@@ -101,13 +103,9 @@ class Database:
             './manage.py',
         ]
 
-        run([
-            *manage_py, 'migrate', '--no-input'
-        ])
+        run([*manage_py, 'migrate', '--no-input'])
 
-        run([
-            *manage_py, 'get_migration_status', '--output='+self.migration_status_file
-        ])
+        run([*manage_py, 'get_migration_status', '--output=' + self.migration_status_file])
 
     def what_to_do_with_migrations(self) -> str:
         status_fn = self.migration_status_path
@@ -141,7 +139,8 @@ class Database:
 
             with connection.cursor() as cursor:
                 cursor.execute(
-                    "SELECT 1 from pg_database WHERE datname=%s;", [self.database_name],
+                    "SELECT 1 from pg_database WHERE datname=%s;",
+                    [self.database_name],
                 )
                 return_value = bool(cursor.fetchone())
             connections.close_all()
@@ -239,6 +238,7 @@ class Database:
             self.important_settings(),
         )
 
+
 DEV_DATABASE = Database(
     platform='dev',
     database_name='zulip',
@@ -251,7 +251,8 @@ TEST_DATABASE = Database(
     settings='zproject.test_settings',
 )
 
-def update_test_databases_if_required(rebuild_test_database: bool=False) -> None:
+
+def update_test_databases_if_required(rebuild_test_database: bool = False) -> None:
     """Checks whether the zulip_test_template database template, is
     consistent with our database migrations; if not, it updates it
     in the fastest way possible:
@@ -284,6 +285,7 @@ def update_test_databases_if_required(rebuild_test_database: bool=False) -> None
     if rebuild_test_database:
         run(['tools/setup/generate-fixtures'])
 
+
 def get_migration_status(**options: Any) -> str:
     verbosity = options.get('verbosity', 1)
 
@@ -313,10 +315,12 @@ def get_migration_status(**options: Any) -> str:
     output = out.read()
     return re.sub(r'\x1b\[(1|0)m', '', output)
 
+
 def extract_migrations_as_list(migration_status: str) -> List[str]:
     MIGRATIONS_RE = re.compile(r'\[[X| ]\] (\d+_.+)\n')
     return MIGRATIONS_RE.findall(migration_status)
 
+
 def destroy_leaked_test_databases(expiry_time: int = 60 * 60) -> int:
     """The logic in zerver/lib/test_runner.py tries to delete all the
     temporary test databases generated by test-backend threads, but it
@@ -362,11 +366,15 @@ def destroy_leaked_test_databases(expiry_time: int = 60 * 60) -> int:
         return 0
 
     commands = "\n".join(f"DROP DATABASE IF EXISTS {db};" for db in databases_to_drop)
-    subprocess.run(["psql", "-q", "-v", "ON_ERROR_STOP=1", "-h", "localhost",
-                    "postgres", "zulip_test"],
-                   input=commands, check=True, universal_newlines=True)
+    subprocess.run(
+        ["psql", "-q", "-v", "ON_ERROR_STOP=1", "-h", "localhost", "postgres", "zulip_test"],
+        input=commands,
+        check=True,
+        universal_newlines=True,
+    )
     return len(databases_to_drop)
 
+
 def remove_test_run_directories(expiry_time: int = 60 * 60) -> int:
     removed = 0
     directories = glob.glob(os.path.join(UUID_VAR_DIR, "test-backend", "run_*"))
diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py
index 7f741cbb3d..64fb108ee4 100644
--- a/zerver/lib/test_helpers.py
+++ b/zerver/lib/test_helpers.py
@@ -77,19 +77,22 @@ class MockLDAP(fakeldap.MockLDAP):
     class ALREADY_EXISTS(ldap.ALREADY_EXISTS):
         pass
 
+
 @contextmanager
-def stub_event_queue_user_events(event_queue_return: Any, user_events_return: Any) -> Iterator[None]:
-    with mock.patch('zerver.lib.events.request_event_queue',
-                    return_value=event_queue_return):
-        with mock.patch('zerver.lib.events.get_user_events',
-                        return_value=user_events_return):
+def stub_event_queue_user_events(
+    event_queue_return: Any, user_events_return: Any
+) -> Iterator[None]:
+    with mock.patch('zerver.lib.events.request_event_queue', return_value=event_queue_return):
+        with mock.patch('zerver.lib.events.get_user_events', return_value=user_events_return):
             yield
 
+
 @contextmanager
 def simulated_queue_client(client: Callable[..., Any]) -> Iterator[None]:
     with mock.patch.object(queue_processors, 'SimpleQueueClient', client):
         yield
 
+
 @contextmanager
 def tornado_redirected_to_list(lst: List[Mapping[str, Any]]) -> Iterator[None]:
     real_event_queue_process_notification = django_tornado_api.process_notification
@@ -102,6 +105,7 @@ def tornado_redirected_to_list(lst: List[Mapping[str, Any]]) -> Iterator[None]:
     yield
     django_tornado_api.process_notification = real_event_queue_process_notification
 
+
 class EventInfo:
     def populate(self, call_args_list: List[Any]) -> None:
         args = call_args_list[0][0]
@@ -109,6 +113,7 @@ class EventInfo:
         self.payload = args[1]
         self.user_ids = args[2]
 
+
 @contextmanager
 def capture_event(event_info: EventInfo) -> Iterator[None]:
     # Use this for simple endpoints that throw a single event
@@ -124,6 +129,7 @@ def capture_event(event_info: EventInfo) -> Iterator[None]:
 
     event_info.populate(m.call_args_list)
 
+
 @contextmanager
 def cache_tries_captured() -> Iterator[List[Tuple[str, Union[str, List[str]], Optional[str]]]]:
     cache_queries: List[Tuple[str, Union[str, List[str]], Optional[str]]] = []
@@ -131,46 +137,55 @@ def cache_tries_captured() -> Iterator[List[Tuple[str, Union[str, List[str]], Op
     orig_get = cache.cache_get
     orig_get_many = cache.cache_get_many
 
-    def my_cache_get(key: str, cache_name: Optional[str]=None) -> Optional[Dict[str, Any]]:
+    def my_cache_get(key: str, cache_name: Optional[str] = None) -> Optional[Dict[str, Any]]:
         cache_queries.append(('get', key, cache_name))
         return orig_get(key, cache_name)
 
-    def my_cache_get_many(keys: List[str], cache_name: Optional[str]=None) -> Dict[str, Any]:  # nocoverage -- simulated code doesn't use this
+    def my_cache_get_many(
+        keys: List[str], cache_name: Optional[str] = None
+    ) -> Dict[str, Any]:  # nocoverage -- simulated code doesn't use this
         cache_queries.append(('getmany', keys, cache_name))
         return orig_get_many(keys, cache_name)
 
     with mock.patch.multiple(cache, cache_get=my_cache_get, cache_get_many=my_cache_get_many):
         yield cache_queries
 
+
 @contextmanager
 def simulated_empty_cache() -> Iterator[List[Tuple[str, Union[str, List[str]], Optional[str]]]]:
     cache_queries: List[Tuple[str, Union[str, List[str]], Optional[str]]] = []
 
-    def my_cache_get(key: str, cache_name: Optional[str]=None) -> Optional[Dict[str, Any]]:
+    def my_cache_get(key: str, cache_name: Optional[str] = None) -> Optional[Dict[str, Any]]:
         cache_queries.append(('get', key, cache_name))
         return None
 
-    def my_cache_get_many(keys: List[str], cache_name: Optional[str]=None) -> Dict[str, Any]:  # nocoverage -- simulated code doesn't use this
+    def my_cache_get_many(
+        keys: List[str], cache_name: Optional[str] = None
+    ) -> Dict[str, Any]:  # nocoverage -- simulated code doesn't use this
         cache_queries.append(('getmany', keys, cache_name))
         return {}
 
     with mock.patch.multiple(cache, cache_get=my_cache_get, cache_get_many=my_cache_get_many):
         yield cache_queries
 
+
 @contextmanager
-def queries_captured(include_savepoints: bool=False, keep_cache_warm: bool=False) -> Generator[
-        List[Dict[str, Union[str, bytes]]], None, None]:
-    '''
+def queries_captured(
+    include_savepoints: bool = False, keep_cache_warm: bool = False
+) -> Generator[List[Dict[str, Union[str, bytes]]], None, None]:
+    """
     Allow a user to capture just the queries executed during
     the with statement.
-    '''
+    """
 
     queries: List[Dict[str, Union[str, bytes]]] = []
 
-    def wrapper_execute(self: TimeTrackingCursor,
-                        action: Callable[[str, ParamsT], None],
-                        sql: Query,
-                        params: ParamsT) -> None:
+    def wrapper_execute(
+        self: TimeTrackingCursor,
+        action: Callable[[str, ParamsT], None],
+        sql: Query,
+        params: ParamsT,
+    ) -> None:
         start = time.time()
         try:
             return action(sql, params)
@@ -178,25 +193,32 @@ def queries_captured(include_savepoints: bool=False, keep_cache_warm: bool=False
             stop = time.time()
             duration = stop - start
             if include_savepoints or not isinstance(sql, str) or 'SAVEPOINT' not in sql:
-                queries.append({
-                    'sql': self.mogrify(sql, params).decode('utf-8'),
-                    'time': f"{duration:.3f}",
-                })
+                queries.append(
+                    {
+                        'sql': self.mogrify(sql, params).decode('utf-8'),
+                        'time': f"{duration:.3f}",
+                    }
+                )
 
-    def cursor_execute(self: TimeTrackingCursor, sql: Query,
-                       params: Optional[Params]=None) -> None:
+    def cursor_execute(
+        self: TimeTrackingCursor, sql: Query, params: Optional[Params] = None
+    ) -> None:
         return wrapper_execute(self, super(TimeTrackingCursor, self).execute, sql, params)
 
-    def cursor_executemany(self: TimeTrackingCursor, sql: Query,
-                           params: Iterable[Params]) -> None:
-        return wrapper_execute(self, super(TimeTrackingCursor, self).executemany, sql, params)  # nocoverage -- doesn't actually get used in tests
+    def cursor_executemany(self: TimeTrackingCursor, sql: Query, params: Iterable[Params]) -> None:
+        return wrapper_execute(
+            self, super(TimeTrackingCursor, self).executemany, sql, params
+        )  # nocoverage -- doesn't actually get used in tests
 
     if not keep_cache_warm:
         cache = get_cache_backend(None)
         cache.clear()
-    with mock.patch.multiple(TimeTrackingCursor, execute=cursor_execute, executemany=cursor_executemany):
+    with mock.patch.multiple(
+        TimeTrackingCursor, execute=cursor_execute, executemany=cursor_executemany
+    ):
         yield queries
 
+
 @contextmanager
 def stdout_suppressed() -> Iterator[IO[str]]:
     """Redirect stdout to /dev/null."""
@@ -206,31 +228,43 @@ def stdout_suppressed() -> Iterator[IO[str]]:
         yield stdout
         sys.stdout = stdout
 
+
 def reset_emails_in_zulip_realm() -> None:
     realm = get_realm('zulip')
-    do_set_realm_property(realm, 'email_address_visibility',
-                          Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE)
+    do_set_realm_property(
+        realm, 'email_address_visibility', Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE
+    )
+
 
 def get_test_image_file(filename: str) -> IO[Any]:
     test_avatar_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../tests/images'))
     return open(os.path.join(test_avatar_dir, filename), 'rb')
 
-def avatar_disk_path(user_profile: UserProfile, medium: bool=False, original: bool=False) -> str:
+
+def avatar_disk_path(
+    user_profile: UserProfile, medium: bool = False, original: bool = False
+) -> str:
     avatar_url_path = avatar_url(user_profile, medium)
     assert avatar_url_path is not None
-    avatar_disk_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars",
-                                    avatar_url_path.split("/")[-2],
-                                    avatar_url_path.split("/")[-1].split("?")[0])
+    avatar_disk_path = os.path.join(
+        settings.LOCAL_UPLOADS_DIR,
+        "avatars",
+        avatar_url_path.split("/")[-2],
+        avatar_url_path.split("/")[-1].split("?")[0],
+    )
     if original:
         return avatar_disk_path.replace(".png", ".original")
     return avatar_disk_path
 
+
 def make_client(name: str) -> Client:
     client, _ = Client.objects.get_or_create(name=name)
     return client
 
+
 def find_key_by_email(address: str) -> Optional[str]:
     from django.core.mail import outbox
+
     key_regex = re.compile("accounts/do_confirm/([a-z0-9]{24})>")
     for message in reversed(outbox):
         if address in message.to:
@@ -240,40 +274,47 @@ def find_key_by_email(address: str) -> Optional[str]:
             return key
     return None  # nocoverage -- in theory a test might want this case, but none do
 
+
 def message_stream_count(user_profile: UserProfile) -> int:
-    return UserMessage.objects. \
-        select_related("message"). \
-        filter(user_profile=user_profile). \
-        count()
+    return UserMessage.objects.select_related("message").filter(user_profile=user_profile).count()
+
 
 def most_recent_usermessage(user_profile: UserProfile) -> UserMessage:
-    query = UserMessage.objects. \
-        select_related("message"). \
-        filter(user_profile=user_profile). \
-        order_by('-message')
+    query = (
+        UserMessage.objects.select_related("message")
+        .filter(user_profile=user_profile)
+        .order_by('-message')
+    )
     return query[0]  # Django does LIMIT here
 
+
 def most_recent_message(user_profile: UserProfile) -> Message:
     usermessage = most_recent_usermessage(user_profile)
     return usermessage.message
 
+
 def get_subscription(stream_name: str, user_profile: UserProfile) -> Subscription:
     stream = get_stream(stream_name, user_profile.realm)
     recipient_id = stream.recipient_id
-    return Subscription.objects.get(user_profile=user_profile,
-                                    recipient_id=recipient_id, active=True)
+    return Subscription.objects.get(
+        user_profile=user_profile, recipient_id=recipient_id, active=True
+    )
+
 
 def get_user_messages(user_profile: UserProfile) -> List[Message]:
-    query = UserMessage.objects. \
-        select_related("message"). \
-        filter(user_profile=user_profile). \
-        order_by('message')
+    query = (
+        UserMessage.objects.select_related("message")
+        .filter(user_profile=user_profile)
+        .order_by('message')
+    )
     return [um.message for um in query]
 
+
 class DummyHandler(AsyncDjangoHandler):
     def __init__(self) -> None:
         allocate_handler_id(self)
 
+
 class POSTRequestMock:
     method = "POST"
 
@@ -294,11 +335,14 @@ class POSTRequestMock:
         self.META = {'PATH_INFO': 'test'}
         self.path = ''
 
+
 class HostRequestMock:
     """A mock request object where get_host() works.  Useful for testing
     routes that use Zulip's subdomains feature"""
 
-    def __init__(self, user_profile: Optional[UserProfile]=None, host: str=settings.EXTERNAL_HOST) -> None:
+    def __init__(
+        self, user_profile: Optional[UserProfile] = None, host: str = settings.EXTERNAL_HOST
+    ) -> None:
         self.host = host
         self.GET: Dict[str, Any] = {}
         self.POST: Dict[str, Any] = {}
@@ -312,8 +356,11 @@ class HostRequestMock:
     def get_host(self) -> str:
         return self.host
 
+
 class MockPythonResponse:
-    def __init__(self, text: str, status_code: int, headers: Optional[Dict[str, str]]=None) -> None:
+    def __init__(
+        self, text: str, status_code: int, headers: Optional[Dict[str, str]] = None
+    ) -> None:
         self.content = text.encode()
         self.text = text
         self.status_code = status_code
@@ -334,15 +381,19 @@ INSTRUMENTED_CALLS: List[Dict[str, Any]] = []
 
 UrlFuncT = TypeVar("UrlFuncT", bound=Callable[..., HttpResponse])  # TODO: make more specific
 
+
 def append_instrumentation_data(data: Dict[str, Any]) -> None:
     INSTRUMENTED_CALLS.append(data)
 
+
 def instrument_url(f: UrlFuncT) -> UrlFuncT:
     if not INSTRUMENTING:  # nocoverage -- option is always enabled; should we remove?
         return f
     else:
-        def wrapper(self: 'ZulipTestCase', url: str, info: object = {},
-                    **kwargs: Any) -> HttpResponse:
+
+        def wrapper(
+            self: 'ZulipTestCase', url: str, info: object = {}, **kwargs: Any
+        ) -> HttpResponse:
             start = time.time()
             result = f(self, url, info, **kwargs)
             delay = time.time() - start
@@ -362,18 +413,23 @@ def instrument_url(f: UrlFuncT) -> UrlFuncT:
                     for k, v in info.items()
                 }
 
-            append_instrumentation_data(dict(
-                url=url,
-                status_code=result.status_code,
-                method=f.__name__,
-                delay=delay,
-                extra_info=extra_info,
-                info=info,
-                test_name=test_name,
-                kwargs=kwargs))
+            append_instrumentation_data(
+                dict(
+                    url=url,
+                    status_code=result.status_code,
+                    method=f.__name__,
+                    delay=delay,
+                    extra_info=extra_info,
+                    info=info,
+                    test_name=test_name,
+                    kwargs=kwargs,
+                )
+            )
             return result
+
         return cast(UrlFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> None:
     if INSTRUMENTING:
         calls = INSTRUMENTED_CALLS
@@ -394,11 +450,11 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
             if url.startswith('/'):
                 url = url[1:]
             if url.startswith('http://testserver/'):
-                url = url[len('http://testserver/'):]
+                url = url[len('http://testserver/') :]
             if url.startswith('http://zulip.testserver/'):
-                url = url[len('http://zulip.testserver/'):]
+                url = url[len('http://zulip.testserver/') :]
             if url.startswith('http://testserver:9080/'):
-                url = url[len('http://testserver:9080/'):]
+                url = url[len('http://testserver:9080/') :]
             return url
 
         def find_pattern(pattern: Any, prefixes: List[str]) -> None:
@@ -419,7 +475,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
 
                 for prefix in prefixes:
                     if url.startswith(prefix):
-                        match_url = url[len(prefix):]
+                        match_url = url[len(prefix) :]
                         if pattern.resolve(match_url):
                             if call['status_code'] in [200, 204, 301, 302]:
                                 cnt += 1
@@ -467,6 +523,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
                 print(f"   {untested_pattern}")
             sys.exit(1)
 
+
 def load_subdomain_token(response: HttpResponse) -> ExternalAuthDataDict:
     assert isinstance(response, HttpResponseRedirect)
     token = response.url.rsplit('/', 1)[1]
@@ -474,8 +531,10 @@ def load_subdomain_token(response: HttpResponse) -> ExternalAuthDataDict:
     assert data is not None
     return data
 
+
 FuncT = TypeVar('FuncT', bound=Callable[..., None])
 
+
 def use_s3_backend(method: FuncT) -> FuncT:
     @mock_s3
     @override_settings(LOCAL_UPLOADS_DIR=None)
@@ -485,14 +544,17 @@ def use_s3_backend(method: FuncT) -> FuncT:
             return method(*args, **kwargs)
         finally:
             zerver.lib.upload.upload_backend = LocalUploadBackend()
+
     return new_method
 
+
 def create_s3_buckets(*bucket_names: str) -> List[ServiceResource]:
     session = boto3.Session(settings.S3_KEY, settings.S3_SECRET_KEY)
     s3 = session.resource('s3')
     buckets = [s3.create_bucket(Bucket=name) for name in bucket_names]
     return buckets
 
+
 def use_db_models(method: Callable[..., None]) -> Callable[..., None]:  # nocoverage
     def method_patched_with_mock(self: 'MigrationsTestCase', apps: StateApps) -> None:
         ArchivedAttachment = apps.get_model('zerver', 'ArchivedAttachment')
@@ -598,18 +660,19 @@ def use_db_models(method: Callable[..., None]) -> Callable[..., None]:  # nocove
             UserProfile=UserProfile,
         )
 
-        with zerver_models_patch,\
-                zerver_test_helpers_patch,\
-                zerver_test_classes_patch:
+        with zerver_models_patch, zerver_test_helpers_patch, zerver_test_classes_patch:
             method(self, apps)
+
     return method_patched_with_mock
 
+
 def create_dummy_file(filename: str) -> str:
     filepath = os.path.join(settings.TEST_WORKER_DIR, filename)
     with open(filepath, 'w') as f:
         f.write('zulip!')
     return filepath
 
+
 def zulip_reaction_info() -> Dict[str, str]:
     return dict(
         emoji_name='zulip',
@@ -617,10 +680,11 @@ def zulip_reaction_info() -> Dict[str, str]:
         reaction_type='zulip_extra_emoji',
     )
 
+
 @contextmanager
 def mock_queue_publish(
-        method_to_patch: str,
-        **kwargs: object,
+    method_to_patch: str,
+    **kwargs: object,
 ) -> Iterator[mock.MagicMock]:
     inner = mock.MagicMock(**kwargs)
 
@@ -636,11 +700,16 @@ def mock_queue_publish(
     with mock.patch(method_to_patch, side_effect=verify_serialize):
         yield inner
 
-def patch_queue_publish(method_to_patch: str) -> Callable[[Callable[..., None]], Callable[..., None]]:
+
+def patch_queue_publish(
+    method_to_patch: str,
+) -> Callable[[Callable[..., None]], Callable[..., None]]:
     def inner(func: Callable[..., None]) -> Callable[..., None]:
         @wraps(func)
         def _wrapped(*args: object, **kwargs: object) -> None:
             with mock_queue_publish(method_to_patch) as m:
                 func(*args, m, **kwargs)
+
         return _wrapped
+
     return inner
diff --git a/zerver/lib/test_runner.py b/zerver/lib/test_runner.py
index bd8f6662de..155b2f4a34 100644
--- a/zerver/lib/test_runner.py
+++ b/zerver/lib/test_runner.py
@@ -31,17 +31,21 @@ from zerver.lib.test_helpers import append_instrumentation_data, write_instrumen
 # below hack, which fails 1/10000000 of the time.
 random_id_range_start = str(random.randint(1, 10000000))
 
-def get_database_id(worker_id: Optional[int]=None) -> str:
+
+def get_database_id(worker_id: Optional[int] = None) -> str:
     if worker_id:
         return f"{random_id_range_start}_{worker_id}"
     return random_id_range_start
 
+
 # The root directory for this run of the test suite.
 TEST_RUN_DIR = get_or_create_dev_uuid_var_path(
-    os.path.join('test-backend', f'run_{get_database_id()}'))
+    os.path.join('test-backend', f'run_{get_database_id()}')
+)
 
 _worker_id = 0  # Used to identify the worker process.
 
+
 class TextTestResult(runner.TextTestResult):
     """
     This class has unpythonic function names because base class follows
@@ -84,6 +88,7 @@ class TextTestResult(runner.TextTestResult):
         )
         self.stream.flush()
 
+
 class RemoteTestResult(django_runner.RemoteTestResult):
     """
     The class follows the unpythonic style of function names of the
@@ -100,13 +105,16 @@ class RemoteTestResult(django_runner.RemoteTestResult):
 
         self.events.append(('addInstrumentation', self.test_index, data))
 
+
 def process_instrumented_calls(func: Callable[[Dict[str, Any]], None]) -> None:
     for call in test_helpers.INSTRUMENTED_CALLS:
         func(call)
 
+
 SerializedSubsuite = Tuple[Type[TestSuite], List[str]]
 SubsuiteArgs = Tuple[Type['RemoteTestRunner'], int, SerializedSubsuite, bool]
 
+
 def run_subsuite(args: SubsuiteArgs) -> Tuple[int, Any]:
     # Reset the accumulated INSTRUMENTED_CALLS before running this subsuite.
     test_helpers.INSTRUMENTED_CALLS = []
@@ -123,6 +131,7 @@ def run_subsuite(args: SubsuiteArgs) -> Tuple[int, Any]:
     process_instrumented_calls(partial(result.addInstrumentation, None))
     return subsuite_index, result.events
 
+
 # Monkey-patch django.test.runner to allow using multiprocessing
 # inside tests without a “daemonic processes are not allowed to have
 # children” error.
@@ -130,9 +139,11 @@ class NoDaemonContext(multiprocessing.context.ForkContext):
     class Process(multiprocessing.context.ForkProcess):
         daemon = cast(bool, property(lambda self: False, lambda self, value: None))
 
+
 django_runner.multiprocessing = NoDaemonContext()
 
-def destroy_test_databases(worker_id: Optional[int]=None) -> None:
+
+def destroy_test_databases(worker_id: Optional[int] = None) -> None:
     for alias in connections:
         connection = connections[alias]
 
@@ -151,7 +162,9 @@ def destroy_test_databases(worker_id: Optional[int]=None) -> None:
                 query = f"DROP DATABASE IF EXISTS {quoted_name}"
                 cursor.execute(query)
 
-        with mock.patch.object(connection.creation, '_destroy_test_db', monkey_patched_destroy_test_db):
+        with mock.patch.object(
+            connection.creation, '_destroy_test_db', monkey_patched_destroy_test_db
+        ):
             # In the parallel mode, the test databases are created
             # through the N=self.parallel child processes, and in the
             # parent process (which calls `destroy_test_databases`),
@@ -174,6 +187,7 @@ def destroy_test_databases(worker_id: Optional[int]=None) -> None:
             else:
                 connection.creation.destroy_test_db()
 
+
 def create_test_databases(worker_id: int) -> None:
     database_id = get_database_id(worker_id)
     for alias in connections:
@@ -191,6 +205,7 @@ def create_test_databases(worker_id: int) -> None:
         connection.settings_dict.update(settings_dict)
         connection.close()
 
+
 def init_worker(counter: "multiprocessing.sharedctypes._Value") -> None:
     """
     This function runs only under parallel mode. It initializes the
@@ -208,6 +223,7 @@ def init_worker(counter: "multiprocessing.sharedctypes._Value") -> None:
 
     # Clear the cache
     from zerver.lib.cache import get_cache_backend
+
     cache = get_cache_backend(None)
     cache.clear()
 
@@ -220,9 +236,11 @@ def init_worker(counter: "multiprocessing.sharedctypes._Value") -> None:
 
     # We manually update the upload directory path in the URL regex.
     from zproject.dev_urls import avatars_url
+
     new_root = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars")
     avatars_url.default_args['document_root'] = new_root
 
+
 class ParallelTestSuite(django_runner.ParallelTestSuite):
     run_subsuite = run_subsuite
     init_worker = init_worker
@@ -236,6 +254,7 @@ class ParallelTestSuite(django_runner.ParallelTestSuite):
         assert not isinstance(self.subsuites, SubSuiteList)
         self.subsuites: Union[SubSuiteList, List[TestSuite]] = SubSuiteList(self.subsuites)
 
+
 def check_import_error(test_name: str) -> None:
     try:
         # Directly using __import__ is not recommended, but here it gives
@@ -255,12 +274,16 @@ def initialize_worker_path(worker_id: int) -> None:
     # Every process should upload to a separate directory so that
     # race conditions can be avoided.
     settings.LOCAL_UPLOADS_DIR = get_or_create_dev_uuid_var_path(
-        os.path.join("test-backend",
-                     os.path.basename(TEST_RUN_DIR),
-                     os.path.basename(worker_path),
-                     "test_uploads"))
+        os.path.join(
+            "test-backend",
+            os.path.basename(TEST_RUN_DIR),
+            os.path.basename(worker_path),
+            "test_uploads",
+        )
+    )
     settings.SENDFILE_ROOT = os.path.join(settings.LOCAL_UPLOADS_DIR, "files")
 
+
 class Runner(DiscoverRunner):
     parallel_test_suite = ParallelTestSuite
 
@@ -298,9 +321,7 @@ class Runner(DiscoverRunner):
 
         # Write the template database ids to a file that we can
         # reference for cleaning them up if they leak.
-        filepath = os.path.join(get_dev_uuid_var_path(),
-                                TEMPLATE_DATABASE_DIR,
-                                get_database_id())
+        filepath = os.path.join(get_dev_uuid_var_path(), TEMPLATE_DATABASE_DIR, get_database_id())
         os.makedirs(os.path.dirname(filepath), exist_ok=True)
         with open(filepath, "w") as f:
             if self.parallel > 1:
@@ -332,9 +353,7 @@ class Runner(DiscoverRunner):
             destroy_test_databases()
 
         # Clean up our record of which databases this process created.
-        filepath = os.path.join(get_dev_uuid_var_path(),
-                                TEMPLATE_DATABASE_DIR,
-                                get_database_id())
+        filepath = os.path.join(get_dev_uuid_var_path(), TEMPLATE_DATABASE_DIR, get_database_id())
         os.remove(filepath)
 
         # Clean up our test runs root directory.
@@ -344,14 +363,16 @@ class Runner(DiscoverRunner):
             print("Unable to clean up the test run's directory.")
         return super().teardown_test_environment(*args, **kwargs)
 
-    def test_imports(self, test_labels: List[str], suite: Union[TestSuite, ParallelTestSuite]) -> None:
+    def test_imports(
+        self, test_labels: List[str], suite: Union[TestSuite, ParallelTestSuite]
+    ) -> None:
         prefix_old = 'unittest.loader.ModuleImportFailure.'  # Python <= 3.4
         prefix_new = 'unittest.loader._FailedTest.'  # Python > 3.4
         error_prefixes = [prefix_old, prefix_new]
         for test_name in get_test_names(suite):
             for prefix in error_prefixes:
                 if test_name.startswith(prefix):
-                    test_name = test_name[len(prefix):]
+                    test_name = test_name[len(prefix) :]
                     for label in test_labels:
                         # This code block is for Python 3.5 when test label is
                         # directly provided, for example:
@@ -368,11 +389,14 @@ class Runner(DiscoverRunner):
                             break
                     check_import_error(test_name)
 
-    def run_tests(self, test_labels: List[str],
-                  extra_tests: Optional[List[TestCase]]=None,
-                  full_suite: bool=False,
-                  include_webhooks: bool=False,
-                  **kwargs: Any) -> Tuple[bool, List[str]]:
+    def run_tests(
+        self,
+        test_labels: List[str],
+        extra_tests: Optional[List[TestCase]] = None,
+        full_suite: bool = False,
+        include_webhooks: bool = False,
+        **kwargs: Any,
+    ) -> Tuple[bool, List[str]]:
         self.setup_test_environment()
         try:
             suite = self.build_suite(test_labels, extra_tests)
@@ -415,6 +439,7 @@ class Runner(DiscoverRunner):
             write_instrumentation_reports(full_suite=full_suite, include_webhooks=include_webhooks)
         return failed, result.failed_tests
 
+
 def get_test_names(suite: Union[TestSuite, ParallelTestSuite]) -> List[str]:
     if isinstance(suite, ParallelTestSuite):
         # suite is ParallelTestSuite. It will have a subsuites parameter of
@@ -427,6 +452,7 @@ def get_test_names(suite: Union[TestSuite, ParallelTestSuite]) -> List[str]:
     else:
         return [t.id() for t in get_tests_from_suite(suite)]
 
+
 def get_tests_from_suite(suite: TestSuite) -> TestCase:
     for test in suite:
         if isinstance(test, TestSuite):
@@ -434,9 +460,11 @@ def get_tests_from_suite(suite: TestSuite) -> TestCase:
         else:
             yield test
 
+
 def serialize_suite(suite: TestSuite) -> Tuple[Type[TestSuite], List[str]]:
     return type(suite), get_test_names(suite)
 
+
 def deserialize_suite(args: Tuple[Type[TestSuite], List[str]]) -> TestSuite:
     suite_class, test_names = args
     suite = suite_class()
@@ -445,9 +473,11 @@ def deserialize_suite(args: Tuple[Type[TestSuite], List[str]]) -> TestSuite:
         suite.addTest(test)
     return suite
 
+
 class RemoteTestRunner(django_runner.RemoteTestRunner):
     resultclass = RemoteTestResult
 
+
 class SubSuiteList(List[Tuple[Type[TestSuite], List[str]]]):
     """
     This class allows us to avoid changing the main logic of
diff --git a/zerver/lib/tex.py b/zerver/lib/tex.py
index a12ef032e7..e2c76943c0 100644
--- a/zerver/lib/tex.py
+++ b/zerver/lib/tex.py
@@ -8,7 +8,7 @@ from django.conf import settings
 from zerver.lib.storage import static_path
 
 
-def render_tex(tex: str, is_inline: bool=True) -> Optional[str]:
+def render_tex(tex: str, is_inline: bool = True) -> Optional[str]:
     r"""Render a TeX string into HTML using KaTeX
 
     Returns the HTML string, or None if there was some error in the TeX syntax
diff --git a/zerver/lib/thumbnail.py b/zerver/lib/thumbnail.py
index db3c112db5..2d1d005735 100644
--- a/zerver/lib/thumbnail.py
+++ b/zerver/lib/thumbnail.py
@@ -19,9 +19,11 @@ from zthumbor.loaders.helpers import THUMBOR_EXTERNAL_TYPE, THUMBOR_LOCAL_FILE_T
 def is_thumbor_enabled() -> bool:
     return settings.THUMBOR_URL != ''
 
+
 def user_uploads_or_external(url: str) -> bool:
     return not is_safe_url(url, allowed_hosts=None) or url.startswith("/user_uploads/")
 
+
 def get_source_type(url: str) -> str:
     if not url.startswith('/user_uploads/'):
         return THUMBOR_EXTERNAL_TYPE
@@ -31,9 +33,8 @@ def get_source_type(url: str) -> str:
         return THUMBOR_LOCAL_FILE_TYPE
     return THUMBOR_S3_TYPE
 
-def generate_thumbnail_url(path: str,
-                           size: str='0x0',
-                           is_camo_url: bool=False) -> str:
+
+def generate_thumbnail_url(path: str, size: str = '0x0', is_camo_url: bool = False) -> str:
     path = urljoin("/", path)
 
     if not is_thumbor_enabled():
diff --git a/zerver/lib/timeout.py b/zerver/lib/timeout.py
index 043afe4c9a..ded20d61f0 100644
--- a/zerver/lib/timeout.py
+++ b/zerver/lib/timeout.py
@@ -7,29 +7,32 @@ from typing import Any, Callable, Optional, Tuple, Type, TypeVar
 
 # Based on https://code.activestate.com/recipes/483752/
 
+
 class TimeoutExpired(Exception):
     '''Exception raised when a function times out.'''
 
     def __str__(self) -> str:
         return 'Function call timed out.'
 
+
 ResultT = TypeVar('ResultT')
 
+
 def timeout(timeout: float, func: Callable[..., ResultT], *args: Any, **kwargs: Any) -> ResultT:
-    '''Call the function in a separate thread.
-       Return its return value, or raise an exception,
-       within approximately 'timeout' seconds.
+    """Call the function in a separate thread.
+    Return its return value, or raise an exception,
+    within approximately 'timeout' seconds.
 
-       The function may receive a TimeoutExpired exception
-       anywhere in its code, which could have arbitrary
-       unsafe effects (resources not released, etc.).
-       It might also fail to receive the exception and
-       keep running in the background even though
-       timeout() has returned.
+    The function may receive a TimeoutExpired exception
+    anywhere in its code, which could have arbitrary
+    unsafe effects (resources not released, etc.).
+    It might also fail to receive the exception and
+    keep running in the background even though
+    timeout() has returned.
 
-       This may also fail to interrupt functions which are
-       stuck in a long-running primitive interpreter
-       operation.'''
+    This may also fail to interrupt functions which are
+    stuck in a long-running primitive interpreter
+    operation."""
 
     class TimeoutThread(threading.Thread):
         def __init__(self) -> None:
@@ -57,7 +60,8 @@ def timeout(timeout: float, func: Callable[..., ResultT], *args: Any, **kwargs:
             assert self.ident is not None  # Thread should be running; c_long expects int
             tid = ctypes.c_long(self.ident)
             result = ctypes.pythonapi.PyThreadState_SetAsyncExc(
-                tid, ctypes.py_object(TimeoutExpired))
+                tid, ctypes.py_object(TimeoutExpired)
+            )
             if result > 1:
                 # "if it returns a number greater than one, you're in trouble,
                 # and you should call it again with exc=NULL to revert the effect"
diff --git a/zerver/lib/timestamp.py b/zerver/lib/timestamp.py
index dcbc3dee49..31e3abbe53 100644
--- a/zerver/lib/timestamp.py
+++ b/zerver/lib/timestamp.py
@@ -5,38 +5,46 @@ import datetime
 class TimezoneNotUTCException(Exception):
     pass
 
+
 def verify_UTC(dt: datetime.datetime) -> None:
     if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) != datetime.timezone.utc.utcoffset(dt):
         raise TimezoneNotUTCException(f"Datetime {dt} does not have a UTC timezone.")
 
+
 def convert_to_UTC(dt: datetime.datetime) -> datetime.datetime:
     if dt.tzinfo is None:
         return dt.replace(tzinfo=datetime.timezone.utc)
     return dt.astimezone(datetime.timezone.utc)
 
+
 def floor_to_hour(dt: datetime.datetime) -> datetime.datetime:
     verify_UTC(dt)
     return datetime.datetime(*dt.timetuple()[:4], tzinfo=datetime.timezone.utc)
 
+
 def floor_to_day(dt: datetime.datetime) -> datetime.datetime:
     verify_UTC(dt)
     return datetime.datetime(*dt.timetuple()[:3], tzinfo=datetime.timezone.utc)
 
+
 def ceiling_to_hour(dt: datetime.datetime) -> datetime.datetime:
     floor = floor_to_hour(dt)
     if floor == dt:
         return floor
     return floor + datetime.timedelta(hours=1)
 
+
 def ceiling_to_day(dt: datetime.datetime) -> datetime.datetime:
     floor = floor_to_day(dt)
     if floor == dt:
         return floor
     return floor + datetime.timedelta(days=1)
 
+
 def timestamp_to_datetime(timestamp: float) -> datetime.datetime:
     return datetime.datetime.fromtimestamp(float(timestamp), tz=datetime.timezone.utc)
 
+
 def datetime_to_timestamp(dt: datetime.datetime) -> int:
     verify_UTC(dt)
     return calendar.timegm(dt.timetuple())
diff --git a/zerver/lib/timezone.py b/zerver/lib/timezone.py
index 3c96809369..f02489e1bc 100644
--- a/zerver/lib/timezone.py
+++ b/zerver/lib/timezone.py
@@ -17,9 +17,11 @@ def get_canonical_timezone_map() -> Dict[str, str]:
                 canonical[alias] = name
     return canonical
 
+
 def canonicalize_timezone(key: str) -> str:
     return get_canonical_timezone_map().get(key, key)
 
+
 # Note: some of these abbreviations are fundamentally ambiguous (see
 # zerver/tests/test_timezone.py), so you should never rely on them as
 # anything more than a heuristic.
diff --git a/zerver/lib/topic.py b/zerver/lib/topic.py
index 2862754d5f..60e2f6a712 100644
--- a/zerver/lib/topic.py
+++ b/zerver/lib/topic.py
@@ -31,20 +31,22 @@ The following functions are for user-facing APIs
 where we'll want to support "subject" for a while.
 '''
 
+
 def get_topic_from_message_info(message_info: Dict[str, Any]) -> str:
-    '''
+    """
     Use this where you are getting dicts that are based off of messages
     that may come from the outside world, especially from third party
     APIs and bots.
 
     We prefer 'topic' to 'subject' here.  We expect at least one field
     to be present (or the caller must know how to handle KeyError).
-    '''
+    """
     if 'topic' in message_info:
         return message_info['topic']
 
     return message_info['subject']
 
+
 def REQ_topic() -> Optional[str]:
     # REQ handlers really return a REQ, but we
     # lie to make the rest of the type matching work.
@@ -55,6 +57,7 @@ def REQ_topic() -> Optional[str]:
         default=None,
     )
 
+
 '''
 TRY TO KEEP THIS DIVIDING LINE.
 
@@ -68,52 +71,71 @@ using "subject" in the DB sense, and nothing customer facing.
 DB_TOPIC_NAME = "subject"
 MESSAGE__TOPIC = 'message__subject'
 
+
 def topic_match_sa(topic_name: str) -> "ColumnElement[bool]":
     # _sa is short for SQLAlchemy, which we use mostly for
     # queries that search messages
     topic_cond = func.upper(column("subject", Text)) == func.upper(literal(topic_name))
     return topic_cond
 
+
 def topic_column_sa() -> "ColumnElement[str]":
     return column("subject", Text)
 
+
 def filter_by_exact_message_topic(query: QuerySet, message: Message) -> QuerySet:
     topic_name = message.topic_name()
     return query.filter(subject=topic_name)
 
+
 def filter_by_topic_name_via_message(query: QuerySet, topic_name: str) -> QuerySet:
     return query.filter(message__subject__iexact=topic_name)
 
+
 def messages_for_topic(stream_recipient_id: int, topic_name: str) -> QuerySet:
     return Message.objects.filter(
         recipient_id=stream_recipient_id,
         subject__iexact=topic_name,
     )
 
+
 def save_message_for_edit_use_case(message: Message) -> None:
-    message.save(update_fields=[TOPIC_NAME, "content", "rendered_content",
-                                "rendered_content_version", "last_edit_time",
-                                "edit_history", "has_attachment", "has_image",
-                                "has_link", "recipient_id"])
+    message.save(
+        update_fields=[
+            TOPIC_NAME,
+            "content",
+            "rendered_content",
+            "rendered_content_version",
+            "last_edit_time",
+            "edit_history",
+            "has_attachment",
+            "has_image",
+            "has_link",
+            "recipient_id",
+        ]
+    )
 
 
-def user_message_exists_for_topic(user_profile: UserProfile,
-                                  recipient_id: int,
-                                  topic_name: str) -> bool:
+def user_message_exists_for_topic(
+    user_profile: UserProfile, recipient_id: int, topic_name: str
+) -> bool:
     return UserMessage.objects.filter(
         user_profile=user_profile,
         message__recipient_id=recipient_id,
         message__subject__iexact=topic_name,
     ).exists()
 
-def update_messages_for_topic_edit(message: Message,
-                                   propagate_mode: str,
-                                   orig_topic_name: str,
-                                   topic_name: Optional[str],
-                                   new_stream: Optional[Stream],
-                                   old_recipient_id: Optional[int],
-                                   edit_history_event: Dict[str, Any],
-                                   last_edit_time: datetime) -> List[Message]:
+
+def update_messages_for_topic_edit(
+    message: Message,
+    propagate_mode: str,
+    orig_topic_name: str,
+    topic_name: Optional[str],
+    new_stream: Optional[Stream],
+    old_recipient_id: Optional[int],
+    edit_history_event: Dict[str, Any],
+    last_edit_time: datetime,
+) -> List[Message]:
     assert (new_stream and old_recipient_id) or (not new_stream and not old_recipient_id)
 
     if old_recipient_id is not None:
@@ -121,11 +143,11 @@ def update_messages_for_topic_edit(message: Message,
     else:
         recipient_id = message.recipient_id
 
-    propagate_query = Q(recipient_id = recipient_id, subject__iexact = orig_topic_name)
+    propagate_query = Q(recipient_id=recipient_id, subject__iexact=orig_topic_name)
     if propagate_mode == 'change_all':
-        propagate_query = propagate_query & ~Q(id = message.id)
+        propagate_query = propagate_query & ~Q(id=message.id)
     if propagate_mode == 'change_later':
-        propagate_query = propagate_query & Q(id__gt = message.id)
+        propagate_query = propagate_query & Q(id__gt=message.id)
 
     messages = Message.objects.filter(propagate_query).select_related()
 
@@ -160,6 +182,7 @@ def update_messages_for_topic_edit(message: Message,
 
     return messages_list
 
+
 def generate_topic_history_from_db_rows(rows: List[Tuple[str, int]]) -> List[Dict[str, Any]]:
     canonical_topic_names: Dict[str, Tuple[int, str]] = {}
 
@@ -174,12 +197,12 @@ def generate_topic_history_from_db_rows(rows: List[Tuple[str, int]]) -> List[Dic
 
     history = []
     for canonical_topic, (max_message_id, topic_name) in canonical_topic_names.items():
-        history.append(dict(
-            name=topic_name,
-            max_id=max_message_id),
+        history.append(
+            dict(name=topic_name, max_id=max_message_id),
         )
     return sorted(history, key=lambda x: -x['max_id'])
 
+
 def get_topic_history_for_public_stream(recipient_id: int) -> List[Dict[str, Any]]:
     cursor = connection.cursor()
     query = '''
@@ -201,9 +224,10 @@ def get_topic_history_for_public_stream(recipient_id: int) -> List[Dict[str, Any
 
     return generate_topic_history_from_db_rows(rows)
 
-def get_topic_history_for_stream(user_profile: UserProfile,
-                                 recipient_id: int,
-                                 public_history: bool) -> List[Dict[str, Any]]:
+
+def get_topic_history_for_stream(
+    user_profile: UserProfile, recipient_id: int, public_history: bool
+) -> List[Dict[str, Any]]:
     if public_history:
         return get_topic_history_for_public_stream(recipient_id)
 
diff --git a/zerver/lib/topic_mutes.py b/zerver/lib/topic_mutes.py
index 74849e990c..580c926914 100644
--- a/zerver/lib/topic_mutes.py
+++ b/zerver/lib/topic_mutes.py
@@ -10,9 +10,7 @@ from zerver.models import MutedTopic, UserProfile, get_stream
 
 
 def get_topic_mutes(user_profile: UserProfile) -> List[Tuple[str, str, float]]:
-    rows = MutedTopic.objects.filter(
-        user_profile=user_profile
-    ).values(
+    rows = MutedTopic.objects.filter(user_profile=user_profile).values(
         'stream__name',
         'topic_name',
         'date_muted',
@@ -22,11 +20,15 @@ def get_topic_mutes(user_profile: UserProfile) -> List[Tuple[str, str, float]]:
         for row in rows
     ]
 
-def set_topic_mutes(user_profile: UserProfile, muted_topics: List[List[str]],
-                    date_muted: Optional[datetime.datetime]=None) -> None:
-    '''
+
+def set_topic_mutes(
+    user_profile: UserProfile,
+    muted_topics: List[List[str]],
+    date_muted: Optional[datetime.datetime] = None,
+) -> None:
+    """
     This is only used in tests.
-    '''
+    """
 
     MutedTopic.objects.filter(
         user_profile=user_profile,
@@ -46,8 +48,14 @@ def set_topic_mutes(user_profile: UserProfile, muted_topics: List[List[str]],
             date_muted=date_muted,
         )
 
-def add_topic_mute(user_profile: UserProfile, stream_id: int, recipient_id: int, topic_name: str,
-                   date_muted: Optional[datetime.datetime]=None) -> None:
+
+def add_topic_mute(
+    user_profile: UserProfile,
+    stream_id: int,
+    recipient_id: int,
+    topic_name: str,
+    date_muted: Optional[datetime.datetime] = None,
+) -> None:
     if date_muted is None:
         date_muted = timezone_now()
     MutedTopic.objects.create(
@@ -58,6 +66,7 @@ def add_topic_mute(user_profile: UserProfile, stream_id: int, recipient_id: int,
         date_muted=date_muted,
     )
 
+
 def remove_topic_mute(user_profile: UserProfile, stream_id: int, topic_name: str) -> None:
     row = MutedTopic.objects.get(
         user_profile=user_profile,
@@ -66,6 +75,7 @@ def remove_topic_mute(user_profile: UserProfile, stream_id: int, topic_name: str
     )
     row.delete()
 
+
 def topic_is_muted(user_profile: UserProfile, stream_id: int, topic_name: str) -> bool:
     is_muted = MutedTopic.objects.filter(
         user_profile=user_profile,
@@ -74,9 +84,10 @@ def topic_is_muted(user_profile: UserProfile, stream_id: int, topic_name: str) -
     ).exists()
     return is_muted
 
-def exclude_topic_mutes(conditions: List[ClauseElement],
-                        user_profile: UserProfile,
-                        stream_id: Optional[int]) -> List[ClauseElement]:
+
+def exclude_topic_mutes(
+    conditions: List[ClauseElement], user_profile: UserProfile, stream_id: Optional[int]
+) -> List[ClauseElement]:
     query = MutedTopic.objects.filter(
         user_profile=user_profile,
     )
@@ -105,10 +116,9 @@ def exclude_topic_mutes(conditions: List[ClauseElement],
     condition = not_(or_(*list(map(mute_cond, rows))))
     return [*conditions, condition]
 
+
 def build_topic_mute_checker(user_profile: UserProfile) -> Callable[[int, str], bool]:
-    rows = MutedTopic.objects.filter(
-        user_profile=user_profile
-    ).values(
+    rows = MutedTopic.objects.filter(user_profile=user_profile).values(
         'recipient_id',
         'topic_name',
     )
diff --git a/zerver/lib/transfer.py b/zerver/lib/transfer.py
index 91c58a50d3..449eaa8cd0 100644
--- a/zerver/lib/transfer.py
+++ b/zerver/lib/transfer.py
@@ -13,12 +13,14 @@ from zerver.models import Attachment, RealmEmoji, UserProfile
 
 s3backend = S3UploadBackend()
 
+
 def transfer_uploads_to_s3(processes: int) -> None:
     # TODO: Eventually, we'll want to add realm icon and logo
     transfer_avatars_to_s3(processes)
     transfer_message_files_to_s3(processes)
     transfer_emoji_to_s3(processes)
 
+
 def _transfer_avatar_to_s3(user: UserProfile) -> None:
     avatar_path = user_avatar_path(user)
     file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", avatar_path) + ".original"
@@ -29,6 +31,7 @@ def _transfer_avatar_to_s3(user: UserProfile) -> None:
     except FileNotFoundError:
         pass
 
+
 def transfer_avatars_to_s3(processes: int) -> None:
     users = list(UserProfile.objects.all())
     if processes == 1:
@@ -41,16 +44,24 @@ def transfer_avatars_to_s3(processes: int) -> None:
             for out in p.imap_unordered(_transfer_avatar_to_s3, users):
                 pass
 
+
 def _transfer_message_files_to_s3(attachment: Attachment) -> None:
     file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "files", attachment.path_id)
     try:
         with open(file_path, 'rb') as f:
             guessed_type = guess_type(attachment.file_name)[0]
-            upload_image_to_s3(s3backend.uploads_bucket, attachment.path_id, guessed_type, attachment.owner, f.read())
+            upload_image_to_s3(
+                s3backend.uploads_bucket,
+                attachment.path_id,
+                guessed_type,
+                attachment.owner,
+                f.read(),
+            )
             logging.info("Uploaded message file in path %s", file_path)
     except FileNotFoundError:  # nocoverage
         pass
 
+
 def transfer_message_files_to_s3(processes: int) -> None:
     attachments = list(Attachment.objects.all())
     if processes == 1:
@@ -63,6 +74,7 @@ def transfer_message_files_to_s3(processes: int) -> None:
             for out in p.imap_unordered(_transfer_message_files_to_s3, attachments):
                 pass
 
+
 def _transfer_emoji_to_s3(realm_emoji: RealmEmoji) -> None:
     if not realm_emoji.file_name or not realm_emoji.author:
         return  # nocoverage
@@ -78,6 +90,7 @@ def _transfer_emoji_to_s3(realm_emoji: RealmEmoji) -> None:
     except FileNotFoundError:  # nocoverage
         pass
 
+
 def transfer_emoji_to_s3(processes: int) -> None:
     realm_emojis = list(RealmEmoji.objects.filter())
     if processes == 1:
diff --git a/zerver/lib/type_debug.py b/zerver/lib/type_debug.py
index 025702993e..10f30a8de9 100644
--- a/zerver/lib/type_debug.py
+++ b/zerver/lib/type_debug.py
@@ -24,6 +24,7 @@ def get_mapping_type_str(x: Mapping[Any, Any]) -> str:
         else:
             return f'{container_type}([({key_type}, {value_type}), ...])'
 
+
 def get_sequence_type_str(x: Sequence[Any]) -> str:
     container_type = type(x).__name__
     if not x:
@@ -43,8 +44,10 @@ def get_sequence_type_str(x: Sequence[Any]) -> str:
         else:
             return f'{container_type}([{elem_type}, ...])'
 
+
 expansion_blacklist = (str, bytes)
 
+
 def get_type_str(x: Any) -> str:
     if x is None:
         return 'None'
@@ -63,8 +66,10 @@ def get_type_str(x: Any) -> str:
     else:
         return type(x).__name__
 
+
 FuncT = TypeVar('FuncT', bound=Callable[..., object])
 
+
 def print_types_to(file_obj: IO[str]) -> Callable[[FuncT], FuncT]:
     def decorator(func: FuncT) -> FuncT:
         @functools.wraps(func)
@@ -72,13 +77,16 @@ def print_types_to(file_obj: IO[str]) -> Callable[[FuncT], FuncT]:
             arg_types = [get_type_str(arg) for arg in args]
             kwarg_types = [key + "=" + get_type_str(value) for key, value in kwargs.items()]
             ret_val = func(*args, **kwargs)
-            output = "{}({}) -> {}".format(func.__name__,
-                                           ", ".join(arg_types + kwarg_types),
-                                           get_type_str(ret_val))
+            output = "{}({}) -> {}".format(
+                func.__name__, ", ".join(arg_types + kwarg_types), get_type_str(ret_val)
+            )
             print(output, file=file_obj)
             return ret_val
+
         return cast(FuncT, wrapper)  # https://github.com/python/mypy/issues/1927
+
     return decorator
 
+
 def print_types(func: FuncT) -> FuncT:
     return print_types_to(sys.stdout)(func)
diff --git a/zerver/lib/types.py b/zerver/lib/types.py
index 368cf970f9..332b4e825f 100644
--- a/zerver/lib/types.py
+++ b/zerver/lib/types.py
@@ -13,6 +13,7 @@ Validator = Callable[[str, object], ResultT]
 ExtendedValidator = Callable[[str, str, object], str]
 RealmUserValidator = Callable[[int, object, bool], List[int]]
 
+
 class ProfileDataElementBase(TypedDict):
     id: int
     name: str
@@ -21,10 +22,12 @@ class ProfileDataElementBase(TypedDict):
     field_data: Optional[str]
     order: int
 
+
 class ProfileDataElement(ProfileDataElementBase):
     value: str
     rendered_value: Optional[str]
 
+
 ProfileData = List[ProfileDataElement]
 
 FieldElement = Tuple[int, Promise, Validator[Union[int, str, List[int]]], Callable[[Any], Any], str]
@@ -33,9 +36,12 @@ UserFieldElement = Tuple[int, Promise, RealmUserValidator, Callable[[Any], Any],
 
 ProfileFieldData = Dict[str, Union[Dict[str, str], str]]
 
+
 class UserDisplayRecipient(TypedDict):
     email: str
     full_name: str
     id: int
     is_mirror_dummy: bool
+
+
 DisplayRecipientT = Union[str, List[UserDisplayRecipient]]
diff --git a/zerver/lib/unminify.py b/zerver/lib/unminify.py
index ec789746de..e39009227f 100644
--- a/zerver/lib/unminify.py
+++ b/zerver/lib/unminify.py
@@ -15,8 +15,8 @@ class SourceMap:
         self._indices: Dict[str, sourcemap.SourceMapDecoder] = {}
 
     def _index_for(self, minified_src: str) -> sourcemap.SourceMapDecoder:
-        '''Return the source map index for minified_src, loading it if not
-           already loaded.'''
+        """Return the source map index for minified_src, loading it if not
+        already loaded."""
 
         # Prevent path traversal
         assert ".." not in minified_src and "/" not in minified_src
@@ -54,12 +54,12 @@ class SourceMap:
                 gen_line, gen_col = list(map(int, match.groups()[1:3]))
                 # The sourcemap lib is 0-based, so subtract 1 from line and col.
                 try:
-                    result = index.lookup(line=gen_line-1, column=gen_col-1)
+                    result = index.lookup(line=gen_line - 1, column=gen_col - 1)
                     display_src = result.src
                     if display_src is not None:
                         webpack_prefix = "webpack:///"
                         if display_src.startswith(webpack_prefix):
-                            display_src = display_src[len(webpack_prefix):]
+                            display_src = display_src[len(webpack_prefix) :]
                         out += f'       = {display_src} line {result.src_line+1} column {result.src_col+1}\n'
                 except IndexError:
                     out += '       [Unable to look up in source map]\n'
diff --git a/zerver/lib/upload.py b/zerver/lib/upload.py
index 1e88fd2a64..53cc1cbee6 100644
--- a/zerver/lib/upload.py
+++ b/zerver/lib/upload.py
@@ -74,9 +74,11 @@ INLINE_MIME_TYPES = [
 # "file name" is the original filename provided by the user run
 # through a sanitization function.
 
+
 class RealmUploadQuotaError(JsonableError):
     code = ErrorCode.REALM_UPLOAD_QUOTA
 
+
 def sanitize_name(value: str) -> str:
     """
     Sanitizes a value to be safe to store in a Linux filesystem, in
@@ -94,9 +96,11 @@ def sanitize_name(value: str) -> str:
     assert value not in {'', '.', '..'}
     return mark_safe(value)
 
+
 class BadImageError(JsonableError):
     code = ErrorCode.BAD_IMAGE
 
+
 name_to_tag_num = {name: num for num, name in ExifTags.TAGS.items()}
 
 # https://stackoverflow.com/a/6218425
@@ -119,7 +123,8 @@ def exif_rotate(image: Image) -> Image:
 
     return image
 
-def resize_avatar(image_data: bytes, size: int=DEFAULT_AVATAR_SIZE) -> bytes:
+
+def resize_avatar(image_data: bytes, size: int = DEFAULT_AVATAR_SIZE) -> bytes:
     try:
         im = Image.open(io.BytesIO(image_data))
         im = exif_rotate(im)
@@ -134,11 +139,12 @@ def resize_avatar(image_data: bytes, size: int=DEFAULT_AVATAR_SIZE) -> bytes:
     im.save(out, format='png')
     return out.getvalue()
 
+
 def resize_logo(image_data: bytes) -> bytes:
     try:
         im = Image.open(io.BytesIO(image_data))
         im = exif_rotate(im)
-        im.thumbnail((8*DEFAULT_AVATAR_SIZE, DEFAULT_AVATAR_SIZE), Image.ANTIALIAS)
+        im.thumbnail((8 * DEFAULT_AVATAR_SIZE, DEFAULT_AVATAR_SIZE), Image.ANTIALIAS)
     except OSError:
         raise BadImageError(_("Could not decode image; did you upload an image file?"))
     except DecompressionBombError:
@@ -150,7 +156,7 @@ def resize_logo(image_data: bytes) -> bytes:
     return out.getvalue()
 
 
-def resize_gif(im: GifImageFile, size: int=DEFAULT_EMOJI_SIZE) -> bytes:
+def resize_gif(im: GifImageFile, size: int = DEFAULT_EMOJI_SIZE) -> bytes:
     frames = []
     duration_info = []
     disposals = []
@@ -165,15 +171,20 @@ def resize_gif(im: GifImageFile, size: int=DEFAULT_EMOJI_SIZE) -> bytes:
         duration_info.append(im.info['duration'])
         disposals.append(im.disposal_method)
     out = io.BytesIO()
-    frames[0].save(out, save_all=True, optimize=False,
-                   format="GIF", append_images=frames[1:],
-                   duration=duration_info,
-                   disposal=disposals,
-                   loop=loop)
+    frames[0].save(
+        out,
+        save_all=True,
+        optimize=False,
+        format="GIF",
+        append_images=frames[1:],
+        duration=duration_info,
+        disposal=disposals,
+        loop=loop,
+    )
     return out.getvalue()
 
 
-def resize_emoji(image_data: bytes, size: int=DEFAULT_EMOJI_SIZE) -> bytes:
+def resize_emoji(image_data: bytes, size: int = DEFAULT_EMOJI_SIZE) -> bytes:
     try:
         im = Image.open(io.BytesIO(image_data))
         image_format = im.format
@@ -183,9 +194,9 @@ def resize_emoji(image_data: bytes, size: int=DEFAULT_EMOJI_SIZE) -> bytes:
             # only resize under certain conditions to minimize the chance of
             # creating ugly gifs.
             should_resize = (
-                im.size[0] != im.size[1]                             # not square
-                or im.size[0] > MAX_EMOJI_GIF_SIZE                   # dimensions too large
-                or len(image_data) > MAX_EMOJI_GIF_FILE_SIZE_BYTES   # filesize too large
+                im.size[0] != im.size[1]  # not square
+                or im.size[0] > MAX_EMOJI_GIF_SIZE  # dimensions too large
+                or len(image_data) > MAX_EMOJI_GIF_FILE_SIZE_BYTES  # filesize too large
             )
             return resize_gif(im, size) if should_resize else image_data
         else:
@@ -202,17 +213,26 @@ def resize_emoji(image_data: bytes, size: int=DEFAULT_EMOJI_SIZE) -> bytes:
 
 ### Common
 
+
 class ZulipUploadBackend:
-    def upload_message_file(self, uploaded_file_name: str, uploaded_file_size: int,
-                            content_type: Optional[str], file_data: bytes,
-                            user_profile: UserProfile,
-                            target_realm: Optional[Realm]=None) -> str:
+    def upload_message_file(
+        self,
+        uploaded_file_name: str,
+        uploaded_file_size: int,
+        content_type: Optional[str],
+        file_data: bytes,
+        user_profile: UserProfile,
+        target_realm: Optional[Realm] = None,
+    ) -> str:
         raise NotImplementedError()
 
-    def upload_avatar_image(self, user_file: File,
-                            acting_user_profile: UserProfile,
-                            target_user_profile: UserProfile,
-                            content_type: Optional[str]=None) -> None:
+    def upload_avatar_image(
+        self,
+        user_file: File,
+        acting_user_profile: UserProfile,
+        target_user_profile: UserProfile,
+        content_type: Optional[str] = None,
+    ) -> None:
         raise NotImplementedError()
 
     def delete_avatar_image(self, user: UserProfile) -> None:
@@ -221,7 +241,7 @@ class ZulipUploadBackend:
     def delete_message_image(self, path_id: str) -> bool:
         raise NotImplementedError()
 
-    def get_avatar_url(self, hash_key: str, medium: bool=False) -> str:
+    def get_avatar_url(self, hash_key: str, medium: bool = False) -> str:
         raise NotImplementedError()
 
     def copy_avatar(self, source_profile: UserProfile, target_profile: UserProfile) -> None:
@@ -239,21 +259,28 @@ class ZulipUploadBackend:
     def get_realm_icon_url(self, realm_id: int, version: int) -> str:
         raise NotImplementedError()
 
-    def upload_realm_logo_image(self, logo_file: File, user_profile: UserProfile,
-                                night: bool) -> None:
+    def upload_realm_logo_image(
+        self, logo_file: File, user_profile: UserProfile, night: bool
+    ) -> None:
         raise NotImplementedError()
 
     def get_realm_logo_url(self, realm_id: int, version: int, night: bool) -> str:
         raise NotImplementedError()
 
-    def upload_emoji_image(self, emoji_file: File, emoji_file_name: str, user_profile: UserProfile) -> None:
+    def upload_emoji_image(
+        self, emoji_file: File, emoji_file_name: str, user_profile: UserProfile
+    ) -> None:
         raise NotImplementedError()
 
     def get_emoji_url(self, emoji_file_name: str, realm_id: int) -> str:
         raise NotImplementedError()
 
-    def upload_export_tarball(self, realm: Realm, tarball_path: str,
-                              percent_callback: Optional[Callable[[Any], None]]=None) -> str:
+    def upload_export_tarball(
+        self,
+        realm: Realm,
+        tarball_path: str,
+        percent_callback: Optional[Callable[[Any], None]] = None,
+    ) -> str:
         raise NotImplementedError()
 
     def delete_export_tarball(self, export_path: str) -> Optional[str]:
@@ -265,24 +292,29 @@ class ZulipUploadBackend:
     def realm_avatar_and_logo_path(self, realm: Realm) -> str:
         raise NotImplementedError()
 
+
 ### S3
 
-def get_bucket(bucket_name: str, session: Optional[Session]=None) -> ServiceResource:
+
+def get_bucket(bucket_name: str, session: Optional[Session] = None) -> ServiceResource:
     # See https://github.com/python/typeshed/issues/2706
     # for why this return type is a `ServiceResource`.
     if session is None:
         session = boto3.Session(settings.S3_KEY, settings.S3_SECRET_KEY)
-    bucket = session.resource('s3', region_name=settings.S3_REGION,
-                              endpoint_url=settings.S3_ENDPOINT_URL).Bucket(bucket_name)
+    bucket = session.resource(
+        's3', region_name=settings.S3_REGION, endpoint_url=settings.S3_ENDPOINT_URL
+    ).Bucket(bucket_name)
     return bucket
 
+
 def upload_image_to_s3(
-        # See https://github.com/python/typeshed/issues/2706
-        bucket: ServiceResource,
-        file_name: str,
-        content_type: Optional[str],
-        user_profile: UserProfile,
-        contents: bytes) -> None:
+    # See https://github.com/python/typeshed/issues/2706
+    bucket: ServiceResource,
+    file_name: str,
+    content_type: Optional[str],
+    user_profile: UserProfile,
+    contents: bytes,
+) -> None:
     key = bucket.Object(file_name)
     metadata = {
         "user_profile_id": str(user_profile.id),
@@ -295,8 +327,13 @@ def upload_image_to_s3(
     if content_type not in INLINE_MIME_TYPES:
         content_disposition = "attachment"
 
-    key.put(Body=contents, Metadata=metadata, ContentType=content_type,
-            ContentDisposition=content_disposition)
+    key.put(
+        Body=contents,
+        Metadata=metadata,
+        ContentType=content_type,
+        ContentDisposition=content_disposition,
+    )
+
 
 def check_upload_within_quota(realm: Realm, uploaded_file_size: int) -> None:
     upload_quota = realm.upload_quota_bytes()
@@ -306,6 +343,7 @@ def check_upload_within_quota(realm: Realm, uploaded_file_size: int) -> None:
     if (used_space + uploaded_file_size) > upload_quota:
         raise RealmUploadQuotaError(_("Upload would exceed your organization's upload quota."))
 
+
 def get_file_info(request: HttpRequest, user_file: File) -> Tuple[str, int, Optional[str]]:
 
     uploaded_file_name = user_file.name
@@ -326,16 +364,20 @@ def get_file_info(request: HttpRequest, user_file: File) -> Tuple[str, int, Opti
 
 
 def get_signed_upload_url(path: str) -> str:
-    client = boto3.client('s3', aws_access_key_id=settings.S3_KEY,
-                          aws_secret_access_key=settings.S3_SECRET_KEY,
-                          region_name=settings.S3_REGION,
-                          endpoint_url=settings.S3_ENDPOINT_URL)
-    return client.generate_presigned_url(ClientMethod='get_object',
-                                         Params={
-                                             'Bucket': settings.S3_AUTH_UPLOADS_BUCKET,
-                                             'Key': path},
-                                         ExpiresIn=SIGNED_UPLOAD_URL_DURATION,
-                                         HttpMethod='GET')
+    client = boto3.client(
+        's3',
+        aws_access_key_id=settings.S3_KEY,
+        aws_secret_access_key=settings.S3_SECRET_KEY,
+        region_name=settings.S3_REGION,
+        endpoint_url=settings.S3_ENDPOINT_URL,
+    )
+    return client.generate_presigned_url(
+        ClientMethod='get_object',
+        Params={'Bucket': settings.S3_AUTH_UPLOADS_BUCKET, 'Key': path},
+        ExpiresIn=SIGNED_UPLOAD_URL_DURATION,
+        HttpMethod='GET',
+    )
+
 
 class S3UploadBackend(ZulipUploadBackend):
     def __init__(self) -> None:
@@ -343,7 +385,8 @@ class S3UploadBackend(ZulipUploadBackend):
 
         self.avatar_bucket = get_bucket(settings.S3_AVATAR_BUCKET, self.session)
         network_location = urllib.parse.urlparse(
-            self.avatar_bucket.meta.client.meta.endpoint_url).netloc
+            self.avatar_bucket.meta.client.meta.endpoint_url
+        ).netloc
         self.avatar_bucket_url = f"https://{self.avatar_bucket.name}.{network_location}"
 
         self.uploads_bucket = get_bucket(settings.S3_AUTH_UPLOADS_BUCKET, self.session)
@@ -355,21 +398,31 @@ class S3UploadBackend(ZulipUploadBackend):
             key.load()
         except botocore.exceptions.ClientError:
             file_name = path_id.split("/")[-1]
-            logging.warning("%s does not exist. Its entry in the database will be removed.", file_name)
+            logging.warning(
+                "%s does not exist. Its entry in the database will be removed.", file_name
+            )
             return False
         key.delete()
         return True
 
-    def upload_message_file(self, uploaded_file_name: str, uploaded_file_size: int,
-                            content_type: Optional[str], file_data: bytes,
-                            user_profile: UserProfile, target_realm: Optional[Realm]=None) -> str:
+    def upload_message_file(
+        self,
+        uploaded_file_name: str,
+        uploaded_file_size: int,
+        content_type: Optional[str],
+        file_data: bytes,
+        user_profile: UserProfile,
+        target_realm: Optional[Realm] = None,
+    ) -> str:
         if target_realm is None:
             target_realm = user_profile.realm
-        s3_file_name = "/".join([
-            str(target_realm.id),
-            secrets.token_urlsafe(18),
-            sanitize_name(uploaded_file_name),
-        ])
+        s3_file_name = "/".join(
+            [
+                str(target_realm.id),
+                secrets.token_urlsafe(18),
+                sanitize_name(uploaded_file_name),
+            ]
+        )
         url = f"/user_uploads/{s3_file_name}"
 
         upload_image_to_s3(
@@ -386,8 +439,13 @@ class S3UploadBackend(ZulipUploadBackend):
     def delete_message_image(self, path_id: str) -> bool:
         return self.delete_file_from_s3(path_id, self.uploads_bucket)
 
-    def write_avatar_images(self, s3_file_name: str, target_user_profile: UserProfile,
-                            image_data: bytes, content_type: Optional[str]) -> None:
+    def write_avatar_images(
+        self,
+        s3_file_name: str,
+        target_user_profile: UserProfile,
+        image_data: bytes,
+        content_type: Optional[str],
+    ) -> None:
         upload_image_to_s3(
             self.avatar_bucket,
             s3_file_name + ".original",
@@ -417,17 +475,19 @@ class S3UploadBackend(ZulipUploadBackend):
         # See avatar_url in avatar.py for URL.  (That code also handles the case
         # that users use gravatar.)
 
-    def upload_avatar_image(self, user_file: File,
-                            acting_user_profile: UserProfile,
-                            target_user_profile: UserProfile,
-                            content_type: Optional[str] = None) -> None:
+    def upload_avatar_image(
+        self,
+        user_file: File,
+        acting_user_profile: UserProfile,
+        target_user_profile: UserProfile,
+        content_type: Optional[str] = None,
+    ) -> None:
         if content_type is None:
             content_type = guess_type(user_file.name)[0]
         s3_file_name = user_avatar_path(target_user_profile)
 
         image_data = user_file.read()
-        self.write_avatar_images(s3_file_name, target_user_profile,
-                                 image_data, content_type)
+        self.write_avatar_images(s3_file_name, target_user_profile, image_data, content_type)
 
     def delete_avatar_image(self, user: UserProfile) -> None:
         path_id = user_avatar_path(user)
@@ -452,7 +512,7 @@ class S3UploadBackend(ZulipUploadBackend):
 
         self.write_avatar_images(s3_target_file_name, target_profile, image_data, content_type)
 
-    def get_avatar_url(self, hash_key: str, medium: bool=False) -> str:
+    def get_avatar_url(self, hash_key: str, medium: bool = False) -> str:
         medium_suffix = "-medium.png" if medium else ""
         # ?x=x allows templates to append additional parameters with &s
         return f"{self.avatar_bucket_url}/{hash_key}{medium_suffix}?x=x"
@@ -492,8 +552,9 @@ class S3UploadBackend(ZulipUploadBackend):
         # ?x=x allows templates to append additional parameters with &s
         return f"{self.avatar_bucket_url}/{realm_id}/realm/icon.png?version={version}"
 
-    def upload_realm_logo_image(self, logo_file: File, user_profile: UserProfile,
-                                night: bool) -> None:
+    def upload_realm_logo_image(
+        self, logo_file: File, user_profile: UserProfile, night: bool
+    ) -> None:
         content_type = guess_type(logo_file.name)[0]
         if night:
             basename = 'night_logo'
@@ -563,8 +624,9 @@ class S3UploadBackend(ZulipUploadBackend):
             resized_avatar,
         )
 
-    def upload_emoji_image(self, emoji_file: File, emoji_file_name: str,
-                           user_profile: UserProfile) -> None:
+    def upload_emoji_image(
+        self, emoji_file: File, emoji_file_name: str, user_profile: UserProfile
+    ) -> None:
         content_type = guess_type(emoji_file.name)[0]
         emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
             realm_id=user_profile.realm_id,
@@ -589,24 +651,33 @@ class S3UploadBackend(ZulipUploadBackend):
         )
 
     def get_emoji_url(self, emoji_file_name: str, realm_id: int) -> str:
-        emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(realm_id=realm_id,
-                                                        emoji_file_name=emoji_file_name)
+        emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
+            realm_id=realm_id, emoji_file_name=emoji_file_name
+        )
         return f"{self.avatar_bucket_url}/{emoji_path}"
 
-    def upload_export_tarball(self, realm: Optional[Realm], tarball_path: str,
-                              percent_callback: Optional[Callable[[Any], None]]=None) -> str:
+    def upload_export_tarball(
+        self,
+        realm: Optional[Realm],
+        tarball_path: str,
+        percent_callback: Optional[Callable[[Any], None]] = None,
+    ) -> str:
         # We use the avatar bucket, because it's world-readable.
-        key = self.avatar_bucket.Object(os.path.join("exports", secrets.token_hex(16),
-                                                     os.path.basename(tarball_path)))
+        key = self.avatar_bucket.Object(
+            os.path.join("exports", secrets.token_hex(16), os.path.basename(tarball_path))
+        )
 
         key.upload_file(tarball_path, Callback=percent_callback)
 
         session = botocore.session.get_session()
         config = Config(signature_version=botocore.UNSIGNED)
 
-        public_url = session.create_client('s3', region_name=settings.S3_REGION,
-                                           endpoint_url=settings.S3_ENDPOINT_URL,
-                                           config=config).generate_presigned_url(
+        public_url = session.create_client(
+            's3',
+            region_name=settings.S3_REGION,
+            endpoint_url=settings.S3_ENDPOINT_URL,
+            config=config,
+        ).generate_presigned_url(
             'get_object',
             Params={
                 'Bucket': self.avatar_bucket.name,
@@ -623,8 +694,10 @@ class S3UploadBackend(ZulipUploadBackend):
             return export_path
         return None
 
+
 ### Local
 
+
 def write_local_file(type: str, path: str, file_data: bytes) -> None:
     file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, type, path)
 
@@ -632,11 +705,13 @@ def write_local_file(type: str, path: str, file_data: bytes) -> None:
     with open(file_path, 'wb') as f:
         f.write(file_data)
 
+
 def read_local_file(type: str, path: str) -> bytes:
     file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, type, path)
     with open(file_path, 'rb') as f:
         return f.read()
 
+
 def delete_local_file(type: str, path: str) -> bool:
     file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, type, path)
     if os.path.isfile(file_path):
@@ -647,6 +722,7 @@ def delete_local_file(type: str, path: str) -> bool:
     logging.warning("%s does not exist. Its entry in the database will be removed.", file_name)
     return False
 
+
 def get_local_file_path(path_id: str) -> Optional[str]:
     local_path = os.path.join(settings.LOCAL_UPLOADS_DIR, 'files', path_id)
     if os.path.isfile(local_path):
@@ -654,8 +730,10 @@ def get_local_file_path(path_id: str) -> Optional[str]:
     else:
         return None
 
+
 LOCAL_FILE_ACCESS_TOKEN_SALT = "local_file_"
 
+
 def generate_unauthed_file_access_url(path_id: str) -> str:
     signed_data = TimestampSigner(salt=LOCAL_FILE_ACCESS_TOKEN_SALT).sign(path_id)
     token = base64.b16encode(signed_data.encode('utf-8')).decode('utf-8')
@@ -663,6 +741,7 @@ def generate_unauthed_file_access_url(path_id: str) -> str:
     filename = path_id.split('/')[-1]
     return reverse('local_file_unauthed', args=[token, filename])
 
+
 def get_local_file_path_id_from_token(token: str) -> Optional[str]:
     signer = TimestampSigner(salt=LOCAL_FILE_ACCESS_TOKEN_SALT)
     try:
@@ -673,17 +752,26 @@ def get_local_file_path_id_from_token(token: str) -> Optional[str]:
 
     return path_id
 
+
 class LocalUploadBackend(ZulipUploadBackend):
-    def upload_message_file(self, uploaded_file_name: str, uploaded_file_size: int,
-                            content_type: Optional[str], file_data: bytes,
-                            user_profile: UserProfile, target_realm: Optional[Realm]=None) -> str:
+    def upload_message_file(
+        self,
+        uploaded_file_name: str,
+        uploaded_file_size: int,
+        content_type: Optional[str],
+        file_data: bytes,
+        user_profile: UserProfile,
+        target_realm: Optional[Realm] = None,
+    ) -> str:
         # Split into 256 subdirectories to prevent directories from getting too big
-        path = "/".join([
-            str(user_profile.realm_id),
-            format(random.randint(0, 255), 'x'),
-            secrets.token_urlsafe(18),
-            sanitize_name(uploaded_file_name),
-        ])
+        path = "/".join(
+            [
+                str(user_profile.realm_id),
+                format(random.randint(0, 255), 'x'),
+                secrets.token_urlsafe(18),
+                sanitize_name(uploaded_file_name),
+            ]
+        )
 
         write_local_file('files', path, file_data)
         create_attachment(uploaded_file_name, path, user_profile, uploaded_file_size)
@@ -701,10 +789,13 @@ class LocalUploadBackend(ZulipUploadBackend):
         resized_medium = resize_avatar(image_data, MEDIUM_AVATAR_SIZE)
         write_local_file('avatars', file_path + '-medium.png', resized_medium)
 
-    def upload_avatar_image(self, user_file: File,
-                            acting_user_profile: UserProfile,
-                            target_user_profile: UserProfile,
-                            content_type: Optional[str] = None) -> None:
+    def upload_avatar_image(
+        self,
+        user_file: File,
+        acting_user_profile: UserProfile,
+        target_user_profile: UserProfile,
+        content_type: Optional[str] = None,
+    ) -> None:
         file_path = user_avatar_path(target_user_profile)
 
         image_data = user_file.read()
@@ -717,7 +808,7 @@ class LocalUploadBackend(ZulipUploadBackend):
         delete_local_file("avatars", path_id + ".png")
         delete_local_file("avatars", path_id + "-medium.png")
 
-    def get_avatar_url(self, hash_key: str, medium: bool=False) -> str:
+    def get_avatar_url(self, hash_key: str, medium: bool = False) -> str:
         # ?x=x allows templates to append additional parameters with &s
         medium_suffix = "-medium" if medium else ""
         return f"/user_avatars/{hash_key}{medium_suffix}.png?x=x"
@@ -735,10 +826,7 @@ class LocalUploadBackend(ZulipUploadBackend):
     def upload_realm_icon_image(self, icon_file: File, user_profile: UserProfile) -> None:
         upload_path = self.realm_avatar_and_logo_path(user_profile.realm)
         image_data = icon_file.read()
-        write_local_file(
-            upload_path,
-            'icon.original',
-            image_data)
+        write_local_file(upload_path, 'icon.original', image_data)
 
         resized_data = resize_avatar(image_data)
         write_local_file(upload_path, 'icon.png', resized_data)
@@ -747,8 +835,9 @@ class LocalUploadBackend(ZulipUploadBackend):
         # ?x=x allows templates to append additional parameters with &s
         return f"/user_avatars/{realm_id}/realm/icon.png?version={version}"
 
-    def upload_realm_logo_image(self, logo_file: File, user_profile: UserProfile,
-                                night: bool) -> None:
+    def upload_realm_logo_image(
+        self, logo_file: File, user_profile: UserProfile, night: bool
+    ) -> None:
         upload_path = self.realm_avatar_and_logo_path(user_profile.realm)
         if night:
             original_file = 'night_logo.original'
@@ -757,10 +846,7 @@ class LocalUploadBackend(ZulipUploadBackend):
             original_file = 'logo.original'
             resized_file = 'logo.png'
         image_data = logo_file.read()
-        write_local_file(
-            upload_path,
-            original_file,
-            image_data)
+        write_local_file(upload_path, original_file, image_data)
 
         resized_data = resize_logo(image_data)
         write_local_file(upload_path, resized_file, resized_data)
@@ -800,31 +886,31 @@ class LocalUploadBackend(ZulipUploadBackend):
         resized_avatar = resize_avatar(image_data)
         write_local_file('avatars', file_path + '.png', resized_avatar)
 
-    def upload_emoji_image(self, emoji_file: File, emoji_file_name: str,
-                           user_profile: UserProfile) -> None:
+    def upload_emoji_image(
+        self, emoji_file: File, emoji_file_name: str, user_profile: UserProfile
+    ) -> None:
         emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
-            realm_id= user_profile.realm_id,
+            realm_id=user_profile.realm_id,
             emoji_file_name=emoji_file_name,
         )
 
         image_data = emoji_file.read()
         resized_image_data = resize_emoji(image_data)
-        write_local_file(
-            'avatars',
-            ".".join((emoji_path, "original")),
-            image_data)
-        write_local_file(
-            'avatars',
-            emoji_path,
-            resized_image_data)
+        write_local_file('avatars', ".".join((emoji_path, "original")), image_data)
+        write_local_file('avatars', emoji_path, resized_image_data)
 
     def get_emoji_url(self, emoji_file_name: str, realm_id: int) -> str:
         return os.path.join(
             "/user_avatars",
-            RealmEmoji.PATH_ID_TEMPLATE.format(realm_id=realm_id, emoji_file_name=emoji_file_name))
+            RealmEmoji.PATH_ID_TEMPLATE.format(realm_id=realm_id, emoji_file_name=emoji_file_name),
+        )
 
-    def upload_export_tarball(self, realm: Realm, tarball_path: str,
-                              percent_callback: Optional[Callable[[Any], None]]=None) -> str:
+    def upload_export_tarball(
+        self,
+        realm: Realm,
+        tarball_path: str,
+        percent_callback: Optional[Callable[[Any], None]] = None,
+    ) -> str:
         path = os.path.join(
             'exports',
             str(realm.id),
@@ -849,48 +935,74 @@ class LocalUploadBackend(ZulipUploadBackend):
         # export_path has a leading `/`
         return realm.uri + export_path
 
+
 # Common and wrappers
 if settings.LOCAL_UPLOADS_DIR is not None:
     upload_backend: ZulipUploadBackend = LocalUploadBackend()
 else:
     upload_backend = S3UploadBackend()  # nocoverage
 
+
 def delete_message_image(path_id: str) -> bool:
     return upload_backend.delete_message_image(path_id)
 
-def upload_avatar_image(user_file: File, acting_user_profile: UserProfile,
-                        target_user_profile: UserProfile,
-                        content_type: Optional[str]=None) -> None:
-    upload_backend.upload_avatar_image(user_file, acting_user_profile,
-                                       target_user_profile, content_type=content_type)
+
+def upload_avatar_image(
+    user_file: File,
+    acting_user_profile: UserProfile,
+    target_user_profile: UserProfile,
+    content_type: Optional[str] = None,
+) -> None:
+    upload_backend.upload_avatar_image(
+        user_file, acting_user_profile, target_user_profile, content_type=content_type
+    )
+
 
 def delete_avatar_image(user_profile: UserProfile) -> None:
     upload_backend.delete_avatar_image(user_profile)
 
+
 def copy_avatar(source_profile: UserProfile, target_profile: UserProfile) -> None:
     upload_backend.copy_avatar(source_profile, target_profile)
 
+
 def upload_icon_image(user_file: File, user_profile: UserProfile) -> None:
     upload_backend.upload_realm_icon_image(user_file, user_profile)
 
+
 def upload_logo_image(user_file: File, user_profile: UserProfile, night: bool) -> None:
     upload_backend.upload_realm_logo_image(user_file, user_profile, night)
 
+
 def upload_emoji_image(emoji_file: File, emoji_file_name: str, user_profile: UserProfile) -> None:
     upload_backend.upload_emoji_image(emoji_file, emoji_file_name, user_profile)
 
-def upload_message_file(uploaded_file_name: str, uploaded_file_size: int,
-                        content_type: Optional[str], file_data: bytes,
-                        user_profile: UserProfile, target_realm: Optional[Realm]=None) -> str:
-    return upload_backend.upload_message_file(uploaded_file_name, uploaded_file_size,
-                                              content_type, file_data, user_profile,
-                                              target_realm=target_realm)
 
-def claim_attachment(user_profile: UserProfile,
-                     path_id: str,
-                     message: Message,
-                     is_message_realm_public: bool,
-                     is_message_web_public: bool=False) -> Attachment:
+def upload_message_file(
+    uploaded_file_name: str,
+    uploaded_file_size: int,
+    content_type: Optional[str],
+    file_data: bytes,
+    user_profile: UserProfile,
+    target_realm: Optional[Realm] = None,
+) -> str:
+    return upload_backend.upload_message_file(
+        uploaded_file_name,
+        uploaded_file_size,
+        content_type,
+        file_data,
+        user_profile,
+        target_realm=target_realm,
+    )
+
+
+def claim_attachment(
+    user_profile: UserProfile,
+    path_id: str,
+    message: Message,
+    is_message_realm_public: bool,
+    is_message_web_public: bool = False,
+) -> Attachment:
     attachment = Attachment.objects.get(path_id=path_id)
     attachment.messages.add(message)
     attachment.is_web_public = attachment.is_web_public or is_message_web_public
@@ -898,24 +1010,39 @@ def claim_attachment(user_profile: UserProfile,
     attachment.save()
     return attachment
 
-def create_attachment(file_name: str, path_id: str, user_profile: UserProfile,
-                      file_size: int) -> bool:
-    attachment = Attachment.objects.create(file_name=file_name, path_id=path_id, owner=user_profile,
-                                           realm=user_profile.realm, size=file_size)
+
+def create_attachment(
+    file_name: str, path_id: str, user_profile: UserProfile, file_size: int
+) -> bool:
+    attachment = Attachment.objects.create(
+        file_name=file_name,
+        path_id=path_id,
+        owner=user_profile,
+        realm=user_profile.realm,
+        size=file_size,
+    )
     from zerver.lib.actions import notify_attachment_update
+
     notify_attachment_update(user_profile, 'add', attachment.to_dict())
     return True
 
-def upload_message_image_from_request(request: HttpRequest, user_file: File,
-                                      user_profile: UserProfile) -> str:
-    uploaded_file_name, uploaded_file_size, content_type = get_file_info(request, user_file)
-    return upload_message_file(uploaded_file_name, uploaded_file_size,
-                               content_type, user_file.read(), user_profile)
 
-def upload_export_tarball(realm: Realm, tarball_path: str,
-                          percent_callback: Optional[Callable[[Any], None]]=None) -> str:
-    return upload_backend.upload_export_tarball(realm, tarball_path,
-                                                percent_callback=percent_callback)
+def upload_message_image_from_request(
+    request: HttpRequest, user_file: File, user_profile: UserProfile
+) -> str:
+    uploaded_file_name, uploaded_file_size, content_type = get_file_info(request, user_file)
+    return upload_message_file(
+        uploaded_file_name, uploaded_file_size, content_type, user_file.read(), user_profile
+    )
+
+
+def upload_export_tarball(
+    realm: Realm, tarball_path: str, percent_callback: Optional[Callable[[Any], None]] = None
+) -> str:
+    return upload_backend.upload_export_tarball(
+        realm, tarball_path, percent_callback=percent_callback
+    )
+
 
 def delete_export_tarball(export_path: str) -> Optional[str]:
     return upload_backend.delete_export_tarball(export_path)
diff --git a/zerver/lib/url_encoding.py b/zerver/lib/url_encoding.py
index 6f8f36a961..148594ee4c 100644
--- a/zerver/lib/url_encoding.py
+++ b/zerver/lib/url_encoding.py
@@ -10,35 +10,39 @@ def hash_util_encode(string: str) -> str:
     # Do the same encoding operation as hash_util.encodeHashComponent on the
     # frontend.
     # `safe` has a default value of "/", but we want those encoded, too.
-    return urllib.parse.quote(
-        string, safe=b"").replace(".", "%2E").replace("%", ".")
+    return urllib.parse.quote(string, safe=b"").replace(".", "%2E").replace("%", ".")
+
 
 def encode_stream(stream_id: int, stream_name: str) -> str:
     # We encode streams for urls as something like 99-Verona.
     stream_name = stream_name.replace(' ', '-')
     return str(stream_id) + '-' + hash_util_encode(stream_name)
 
+
 def personal_narrow_url(realm: Realm, sender: UserProfile) -> str:
     base_url = f"{realm.uri}/#narrow/pm-with/"
     email_user = sender.email.split('@')[0].lower()
     pm_slug = str(sender.id) + '-' + hash_util_encode(email_user)
     return base_url + pm_slug
 
+
 def huddle_narrow_url(realm: Realm, other_user_ids: List[int]) -> str:
     pm_slug = ','.join(str(user_id) for user_id in sorted(other_user_ids)) + '-group'
     base_url = f"{realm.uri}/#narrow/pm-with/"
     return base_url + pm_slug
 
+
 def stream_narrow_url(realm: Realm, stream: Stream) -> str:
     base_url = f"{realm.uri}/#narrow/stream/"
     return base_url + encode_stream(stream.id, stream.name)
 
+
 def topic_narrow_url(realm: Realm, stream: Stream, topic: str) -> str:
     base_url = f"{realm.uri}/#narrow/stream/"
     return f"{base_url}{encode_stream(stream.id, stream.name)}/topic/{hash_util_encode(topic)}"
 
-def near_message_url(realm: Realm,
-                     message: Dict[str, Any]) -> str:
+
+def near_message_url(realm: Realm, message: Dict[str, Any]) -> str:
 
     if message['type'] == 'stream':
         url = near_stream_message_url(
@@ -53,8 +57,8 @@ def near_message_url(realm: Realm,
     )
     return url
 
-def near_stream_message_url(realm: Realm,
-                            message: Dict[str, Any]) -> str:
+
+def near_stream_message_url(realm: Realm, message: Dict[str, Any]) -> str:
     message_id = str(message['id'])
     stream_id = message['stream_id']
     stream_name = message['display_recipient']
@@ -75,13 +79,10 @@ def near_stream_message_url(realm: Realm,
     full_url = '/'.join(parts)
     return full_url
 
-def near_pm_message_url(realm: Realm,
-                        message: Dict[str, Any]) -> str:
+
+def near_pm_message_url(realm: Realm, message: Dict[str, Any]) -> str:
     message_id = str(message['id'])
-    str_user_ids = [
-        str(recipient['id'])
-        for recipient in message['display_recipient']
-    ]
+    str_user_ids = [str(recipient['id']) for recipient in message['display_recipient']]
 
     # Use the "perma-link" format here that includes the sender's
     # user_id, so they're easier to share between people.
@@ -98,11 +99,13 @@ def near_pm_message_url(realm: Realm,
     full_url = '/'.join(parts)
     return full_url
 
+
 def add_query_to_redirect_url(original_url: str, query: str) -> str:
     # Using 'mark_sanitized' because user-controlled data after the '?' is
     # not relevant for open redirects
     return original_url + "?" + mark_sanitized(query)
 
+
 def add_query_arg_to_redirect_url(original_url: str, query_arg: str) -> str:
     assert '?' in original_url
     # Using 'mark_sanitized' because user-controlled data after the '?' is
diff --git a/zerver/lib/url_preview/oembed.py b/zerver/lib/url_preview/oembed.py
index 1a9ecaea8c..0a4799c5dc 100644
--- a/zerver/lib/url_preview/oembed.py
+++ b/zerver/lib/url_preview/oembed.py
@@ -4,9 +4,9 @@ from typing import Any, Dict, Optional
 from pyoembed import PyOembedException, oEmbed
 
 
-def get_oembed_data(url: str,
-                    maxwidth: int=640,
-                    maxheight: int=480) -> Optional[Dict[str, Any]]:
+def get_oembed_data(
+    url: str, maxwidth: int = 640, maxheight: int = 480
+) -> Optional[Dict[str, Any]]:
     try:
         data = oEmbed(url, maxwidth=maxwidth, maxheight=maxheight)
     except (PyOembedException, json.decoder.JSONDecodeError):
@@ -42,6 +42,7 @@ def get_oembed_data(url: str,
         description=data.get('description'),
     )
 
+
 def strip_cdata(html: str) -> str:
     # Work around a bug in SoundCloud's XML generation:
     # <html>&lt;![CDATA[&lt;iframe ...&gt;&lt;/iframe&gt;]]&gt;</html>
diff --git a/zerver/lib/url_preview/parsers/base.py b/zerver/lib/url_preview/parsers/base.py
index 563c6d1d0d..9be8418960 100644
--- a/zerver/lib/url_preview/parsers/base.py
+++ b/zerver/lib/url_preview/parsers/base.py
@@ -8,6 +8,7 @@ class BaseParser:
         # processes in production, and bs4 is big enough that
         # importing it adds 10s of milliseconds to manage.py startup.
         from bs4 import BeautifulSoup
+
         charset = None
         if content_type is not None:
             charset = cgi.parse_header(content_type)[1].get("charset")
diff --git a/zerver/lib/url_preview/parsers/generic.py b/zerver/lib/url_preview/parsers/generic.py
index 73acbb89cd..9f121fc639 100644
--- a/zerver/lib/url_preview/parsers/generic.py
+++ b/zerver/lib/url_preview/parsers/generic.py
@@ -8,28 +8,29 @@ class GenericParser(BaseParser):
         return {
             'title': self._get_title(),
             'description': self._get_description(),
-            'image': self._get_image()}
+            'image': self._get_image(),
+        }
 
     def _get_title(self) -> Optional[str]:
         soup = self._soup
-        if (soup.title and soup.title.text != ''):
+        if soup.title and soup.title.text != '':
             return soup.title.text
-        if (soup.h1 and soup.h1.text != ''):
+        if soup.h1 and soup.h1.text != '':
             return soup.h1.text
         return None
 
     def _get_description(self) -> Optional[str]:
         soup = self._soup
         meta_description = soup.find('meta', attrs={'name': 'description'})
-        if (meta_description and meta_description.get('content', '') != ''):
+        if meta_description and meta_description.get('content', '') != '':
             return meta_description['content']
         first_h1 = soup.find('h1')
         if first_h1:
             first_p = first_h1.find_next('p')
-            if (first_p and first_p.text != ''):
+            if first_p and first_p.text != '':
                 return first_p.text
         first_p = soup.find('p')
-        if (first_p and first_p.text != ''):
+        if first_p and first_p.text != '':
             return first_p.text
         return None
 
diff --git a/zerver/lib/url_preview/parsers/open_graph.py b/zerver/lib/url_preview/parsers/open_graph.py
index 8c31546e01..3da4f4718a 100644
--- a/zerver/lib/url_preview/parsers/open_graph.py
+++ b/zerver/lib/url_preview/parsers/open_graph.py
@@ -19,7 +19,7 @@ class OpenGraphParser(BaseParser):
             if tag['property'] not in self.allowed_og_properties:
                 continue
 
-            og_property_name = tag['property'][len('og:'):]
+            og_property_name = tag['property'][len('og:') :]
             if not tag.has_attr('content'):
                 continue
 
diff --git a/zerver/lib/url_preview/preview.py b/zerver/lib/url_preview/preview.py
index 8abd48536c..c905ff4a33 100644
--- a/zerver/lib/url_preview/preview.py
+++ b/zerver/lib/url_preview/preview.py
@@ -23,7 +23,9 @@ link_regex = re.compile(
     r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|'  # domain...
     r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'  # ...or ip
     r'(?::\d+)?'  # optional port
-    r'(?:/?|[/?]\S+)$', re.IGNORECASE)
+    r'(?:/?|[/?]\S+)$',
+    re.IGNORECASE,
+)
 
 # Use Chrome User-Agent, since some sites refuse to work on old browsers
 ZULIP_URL_PREVIEW_USER_AGENT = (
@@ -38,6 +40,7 @@ TIMEOUT = 15
 def is_link(url: str) -> Match[str]:
     return link_regex.match(smart_text(url))
 
+
 def guess_mimetype_from_content(response: requests.Response) -> str:
     mime_magic = magic.Magic(mime=True)
     try:
@@ -46,6 +49,7 @@ def guess_mimetype_from_content(response: requests.Response) -> str:
         content = ''
     return mime_magic.from_buffer(content)
 
+
 def valid_content_type(url: str) -> bool:
     try:
         response = requests.get(url, stream=True, headers=HEADERS, timeout=TIMEOUT)
@@ -62,19 +66,22 @@ def valid_content_type(url: str) -> bool:
         content_type = guess_mimetype_from_content(response)
     return content_type.startswith('text/html')
 
+
 def catch_network_errors(func: Callable[..., Any]) -> Callable[..., Any]:
     def wrapper(*args: Any, **kwargs: Any) -> Any:
         try:
             return func(*args, **kwargs)
         except requests.exceptions.RequestException:
             pass
+
     return wrapper
 
+
 @catch_network_errors
 @cache_with_key(preview_url_cache_key, cache_name=CACHE_NAME, with_statsd_key="urlpreview_data")
-def get_link_embed_data(url: str,
-                        maxwidth: int=640,
-                        maxheight: int=480) -> Optional[Dict[str, Any]]:
+def get_link_embed_data(
+    url: str, maxwidth: int = 640, maxheight: int = 480
+) -> Optional[Dict[str, Any]]:
     if not is_link(url):
         return None
 
@@ -97,14 +104,16 @@ def get_link_embed_data(url: str,
             if not data.get(key) and og_data.get(key):
                 data[key] = og_data[key]
 
-        generic_data = GenericParser(
-            response.content, response.headers.get("Content-Type")
-        ).extract_data() or {}
+        generic_data = (
+            GenericParser(response.content, response.headers.get("Content-Type")).extract_data()
+            or {}
+        )
         for key in ['title', 'description', 'image']:
             if not data.get(key) and generic_data.get(key):
                 data[key] = generic_data[key]
     return data
 
+
 @get_cache_with_key(preview_url_cache_key, cache_name=CACHE_NAME)
-def link_embed_data_from_cache(url: str, maxwidth: int=640, maxheight: int=480) -> Any:
+def link_embed_data_from_cache(url: str, maxwidth: int = 640, maxheight: int = 480) -> Any:
     return
diff --git a/zerver/lib/user_agent.py b/zerver/lib/user_agent.py
index 2f2496a3d5..961d77ce05 100644
--- a/zerver/lib/user_agent.py
+++ b/zerver/lib/user_agent.py
@@ -8,7 +8,10 @@ pattern = re.compile(
     """^ (?P<name> [^/ ]* [^0-9/(]* )
     (/ (?P<version> [^/ ]* ))?
     ([ /] .*)?
-    $""", re.X)
+    $""",
+    re.X,
+)
+
 
 def parse_user_agent(user_agent: str) -> Dict[str, str]:
     match = pattern.match(user_agent)
diff --git a/zerver/lib/user_groups.py b/zerver/lib/user_groups.py
index c6e314c63f..4be3ce0337 100644
--- a/zerver/lib/user_groups.py
+++ b/zerver/lib/user_groups.py
@@ -12,16 +12,18 @@ def access_user_group_by_id(user_group_id: int, user_profile: UserProfile) -> Us
         user_group = UserGroup.objects.get(id=user_group_id, realm=user_profile.realm)
         group_member_ids = get_user_group_members(user_group)
         msg = _("Only group members and organization administrators can administer this group.")
-        if (not user_profile.is_realm_admin and user_profile.id not in group_member_ids):
+        if not user_profile.is_realm_admin and user_profile.id not in group_member_ids:
             raise JsonableError(msg)
     except UserGroup.DoesNotExist:
         raise JsonableError(_("Invalid user group"))
     return user_group
 
+
 def user_groups_in_realm(realm: Realm) -> List[UserGroup]:
     user_groups = UserGroup.objects.filter(realm=realm)
     return list(user_groups)
 
+
 def user_groups_in_realm_serialized(realm: Realm) -> List[Dict[str, Any]]:
     """This function is used in do_events_register code path so this code
     should be performant.  We need to do 2 database queries because
@@ -39,7 +41,8 @@ def user_groups_in_realm_serialized(realm: Realm) -> List[Dict[str, Any]]:
         )
 
     membership = UserGroupMembership.objects.filter(user_group__realm=realm).values_list(
-        'user_group_id', 'user_profile_id')
+        'user_group_id', 'user_profile_id'
+    )
     for (user_group_id, user_profile_id) in membership:
         group_dicts[user_group_id]['members'].append(user_profile_id)
     for group_dict in group_dicts.values():
@@ -47,19 +50,25 @@ def user_groups_in_realm_serialized(realm: Realm) -> List[Dict[str, Any]]:
 
     return sorted(group_dicts.values(), key=lambda group_dict: group_dict['id'])
 
+
 def get_user_groups(user_profile: UserProfile) -> List[UserGroup]:
     return list(user_profile.usergroup_set.all())
 
+
 def check_add_user_to_user_group(user_profile: UserProfile, user_group: UserGroup) -> bool:
     member_obj, created = UserGroupMembership.objects.get_or_create(
-        user_group=user_group, user_profile=user_profile)
+        user_group=user_group, user_profile=user_profile
+    )
     return created
 
+
 def remove_user_from_user_group(user_profile: UserProfile, user_group: UserGroup) -> int:
     num_deleted, _ = UserGroupMembership.objects.filter(
-        user_profile=user_profile, user_group=user_group).delete()
+        user_profile=user_profile, user_group=user_group
+    ).delete()
     return num_deleted
 
+
 def check_remove_user_from_user_group(user_profile: UserProfile, user_group: UserGroup) -> bool:
     try:
         num_deleted = remove_user_from_user_group(user_profile, user_group)
@@ -67,22 +76,26 @@ def check_remove_user_from_user_group(user_profile: UserProfile, user_group: Use
     except Exception:
         return False
 
-def create_user_group(name: str, members: List[UserProfile], realm: Realm,
-                      description: str='') -> UserGroup:
+
+def create_user_group(
+    name: str, members: List[UserProfile], realm: Realm, description: str = ''
+) -> UserGroup:
     with transaction.atomic():
-        user_group = UserGroup.objects.create(name=name, realm=realm,
-                                              description=description)
+        user_group = UserGroup.objects.create(name=name, realm=realm, description=description)
         UserGroupMembership.objects.bulk_create(
-            UserGroupMembership(user_profile=member, user_group=user_group)
-            for member in members
+            UserGroupMembership(user_profile=member, user_group=user_group) for member in members
         )
         return user_group
 
+
 def get_user_group_members(user_group: UserGroup) -> List[UserProfile]:
     members = UserGroupMembership.objects.filter(user_group=user_group)
     return [member.user_profile.id for member in members]
 
+
 def get_memberships_of_users(user_group: UserGroup, members: List[UserProfile]) -> List[int]:
-    return list(UserGroupMembership.objects.filter(
-        user_group=user_group,
-        user_profile__in=members).values_list('user_profile_id', flat=True))
+    return list(
+        UserGroupMembership.objects.filter(
+            user_group=user_group, user_profile__in=members
+        ).values_list('user_profile_id', flat=True)
+    )
diff --git a/zerver/lib/user_status.py b/zerver/lib/user_status.py
index a21a6c0b08..6a3a715f74 100644
--- a/zerver/lib/user_status.py
+++ b/zerver/lib/user_status.py
@@ -7,16 +7,19 @@ from zerver.models import UserStatus
 
 
 def get_user_info_dict(realm_id: int) -> Dict[str, Dict[str, Any]]:
-    rows = UserStatus.objects.filter(
-        user_profile__realm_id=realm_id,
-        user_profile__is_active=True,
-    ).exclude(
-        Q(status=UserStatus.NORMAL) &
-        Q(status_text=''),
-    ).values(
-        'user_profile_id',
-        'status',
-        'status_text',
+    rows = (
+        UserStatus.objects.filter(
+            user_profile__realm_id=realm_id,
+            user_profile__is_active=True,
+        )
+        .exclude(
+            Q(status=UserStatus.NORMAL) & Q(status_text=''),
+        )
+        .values(
+            'user_profile_id',
+            'status',
+            'status_text',
+        )
     )
 
     user_dict: Dict[str, Dict[str, Any]] = {}
@@ -35,10 +38,10 @@ def get_user_info_dict(realm_id: int) -> Dict[str, Dict[str, Any]]:
 
     return user_dict
 
-def update_user_status(user_profile_id: int,
-                       status: Optional[int],
-                       status_text: Optional[str],
-                       client_id: int) -> None:
+
+def update_user_status(
+    user_profile_id: int, status: Optional[int], status_text: Optional[str], client_id: int
+) -> None:
 
     timestamp = timezone_now()
 
diff --git a/zerver/lib/users.py b/zerver/lib/users.py
index a4f9c08a94..37bef15f26 100644
--- a/zerver/lib/users.py
+++ b/zerver/lib/users.py
@@ -38,8 +38,7 @@ def check_full_name(full_name_raw: str) -> str:
     if len(full_name) < UserProfile.MIN_NAME_LENGTH:
         raise JsonableError(_("Name too short!"))
     for character in full_name:
-        if (unicodedata.category(character)[0] == 'C' or
-                character in UserProfile.NAME_INVALID_CHARS):
+        if unicodedata.category(character)[0] == 'C' or character in UserProfile.NAME_INVALID_CHARS:
             raise JsonableError(_("Invalid characters in name!"))
     # Names ending with e.g. `|15` could be ambiguous for
     # sloppily-written parsers of our Markdown syntax for mentioning
@@ -49,6 +48,7 @@ def check_full_name(full_name_raw: str) -> str:
         raise JsonableError(_("Invalid format!"))
     return full_name
 
+
 # NOTE: We don't try to absolutely prevent 2 bots from having the same
 # name (e.g. you can get there by reactivating a deactivated bot after
 # making a new bot with the same name).  This is just a check designed
@@ -63,16 +63,18 @@ def check_bot_name_available(realm_id: int, full_name: str) -> None:
     if dup_exists:
         raise JsonableError(_("Name is already in use!"))
 
+
 def check_short_name(short_name_raw: str) -> str:
     short_name = short_name_raw.strip()
     if len(short_name) == 0:
         raise JsonableError(_("Bad name or username"))
     return short_name
 
-def check_valid_bot_config(bot_type: int, service_name: str,
-                           config_data: Dict[str, str]) -> None:
+
+def check_valid_bot_config(bot_type: int, service_name: str, config_data: Dict[str, str]) -> None:
     if bot_type == UserProfile.INCOMING_WEBHOOK_BOT:
         from zerver.lib.integrations import WEBHOOK_INTEGRATIONS
+
         config_options = None
         for integration in WEBHOOK_INTEGRATIONS:
             if integration.name == service_name:
@@ -84,20 +86,22 @@ def check_valid_bot_config(bot_type: int, service_name: str,
 
         missing_keys = set(config_options.keys()) - set(config_data.keys())
         if missing_keys:
-            raise JsonableError(_("Missing configuration parameters: {}").format(
-                missing_keys,
-            ))
+            raise JsonableError(
+                _("Missing configuration parameters: {}").format(
+                    missing_keys,
+                )
+            )
 
         for key, validator in config_options.items():
             value = config_data[key]
             error = validator(key, value)
             if error:
-                raise JsonableError(_("Invalid {} value {} ({})").format(
-                                    key, value, error))
+                raise JsonableError(_("Invalid {} value {} ({})").format(key, value, error))
 
     elif bot_type == UserProfile.EMBEDDED_BOT:
         try:
             from zerver.lib.bot_lib import get_bot_handler
+
             bot_handler = get_bot_handler(service_name)
             if hasattr(bot_handler, 'validate_config'):
                 bot_handler.validate_config(config_data)
@@ -109,14 +113,19 @@ def check_valid_bot_config(bot_type: int, service_name: str,
             # error message.
             raise JsonableError(_("Invalid configuration data!"))
 
+
 # Adds an outgoing webhook or embedded bot service.
-def add_service(name: str, user_profile: UserProfile, base_url: Optional[str]=None,
-                interface: Optional[int]=None, token: Optional[str]=None) -> None:
-    Service.objects.create(name=name,
-                           user_profile=user_profile,
-                           base_url=base_url,
-                           interface=interface,
-                           token=token)
+def add_service(
+    name: str,
+    user_profile: UserProfile,
+    base_url: Optional[str] = None,
+    interface: Optional[int] = None,
+    token: Optional[str] = None,
+) -> None:
+    Service.objects.create(
+        name=name, user_profile=user_profile, base_url=base_url, interface=interface, token=token
+    )
+
 
 def check_bot_creation_policy(user_profile: UserProfile, bot_type: int) -> None:
     # Realm administrators can always add bot
@@ -127,23 +136,30 @@ def check_bot_creation_policy(user_profile: UserProfile, bot_type: int) -> None:
         return
     if user_profile.realm.bot_creation_policy == Realm.BOT_CREATION_ADMINS_ONLY:
         raise OrganizationAdministratorRequired()
-    if user_profile.realm.bot_creation_policy == Realm.BOT_CREATION_LIMIT_GENERIC_BOTS and \
-            bot_type == UserProfile.DEFAULT_BOT:
+    if (
+        user_profile.realm.bot_creation_policy == Realm.BOT_CREATION_LIMIT_GENERIC_BOTS
+        and bot_type == UserProfile.DEFAULT_BOT
+    ):
         raise OrganizationAdministratorRequired()
 
+
 def check_valid_bot_type(user_profile: UserProfile, bot_type: int) -> None:
     if bot_type not in user_profile.allowed_bot_types:
         raise JsonableError(_('Invalid bot type'))
 
+
 def check_valid_interface_type(interface_type: Optional[int]) -> None:
     if interface_type not in Service.ALLOWED_INTERFACE_TYPES:
         raise JsonableError(_('Invalid interface type'))
 
+
 def is_administrator_role(role: int) -> bool:
     return role in {UserProfile.ROLE_REALM_ADMINISTRATOR, UserProfile.ROLE_REALM_OWNER}
 
-def bulk_get_users(emails: List[str], realm: Optional[Realm],
-                   base_query: 'QuerySet[UserProfile]'=None) -> Dict[str, UserProfile]:
+
+def bulk_get_users(
+    emails: List[str], realm: Optional[Realm], base_query: 'QuerySet[UserProfile]' = None
+) -> Dict[str, UserProfile]:
     if base_query is None:
         assert realm is not None
         query = UserProfile.objects.filter(realm=realm, is_active=True)
@@ -167,9 +183,7 @@ def bulk_get_users(emails: List[str], realm: Optional[Realm],
         # But chaining __in and __iexact doesn't work with Django's
         # ORM, so we have the following hack to construct the relevant where clause
         where_clause = "upper(zerver_userprofile.email::text) IN (SELECT upper(email) FROM unnest(%s) AS email)"
-        return query.select_related("realm").extra(
-            where=[where_clause],
-            params=(emails,))
+        return query.select_related("realm").extra(where=[where_clause], params=(emails,))
 
     def user_to_email(user_profile: UserProfile) -> str:
         return user_profile.email.lower()
@@ -183,9 +197,11 @@ def bulk_get_users(emails: List[str], realm: Optional[Realm],
         id_fetcher=user_to_email,
     )
 
+
 def get_user_id(user: UserProfile) -> int:
     return user.id
 
+
 def user_ids_to_users(user_ids: Sequence[int], realm: Realm) -> List[UserProfile]:
     # TODO: Consider adding a flag to control whether deactivated
     # users should be included.
@@ -211,6 +227,7 @@ def user_ids_to_users(user_ids: Sequence[int], realm: Realm) -> List[UserProfile
             raise JsonableError(_("Invalid user ID: {}").format(user_profile.id))
     return user_profiles
 
+
 def access_bot_by_id(user_profile: UserProfile, user_id: int) -> UserProfile:
     try:
         target = get_user_profile_by_id_in_realm(user_id, user_profile.realm)
@@ -222,12 +239,13 @@ def access_bot_by_id(user_profile: UserProfile, user_id: int) -> UserProfile:
         raise JsonableError(_("Insufficient permission"))
     return target
 
+
 def access_user_by_id(
     user_profile: UserProfile,
     target_user_id: int,
     *,
-    allow_deactivated: bool=False,
-    allow_bots: bool=False,
+    allow_deactivated: bool = False,
+    allow_bots: bool = False,
     for_admin: bool,
 ) -> UserProfile:
     """Master function for accessing another user by ID in API code;
@@ -250,26 +268,41 @@ def access_user_by_id(
         raise JsonableError(_("Insufficient permission"))
     return target
 
+
 def get_accounts_for_email(email: str) -> List[Dict[str, Optional[str]]]:
-    profiles = UserProfile.objects.select_related('realm').filter(delivery_email__iexact=email.strip(),
-                                                                  is_active=True,
-                                                                  realm__deactivated=False,
-                                                                  is_bot=False).order_by('date_joined')
-    return [{"realm_name": profile.realm.name,
-             "string_id": profile.realm.string_id,
-             "full_name": profile.full_name,
-             "avatar": avatar_url(profile)}
-            for profile in profiles]
+    profiles = (
+        UserProfile.objects.select_related('realm')
+        .filter(
+            delivery_email__iexact=email.strip(),
+            is_active=True,
+            realm__deactivated=False,
+            is_bot=False,
+        )
+        .order_by('date_joined')
+    )
+    return [
+        {
+            "realm_name": profile.realm.name,
+            "string_id": profile.realm.string_id,
+            "full_name": profile.full_name,
+            "avatar": avatar_url(profile),
+        }
+        for profile in profiles
+    ]
+
 
 def get_api_key(user_profile: UserProfile) -> str:
     return user_profile.api_key
 
+
 def get_all_api_keys(user_profile: UserProfile) -> List[str]:
     # Users can only have one API key for now
     return [user_profile.api_key]
 
-def validate_user_custom_profile_field(realm_id: int, field: CustomProfileField,
-                                       value: Union[int, str, List[int]]) -> Union[int, str, List[int]]:
+
+def validate_user_custom_profile_field(
+    realm_id: int, field: CustomProfileField, value: Union[int, str, List[int]]
+) -> Union[int, str, List[int]]:
     validators = CustomProfileField.FIELD_VALIDATORS
     field_type = field.field_type
     var_name = f'{field.name}'
@@ -288,8 +321,10 @@ def validate_user_custom_profile_field(realm_id: int, field: CustomProfileField,
     else:
         raise AssertionError("Invalid field type")
 
-def validate_user_custom_profile_data(realm_id: int,
-                                      profile_data: List[Dict[str, Union[int, str, List[int]]]]) -> None:
+
+def validate_user_custom_profile_data(
+    realm_id: int, profile_data: List[Dict[str, Union[int, str, List[int]]]]
+) -> None:
     # This function validate all custom field values according to their field type.
     for item in profile_data:
         field_id = item['id']
@@ -303,6 +338,7 @@ def validate_user_custom_profile_data(realm_id: int,
         except ValidationError as error:
             raise JsonableError(error.message)
 
+
 def compute_show_invites_and_add_streams(user_profile: Optional[UserProfile]) -> Tuple[bool, bool]:
     if user_profile is None:
         return False, False
@@ -318,9 +354,15 @@ def compute_show_invites_and_add_streams(user_profile: Optional[UserProfile]) ->
 
     return True, True
 
-def format_user_row(realm: Realm, acting_user: Optional[UserProfile], row: Dict[str, Any],
-                    client_gravatar: bool, user_avatar_url_field_optional: bool,
-                    custom_profile_field_data: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+
+def format_user_row(
+    realm: Realm,
+    acting_user: Optional[UserProfile],
+    row: Dict[str, Any],
+    client_gravatar: bool,
+    user_avatar_url_field_optional: bool,
+    custom_profile_field_data: Optional[Dict[str, Any]] = None,
+) -> Dict[str, Any]:
     """Formats a user row returned by a database fetch using
     .values(*realm_user_dict_fields) into a dictionary representation
     of that user for API delivery to clients.  The acting_user
@@ -341,8 +383,8 @@ def format_user_row(realm: Realm, acting_user: Optional[UserProfile], row: Dict[
         is_bot=is_bot,
         full_name=row['full_name'],
         timezone=canonicalize_timezone(row['timezone']),
-        is_active = row['is_active'],
-        date_joined = row['date_joined'].isoformat(),
+        is_active=row['is_active'],
+        date_joined=row['date_joined'].isoformat(),
     )
 
     # Zulip clients that support using `GET /avatar/{user_id}` as a
@@ -365,16 +407,20 @@ def format_user_row(realm: Realm, acting_user: Optional[UserProfile], row: Dict[
     # different optimization for organizations with 10,000s of users.
     include_avatar_url = not user_avatar_url_field_optional or not row['long_term_idle']
     if include_avatar_url:
-        result['avatar_url'] = get_avatar_field(user_id=row['id'],
-                                                realm_id=realm.id,
-                                                email=row['delivery_email'],
-                                                avatar_source=row['avatar_source'],
-                                                avatar_version=row['avatar_version'],
-                                                medium=False,
-                                                client_gravatar=client_gravatar)
+        result['avatar_url'] = get_avatar_field(
+            user_id=row['id'],
+            realm_id=realm.id,
+            email=row['delivery_email'],
+            avatar_source=row['avatar_source'],
+            avatar_version=row['avatar_version'],
+            medium=False,
+            client_gravatar=client_gravatar,
+        )
 
-    if acting_user is not None and (realm.email_address_visibility == Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS and
-                                    acting_user.is_realm_admin):
+    if acting_user is not None and (
+        realm.email_address_visibility == Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        and acting_user.is_realm_admin
+    ):
         result['delivery_email'] = row['delivery_email']
 
     if is_bot:
@@ -388,6 +434,7 @@ def format_user_row(realm: Realm, acting_user: Optional[UserProfile], row: Dict[
         result['profile_data'] = custom_profile_field_data
     return result
 
+
 def user_profile_to_user_row(user_profile: UserProfile) -> Dict[str, Any]:
     # What we're trying to do is simulate the user_profile having been
     # fetched from a QuerySet using `.values(*realm_user_dict_fields)`
@@ -404,16 +451,18 @@ def user_profile_to_user_row(user_profile: UserProfile) -> Dict[str, Any]:
     # This could be potentially simplified in the future by
     # changing realm_user_dict_fields to name the bot owner with
     # the less readable `bot_owner` (instead of `bot_owner_id`).
-    user_row = model_to_dict(user_profile,
-                             fields=[*realm_user_dict_fields, 'bot_owner'])
+    user_row = model_to_dict(user_profile, fields=[*realm_user_dict_fields, 'bot_owner'])
     user_row['bot_owner_id'] = user_row['bot_owner']
     del user_row['bot_owner']
     return user_row
 
+
 def get_cross_realm_dicts() -> List[Dict[str, Any]]:
-    users = bulk_get_users(list(settings.CROSS_REALM_BOT_EMAILS), None,
-                           base_query=UserProfile.objects.filter(
-                           realm__string_id=settings.SYSTEM_BOT_REALM)).values()
+    users = bulk_get_users(
+        list(settings.CROSS_REALM_BOT_EMAILS),
+        None,
+        base_query=UserProfile.objects.filter(realm__string_id=settings.SYSTEM_BOT_REALM),
+    ).values()
     result = []
     for user in users:
         # Important: We filter here, is addition to in
@@ -427,17 +476,23 @@ def get_cross_realm_dicts() -> List[Dict[str, Any]]:
         # just set bot_owner_id=None.
         user_row['bot_owner_id'] = None
 
-        result.append(format_user_row(user.realm,
-                                      acting_user=user,
-                                      row=user_row,
-                                      client_gravatar=False,
-                                      user_avatar_url_field_optional=False,
-                                      custom_profile_field_data=None))
+        result.append(
+            format_user_row(
+                user.realm,
+                acting_user=user,
+                row=user_row,
+                client_gravatar=False,
+                user_avatar_url_field_optional=False,
+                custom_profile_field_data=None,
+            )
+        )
 
     return result
 
-def get_custom_profile_field_values(custom_profile_field_values:
-                                    List[CustomProfileFieldValue]) -> Dict[int, Dict[str, Any]]:
+
+def get_custom_profile_field_values(
+    custom_profile_field_values: List[CustomProfileFieldValue],
+) -> Dict[int, Dict[str, Any]]:
     profiles_by_user_id: Dict[int, Dict[str, Any]] = defaultdict(dict)
     for profile_field in custom_profile_field_values:
         user_id = profile_field.user_profile_id
@@ -452,9 +507,16 @@ def get_custom_profile_field_values(custom_profile_field_values:
             }
     return profiles_by_user_id
 
-def get_raw_user_data(realm: Realm, acting_user: Optional[UserProfile], *, target_user: Optional[UserProfile]=None,
-                      client_gravatar: bool, user_avatar_url_field_optional: bool,
-                      include_custom_profile_fields: bool=True) -> Dict[int, Dict[str, str]]:
+
+def get_raw_user_data(
+    realm: Realm,
+    acting_user: Optional[UserProfile],
+    *,
+    target_user: Optional[UserProfile] = None,
+    client_gravatar: bool,
+    user_avatar_url_field_optional: bool,
+    include_custom_profile_fields: bool = True,
+) -> Dict[int, Dict[str, str]]:
     """Fetches data about the target user(s) appropriate for sending to
     acting_user via the standard format for the Zulip API.  If
     target_user is None, we fetch all users in the realm.
@@ -482,11 +544,12 @@ def get_raw_user_data(realm: Realm, acting_user: Optional[UserProfile], *, targe
         if profiles_by_user_id is not None:
             custom_profile_field_data = profiles_by_user_id.get(row['id'], {})
 
-        result[row['id']] = format_user_row(realm,
-                                            acting_user=acting_user,
-                                            row=row,
-                                            client_gravatar=client_gravatar,
-                                            user_avatar_url_field_optional=user_avatar_url_field_optional,
-                                            custom_profile_field_data=custom_profile_field_data,
-                                            )
+        result[row['id']] = format_user_row(
+            realm,
+            acting_user=acting_user,
+            row=row,
+            client_gravatar=client_gravatar,
+            user_avatar_url_field_optional=user_avatar_url_field_optional,
+            custom_profile_field_data=custom_profile_field_data,
+        )
     return result
diff --git a/zerver/lib/utils.py b/zerver/lib/utils.py
index 3e1a3d23e0..7dc958ec1a 100644
--- a/zerver/lib/utils.py
+++ b/zerver/lib/utils.py
@@ -11,7 +11,8 @@ from django.conf import settings
 
 T = TypeVar('T')
 
-def statsd_key(val: str, clean_periods: bool=False) -> str:
+
+def statsd_key(val: str, clean_periods: bool = False) -> str:
     if ':' in val:
         val = val.split(':')[0]
     val = val.replace('-', "_")
@@ -20,6 +21,7 @@ def statsd_key(val: str, clean_periods: bool=False) -> str:
 
     return val
 
+
 class StatsDWrapper:
     """Transparently either submit metrics to statsd
     or do nothing without erroring out"""
@@ -27,9 +29,10 @@ class StatsDWrapper:
     # Backported support for gauge deltas
     # as our statsd server supports them but supporting
     # pystatsd is not released yet
-    def _our_gauge(self, stat: str, value: float, rate: float=1, delta: bool=False) -> None:
+    def _our_gauge(self, stat: str, value: float, rate: float = 1, delta: bool = False) -> None:
         """Set a gauge value."""
         from django_statsd.clients import statsd
+
         if delta:
             value_str = f'{value:+g}|g'
         else:
@@ -42,6 +45,7 @@ class StatsDWrapper:
         if name in ['timer', 'timing', 'incr', 'decr', 'gauge']:
             if settings.STATSD_HOST != '':
                 from django_statsd.clients import statsd
+
                 if name == 'gauge':
                     return self._our_gauge
                 else:
@@ -51,21 +55,24 @@ class StatsDWrapper:
 
         raise AttributeError
 
+
 statsd = StatsDWrapper()
 
 # Runs the callback with slices of all_list of a given batch_size
-def run_in_batches(all_list: Sequence[T],
-                   batch_size: int,
-                   callback: Callable[[Sequence[T]], None],
-                   sleep_time: int=0,
-                   logger: Optional[Callable[[str], None]]=None) -> None:
+def run_in_batches(
+    all_list: Sequence[T],
+    batch_size: int,
+    callback: Callable[[Sequence[T]], None],
+    sleep_time: int = 0,
+    logger: Optional[Callable[[str], None]] = None,
+) -> None:
     if len(all_list) == 0:
         return
 
     limit = (len(all_list) // batch_size) + 1
     for i in range(limit):
-        start = i*batch_size
-        end = (i+1) * batch_size
+        start = i * batch_size
+        end = (i + 1) * batch_size
         if end >= len(all_list):
             end = len(all_list)
         batch = all_list[start:end]
@@ -78,8 +85,8 @@ def run_in_batches(all_list: Sequence[T],
         if i != limit - 1:
             sleep(sleep_time)
 
-def make_safe_digest(string: str,
-                     hash_func: Callable[[bytes], Any]=hashlib.sha1) -> str:
+
+def make_safe_digest(string: str, hash_func: Callable[[bytes], Any] = hashlib.sha1) -> str:
     """
     return a hex digest of `string`.
     """
@@ -102,6 +109,7 @@ def log_statsd_event(name: str) -> None:
     event_name = f"events.{name}"
     statsd.incr(event_name)
 
+
 def generate_api_key() -> str:
     api_key = ""
     while len(api_key) < 32:
@@ -109,14 +117,18 @@ def generate_api_key() -> str:
         api_key += secrets.token_urlsafe(3 * 9).replace("_", "").replace("-", "")
     return api_key[:32]
 
+
 def has_api_key_format(key: str) -> bool:
     return bool(re.fullmatch(r"([A-Za-z0-9]){32}", key))
 
-def query_chunker(queries: List[Any],
-                  id_collector: Optional[Set[int]]=None,
-                  chunk_size: int=1000,
-                  db_chunk_size: Optional[int]=None) -> Iterator[Any]:
-    '''
+
+def query_chunker(
+    queries: List[Any],
+    id_collector: Optional[Set[int]] = None,
+    chunk_size: int = 1000,
+    db_chunk_size: Optional[int] = None,
+) -> Iterator[Any]:
+    """
     This merges one or more Django ascending-id queries into
     a generator that returns chunks of chunk_size row objects
     during each yield, preserving id order across all results..
@@ -130,7 +142,7 @@ def query_chunker(queries: List[Any],
     internally to enforce unique ids, but which the caller
     can pass in to us if they want the side effect of collecting
     all ids.
-    '''
+    """
     if db_chunk_size is None:
         db_chunk_size = chunk_size // len(queries)
 
@@ -138,7 +150,7 @@ def query_chunker(queries: List[Any],
     assert chunk_size >= 2
 
     if id_collector is not None:
-        assert(len(id_collector) == 0)
+        assert len(id_collector) == 0
     else:
         id_collector = set()
 
@@ -169,18 +181,20 @@ def query_chunker(queries: List[Any],
 
         yield [row for row_id, i, row in tup_chunk]
 
-def process_list_in_batches(lst: List[Any],
-                            chunk_size: int,
-                            process_batch: Callable[[List[Any]], None]) -> None:
+
+def process_list_in_batches(
+    lst: List[Any], chunk_size: int, process_batch: Callable[[List[Any]], None]
+) -> None:
     offset = 0
 
     while True:
-        items = lst[offset:offset+chunk_size]
+        items = lst[offset : offset + chunk_size]
         if not items:
             break
         process_batch(items)
         offset += chunk_size
 
+
 def split_by(array: List[Any], group_size: int, filler: Any) -> List[List[Any]]:
     """
     Group elements into list of size `group_size` and fill empty cells with
diff --git a/zerver/lib/validator.py b/zerver/lib/validator.py
index c4c06ffd63..7d0f60159e 100644
--- a/zerver/lib/validator.py
+++ b/zerver/lib/validator.py
@@ -45,12 +45,14 @@ def check_string(var_name: str, val: object) -> str:
         raise ValidationError(_('{var_name} is not a string').format(var_name=var_name))
     return val
 
+
 def check_required_string(var_name: str, val: object) -> str:
     s = check_string(var_name, val)
     if not s.strip():
         raise ValidationError(_("{item} cannot be blank.").format(item=var_name))
     return s
 
+
 def check_string_in(possible_values: Union[Set[str], List[str]]) -> Validator[str]:
     def validator(var_name: str, val: object) -> str:
         s = check_string(var_name, val)
@@ -60,34 +62,46 @@ def check_string_in(possible_values: Union[Set[str], List[str]]) -> Validator[st
 
     return validator
 
+
 def check_short_string(var_name: str, val: object) -> str:
     return check_capped_string(50)(var_name, val)
 
+
 def check_capped_string(max_length: int) -> Validator[str]:
     def validator(var_name: str, val: object) -> str:
         s = check_string(var_name, val)
         if len(s) > max_length:
-            raise ValidationError(_("{var_name} is too long (limit: {max_length} characters)").format(
-                var_name=var_name, max_length=max_length,
-            ))
+            raise ValidationError(
+                _("{var_name} is too long (limit: {max_length} characters)").format(
+                    var_name=var_name,
+                    max_length=max_length,
+                )
+            )
         return s
 
     return validator
 
+
 def check_string_fixed_length(length: int) -> Validator[str]:
     def validator(var_name: str, val: object) -> str:
         s = check_string(var_name, val)
         if len(s) != length:
-            raise ValidationError(_("{var_name} has incorrect length {length}; should be {target_length}").format(
-                var_name=var_name, target_length=length, length=len(s),
-            ))
+            raise ValidationError(
+                _("{var_name} has incorrect length {length}; should be {target_length}").format(
+                    var_name=var_name,
+                    target_length=length,
+                    length=len(s),
+                )
+            )
         return s
 
     return validator
 
+
 def check_long_string(var_name: str, val: object) -> str:
     return check_capped_string(500)(var_name, val)
 
+
 def check_date(var_name: str, val: object) -> str:
     if not isinstance(val, str):
         raise ValidationError(_('{var_name} is not a string').format(var_name=var_name))
@@ -98,11 +112,13 @@ def check_date(var_name: str, val: object) -> str:
         raise ValidationError(_('{var_name} is not a date').format(var_name=var_name))
     return val
 
+
 def check_int(var_name: str, val: object) -> int:
     if not isinstance(val, int):
         raise ValidationError(_('{var_name} is not an integer').format(var_name=var_name))
     return val
 
+
 def check_int_in(possible_values: List[int]) -> Validator[int]:
     def validator(var_name: str, val: object) -> int:
         n = check_int(var_name, val)
@@ -112,41 +128,54 @@ def check_int_in(possible_values: List[int]) -> Validator[int]:
 
     return validator
 
+
 def check_float(var_name: str, val: object) -> float:
     if not isinstance(val, float):
         raise ValidationError(_('{var_name} is not a float').format(var_name=var_name))
     return val
 
+
 def check_bool(var_name: str, val: object) -> bool:
     if not isinstance(val, bool):
         raise ValidationError(_('{var_name} is not a boolean').format(var_name=var_name))
     return val
 
+
 def check_color(var_name: str, val: object) -> str:
     s = check_string(var_name, val)
     valid_color_pattern = re.compile(r'^#([a-fA-F0-9]{3,6})$')
     matched_results = valid_color_pattern.match(s)
     if not matched_results:
-        raise ValidationError(_('{var_name} is not a valid hex color code').format(var_name=var_name))
+        raise ValidationError(
+            _('{var_name} is not a valid hex color code').format(var_name=var_name)
+        )
     return s
 
+
 def check_none_or(sub_validator: Validator[ResultT]) -> Validator[Optional[ResultT]]:
     def f(var_name: str, val: object) -> Optional[ResultT]:
         if val is None:
             return val
         else:
             return sub_validator(var_name, val)
+
     return f
 
-def check_list(sub_validator: Validator[ResultT], length: Optional[int]=None) -> Validator[List[ResultT]]:
+
+def check_list(
+    sub_validator: Validator[ResultT], length: Optional[int] = None
+) -> Validator[List[ResultT]]:
     def f(var_name: str, val: object) -> List[ResultT]:
         if not isinstance(val, list):
             raise ValidationError(_('{var_name} is not a list').format(var_name=var_name))
 
         if length is not None and length != len(val):
-            raise ValidationError(_('{container} should have exactly {length} items').format(
-                container=var_name, length=length,
-            ))
+            raise ValidationError(
+                _('{container} should have exactly {length} items').format(
+                    container=var_name,
+                    length=length,
+                )
+            )
 
         for i, item in enumerate(val):
             vname = f'{var_name}[{i}]'
@@ -154,8 +183,10 @@ def check_list(sub_validator: Validator[ResultT], length: Optional[int]=None) ->
             assert item is valid_item  # To justify the unchecked cast below
 
         return cast(List[ResultT], val)
+
     return f
 
+
 def check_tuple(sub_validators: List[Validator[ResultT]]) -> Validator[Tuple[Any, ...]]:
     def f(var_name: str, val: object) -> Tuple[Any, ...]:
         if not isinstance(val, tuple):
@@ -163,36 +194,51 @@ def check_tuple(sub_validators: List[Validator[ResultT]]) -> Validator[Tuple[Any
 
         desired_len = len(sub_validators)
         if desired_len != len(val):
-            raise ValidationError(_('{var_name} should have exactly {desired_len} items').format(
-                var_name=var_name, desired_len=desired_len,
-            ))
+            raise ValidationError(
+                _('{var_name} should have exactly {desired_len} items').format(
+                    var_name=var_name,
+                    desired_len=desired_len,
+                )
+            )
 
         for i, sub_validator in enumerate(sub_validators):
             vname = f'{var_name}[{i}]'
             sub_validator(vname, val[i])
 
         return val
+
     return f
 
+
 # https://zulip.readthedocs.io/en/latest/testing/mypy.html#using-overload-to-accurately-describe-variations
 @overload
-def check_dict(required_keys: Iterable[Tuple[str, Validator[object]]]=[],
-               optional_keys: Iterable[Tuple[str, Validator[object]]]=[],
-               *,
-               _allow_only_listed_keys: bool=False) -> Validator[Dict[str, object]]:
+def check_dict(
+    required_keys: Iterable[Tuple[str, Validator[object]]] = [],
+    optional_keys: Iterable[Tuple[str, Validator[object]]] = [],
+    *,
+    _allow_only_listed_keys: bool = False,
+) -> Validator[Dict[str, object]]:
     ...
+
+
 @overload
-def check_dict(required_keys: Iterable[Tuple[str, Validator[ResultT]]]=[],
-               optional_keys: Iterable[Tuple[str, Validator[ResultT]]]=[],
-               *,
-               value_validator: Validator[ResultT],
-               _allow_only_listed_keys: bool=False) -> Validator[Dict[str, ResultT]]:
+def check_dict(
+    required_keys: Iterable[Tuple[str, Validator[ResultT]]] = [],
+    optional_keys: Iterable[Tuple[str, Validator[ResultT]]] = [],
+    *,
+    value_validator: Validator[ResultT],
+    _allow_only_listed_keys: bool = False,
+) -> Validator[Dict[str, ResultT]]:
     ...
-def check_dict(required_keys: Iterable[Tuple[str, Validator[ResultT]]]=[],
-               optional_keys: Iterable[Tuple[str, Validator[ResultT]]]=[],
-               *,
-               value_validator: Optional[Validator[ResultT]]=None,
-               _allow_only_listed_keys: bool=False) -> Validator[Dict[str, ResultT]]:
+
+
+def check_dict(
+    required_keys: Iterable[Tuple[str, Validator[ResultT]]] = [],
+    optional_keys: Iterable[Tuple[str, Validator[ResultT]]] = [],
+    *,
+    value_validator: Optional[Validator[ResultT]] = None,
+    _allow_only_listed_keys: bool = False,
+) -> Validator[Dict[str, ResultT]]:
     def f(var_name: str, val: object) -> Dict[str, ResultT]:
         if not isinstance(val, dict):
             raise ValidationError(_('{var_name} is not a dict').format(var_name=var_name))
@@ -202,9 +248,12 @@ def check_dict(required_keys: Iterable[Tuple[str, Validator[ResultT]]]=[],
 
         for k, sub_validator in required_keys:
             if k not in val:
-                raise ValidationError(_('{key_name} key is missing from {var_name}').format(
-                    key_name=k, var_name=var_name,
-                ))
+                raise ValidationError(
+                    _('{key_name} key is missing from {var_name}').format(
+                        key_name=k,
+                        var_name=var_name,
+                    )
+                )
             vname = f'{var_name}["{k}"]'
             sub_validator(vname, val[k])
 
@@ -224,19 +273,25 @@ def check_dict(required_keys: Iterable[Tuple[str, Validator[ResultT]]]=[],
             optional_keys_set = {x[0] for x in optional_keys}
             delta_keys = set(val.keys()) - required_keys_set - optional_keys_set
             if len(delta_keys) != 0:
-                raise ValidationError(_("Unexpected arguments: {}").format(", ".join(list(delta_keys))))
+                raise ValidationError(
+                    _("Unexpected arguments: {}").format(", ".join(list(delta_keys)))
+                )
 
         return cast(Dict[str, ResultT], val)
 
     return f
 
-def check_dict_only(required_keys: Iterable[Tuple[str, Validator[ResultT]]],
-                    optional_keys: Iterable[Tuple[str, Validator[ResultT]]]=[]) -> Validator[Dict[str, ResultT]]:
+
+def check_dict_only(
+    required_keys: Iterable[Tuple[str, Validator[ResultT]]],
+    optional_keys: Iterable[Tuple[str, Validator[ResultT]]] = [],
+) -> Validator[Dict[str, ResultT]]:
     return cast(
         Validator[Dict[str, ResultT]],
         check_dict(required_keys, optional_keys, _allow_only_listed_keys=True),
     )
 
+
 def check_union(allowed_type_funcs: Iterable[Validator[ResultT]]) -> Validator[ResultT]:
     """
     Use this validator if an argument is of a variable type (e.g. processing
@@ -253,23 +308,32 @@ def check_union(allowed_type_funcs: Iterable[Validator[ResultT]]) -> Validator[R
             except ValidationError:
                 pass
         raise ValidationError(_('{var_name} is not an allowed_type').format(var_name=var_name))
+
     return enumerated_type_check
 
+
 def equals(expected_val: ResultT) -> Validator[ResultT]:
     def f(var_name: str, val: object) -> ResultT:
         if val != expected_val:
-            raise ValidationError(_('{variable} != {expected_value} ({value} is wrong)').format(
-                variable=var_name, expected_value=expected_val, value=val,
-            ))
+            raise ValidationError(
+                _('{variable} != {expected_value} ({value} is wrong)').format(
+                    variable=var_name,
+                    expected_value=expected_val,
+                    value=val,
+                )
+            )
         return cast(ResultT, val)
+
     return f
 
+
 def validate_login_email(email: str) -> None:
     try:
         validate_email(email)
     except ValidationError as err:
         raise JsonableError(str(err.message))
 
+
 def check_url(var_name: str, val: object) -> str:
     # First, ensure val is a string
     s = check_string(var_name, val)
@@ -281,6 +345,7 @@ def check_url(var_name: str, val: object) -> str:
     except ValidationError:
         raise ValidationError(_('{var_name} is not a URL').format(var_name=var_name))
 
+
 def check_external_account_url_pattern(var_name: str, val: object) -> str:
     s = check_string(var_name, val)
 
@@ -291,15 +356,18 @@ def check_external_account_url_pattern(var_name: str, val: object) -> str:
     check_url(var_name, url_val)
     return s
 
+
 def validate_choice_field_data(field_data: ProfileFieldData) -> Dict[str, Dict[str, str]]:
     """
     This function is used to validate the data sent to the server while
     creating/editing choices of the choice field in Organization settings.
     """
-    validator = check_dict_only([
-        ('text', check_required_string),
-        ('order', check_required_string),
-    ])
+    validator = check_dict_only(
+        [
+            ('text', check_required_string),
+            ('order', check_required_string),
+        ]
+    )
 
     for key, value in field_data.items():
         if not key.strip():
@@ -310,6 +378,7 @@ def validate_choice_field_data(field_data: ProfileFieldData) -> Dict[str, Dict[s
 
     return cast(Dict[str, Dict[str, str]], field_data)
 
+
 def validate_choice_field(var_name: str, field_data: str, value: object) -> str:
     """
     This function is used to validate the value selected by the user against a
@@ -322,6 +391,7 @@ def validate_choice_field(var_name: str, field_data: str, value: object) -> str:
         raise ValidationError(msg.format(value=value, field_name=var_name))
     return s
 
+
 def check_widget_content(widget_content: object) -> Dict[str, Any]:
     if not isinstance(widget_content, dict):
         raise ValidationError('widget_content is not a dict')
@@ -345,20 +415,24 @@ def check_widget_content(widget_content: object) -> Dict[str, Any]:
 
         if extra_data['type'] == 'choices':
             check_choices = check_list(
-                check_dict([
-                    ('short_name', check_string),
-                    ('long_name', check_string),
-                    ('reply', check_string),
-                ]),
+                check_dict(
+                    [
+                        ('short_name', check_string),
+                        ('long_name', check_string),
+                        ('reply', check_string),
+                    ]
+                ),
             )
 
             # We re-check "type" here just to avoid it looking
             # like we have extraneous keys.
-            checker = check_dict([
-                ('type', equals('choices')),
-                ('heading', check_string),
-                ('choices', check_choices),
-            ])
+            checker = check_dict(
+                [
+                    ('type', equals('choices')),
+                    ('heading', check_string),
+                    ('choices', check_choices),
+                ]
+            )
 
             checker('extra_data', extra_data)
 
@@ -370,7 +444,7 @@ def check_widget_content(widget_content: object) -> Dict[str, Any]:
 
 
 # Converter functions for use with has_request_variables
-def to_non_negative_int(s: str, max_int_size: int=2**32-1) -> int:
+def to_non_negative_int(s: str, max_int_size: int = 2 ** 32 - 1) -> int:
     x = int(s)
     if x < 0:
         raise ValueError("argument is negative")
@@ -378,6 +452,7 @@ def to_non_negative_int(s: str, max_int_size: int=2**32-1) -> int:
         raise ValueError(f'{x} is too large (max {max_int_size})')
     return x
 
+
 def to_positive_or_allowed_int(allowed_integer: int) -> Callable[[str], int]:
     def converter(s: str) -> int:
         x = int(s)
@@ -386,17 +461,22 @@ def to_positive_or_allowed_int(allowed_integer: int) -> Callable[[str], int]:
         if x == 0:
             raise ValueError("argument is 0")
         return to_non_negative_int(s)
+
     return converter
 
+
 def check_string_or_int_list(var_name: str, val: object) -> Union[str, List[int]]:
     if isinstance(val, str):
         return val
 
     if not isinstance(val, list):
-        raise ValidationError(_('{var_name} is not a string or an integer list').format(var_name=var_name))
+        raise ValidationError(
+            _('{var_name} is not a string or an integer list').format(var_name=var_name)
+        )
 
     return check_list(check_int)(var_name, val)
 
+
 def check_string_or_int(var_name: str, val: object) -> Union[str, int]:
     if isinstance(val, (str, int)):
         return val
diff --git a/zerver/lib/webhooks/common.py b/zerver/lib/webhooks/common.py
index 585887bcda..4b8c197016 100644
--- a/zerver/lib/webhooks/common.py
+++ b/zerver/lib/webhooks/common.py
@@ -35,13 +35,17 @@ that this integration expects!
 # Django prefixes all custom HTTP headers with `HTTP_`
 DJANGO_HTTP_PREFIX = "HTTP_"
 
-def notify_bot_owner_about_invalid_json(user_profile: UserProfile,
-                                        webhook_client_name: str) -> None:
+
+def notify_bot_owner_about_invalid_json(
+    user_profile: UserProfile, webhook_client_name: str
+) -> None:
     send_rate_limited_pm_notification_to_bot_owner(
-        user_profile, user_profile.realm,
+        user_profile,
+        user_profile.realm,
         INVALID_JSON_MESSAGE.format(webhook_name=webhook_client_name).strip(),
     )
 
+
 class MissingHTTPEventHeader(JsonableError):
     code = ErrorCode.MISSING_HTTP_EVENT_HEADER
     data_fields = ['header']
@@ -53,18 +57,21 @@ class MissingHTTPEventHeader(JsonableError):
     def msg_format() -> str:
         return _("Missing the HTTP event header '{header}'")
 
+
 @has_request_variables
 def check_send_webhook_message(
-        request: HttpRequest, user_profile: UserProfile,
-        topic: str, body: str, stream: Optional[str]=REQ(default=None),
-        user_specified_topic: Optional[str]=REQ("topic", default=None),
-        unquote_url_parameters: bool=False,
+    request: HttpRequest,
+    user_profile: UserProfile,
+    topic: str,
+    body: str,
+    stream: Optional[str] = REQ(default=None),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+    unquote_url_parameters: bool = False,
 ) -> None:
 
     if stream is None:
         assert user_profile.bot_owner is not None
-        check_send_private_message(user_profile, request.client,
-                                   user_profile.bot_owner, body)
+        check_send_private_message(user_profile, request.client, user_profile.bot_owner, body)
     else:
         # Some third-party websites (such as Atlassian's JIRA), tend to
         # double escape their URLs in a manner that escaped space characters
@@ -79,8 +86,7 @@ def check_send_webhook_message(
                 topic = unquote(topic)
 
         try:
-            check_send_stream_message(user_profile, request.client,
-                                      stream, topic, body)
+            check_send_stream_message(user_profile, request.client, stream, topic, body)
         except StreamDoesNotExistError:
             # A PM will be sent to the bot_owner by check_message, notifying
             # that the webhook bot just tried to send a message to a non-existent
@@ -88,8 +94,9 @@ def check_send_webhook_message(
             # webhook-errors.log
             pass
 
+
 def standardize_headers(input_headers: Union[None, Dict[str, Any]]) -> Dict[str, str]:
-    """ This method can be used to standardize a dictionary of headers with
+    """This method can be used to standardize a dictionary of headers with
     the standard format that Django expects. For reference, refer to:
     https://docs.djangoproject.com/en/2.2/ref/request-response/#django.http.HttpRequest.headers
 
@@ -110,9 +117,10 @@ def standardize_headers(input_headers: Union[None, Dict[str, Any]]) -> Dict[str,
 
     return canonical_headers
 
-def validate_extract_webhook_http_header(request: HttpRequest, header: str,
-                                         integration_name: str,
-                                         fatal: bool=True) -> Optional[str]:
+
+def validate_extract_webhook_http_header(
+    request: HttpRequest, header: str, integration_name: str, fatal: bool = True
+) -> Optional[str]:
     extracted_header = request.META.get(DJANGO_HTTP_PREFIX + header)
     if extracted_header is None and fatal:
         message_body = MISSING_EVENT_HEADER_MESSAGE.format(
@@ -123,15 +131,15 @@ def validate_extract_webhook_http_header(request: HttpRequest, header: str,
             support_email=FromAddress.SUPPORT,
         )
         send_rate_limited_pm_notification_to_bot_owner(
-            request.user, request.user.realm, message_body)
+            request.user, request.user.realm, message_body
+        )
 
         raise MissingHTTPEventHeader(header)
 
     return extracted_header
 
 
-def get_fixture_http_headers(integration_name: str,
-                             fixture_name: str) -> Dict["str", "str"]:
+def get_fixture_http_headers(integration_name: str, fixture_name: str) -> Dict["str", "str"]:
     """For integrations that require custom HTTP headers for some (or all)
     of their test fixtures, this method will call a specially named
     function from the target integration module to determine what set
@@ -153,14 +161,17 @@ def get_http_headers_from_filename(http_header_key: str) -> Callable[[str], Dict
     be easily (statically) determined, then name the fixtures in the format
     of "header_value__other_details" or even "header_value" and the use this
     method in the headers.py file for the integration."""
+
     def fixture_to_headers(filename: str) -> Dict[str, str]:
         if '__' in filename:
             event_type = filename.split("__")[0]
         else:
             event_type = filename
         return {http_header_key: event_type}
+
     return fixture_to_headers
 
+
 def unix_milliseconds_to_timestamp(milliseconds: Any, webhook: str) -> datetime:
     """If an integration requires time input in unix milliseconds, this helper
     checks to ensure correct type and will catch any errors related to type or
diff --git a/zerver/lib/webhooks/git.py b/zerver/lib/webhooks/git.py
index bc1aa1fd56..3d592b96b1 100644
--- a/zerver/lib/webhooks/git.py
+++ b/zerver/lib/webhooks/git.py
@@ -17,26 +17,40 @@ PUSH_PUSHED_TEXT_WITH_URL = "[pushed]({compare_url}) {number_of_commits} {commit
 PUSH_PUSHED_TEXT_WITHOUT_URL = "pushed {number_of_commits} {commit_or_commits}"
 
 PUSH_COMMITS_BASE = '{user_name} {pushed_text} to branch {branch_name}.'
-PUSH_COMMITS_MESSAGE_TEMPLATE_WITH_COMMITTERS = PUSH_COMMITS_BASE + """ {committers_details}.
+PUSH_COMMITS_MESSAGE_TEMPLATE_WITH_COMMITTERS = (
+    PUSH_COMMITS_BASE
+    + """ {committers_details}.
 
 {commits_data}
 """
-PUSH_COMMITS_MESSAGE_TEMPLATE_WITHOUT_COMMITTERS = PUSH_COMMITS_BASE + """
+)
+PUSH_COMMITS_MESSAGE_TEMPLATE_WITHOUT_COMMITTERS = (
+    PUSH_COMMITS_BASE
+    + """
 
 {commits_data}
 """
-PUSH_DELETE_BRANCH_MESSAGE_TEMPLATE = "{user_name} [deleted]({compare_url}) the branch {branch_name}."
-PUSH_LOCAL_BRANCH_WITHOUT_COMMITS_MESSAGE_TEMPLATE = "{user_name} [pushed]({compare_url}) the branch {branch_name}."
+)
+PUSH_DELETE_BRANCH_MESSAGE_TEMPLATE = (
+    "{user_name} [deleted]({compare_url}) the branch {branch_name}."
+)
+PUSH_LOCAL_BRANCH_WITHOUT_COMMITS_MESSAGE_TEMPLATE = (
+    "{user_name} [pushed]({compare_url}) the branch {branch_name}."
+)
 PUSH_COMMITS_MESSAGE_EXTENSION = "Commits by {}"
 PUSH_COMMITTERS_LIMIT_INFO = 3
 
-FORCE_PUSH_COMMITS_MESSAGE_TEMPLATE = "{user_name} [force pushed]({url}) to branch {branch_name}. Head is now {head}."
+FORCE_PUSH_COMMITS_MESSAGE_TEMPLATE = (
+    "{user_name} [force pushed]({url}) to branch {branch_name}. Head is now {head}."
+)
 CREATE_BRANCH_MESSAGE_TEMPLATE = "{user_name} created [{branch_name}]({url}) branch."
 CREATE_BRANCH_WITHOUT_URL_MESSAGE_TEMPLATE = "{user_name} created {branch_name} branch."
 REMOVE_BRANCH_MESSAGE_TEMPLATE = "{user_name} deleted branch {branch_name}."
 
 PULL_REQUEST_OR_ISSUE_MESSAGE_TEMPLATE = "{user_name} {action} [{type}{id}]({url})"
-PULL_REQUEST_OR_ISSUE_MESSAGE_TEMPLATE_WITH_TITLE = "{user_name} {action} [{type}{id} {title}]({url})"
+PULL_REQUEST_OR_ISSUE_MESSAGE_TEMPLATE_WITH_TITLE = (
+    "{user_name} {action} [{type}{id} {title}]({url})"
+)
 PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE = "(assigned to {assignee})"
 PULL_REQUEST_BRANCH_INFO_TEMPLATE = "from `{target}` to `{base}`"
 
@@ -53,10 +67,15 @@ TAG_WITHOUT_URL_TEMPLATE = "{tag_name}"
 
 RELEASE_MESSAGE_TEMPLATE = "{user_name} {action} release [{release_name}]({url}) for tag {tagname}."
 
-def get_push_commits_event_message(user_name: str, compare_url: Optional[str],
-                                   branch_name: str, commits_data: List[Dict[str, Any]],
-                                   is_truncated: bool=False,
-                                   deleted: bool=False) -> str:
+
+def get_push_commits_event_message(
+    user_name: str,
+    compare_url: Optional[str],
+    branch_name: str,
+    commits_data: List[Dict[str, Any]],
+    is_truncated: bool = False,
+    deleted: bool = False,
+) -> str:
     if not commits_data and deleted:
         return PUSH_DELETE_BRANCH_MESSAGE_TEMPLATE.format(
             user_name=user_name,
@@ -71,12 +90,15 @@ def get_push_commits_event_message(user_name: str, compare_url: Optional[str],
             branch_name=branch_name,
         )
 
-    pushed_message_template = PUSH_PUSHED_TEXT_WITH_URL if compare_url else PUSH_PUSHED_TEXT_WITHOUT_URL
+    pushed_message_template = (
+        PUSH_PUSHED_TEXT_WITH_URL if compare_url else PUSH_PUSHED_TEXT_WITHOUT_URL
+    )
 
     pushed_text_message = pushed_message_template.format(
         compare_url=compare_url,
         number_of_commits=len(commits_data),
-        commit_or_commits=COMMIT_OR_COMMITS.format('s' if len(commits_data) > 1 else ''))
+        commit_or_commits=COMMIT_OR_COMMITS.format('s' if len(commits_data) > 1 else ''),
+    )
 
     committers_items: List[Tuple[str, int]] = get_all_committers(commits_data)
     if len(committers_items) == 1 and user_name == committers_items[0][0]:
@@ -103,7 +125,10 @@ def get_push_commits_event_message(user_name: str, compare_url: Optional[str],
             commits_data=get_commits_content(commits_data, is_truncated),
         ).rstrip()
 
-def get_force_push_commits_event_message(user_name: str, url: str, branch_name: str, head: str) -> str:
+
+def get_force_push_commits_event_message(
+    user_name: str, url: str, branch_name: str, head: str
+) -> str:
     return FORCE_PUSH_COMMITS_MESSAGE_TEMPLATE.format(
         user_name=user_name,
         url=url,
@@ -111,6 +136,7 @@ def get_force_push_commits_event_message(user_name: str, url: str, branch_name:
         head=head,
     )
 
+
 def get_create_branch_event_message(user_name: str, url: Optional[str], branch_name: str) -> str:
     if url is None:
         return CREATE_BRANCH_WITHOUT_URL_MESSAGE_TEMPLATE.format(
@@ -123,17 +149,27 @@ def get_create_branch_event_message(user_name: str, url: Optional[str], branch_n
         branch_name=branch_name,
     )
 
+
 def get_remove_branch_event_message(user_name: str, branch_name: str) -> str:
     return REMOVE_BRANCH_MESSAGE_TEMPLATE.format(
         user_name=user_name,
         branch_name=branch_name,
     )
 
-def get_pull_request_event_message(user_name: str, action: str, url: str, number: Optional[int]=None,
-                                   target_branch: Optional[str]=None, base_branch: Optional[str]=None,
-                                   message: Optional[str]=None, assignee: Optional[str]=None,
-                                   assignees: Optional[List[Dict[str, Any]]]=None,
-                                   type: str='PR', title: Optional[str]=None) -> str:
+
+def get_pull_request_event_message(
+    user_name: str,
+    action: str,
+    url: str,
+    number: Optional[int] = None,
+    target_branch: Optional[str] = None,
+    base_branch: Optional[str] = None,
+    message: Optional[str] = None,
+    assignee: Optional[str] = None,
+    assignees: Optional[List[Dict[str, Any]]] = None,
+    type: str = 'PR',
+    title: Optional[str] = None,
+) -> str:
     kwargs = {
         'user_name': user_name,
         'action': action,
@@ -160,12 +196,12 @@ def get_pull_request_event_message(user_name: str, action: str, url: str, number
             assignees_string = ", ".join(usernames[:-1]) + " and " + usernames[-1]
 
         assignee_info = PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE.format(
-            assignee=assignees_string)
+            assignee=assignees_string
+        )
         main_message = f"{main_message} {assignee_info}"
 
     elif assignee:
-        assignee_info = PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE.format(
-            assignee=assignee)
+        assignee_info = PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE.format(assignee=assignee)
         main_message = f"{main_message} {assignee_info}"
 
     if target_branch and base_branch:
@@ -176,7 +212,7 @@ def get_pull_request_event_message(user_name: str, action: str, url: str, number
         main_message = f"{main_message} {branch_info}"
 
     punctuation = ':' if message else '.'
-    if (assignees or assignee or (target_branch and base_branch) or (title is None)):
+    if assignees or assignee or (target_branch and base_branch) or (title is None):
         main_message = f'{main_message}{punctuation}'
     elif title is not None:
         # Once we get here, we know that the message ends with a title
@@ -188,21 +224,25 @@ def get_pull_request_event_message(user_name: str, action: str, url: str, number
         main_message += '\n' + CONTENT_MESSAGE_TEMPLATE.format(message=message)
     return main_message.rstrip()
 
-def get_setup_webhook_message(integration: str, user_name: Optional[str]=None) -> str:
+
+def get_setup_webhook_message(integration: str, user_name: Optional[str] = None) -> str:
     content = SETUP_MESSAGE_TEMPLATE.format(integration=integration)
     if user_name:
         content += SETUP_MESSAGE_USER_PART.format(user_name=user_name)
     content = f"{content}."
     return content
 
-def get_issue_event_message(user_name: str,
-                            action: str,
-                            url: str,
-                            number: Optional[int]=None,
-                            message: Optional[str]=None,
-                            assignee: Optional[str]=None,
-                            assignees: Optional[List[Dict[str, Any]]]=None,
-                            title: Optional[str]=None) -> str:
+
+def get_issue_event_message(
+    user_name: str,
+    action: str,
+    url: str,
+    number: Optional[int] = None,
+    message: Optional[str] = None,
+    assignee: Optional[str] = None,
+    assignees: Optional[List[Dict[str, Any]]] = None,
+    title: Optional[str] = None,
+) -> str:
     return get_pull_request_event_message(
         user_name,
         action,
@@ -215,10 +255,10 @@ def get_issue_event_message(user_name: str,
         title=title,
     )
 
-def get_push_tag_event_message(user_name: str,
-                               tag_name: str,
-                               tag_url: Optional[str]=None,
-                               action: str='pushed') -> str:
+
+def get_push_tag_event_message(
+    user_name: str, tag_name: str, tag_url: Optional[str] = None, action: str = 'pushed'
+) -> str:
     if tag_url:
         tag_part = TAG_WITH_URL_TEMPLATE.format(tag_name=tag_name, tag_url=tag_url)
     else:
@@ -235,11 +275,10 @@ def get_push_tag_event_message(user_name: str,
 
     return message
 
-def get_commits_comment_action_message(user_name: str,
-                                       action: str,
-                                       commit_url: str,
-                                       sha: str,
-                                       message: Optional[str]=None) -> str:
+
+def get_commits_comment_action_message(
+    user_name: str, action: str, commit_url: str, sha: str, message: Optional[str] = None
+) -> str:
     content = COMMITS_COMMENT_MESSAGE_TEMPLATE.format(
         user_name=user_name,
         action=action,
@@ -255,7 +294,8 @@ def get_commits_comment_action_message(user_name: str,
 
     return content
 
-def get_commits_content(commits_data: List[Dict[str, Any]], is_truncated: bool=False) -> str:
+
+def get_commits_content(commits_data: List[Dict[str, Any]], is_truncated: bool = False) -> str:
     commits_content = ''
     for commit in commits_data[:COMMITS_LIMIT]:
         commits_content += COMMIT_ROW_TEMPLATE.format(
@@ -274,8 +314,10 @@ def get_commits_content(commits_data: List[Dict[str, Any]], is_truncated: bool=F
         ).replace('  ', ' ')
     return commits_content.rstrip()
 
-def get_release_event_message(user_name: str, action: str,
-                              tagname: str, release_name: str, url: str) -> str:
+
+def get_release_event_message(
+    user_name: str, action: str, tagname: str, release_name: str, url: str
+) -> str:
     content = RELEASE_MESSAGE_TEMPLATE.format(
         user_name=user_name,
         action=action,
@@ -286,9 +328,11 @@ def get_release_event_message(user_name: str, action: str,
 
     return content
 
+
 def get_short_sha(sha: str) -> str:
     return sha[:7]
 
+
 def get_all_committers(commits_data: List[Dict[str, Any]]) -> List[Tuple[str, int]]:
     committers: Dict[str, int] = defaultdict(int)
 
@@ -297,7 +341,8 @@ def get_all_committers(commits_data: List[Dict[str, Any]]) -> List[Tuple[str, in
 
     # Sort by commit count, breaking ties alphabetically.
     committers_items: List[Tuple[str, int]] = sorted(
-        committers.items(), key=lambda item: (-item[1], item[0]),
+        committers.items(),
+        key=lambda item: (-item[1], item[0]),
     )
     committers_values: List[int] = [c_i[1] for c_i in committers_items]
 
diff --git a/zerver/lib/widget.py b/zerver/lib/widget.py
index 55f6fad0bd..4c9d95406e 100644
--- a/zerver/lib/widget.py
+++ b/zerver/lib/widget.py
@@ -20,8 +20,8 @@ def get_widget_data(content: str) -> Tuple[Optional[str], Optional[str]]:
 
     return None, None
 
-def get_extra_data_from_widget_type(content: str,
-                                    widget_type: Optional[str]) -> Any:
+
+def get_extra_data_from_widget_type(content: str, widget_type: Optional[str]) -> Any:
     if widget_type == 'poll':
         # This is used to extract the question from the poll command.
         # The command '/poll question' will pre-set the question in the poll
@@ -43,11 +43,12 @@ def get_extra_data_from_widget_type(content: str,
         return extra_data
     return None
 
+
 def do_widget_post_save_actions(send_request: SendMessageRequest) -> None:
-    '''
+    """
     This code works with the webapp; mobile and other
     clients should also start supporting this soon.
-    '''
+    """
     message_content = send_request.message.content
     sender_id = send_request.message.sender_id
     message_id = send_request.message.id
diff --git a/zerver/lib/zcommand.py b/zerver/lib/zcommand.py
index 4003a5bb84..78df925a03 100644
--- a/zerver/lib/zcommand.py
+++ b/zerver/lib/zcommand.py
@@ -8,16 +8,19 @@ from zerver.models import UserProfile
 
 
 def process_zcommands(content: str, user_profile: UserProfile) -> Dict[str, Any]:
-    def change_mode_setting(command: str, switch_command: str,
-                            setting: str, setting_value: int) -> str:
-        msg = 'Changed to {command} mode! To revert ' \
+    def change_mode_setting(
+        command: str, switch_command: str, setting: str, setting_value: int
+    ) -> str:
+        msg = (
+            'Changed to {command} mode! To revert '
             '{command} mode, type `/{switch_command}`.'.format(
                 command=command,
                 switch_command=switch_command,
             )
-        do_set_user_display_setting(user_profile=user_profile,
-                                    setting_name=setting,
-                                    setting_value=setting_value)
+        )
+        do_set_user_display_setting(
+            user_profile=user_profile, setting_name=setting, setting_value=setting_value
+        )
         return msg
 
     if not content.startswith('/'):
@@ -29,29 +32,45 @@ def process_zcommands(content: str, user_profile: UserProfile) -> Dict[str, Any]
     elif command == 'night':
         if user_profile.color_scheme == UserProfile.COLOR_SCHEME_NIGHT:
             return dict(msg='You are still in night mode.')
-        return dict(msg=change_mode_setting(command=command,
-                                            switch_command='day',
-                                            setting='color_scheme',
-                                            setting_value=UserProfile.COLOR_SCHEME_NIGHT))
+        return dict(
+            msg=change_mode_setting(
+                command=command,
+                switch_command='day',
+                setting='color_scheme',
+                setting_value=UserProfile.COLOR_SCHEME_NIGHT,
+            )
+        )
     elif command == 'day':
         if user_profile.color_scheme == UserProfile.COLOR_SCHEME_LIGHT:
             return dict(msg='You are still in day mode.')
-        return dict(msg=change_mode_setting(command=command,
-                                            switch_command='night',
-                                            setting='color_scheme',
-                                            setting_value=UserProfile.COLOR_SCHEME_LIGHT))
+        return dict(
+            msg=change_mode_setting(
+                command=command,
+                switch_command='night',
+                setting='color_scheme',
+                setting_value=UserProfile.COLOR_SCHEME_LIGHT,
+            )
+        )
     elif command == 'fluid-width':
         if user_profile.fluid_layout_width:
             return dict(msg='You are still in fluid width mode.')
-        return dict(msg=change_mode_setting(command=command,
-                                            switch_command='fixed-width',
-                                            setting='fluid_layout_width',
-                                            setting_value=True))
+        return dict(
+            msg=change_mode_setting(
+                command=command,
+                switch_command='fixed-width',
+                setting='fluid_layout_width',
+                setting_value=True,
+            )
+        )
     elif command == 'fixed-width':
         if not user_profile.fluid_layout_width:
             return dict(msg='You are still in fixed width mode.')
-        return dict(msg=change_mode_setting(command=command,
-                                            switch_command='fluid-width',
-                                            setting='fluid_layout_width',
-                                            setting_value=False))
+        return dict(
+            msg=change_mode_setting(
+                command=command,
+                switch_command='fluid-width',
+                setting='fluid_layout_width',
+                setting_value=False,
+            )
+        )
     raise JsonableError(_('No such command: {}').format(command))
diff --git a/zerver/lib/zephyr.py b/zerver/lib/zephyr.py
index 116ae1beae..baf2358cfb 100644
--- a/zerver/lib/zephyr.py
+++ b/zerver/lib/zephyr.py
@@ -9,9 +9,7 @@ def compute_mit_user_fullname(email: str) -> str:
         # Input is either e.g. username@mit.edu or user|CROSSREALM.INVALID@mit.edu
         match_user = re.match(r'^([a-zA-Z0-9_.-]+)(\|.+)?@mit\.edu$', email.lower())
         if match_user and match_user.group(2) is None:
-            answer = DNS.dnslookup(
-                f"{match_user.group(1)}.passwd.ns.athena.mit.edu",
-                DNS.Type.TXT)
+            answer = DNS.dnslookup(f"{match_user.group(1)}.passwd.ns.athena.mit.edu", DNS.Type.TXT)
             hesiod_name = answer[0][0].split(':')[4].split(',')[0].strip()
             if hesiod_name != "":
                 return hesiod_name
diff --git a/zerver/logging_handlers.py b/zerver/logging_handlers.py
index 9cac485774..787a3e533f 100644
--- a/zerver/logging_handlers.py
+++ b/zerver/logging_handlers.py
@@ -30,6 +30,7 @@ def try_git_describe() -> Optional[str]:
     except (FileNotFoundError, subprocess.CalledProcessError):  # nocoverage
         return None
 
+
 def add_request_metadata(report: Dict[str, Any], request: HttpRequest) -> None:
     report['has_request'] = True
 
@@ -40,6 +41,7 @@ def add_request_metadata(report: Dict[str, Any], request: HttpRequest) -> None:
     report['server_name'] = request.META.get('SERVER_NAME', None)
     try:
         from django.contrib.auth.models import AnonymousUser
+
         user_profile = request.user
         if isinstance(user_profile, AnonymousUser):
             user_full_name = None
@@ -67,8 +69,11 @@ def add_request_metadata(report: Dict[str, Any], request: HttpRequest) -> None:
 
     exception_filter = get_exception_reporter_filter(request)
     try:
-        report['data'] = exception_filter.get_post_parameters(request) \
-            if request.method == 'POST' else request.GET
+        report['data'] = (
+            exception_filter.get_post_parameters(request)
+            if request.method == 'POST'
+            else request.GET
+        )
     except Exception:
         # exception_filter.get_post_parameters will throw
         # RequestDataTooBig if there's a really big file uploaded
@@ -81,13 +86,15 @@ def add_request_metadata(report: Dict[str, Any], request: HttpRequest) -> None:
         # exception if the host is invalid
         report['host'] = platform.node()
 
+
 @runtime_checkable
 class HasRequest(Protocol):
     request: HttpRequest
 
+
 class AdminNotifyHandler(logging.Handler):
     """An logging handler that sends the log/exception to the queue to be
-       turned into an email and/or a Zulip message for the server admins.
+    turned into an email and/or a Zulip message for the server admins.
     """
 
     # adapted in part from django/utils/log.py
@@ -124,7 +131,9 @@ class AdminNotifyHandler(logging.Handler):
             if record.exc_info:
                 stack_trace = ''.join(traceback.format_exception(*record.exc_info))
                 message = str(record.exc_info[1])
-                is_markdown_rendering_exception = record.msg.startswith('Exception in Markdown parser')
+                is_markdown_rendering_exception = record.msg.startswith(
+                    'Exception in Markdown parser'
+                )
             else:
                 stack_trace = 'No stack trace available'
                 message = record.getMessage()
@@ -154,8 +163,11 @@ class AdminNotifyHandler(logging.Handler):
             logging.warning("Reporting an error to admins...")
             logging.warning(
                 "Reporting an error to admins: %s %s %s %s %s",
-                record.levelname, report['logger_name'], report['log_module'],
-                report['message'], report['stack_trace'],
+                record.levelname,
+                report['logger_name'],
+                report['log_module'],
+                report['message'],
+                report['stack_trace'],
             )
 
         try:
@@ -163,12 +175,16 @@ class AdminNotifyHandler(logging.Handler):
                 # On staging, process the report directly so it can happen inside this
                 # try/except to prevent looping
                 from zerver.lib.error_notify import notify_server_error
+
                 notify_server_error(report, is_markdown_rendering_exception)
             else:
-                queue_json_publish('error_reports', dict(
-                    type = "server",
-                    report = report,
-                ))
+                queue_json_publish(
+                    'error_reports',
+                    dict(
+                        type="server",
+                        report=report,
+                    ),
+                )
         except Exception:
             # If this breaks, complain loudly but don't pass the traceback up the stream
             # However, we *don't* want to use logging.exception since that could trigger a loop.
diff --git a/zerver/management/commands/add_users_to_streams.py b/zerver/management/commands/add_users_to_streams.py
index b47d60d484..81b2331ff6 100644
--- a/zerver/management/commands/add_users_to_streams.py
+++ b/zerver/management/commands/add_users_to_streams.py
@@ -14,9 +14,8 @@ class Command(ZulipBaseCommand):
         self.add_user_list_args(parser, all_users_help="Add all users in realm to these streams.")
 
         parser.add_argument(
-            '-s', '--streams',
-            required=True,
-            help='A comma-separated list of stream names.')
+            '-s', '--streams', required=True, help='A comma-separated list of stream names.'
+        )
 
     def handle(self, **options: Any) -> None:
         realm = self.get_realm(options)
@@ -28,8 +27,14 @@ class Command(ZulipBaseCommand):
         for stream_name in set(stream_names):
             for user_profile in user_profiles:
                 stream = ensure_stream(realm, stream_name, acting_user=None)
-                _ignore, already_subscribed = bulk_add_subscriptions(realm, [stream], [user_profile])
+                _ignore, already_subscribed = bulk_add_subscriptions(
+                    realm, [stream], [user_profile]
+                )
                 was_there_already = user_profile.id in (info.user.id for info in already_subscribed)
-                print("{} {} to {}".format(
-                    "Already subscribed" if was_there_already else "Subscribed",
-                    user_profile.delivery_email, stream_name))
+                print(
+                    "{} {} to {}".format(
+                        "Already subscribed" if was_there_already else "Subscribed",
+                        user_profile.delivery_email,
+                        stream_name,
+                    )
+                )
diff --git a/zerver/management/commands/archive_messages.py b/zerver/management/commands/archive_messages.py
index a3fa8f90fb..8d383fdd05 100644
--- a/zerver/management/commands/archive_messages.py
+++ b/zerver/management/commands/archive_messages.py
@@ -6,7 +6,6 @@ from zerver.lib.retention import archive_messages, clean_archived_data
 
 
 class Command(BaseCommand):
-
     def handle(self, *args: Any, **options: str) -> None:
         clean_archived_data()
         archive_messages()
diff --git a/zerver/management/commands/audit_fts_indexes.py b/zerver/management/commands/audit_fts_indexes.py
index 84e468aa1e..39ff37ce33 100644
--- a/zerver/management/commands/audit_fts_indexes.py
+++ b/zerver/management/commands/audit_fts_indexes.py
@@ -8,12 +8,14 @@ from zerver.lib.management import ZulipBaseCommand
 class Command(ZulipBaseCommand):
     def handle(self, *args: Any, **kwargs: str) -> None:
         with connection.cursor() as cursor:
-            cursor.execute("""
+            cursor.execute(
+                """
                 UPDATE zerver_message
                 SET search_tsvector =
                 to_tsvector('zulip.english_us_search', subject || rendered_content)
                 WHERE to_tsvector('zulip.english_us_search', subject || rendered_content) != search_tsvector
-            """)
+            """
+            )
 
             fixed_message_count = cursor.rowcount
             print(f"Fixed {fixed_message_count} messages.")
diff --git a/zerver/management/commands/backup.py b/zerver/management/commands/backup.py
index ef78cf8533..9f402996c4 100644
--- a/zerver/management/commands/backup.py
+++ b/zerver/management/commands/backup.py
@@ -83,8 +83,12 @@ class Command(ZulipBaseCommand):
                 )
                 members.append("zulip-backup/database")
 
-            if not options['skip_uploads'] and settings.LOCAL_UPLOADS_DIR is not None and os.path.exists(
-                os.path.join(settings.DEPLOY_ROOT, settings.LOCAL_UPLOADS_DIR),
+            if (
+                not options['skip_uploads']
+                and settings.LOCAL_UPLOADS_DIR is not None
+                and os.path.exists(
+                    os.path.join(settings.DEPLOY_ROOT, settings.LOCAL_UPLOADS_DIR),
+                )
             ):
                 members.append(
                     os.path.join(settings.DEPLOY_ROOT, settings.LOCAL_UPLOADS_DIR),
@@ -99,7 +103,8 @@ class Command(ZulipBaseCommand):
             assert not any("|" in name or "|" in path for name, path in paths)
             transform_args = [
                 r"--transform=s|^{}(/.*)?$|zulip-backup/{}\1|x".format(
-                    re.escape(path), name.replace("\\", r"\\"),
+                    re.escape(path),
+                    name.replace("\\", r"\\"),
                 )
                 for name, path in paths
             ]
@@ -115,10 +120,15 @@ class Command(ZulipBaseCommand):
                     tarball_path = options["output"]
 
                 run(
-                    ["tar", f"--directory={tmp}", "-cPzf", tarball_path,
-                     *transform_args,
-                     "--",
-                     *members]
+                    [
+                        "tar",
+                        f"--directory={tmp}",
+                        "-cPzf",
+                        tarball_path,
+                        *transform_args,
+                        "--",
+                        *members,
+                    ]
                 )
                 print(f"Backup tarball written to {tarball_path}")
             except BaseException:
diff --git a/zerver/management/commands/bulk_change_user_name.py b/zerver/management/commands/bulk_change_user_name.py
index eeb9b55768..32d5353dac 100644
--- a/zerver/management/commands/bulk_change_user_name.py
+++ b/zerver/management/commands/bulk_change_user_name.py
@@ -11,8 +11,11 @@ class Command(ZulipBaseCommand):
     help = """Change the names for many users."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('data_file', metavar='<data file>',
-                            help="file containing rows of the form <email>,<desired name>")
+        parser.add_argument(
+            'data_file',
+            metavar='<data file>',
+            help="file containing rows of the form <email>,<desired name>",
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: str) -> None:
diff --git a/zerver/management/commands/change_user_email.py b/zerver/management/commands/change_user_email.py
index 633cc67504..b657a2d495 100644
--- a/zerver/management/commands/change_user_email.py
+++ b/zerver/management/commands/change_user_email.py
@@ -10,10 +10,8 @@ class Command(ZulipBaseCommand):
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         self.add_realm_args(parser)
-        parser.add_argument('old_email', metavar='<old email>',
-                            help='email address to change')
-        parser.add_argument('new_email', metavar='<new email>',
-                            help='new email address')
+        parser.add_argument('old_email', metavar='<old email>', help='email address to change')
+        parser.add_argument('new_email', metavar='<new email>', help='new email address')
 
     def handle(self, *args: Any, **options: str) -> None:
         old_email = options['old_email']
diff --git a/zerver/management/commands/change_user_role.py b/zerver/management/commands/change_user_role.py
index 81ec2f07f7..d130c4bf38 100644
--- a/zerver/management/commands/change_user_role.py
+++ b/zerver/management/commands/change_user_role.py
@@ -19,16 +19,19 @@ ONLY perform this on customer request from an authorized person.
 """
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('email', metavar='<email>',
-                            help="email of user to change role")
-        parser.add_argument('new_role', metavar='<new_role>',
-                            choices=['owner', 'admin', 'member', 'guest', 'can_forge_sender',
-                                     'can_create_users'],
-                            help="new role of the user")
-        parser.add_argument('--revoke',
-                            dest='grant',
-                            action="store_false",
-                            help='Remove can_forge_sender or can_create_users permission.')
+        parser.add_argument('email', metavar='<email>', help="email of user to change role")
+        parser.add_argument(
+            'new_role',
+            metavar='<new_role>',
+            choices=['owner', 'admin', 'member', 'guest', 'can_forge_sender', 'can_create_users'],
+            help="new role of the user",
+        )
+        parser.add_argument(
+            '--revoke',
+            dest='grant',
+            action="store_false",
+            help='Remove can_forge_sender or can_create_users permission.',
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: Any) -> None:
@@ -37,21 +40,27 @@ ONLY perform this on customer request from an authorized person.
 
         user = self.get_user(email, realm)
 
-        user_role_map = {'owner': UserProfile.ROLE_REALM_OWNER,
-                         'admin': UserProfile.ROLE_REALM_ADMINISTRATOR,
-                         'member': UserProfile.ROLE_MEMBER,
-                         'guest': UserProfile.ROLE_GUEST}
+        user_role_map = {
+            'owner': UserProfile.ROLE_REALM_OWNER,
+            'admin': UserProfile.ROLE_REALM_ADMINISTRATOR,
+            'member': UserProfile.ROLE_MEMBER,
+            'guest': UserProfile.ROLE_GUEST,
+        }
 
         if options['new_role'] not in ['can_forge_sender', 'can_create_users']:
             new_role = user_role_map[options['new_role']]
             if not options['grant']:
-                raise CommandError("Revoke not supported with this permission; please specify new role.")
+                raise CommandError(
+                    "Revoke not supported with this permission; please specify new role."
+                )
             if new_role == user.role:
                 raise CommandError("User already has this role.")
             old_role_name = UserProfile.ROLE_ID_TO_NAME_MAP[user.role]
             do_change_user_role(user, new_role, acting_user=None)
             new_role_name = UserProfile.ROLE_ID_TO_NAME_MAP[user.role]
-            print(f"Role for {user.delivery_email} changed from {old_role_name} to {new_role_name}.")
+            print(
+                f"Role for {user.delivery_email} changed from {old_role_name} to {new_role_name}."
+            )
             return
 
         if options['new_role'] == 'can_forge_sender':
@@ -62,7 +71,9 @@ ONLY perform this on customer request from an authorized person.
             do_change_can_forge_sender(user, options['grant'])
 
             granted_text = "have" if options['grant'] else "not have"
-            print(f"{user.delivery_email} changed to {granted_text} {options['new_role']} permission.")
+            print(
+                f"{user.delivery_email} changed to {granted_text} {options['new_role']} permission."
+            )
         else:
             if user.can_create_users and options['grant']:
                 raise CommandError("User can already create users for this realm.")
diff --git a/zerver/management/commands/check_redis.py b/zerver/management/commands/check_redis.py
index bfa3a7c429..eeb44b78eb 100644
--- a/zerver/management/commands/check_redis.py
+++ b/zerver/management/commands/check_redis.py
@@ -16,12 +16,14 @@ class Command(BaseCommand):
     Usage: ./manage.py [--trim] check_redis"""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-t', '--trim',
-                            action='store_true',
-                            help="Actually trim excess")
+        parser.add_argument('-t', '--trim', action='store_true', help="Actually trim excess")
 
-    def _check_within_range(self, key: str, count_func: Callable[[], int],
-                            trim_func: Optional[Callable[[str, int], object]]=None) -> None:
+    def _check_within_range(
+        self,
+        key: str,
+        count_func: Callable[[], int],
+        trim_func: Optional[Callable[[str, int], object]] = None,
+    ) -> None:
         user_id = int(key.split(':')[1])
         user = get_user_profile_by_id(user_id)
         entity = RateLimitedUser(user)
@@ -33,8 +35,12 @@ class Command(BaseCommand):
 
         count = count_func()
         if count > max_calls:
-            logging.error("Redis health check found key with more elements \
-than max_api_calls! (trying to trim) %s %s", key, count)
+            logging.error(
+                "Redis health check found key with more elements \
+than max_api_calls! (trying to trim) %s %s",
+                key,
+                count,
+            )
             if trim_func is not None:
                 client.expire(key, entity.max_api_window())
                 trim_func(key, max_calls)
@@ -47,17 +53,15 @@ than max_api_calls! (trying to trim) %s %s", key, count)
         wildcard_list = "ratelimit:*:*:list"
         wildcard_zset = "ratelimit:*:*:zset"
 
-        trim_func: Optional[
-            Callable[[str, int], object]
-        ] = lambda key, max_calls: client.ltrim(key, 0, max_calls - 1)
+        trim_func: Optional[Callable[[str, int], object]] = lambda key, max_calls: client.ltrim(
+            key, 0, max_calls - 1
+        )
         if not options['trim']:
             trim_func = None
 
         lists = client.keys(wildcard_list)
         for list_name in lists:
-            self._check_within_range(list_name,
-                                     lambda: client.llen(list_name),
-                                     trim_func)
+            self._check_within_range(list_name, lambda: client.llen(list_name), trim_func)
 
         zsets = client.keys(wildcard_zset)
         for zset in zsets:
@@ -65,6 +69,6 @@ than max_api_calls! (trying to trim) %s %s", key, count)
             # We can warn on our zset being too large, but we don't know what
             # elements to trim. We'd have to go through every list item and take
             # the intersection. The best we can do is expire it
-            self._check_within_range(zset,
-                                     lambda: client.zcount(zset, 0, now),
-                                     lambda key, max_calls: None)
+            self._check_within_range(
+                zset, lambda: client.zcount(zset, 0, now), lambda key, max_calls: None
+            )
diff --git a/zerver/management/commands/compilemessages.py b/zerver/management/commands/compilemessages.py
index 74db445540..b7beaa6c62 100644
--- a/zerver/management/commands/compilemessages.py
+++ b/zerver/management/commands/compilemessages.py
@@ -17,14 +17,12 @@ from pyuca import Collator
 
 
 class Command(compilemessages.Command):
-
     def add_arguments(self, parser: CommandParser) -> None:
         super().add_arguments(parser)
 
         parser.add_argument(
-            '--strict', '-s',
-            action='store_true',
-            help='Stop execution in case of errors.')
+            '--strict', '-s', action='store_true', help='Stop execution in case of errors.'
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         super().handle(*args, **options)
@@ -67,7 +65,7 @@ class Command(compilemessages.Command):
     def get_name_from_po_file(self, po_filename: str, locale: str) -> str:
         try:
             team = polib.pofile(po_filename).metadata["Language-Team"]
-            return team[:team.rindex(" (")]
+            return team[: team.rindex(" (")]
         except (KeyError, ValueError):
             raise Exception(f"Unknown language {locale}")
 
@@ -100,12 +98,14 @@ class Command(compilemessages.Command):
 
         for locale in locales:
             if locale == 'en':
-                data['languages'].append({
-                    'name': 'English',
-                    'name_local': 'English',
-                    'code': 'en',
-                    'locale': 'en',
-                })
+                data['languages'].append(
+                    {
+                        'name': 'English',
+                        'name_local': 'English',
+                        'code': 'en',
+                        'locale': 'en',
+                    }
+                )
                 continue
 
             lc_messages_path = os.path.join(locale_path, locale, 'LC_MESSAGES')
diff --git a/zerver/management/commands/convert_gitter_data.py b/zerver/management/commands/convert_gitter_data.py
index f55e8dd200..a2f9d378d5 100644
--- a/zerver/management/commands/convert_gitter_data.py
+++ b/zerver/management/commands/convert_gitter_data.py
@@ -13,16 +13,19 @@ class Command(BaseCommand):
     help = """Convert the Gitter data into Zulip data format."""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('gitter_data', nargs='+',
-                            metavar='<gitter data>',
-                            help="Gitter data in json format")
+        parser.add_argument(
+            'gitter_data', nargs='+', metavar='<gitter data>', help="Gitter data in json format"
+        )
 
-        parser.add_argument('--output', dest='output_dir',
-                            help='Directory to write exported data to.')
+        parser.add_argument(
+            '--output', dest='output_dir', help='Directory to write exported data to.'
+        )
 
-        parser.add_argument('--threads',
-                            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
-                            help='Threads to download avatars and attachments faster')
+        parser.add_argument(
+            '--threads',
+            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
+            help='Threads to download avatars and attachments faster',
+        )
 
         parser.formatter_class = argparse.RawTextHelpFormatter
 
diff --git a/zerver/management/commands/convert_mattermost_data.py b/zerver/management/commands/convert_mattermost_data.py
index 65a31226dc..689f1bc1b9 100644
--- a/zerver/management/commands/convert_mattermost_data.py
+++ b/zerver/management/commands/convert_mattermost_data.py
@@ -23,17 +23,23 @@ class Command(BaseCommand):
     help = """Convert the mattermost data into Zulip data format."""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        dir_help = "Directory containing exported JSON file and exported_emoji (optional) directory."
-        parser.add_argument('mattermost_data_dir',
-                            metavar='<mattermost data directory>',
-                            help=dir_help)
+        dir_help = (
+            "Directory containing exported JSON file and exported_emoji (optional) directory."
+        )
+        parser.add_argument(
+            'mattermost_data_dir', metavar='<mattermost data directory>', help=dir_help
+        )
 
-        parser.add_argument('--output', dest='output_dir',
-                            help='Directory to write converted data to.')
+        parser.add_argument(
+            '--output', dest='output_dir', help='Directory to write converted data to.'
+        )
 
-        parser.add_argument('--mask', dest='masking_content',
-                            action="store_true",
-                            help='Mask the content for privacy during QA.')
+        parser.add_argument(
+            '--mask',
+            dest='masking_content',
+            action="store_true",
+            help='Mask the content for privacy during QA.',
+        )
 
         parser.formatter_class = argparse.RawTextHelpFormatter
 
diff --git a/zerver/management/commands/convert_slack_data.py b/zerver/management/commands/convert_slack_data.py
index d429a1da6b..c152099618 100644
--- a/zerver/management/commands/convert_slack_data.py
+++ b/zerver/management/commands/convert_slack_data.py
@@ -13,19 +13,23 @@ class Command(BaseCommand):
     help = """Convert the Slack data into Zulip data format."""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('slack_data_zip', nargs='+',
-                            metavar='<Slack data zip>',
-                            help="Zipped Slack data")
+        parser.add_argument(
+            'slack_data_zip', nargs='+', metavar='<Slack data zip>', help="Zipped Slack data"
+        )
 
-        parser.add_argument('--token', metavar='<slack_token>',
-                            help='Slack legacy token of the organsation')
+        parser.add_argument(
+            '--token', metavar='<slack_token>', help='Slack legacy token of the organsation'
+        )
 
-        parser.add_argument('--output', dest='output_dir',
-                            help='Directory to write exported data to.')
+        parser.add_argument(
+            '--output', dest='output_dir', help='Directory to write exported data to.'
+        )
 
-        parser.add_argument('--threads',
-                            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
-                            help='Threads to use in exporting UserMessage objects in parallel')
+        parser.add_argument(
+            '--threads',
+            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
+            help='Threads to use in exporting UserMessage objects in parallel',
+        )
 
         parser.formatter_class = argparse.RawTextHelpFormatter
 
diff --git a/zerver/management/commands/create_default_stream_groups.py b/zerver/management/commands/create_default_stream_groups.py
index f0ec9ab27a..762ed6d196 100644
--- a/zerver/management/commands/create_default_stream_groups.py
+++ b/zerver/management/commands/create_default_stream_groups.py
@@ -17,21 +17,22 @@ Create default stream groups which the users can choose during sign up.
         self.add_realm_args(parser, True)
 
         parser.add_argument(
-            '-n', '--name',
+            '-n',
+            '--name',
             required=True,
             help='Name of the group you want to create.',
         )
 
         parser.add_argument(
-            '-d', '--description',
+            '-d',
+            '--description',
             required=True,
             help='Description of the group.',
         )
 
         parser.add_argument(
-            '-s', '--streams',
-            required=True,
-            help='A comma-separated list of stream names.')
+            '-s', '--streams', required=True, help='A comma-separated list of stream names.'
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         realm = self.get_realm(options)
@@ -45,10 +46,12 @@ Create default stream groups which the users can choose during sign up.
 
         try:
             default_stream_group = DefaultStreamGroup.objects.get(
-                name=options["name"], realm=realm, description=options["description"])
+                name=options["name"], realm=realm, description=options["description"]
+            )
         except DefaultStreamGroup.DoesNotExist:
             default_stream_group = DefaultStreamGroup.objects.create(
-                name=options["name"], realm=realm, description=options["description"])
+                name=options["name"], realm=realm, description=options["description"]
+            )
         default_stream_group.streams.set(streams)
 
         default_stream_groups = DefaultStreamGroup.objects.all()
diff --git a/zerver/management/commands/create_large_indexes.py b/zerver/management/commands/create_large_indexes.py
index 995ada1cdd..ead2affd64 100644
--- a/zerver/management/commands/create_large_indexes.py
+++ b/zerver/management/commands/create_large_indexes.py
@@ -18,62 +18,77 @@ def create_indexes() -> None:
     with connection.cursor() as cursor:
         # copied from 0082
         print("Creating index zerver_usermessage_starred_message_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_starred_message_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 2) != 0;
-        ''')
+        '''
+        )
 
         # copied from 0083
         print("Creating index zerver_usermessage_mentioned_message_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_mentioned_message_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 8) != 0;
-        ''')
+        '''
+        )
 
         # copied from 0095
         print("Creating index zerver_usermessage_unread_message_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_unread_message_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 1) = 0;
-        ''')
+        '''
+        )
 
         # copied from 0098
         print("Creating index zerver_usermessage_has_alert_word_message_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_has_alert_word_message_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 512) != 0;
-        ''')
+        '''
+        )
 
         # copied from 0099
         print("Creating index zerver_usermessage_wildcard_mentioned_message_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_wildcard_mentioned_message_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 8) != 0 OR (flags & 16) != 0;
-        ''')
+        '''
+        )
 
         # copied from 0177
         print("Creating index zerver_usermessage_is_private_message_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_is_private_message_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 2048) != 0;
-        ''')
+        '''
+        )
 
         # copied from 0180
         print("Creating index zerver_usermessage_active_mobile_push_notification_id.")
-        cursor.execute('''
+        cursor.execute(
+            '''
             CREATE INDEX IF NOT EXISTS zerver_usermessage_active_mobile_push_notification_id
             ON zerver_usermessage (user_profile_id, message_id)
             WHERE (flags & 4096) != 0;
-        ''')
+        '''
+        )
 
         print("Finished.")
 
+
 class Command(ZulipBaseCommand):
     help = """Create concurrent indexes for large tables."""
 
diff --git a/zerver/management/commands/create_stream.py b/zerver/management/commands/create_stream.py
index 38eee0e88a..73441a1d44 100644
--- a/zerver/management/commands/create_stream.py
+++ b/zerver/management/commands/create_stream.py
@@ -13,8 +13,7 @@ the command."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         self.add_realm_args(parser, True, "realm in which to create the stream")
-        parser.add_argument('stream_name', metavar='<stream name>',
-                            help='name of stream to create')
+        parser.add_argument('stream_name', metavar='<stream name>', help='name of stream to create')
 
     def handle(self, *args: Any, **options: str) -> None:
         realm = self.get_realm(options)
diff --git a/zerver/management/commands/create_user.py b/zerver/management/commands/create_user.py
index e6599837de..e228d6267c 100644
--- a/zerver/management/commands/create_user.py
+++ b/zerver/management/commands/create_user.py
@@ -21,29 +21,47 @@ Omit both <email> and <full name> for interactive user creation.
 """
 
     def add_arguments(self, parser: argparse.ArgumentParser) -> None:
-        parser.add_argument('--this-user-has-accepted-the-tos',
-                            dest='tos',
-                            action="store_true",
-                            help='Acknowledgement that the user has already accepted the ToS.')
-        parser.add_argument('--password',
-                            help='password of new user. For development only.'
-                                 'Note that we recommend against setting '
-                                 'passwords this way, since they can be snooped by any user account '
-                                 'on the server via `ps -ef` or by any superuser with'
-                                 'read access to the user\'s bash history.')
-        parser.add_argument('--password-file',
-                            help='The file containing the password of the new user.')
-        parser.add_argument('email', metavar='<email>', nargs='?', default=argparse.SUPPRESS,
-                            help='email address of new user')
-        parser.add_argument('full_name', metavar='<full name>', nargs='?',
-                            default=argparse.SUPPRESS,
-                            help='full name of new user')
-        self.add_realm_args(parser, True, "The name of the existing realm to which to add the user.")
+        parser.add_argument(
+            '--this-user-has-accepted-the-tos',
+            dest='tos',
+            action="store_true",
+            help='Acknowledgement that the user has already accepted the ToS.',
+        )
+        parser.add_argument(
+            '--password',
+            help='password of new user. For development only.'
+            'Note that we recommend against setting '
+            'passwords this way, since they can be snooped by any user account '
+            'on the server via `ps -ef` or by any superuser with'
+            'read access to the user\'s bash history.',
+        )
+        parser.add_argument(
+            '--password-file', help='The file containing the password of the new user.'
+        )
+        parser.add_argument(
+            'email',
+            metavar='<email>',
+            nargs='?',
+            default=argparse.SUPPRESS,
+            help='email address of new user',
+        )
+        parser.add_argument(
+            'full_name',
+            metavar='<full name>',
+            nargs='?',
+            default=argparse.SUPPRESS,
+            help='full name of new user',
+        )
+        self.add_realm_args(
+            parser, True, "The name of the existing realm to which to add the user."
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         if not options["tos"]:
-            raise CommandError("""You must confirm that this user has accepted the
-Terms of Service by passing --this-user-has-accepted-the-tos.""")
+            raise CommandError(
+                """You must confirm that this user has accepted the
+Terms of Service by passing --this-user-has-accepted-the-tos."""
+            )
         realm = self.get_realm(options)
         assert realm is not None  # Should be ensured by parser
 
@@ -56,8 +74,10 @@ Terms of Service by passing --this-user-has-accepted-the-tos.""")
                 raise CommandError("Invalid email address.")
         except KeyError:
             if 'email' in options or 'full_name' in options:
-                raise CommandError("""Either specify an email and full name as two
-parameters, or specify no parameters for interactive user creation.""")
+                raise CommandError(
+                    """Either specify an email and full name as two
+parameters, or specify no parameters for interactive user creation."""
+                )
             else:
                 while True:
                     email = input("Email: ")
diff --git a/zerver/management/commands/deactivate_realm.py b/zerver/management/commands/deactivate_realm.py
index 782b9f8bb1..c54503a377 100644
--- a/zerver/management/commands/deactivate_realm.py
+++ b/zerver/management/commands/deactivate_realm.py
@@ -9,8 +9,9 @@ class Command(ZulipBaseCommand):
     help = """Script to deactivate a realm."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--redirect_url', metavar='<redirect_url>',
-                            help="URL to which the realm has moved")
+        parser.add_argument(
+            '--redirect_url', metavar='<redirect_url>', help="URL to which the realm has moved"
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: str) -> None:
diff --git a/zerver/management/commands/deactivate_user.py b/zerver/management/commands/deactivate_user.py
index 0ae061d5a0..ab48cd953a 100644
--- a/zerver/management/commands/deactivate_user.py
+++ b/zerver/management/commands/deactivate_user.py
@@ -11,28 +11,36 @@ class Command(ZulipBaseCommand):
     help = "Deactivate a user, including forcibly logging them out."
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('-f', '--for-real',
-                            action='store_true',
-                            help="Actually deactivate the user. Default is a dry run.")
-        parser.add_argument('email', metavar='<email>',
-                            help='email of user to deactivate')
+        parser.add_argument(
+            '-f',
+            '--for-real',
+            action='store_true',
+            help="Actually deactivate the user. Default is a dry run.",
+        )
+        parser.add_argument('email', metavar='<email>', help='email of user to deactivate')
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: Any) -> None:
         realm = self.get_realm(options)
         user_profile = self.get_user(options['email'], realm)
 
-        print(f"Deactivating {user_profile.full_name} ({user_profile.delivery_email}) - {user_profile.realm.string_id}")
+        print(
+            f"Deactivating {user_profile.full_name} ({user_profile.delivery_email}) - {user_profile.realm.string_id}"
+        )
         print(f"{user_profile.delivery_email} has the following active sessions:")
         for session in user_sessions(user_profile):
             print(session.expire_date, session.get_decoded())
         print("")
-        print("{} has {} active bots that will also be deactivated.".format(
-            user_profile.delivery_email,
-            UserProfile.objects.filter(
-                is_bot=True, is_active=True, bot_owner=user_profile,
-            ).count(),
-        ))
+        print(
+            "{} has {} active bots that will also be deactivated.".format(
+                user_profile.delivery_email,
+                UserProfile.objects.filter(
+                    is_bot=True,
+                    is_active=True,
+                    bot_owner=user_profile,
+                ).count(),
+            )
+        )
 
         if not options["for_real"]:
             raise CommandError("This was a dry run. Pass -f to actually deactivate.")
diff --git a/zerver/management/commands/delete_old_unclaimed_attachments.py b/zerver/management/commands/delete_old_unclaimed_attachments.py
index f73380a44a..73aec05b04 100644
--- a/zerver/management/commands/delete_old_unclaimed_attachments.py
+++ b/zerver/management/commands/delete_old_unclaimed_attachments.py
@@ -13,15 +13,21 @@ class Command(BaseCommand):
               One week is taken as the default value."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('-w', '--weeks',
-                            dest='delta_weeks',
-                            default=5,
-                            type=int,
-                            help="Limiting value of how old the file can be.")
+        parser.add_argument(
+            '-w',
+            '--weeks',
+            dest='delta_weeks',
+            default=5,
+            type=int,
+            help="Limiting value of how old the file can be.",
+        )
 
-        parser.add_argument('-f', '--for-real',
-                            action='store_true',
-                            help="Actually remove the files from the storage.")
+        parser.add_argument(
+            '-f',
+            '--for-real',
+            action='store_true',
+            help="Actually remove the files from the storage.",
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         delta_weeks = options['delta_weeks']
diff --git a/zerver/management/commands/delete_realm.py b/zerver/management/commands/delete_realm.py
index 84f3dda8a8..d79883b2a6 100644
--- a/zerver/management/commands/delete_realm.py
+++ b/zerver/management/commands/delete_realm.py
@@ -24,14 +24,14 @@ realms used for testing; consider using deactivate_realm instead."""
             is_bot=False,
         ).count()
 
-        message_count = Message.objects.filter(
-            sender__realm=realm
-        ).count()
+        message_count = Message.objects.filter(sender__realm=realm).count()
 
         print(f"This realm has {user_count} users and {message_count} messages.\n")
 
-        print("This command will \033[91mPERMANENTLY DELETE\033[0m all data for this realm.  "
-              "Most use cases will be better served by scrub_realm and/or deactivate_realm.")
+        print(
+            "This command will \033[91mPERMANENTLY DELETE\033[0m all data for this realm.  "
+            "Most use cases will be better served by scrub_realm and/or deactivate_realm."
+        )
 
         confirmation = input("Type the name of the realm to confirm: ")
         if confirmation != realm.string_id:
diff --git a/zerver/management/commands/deliver_email.py b/zerver/management/commands/deliver_email.py
index 023d3dbe45..c7571dc617 100644
--- a/zerver/management/commands/deliver_email.py
+++ b/zerver/management/commands/deliver_email.py
@@ -24,6 +24,7 @@ from zerver.models import ScheduledEmail
 logger = logging.getLogger(__name__)
 log_to_file(logger, settings.EMAIL_DELIVERER_LOG_PATH)
 
+
 class Command(BaseCommand):
     help = """Deliver emails queued by various parts of Zulip
 (either for immediate sending or sending at a specified time).
@@ -40,7 +41,8 @@ Usage: ./manage.py deliver_email
 
         while True:
             email_jobs_to_deliver = ScheduledEmail.objects.filter(
-                scheduled_timestamp__lte=timezone_now())
+                scheduled_timestamp__lte=timezone_now()
+            )
             if email_jobs_to_deliver:
                 for job in email_jobs_to_deliver:
                     try:
diff --git a/zerver/management/commands/deliver_scheduled_messages.py b/zerver/management/commands/deliver_scheduled_messages.py
index 5efb56f15d..f0219979c0 100644
--- a/zerver/management/commands/deliver_scheduled_messages.py
+++ b/zerver/management/commands/deliver_scheduled_messages.py
@@ -17,6 +17,7 @@ from zerver.models import Message, ScheduledMessage, get_user_by_delivery_email
 logger = logging.getLogger(__name__)
 log_to_file(logger, settings.SCHEDULED_MESSAGE_DELIVERER_LOG_PATH)
 
+
 class Command(BaseCommand):
     help = """Deliver scheduled messages from the ScheduledMessage table.
 Run this command under supervisor.
@@ -42,10 +43,15 @@ Usage: ./manage.py deliver_scheduled_messages
         if delivery_type == ScheduledMessage.SEND_LATER:
             message.sender = original_sender
         elif delivery_type == ScheduledMessage.REMIND:
-            message.sender = get_user_by_delivery_email(settings.NOTIFICATION_BOT, original_sender.realm)
+            message.sender = get_user_by_delivery_email(
+                settings.NOTIFICATION_BOT, original_sender.realm
+            )
 
-        message_dict = {'message': message, 'stream': scheduled_message.stream,
-                        'realm': scheduled_message.realm}
+        message_dict = {
+            'message': message,
+            'stream': scheduled_message.stream,
+            'realm': scheduled_message.realm,
+        }
         return build_message_send_dict(message_dict)
 
     def handle(self, *args: Any, **options: Any) -> None:
@@ -60,8 +66,8 @@ Usage: ./manage.py deliver_scheduled_messages
 
             while True:
                 messages_to_deliver = ScheduledMessage.objects.filter(
-                    scheduled_timestamp__lte=timezone_now(),
-                    delivered=False)
+                    scheduled_timestamp__lte=timezone_now(), delivered=False
+                )
                 for message in messages_to_deliver:
                     do_send_messages([self.construct_message(message)])
                     message.delivered = True
diff --git a/zerver/management/commands/dump_messages.py b/zerver/management/commands/dump_messages.py
index c08fc9e31d..2713f65137 100644
--- a/zerver/management/commands/dump_messages.py
+++ b/zerver/management/commands/dump_messages.py
@@ -14,16 +14,19 @@ class Command(ZulipBaseCommand):
     def add_arguments(self, parser: CommandParser) -> None:
         default_cutoff = time.time() - 60 * 60 * 24 * 30  # 30 days.
         self.add_realm_args(parser, True)
-        parser.add_argument('--since',
-                            type=int,
-                            default=default_cutoff,
-                            help='The time in epoch since from which to start the dump.')
+        parser.add_argument(
+            '--since',
+            type=int,
+            default=default_cutoff,
+            help='The time in epoch since from which to start the dump.',
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         realm = self.get_realm(options)
         streams = Stream.objects.filter(realm=realm, invite_only=False)
         recipients = Recipient.objects.filter(
-            type=Recipient.STREAM, type_id__in=[stream.id for stream in streams])
+            type=Recipient.STREAM, type_id__in=[stream.id for stream in streams]
+        )
         cutoff = datetime.datetime.fromtimestamp(options["since"], tz=datetime.timezone.utc)
         messages = Message.objects.filter(date_sent__gt=cutoff, recipient__in=recipients)
 
diff --git a/zerver/management/commands/email_mirror.py b/zerver/management/commands/email_mirror.py
index e301f51d8c..7f0c2fa911 100644
--- a/zerver/management/commands/email_mirror.py
+++ b/zerver/management/commands/email_mirror.py
@@ -69,10 +69,17 @@ class Command(BaseCommand):
 
     def handle(self, *args: Any, **options: str) -> None:
         # We're probably running from cron, try to batch-process mail
-        if (not settings.EMAIL_GATEWAY_BOT or not settings.EMAIL_GATEWAY_LOGIN or
-            not settings.EMAIL_GATEWAY_PASSWORD or not settings.EMAIL_GATEWAY_IMAP_SERVER or
-                not settings.EMAIL_GATEWAY_IMAP_PORT or not settings.EMAIL_GATEWAY_IMAP_FOLDER):
-            raise CommandError("Please configure the email mirror gateway in /etc/zulip/, "
-                               "or specify $ORIGINAL_RECIPIENT if piping a single mail.")
+        if (
+            not settings.EMAIL_GATEWAY_BOT
+            or not settings.EMAIL_GATEWAY_LOGIN
+            or not settings.EMAIL_GATEWAY_PASSWORD
+            or not settings.EMAIL_GATEWAY_IMAP_SERVER
+            or not settings.EMAIL_GATEWAY_IMAP_PORT
+            or not settings.EMAIL_GATEWAY_IMAP_FOLDER
+        ):
+            raise CommandError(
+                "Please configure the email mirror gateway in /etc/zulip/, "
+                "or specify $ORIGINAL_RECIPIENT if piping a single mail."
+            )
         for message in get_imap_messages():
             process_message(message)
diff --git a/zerver/management/commands/enqueue_digest_emails.py b/zerver/management/commands/enqueue_digest_emails.py
index d99d4d9b61..6507335c51 100644
--- a/zerver/management/commands/enqueue_digest_emails.py
+++ b/zerver/management/commands/enqueue_digest_emails.py
@@ -13,6 +13,7 @@ from zerver.lib.logging_util import log_to_file
 logger = logging.getLogger(__name__)
 log_to_file(logger, settings.DIGEST_LOG_PATH)
 
+
 class Command(BaseCommand):
     help = """Enqueue digest emails for users that haven't checked the app
 in a while.
diff --git a/zerver/management/commands/enqueue_file.py b/zerver/management/commands/enqueue_file.py
index 9e22dc0996..4ebf23c132 100644
--- a/zerver/management/commands/enqueue_file.py
+++ b/zerver/management/commands/enqueue_file.py
@@ -11,6 +11,7 @@ from zerver.lib.queue import queue_json_publish
 def error(*args: Any) -> None:
     raise Exception('We cannot enqueue because settings.USING_RABBITMQ is False.')
 
+
 class Command(BaseCommand):
     help = """Read JSON lines from a file and enqueue them to a worker queue.
 
@@ -23,10 +24,12 @@ You can use "-" to represent stdin.
 """
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('queue_name', metavar='<queue>',
-                            help="name of worker queue to enqueue to")
-        parser.add_argument('file_name', metavar='<file>',
-                            help="name of file containing JSON lines")
+        parser.add_argument(
+            'queue_name', metavar='<queue>', help="name of worker queue to enqueue to"
+        )
+        parser.add_argument(
+            'file_name', metavar='<file>', help="name of file containing JSON lines"
+        )
 
     def handle(self, *args: Any, **options: str) -> None:
         queue_name = options['queue_name']
diff --git a/zerver/management/commands/export.py b/zerver/management/commands/export.py
index a3e022d293..b78e099198 100644
--- a/zerver/management/commands/export.py
+++ b/zerver/management/commands/export.py
@@ -77,27 +77,39 @@ class Command(ZulipBaseCommand):
     of recipients of messages in the realm, hardware, etc."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--output',
-                            dest='output_dir',
-                            help='Directory to write exported data to.')
-        parser.add_argument('--threads',
-                            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
-                            help='Threads to use in exporting UserMessage objects in parallel')
-        parser.add_argument('--public-only',
-                            action="store_true",
-                            help='Export only public stream messages and associated attachments')
-        parser.add_argument('--deactivate-realm',
-                            action="store_true",
-                            help='Deactivate the realm immediately before exporting')
-        parser.add_argument('--consent-message-id',
-                            type=int,
-                            help='ID of the message advertising users to react with thumbs up')
-        parser.add_argument('--upload',
-                            action="store_true",
-                            help="Whether to upload resulting tarball to s3 or LOCAL_UPLOADS_DIR")
-        parser.add_argument('--delete-after-upload',
-                            action="store_true",
-                            help='Automatically delete the local tarball after a successful export')
+        parser.add_argument(
+            '--output', dest='output_dir', help='Directory to write exported data to.'
+        )
+        parser.add_argument(
+            '--threads',
+            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
+            help='Threads to use in exporting UserMessage objects in parallel',
+        )
+        parser.add_argument(
+            '--public-only',
+            action="store_true",
+            help='Export only public stream messages and associated attachments',
+        )
+        parser.add_argument(
+            '--deactivate-realm',
+            action="store_true",
+            help='Deactivate the realm immediately before exporting',
+        )
+        parser.add_argument(
+            '--consent-message-id',
+            type=int,
+            help='ID of the message advertising users to react with thumbs up',
+        )
+        parser.add_argument(
+            '--upload',
+            action="store_true",
+            help="Whether to upload resulting tarball to s3 or LOCAL_UPLOADS_DIR",
+        )
+        parser.add_argument(
+            '--delete-after-upload',
+            action="store_true",
+            help='Automatically delete the local tarball after a successful export',
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: Any) -> None:
@@ -134,26 +146,36 @@ class Command(ZulipBaseCommand):
             # the message through message.sender.realm.  So instead we
             # check the realm of the people who reacted to the message
             # (who must all be in the message's realm).
-            reactions = Reaction.objects.filter(message=message,
-                                                # outbox = 1f4e4
-                                                emoji_code="1f4e4",
-                                                reaction_type="unicode_emoji")
+            reactions = Reaction.objects.filter(
+                message=message,
+                # outbox = 1f4e4
+                emoji_code="1f4e4",
+                reaction_type="unicode_emoji",
+            )
             for reaction in reactions:
                 if reaction.user_profile.realm != realm:
-                    raise CommandError("Users from a different realm reacted to message. Aborting...")
+                    raise CommandError(
+                        "Users from a different realm reacted to message. Aborting..."
+                    )
 
             print(f"\n\033[94mMessage content:\033[0m\n{message.content}\n")
 
-            user_count = UserProfile.objects.filter(
-                realm_id=realm.id,
-                is_active=True,
-                is_bot=False,
-            ).exclude(
-                # We exclude guests, because they're not a priority for
-                # looking at whether most users are being exported.
-                role=UserProfile.ROLE_GUEST,
-            ).count()
-            print(f"\033[94mNumber of users that reacted outbox:\033[0m {len(reactions)} / {user_count} total non-guest users\n")
+            user_count = (
+                UserProfile.objects.filter(
+                    realm_id=realm.id,
+                    is_active=True,
+                    is_bot=False,
+                )
+                .exclude(
+                    # We exclude guests, because they're not a priority for
+                    # looking at whether most users are being exported.
+                    role=UserProfile.ROLE_GUEST,
+                )
+                .count()
+            )
+            print(
+                f"\033[94mNumber of users that reacted outbox:\033[0m {len(reactions)} / {user_count} total non-guest users\n"
+            )
 
             proceed = input("Continue? [y/N] ")
             if proceed.lower() not in ('y', 'yes'):
@@ -176,7 +198,9 @@ class Command(ZulipBaseCommand):
             with open(tarball_path, "x"):
                 pass
         except FileExistsError:
-            raise CommandError(f"Refusing to overwrite existing tarball: {tarball_path}. Aborting...")
+            raise CommandError(
+                f"Refusing to overwrite existing tarball: {tarball_path}. Aborting..."
+            )
 
         if options["deactivate_realm"]:
             print(f"\033[94mDeactivating realm\033[0m: {realm.string_id}")
@@ -187,9 +211,13 @@ class Command(ZulipBaseCommand):
             sys.stdout.flush()
 
         # Allows us to trigger exports separately from command line argument parsing
-        export_realm_wrapper(realm=realm, output_dir=output_dir,
-                             threads=num_threads, upload=options['upload'],
-                             public_only=public_only,
-                             delete_after_upload=options["delete_after_upload"],
-                             percent_callback=percent_callback,
-                             consent_message_id=consent_message_id)
+        export_realm_wrapper(
+            realm=realm,
+            output_dir=output_dir,
+            threads=num_threads,
+            upload=options['upload'],
+            public_only=public_only,
+            delete_after_upload=options["delete_after_upload"],
+            percent_callback=percent_callback,
+            consent_message_id=consent_message_id,
+        )
diff --git a/zerver/management/commands/export_single_user.py b/zerver/management/commands/export_single_user.py
index 327a4a2b01..abcbdf670a 100644
--- a/zerver/management/commands/export_single_user.py
+++ b/zerver/management/commands/export_single_user.py
@@ -19,11 +19,10 @@ class Command(ZulipBaseCommand):
     with (for example) any bots owned by the user."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('email', metavar='<email>',
-                            help="email of user to export")
-        parser.add_argument('--output',
-                            dest='output_dir',
-                            help='Directory to write exported data to.')
+        parser.add_argument('email', metavar='<email>', help="email of user to export")
+        parser.add_argument(
+            '--output', dest='output_dir', help='Directory to write exported data to.'
+        )
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: Any) -> None:
diff --git a/zerver/management/commands/export_usermessage_batch.py b/zerver/management/commands/export_usermessage_batch.py
index 0e07f2804d..d7e4ad7dc2 100644
--- a/zerver/management/commands/export_usermessage_batch.py
+++ b/zerver/management/commands/export_usermessage_batch.py
@@ -13,13 +13,13 @@ class Command(BaseCommand):
     help = """UserMessage fetching helper for export.py"""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--path',
-                            help='Path to find messages.json archives')
-        parser.add_argument('--thread',
-                            help='Thread ID')
-        parser.add_argument('--consent-message-id',
-                            type=int,
-                            help='ID of the message advertising users to react with thumbs up')
+        parser.add_argument('--path', help='Path to find messages.json archives')
+        parser.add_argument('--thread', help='Thread ID')
+        parser.add_argument(
+            '--consent-message-id',
+            type=int,
+            help='ID of the message advertising users to react with thumbs up',
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         logging.info("Starting UserMessage batch thread %s", options['thread'])
diff --git a/zerver/management/commands/fill_memcached_caches.py b/zerver/management/commands/fill_memcached_caches.py
index 685ed30569..98d876b1fd 100644
--- a/zerver/management/commands/fill_memcached_caches.py
+++ b/zerver/management/commands/fill_memcached_caches.py
@@ -8,8 +8,7 @@ from zerver.lib.cache_helpers import cache_fillers, fill_remote_cache
 
 class Command(BaseCommand):
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--cache',
-                            help="Populate the memcached cache of messages.")
+        parser.add_argument('--cache', help="Populate the memcached cache of messages.")
 
     def handle(self, *args: Any, **options: Optional[str]) -> None:
         if options["cache"] is not None:
diff --git a/zerver/management/commands/fix_unreads.py b/zerver/management/commands/fix_unreads.py
index 3b433ca96c..dbb764ada8 100644
--- a/zerver/management/commands/fix_unreads.py
+++ b/zerver/management/commands/fix_unreads.py
@@ -10,24 +10,24 @@ from zerver.models import Realm, UserProfile
 
 logging.getLogger('zulip.fix_unreads').setLevel(logging.INFO)
 
+
 class Command(ZulipBaseCommand):
     help = """Fix problems related to unread counts."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('emails',
-                            metavar='<emails>',
-                            nargs='*',
-                            help='email address to spelunk')
-        parser.add_argument('--all',
-                            action='store_true',
-                            help='fix all users in specified realm')
+        parser.add_argument(
+            'emails', metavar='<emails>', nargs='*', help='email address to spelunk'
+        )
+        parser.add_argument('--all', action='store_true', help='fix all users in specified realm')
         self.add_realm_args(parser)
 
     def fix_all_users(self, realm: Realm) -> None:
-        user_profiles = list(UserProfile.objects.filter(
-            realm=realm,
-            is_bot=False,
-        ))
+        user_profiles = list(
+            UserProfile.objects.filter(
+                realm=realm,
+                is_bot=False,
+            )
+        )
         for user_profile in user_profiles:
             fix(user_profile)
             connection.commit()
diff --git a/zerver/management/commands/generate_invite_links.py b/zerver/management/commands/generate_invite_links.py
index 7c8470d641..f8627bbd5b 100644
--- a/zerver/management/commands/generate_invite_links.py
+++ b/zerver/management/commands/generate_invite_links.py
@@ -13,11 +13,17 @@ class Command(ZulipBaseCommand):
     help = "Generate activation links for users and print them to stdout."
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--force',
-                            action="store_true",
-                            help='Override that the domain is restricted to external users.')
-        parser.add_argument('emails', metavar='<email>', nargs='*',
-                            help='email of users to generate an activation link for')
+        parser.add_argument(
+            '--force',
+            action="store_true",
+            help='Override that the domain is restricted to external users.',
+        )
+        parser.add_argument(
+            'emails',
+            metavar='<email>',
+            nargs='*',
+            help='email of users to generate an activation link for',
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: Any) -> None:
@@ -46,11 +52,12 @@ class Command(ZulipBaseCommand):
                 email_allowed_for_realm(email, realm)
             except DomainNotAllowedForRealmError:
                 if not options["force"]:
-                    raise CommandError("You've asked to add an external user '{}' to a "
-                                       "closed realm '{}'.\nAre you sure? To do this, "
-                                       "pass --force.".format(email, realm.string_id))
+                    raise CommandError(
+                        "You've asked to add an external user '{}' to a "
+                        "closed realm '{}'.\nAre you sure? To do this, "
+                        "pass --force.".format(email, realm.string_id)
+                    )
 
             prereg_user = PreregistrationUser(email=email, realm=realm)
             prereg_user.save()
-            print(email + ": " + create_confirmation_link(prereg_user,
-                                                          Confirmation.INVITATION))
+            print(email + ": " + create_confirmation_link(prereg_user, Confirmation.INVITATION))
diff --git a/zerver/management/commands/generate_multiuse_invite_link.py b/zerver/management/commands/generate_multiuse_invite_link.py
index d4c8125942..577b5f3f12 100644
--- a/zerver/management/commands/generate_multiuse_invite_link.py
+++ b/zerver/management/commands/generate_multiuse_invite_link.py
@@ -12,9 +12,7 @@ class Command(ZulipBaseCommand):
     def add_arguments(self, parser: ArgumentParser) -> None:
         self.add_realm_args(parser, True)
 
-        parser.add_argument(
-            '-s', '--streams',
-            help='A comma-separated list of stream names.')
+        parser.add_argument('-s', '--streams', help='A comma-separated list of stream names.')
 
         parser.add_argument(
             '--referred-by',
diff --git a/zerver/management/commands/generate_realm_creation_link.py b/zerver/management/commands/generate_realm_creation_link.py
index 27faaab4bf..1c8761ba9a 100644
--- a/zerver/management/commands/generate_realm_creation_link.py
+++ b/zerver/management/commands/generate_realm_creation_link.py
@@ -21,10 +21,16 @@ class Command(ZulipBaseCommand):
             # first check if the db has been initialized
             Realm.objects.first()
         except ProgrammingError:
-            raise CommandError("The Zulip database does not appear to exist. Have you run initialize-database?")
+            raise CommandError(
+                "The Zulip database does not appear to exist. Have you run initialize-database?"
+            )
 
         url = generate_realm_creation_url(by_admin=True)
-        self.stdout.write(self.style.SUCCESS("Please visit the following secure single-use link to register your "))
+        self.stdout.write(
+            self.style.SUCCESS(
+                "Please visit the following secure single-use link to register your "
+            )
+        )
         self.stdout.write(self.style.SUCCESS("new Zulip organization:\033[0m"))
         self.stdout.write("")
         self.stdout.write(self.style.SUCCESS(f"    \033[1;92m{url}\033[0m"))
diff --git a/zerver/management/commands/get_migration_status.py b/zerver/management/commands/get_migration_status.py
index b92c90f9dc..21f96cf530 100644
--- a/zerver/management/commands/get_migration_status.py
+++ b/zerver/management/commands/get_migration_status.py
@@ -13,15 +13,17 @@ class Command(BaseCommand):
     help = "Get status of migrations."
 
     def add_arguments(self, parser: argparse.ArgumentParser) -> None:
-        parser.add_argument('app_label', nargs='?',
-                            help='App label of an application to synchronize the state.')
+        parser.add_argument(
+            'app_label', nargs='?', help='App label of an application to synchronize the state.'
+        )
 
-        parser.add_argument('--database',
-                            default=DEFAULT_DB_ALIAS, help='Nominates a database to synchronize. '
-                            'Defaults to the "default" database.')
+        parser.add_argument(
+            '--database',
+            default=DEFAULT_DB_ALIAS,
+            help='Nominates a database to synchronize. ' 'Defaults to the "default" database.',
+        )
 
-        parser.add_argument('--output',
-                            help='Path to store the status to (default to stdout).')
+        parser.add_argument('--output', help='Path to store the status to (default to stdout).')
 
     def handle(self, *args: Any, **options: Any) -> None:
         result = get_migration_status(**options)
diff --git a/zerver/management/commands/import.py b/zerver/management/commands/import.py
index 4652d7047b..4bb0054129 100644
--- a/zerver/management/commands/import.py
+++ b/zerver/management/commands/import.py
@@ -19,27 +19,37 @@ This command should be used only on a newly created, empty Zulip instance to
 import a database dump from one or more JSON files."""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('--destroy-rebuild-database',
-                            action="store_true",
-                            help='Destroys and rebuilds the databases prior to import.')
+        parser.add_argument(
+            '--destroy-rebuild-database',
+            action="store_true",
+            help='Destroys and rebuilds the databases prior to import.',
+        )
 
-        parser.add_argument('--import-into-nonempty',
-                            action="store_true",
-                            help='Import into an existing nonempty database.')
+        parser.add_argument(
+            '--import-into-nonempty',
+            action="store_true",
+            help='Import into an existing nonempty database.',
+        )
 
-        parser.add_argument('--allow-reserved-subdomain',
-                            action="store_true",
-                            help='Allow use of reserved subdomains')
+        parser.add_argument(
+            '--allow-reserved-subdomain',
+            action="store_true",
+            help='Allow use of reserved subdomains',
+        )
 
-        parser.add_argument('subdomain', metavar='<subdomain>',
-                            help="Subdomain")
+        parser.add_argument('subdomain', metavar='<subdomain>', help="Subdomain")
 
-        parser.add_argument('export_paths', nargs='+',
-                            metavar='<export path>',
-                            help="list of export directories to import")
-        parser.add_argument('--processes',
-                            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
-                            help='Number of processes to use for uploading Avatars to S3 in parallel')
+        parser.add_argument(
+            'export_paths',
+            nargs='+',
+            metavar='<export path>',
+            help="list of export directories to import",
+        )
+        parser.add_argument(
+            '--processes',
+            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
+            help='Number of processes to use for uploading Avatars to S3 in parallel',
+        )
         parser.formatter_class = argparse.RawTextHelpFormatter
 
     def do_destroy_and_rebuild_database(self, db_name: str) -> None:
@@ -76,7 +86,9 @@ import a database dump from one or more JSON files."""
             if not os.path.exists(path):
                 raise CommandError(f"Directory not found: '{path}'")
             if not os.path.isdir(path):
-                raise CommandError("Export file should be folder; if it's a tarball, please unpack it first.")
+                raise CommandError(
+                    "Export file should be folder; if it's a tarball, please unpack it first."
+                )
             paths.append(path)
 
         for path in paths:
diff --git a/zerver/management/commands/list_realms.py b/zerver/management/commands/list_realms.py
index b815aabd80..45009ffb73 100644
--- a/zerver/management/commands/list_realms.py
+++ b/zerver/management/commands/list_realms.py
@@ -15,9 +15,9 @@ Usage examples:
 ./manage.py list_realms --all"""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument("--all",
-                            action="store_true",
-                            help="Print all the configuration settings of the realms.")
+        parser.add_argument(
+            "--all", action="store_true", help="Print all the configuration settings of the realms."
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         realms = Realm.objects.all()
@@ -33,11 +33,11 @@ Usage examples:
             for realm in realms:
                 display_string_id = realm.string_id if realm.string_id != '' else "''"
                 if realm.deactivated:
-                    print(self.style.ERROR(outer_format.format(
-                        realm.id,
-                        display_string_id,
-                        realm.name,
-                        realm.uri)))
+                    print(
+                        self.style.ERROR(
+                            outer_format.format(realm.id, display_string_id, realm.name, realm.uri)
+                        )
+                    )
                     deactivated = True
                 else:
                     print(outer_format.format(realm.id, display_string_id, realm.name, realm.uri))
diff --git a/zerver/management/commands/logout_all_users.py b/zerver/management/commands/logout_all_users.py
index 594ff08a6f..a8b0c52e49 100644
--- a/zerver/management/commands/logout_all_users.py
+++ b/zerver/management/commands/logout_all_users.py
@@ -13,9 +13,11 @@ class Command(ZulipBaseCommand):
     help = "Log out all users."
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--deactivated-only',
-                            action='store_true',
-                            help="Only logout all users who are deactivated")
+        parser.add_argument(
+            '--deactivated-only',
+            action='store_true',
+            help="Only logout all users who are deactivated",
+        )
         self.add_realm_args(parser, help="Only logout all users in a particular realm")
 
     def handle(self, *args: Any, **options: Any) -> None:
diff --git a/zerver/management/commands/makemessages.py b/zerver/management/commands/makemessages.py
index fb0aea8d22..eea931c8db 100644
--- a/zerver/management/commands/makemessages.py
+++ b/zerver/management/commands/makemessages.py
@@ -43,32 +43,40 @@ from django.core.management.commands import makemessages
 from django.template.base import BLOCK_TAG_END, BLOCK_TAG_START
 from django.utils.translation import template
 
-strip_whitespace_right = re.compile(f"({BLOCK_TAG_START}-?\\s*(trans|pluralize).*?-{BLOCK_TAG_END})\\s+", re.U)
-strip_whitespace_left = re.compile(f"\\s+({BLOCK_TAG_START}-\\s*(endtrans|pluralize).*?-?{BLOCK_TAG_END})", re.U)
+strip_whitespace_right = re.compile(
+    f"({BLOCK_TAG_START}-?\\s*(trans|pluralize).*?-{BLOCK_TAG_END})\\s+", re.U
+)
+strip_whitespace_left = re.compile(
+    f"\\s+({BLOCK_TAG_START}-\\s*(endtrans|pluralize).*?-?{BLOCK_TAG_END})", re.U
+)
 
-regexes = [r'{{#tr .*?}}([\s\S]*?){{/tr}}',  # '.' doesn't match '\n' by default
-           r'{{\s*t "(.*?)"\W*}}',
-           r"{{\s*t '(.*?)'\W*}}",
-           r'\(t "(.*?)"\)',
-           r'=\(t "(.*?)"\)(?=[^{]*}})',
-           r"=\(t '(.*?)'\)(?=[^{]*}})",
-           r"i18n\.t\('([^']*?)'\)",
-           r"i18n\.t\('(.*?)',\s*.*?[^,]\)",
-           r'i18n\.t\("([^"]*?)"\)',
-           r'i18n\.t\("(.*?)",\s*.*?[^,]\)',
-           ]
-tags = [('err_', "error"),
-        ]
+regexes = [
+    r'{{#tr .*?}}([\s\S]*?){{/tr}}',  # '.' doesn't match '\n' by default
+    r'{{\s*t "(.*?)"\W*}}',
+    r"{{\s*t '(.*?)'\W*}}",
+    r'\(t "(.*?)"\)',
+    r'=\(t "(.*?)"\)(?=[^{]*}})',
+    r"=\(t '(.*?)'\)(?=[^{]*}})",
+    r"i18n\.t\('([^']*?)'\)",
+    r"i18n\.t\('(.*?)',\s*.*?[^,]\)",
+    r'i18n\.t\("([^"]*?)"\)',
+    r'i18n\.t\("(.*?)",\s*.*?[^,]\)',
+]
+tags = [
+    ('err_', "error"),
+]
 
 frontend_compiled_regexes = [re.compile(regex) for regex in regexes]
 multiline_js_comment = re.compile(r"/\*.*?\*/", re.DOTALL)
 singleline_js_comment = re.compile("//.*?\n")
 
+
 def strip_whitespaces(src: str) -> str:
     src = strip_whitespace_left.sub('\\1', src)
     src = strip_whitespace_right.sub('\\1', src)
     return src
 
+
 class Command(makemessages.Command):
 
     xgettext_options = makemessages.Command.xgettext_options
@@ -77,28 +85,37 @@ class Command(makemessages.Command):
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         super().add_arguments(parser)
-        parser.add_argument('--frontend-source',
-                            default='static/templates',
-                            help='Name of the Handlebars template directory')
-        parser.add_argument('--frontend-output',
-                            default='locale',
-                            help='Name of the frontend messages output directory')
-        parser.add_argument('--frontend-namespace',
-                            default='translations.json',
-                            help='Namespace of the frontend locale file')
+        parser.add_argument(
+            '--frontend-source',
+            default='static/templates',
+            help='Name of the Handlebars template directory',
+        )
+        parser.add_argument(
+            '--frontend-output',
+            default='locale',
+            help='Name of the frontend messages output directory',
+        )
+        parser.add_argument(
+            '--frontend-namespace',
+            default='translations.json',
+            help='Namespace of the frontend locale file',
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         self.handle_django_locales(*args, **options)
         self.handle_frontend_locales(**options)
 
-    def handle_frontend_locales(self, *,
-                                frontend_source: str,
-                                frontend_output: str,
-                                frontend_namespace: str,
-                                locale: List[str],
-                                exclude: List[str],
-                                all: bool,
-                                **options: Any) -> None:
+    def handle_frontend_locales(
+        self,
+        *,
+        frontend_source: str,
+        frontend_output: str,
+        frontend_namespace: str,
+        locale: List[str],
+        exclude: List[str],
+        all: bool,
+        **options: Any,
+    ) -> None:
         self.frontend_source = frontend_source
         self.frontend_output = frontend_output
         self.frontend_namespace = frontend_namespace
@@ -118,11 +135,14 @@ class Command(makemessages.Command):
         # Extend the regular expressions that are used to detect
         # translation blocks with an "OR jinja-syntax" clause.
         template.endblock_re = re.compile(
-            template.endblock_re.pattern + '|' + r"""^-?\s*endtrans\s*-?$""")
+            template.endblock_re.pattern + '|' + r"""^-?\s*endtrans\s*-?$"""
+        )
         template.block_re = re.compile(
-            template.block_re.pattern + '|' + r"""^-?\s*trans(?:\s+(?!'|")(?=.*?=.*?)|\s*-?$)""")
+            template.block_re.pattern + '|' + r"""^-?\s*trans(?:\s+(?!'|")(?=.*?=.*?)|\s*-?$)"""
+        )
         template.plural_re = re.compile(
-            template.plural_re.pattern + '|' + r"""^-?\s*pluralize(?:\s+.+|-?$)""")
+            template.plural_re.pattern + '|' + r"""^-?\s*pluralize(?:\s+.+|-?$)"""
+        )
         template.constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?')).*\)""")
 
         def my_templatize(src: str, *args: Any, **kwargs: Any) -> str:
@@ -172,8 +192,9 @@ class Command(makemessages.Command):
                 with open(os.path.join(dirpath, filename)) as reader:
                     data = reader.read()
                     translation_strings.extend(self.extract_strings(data))
-        for dirpath, dirnames, filenames in itertools.chain(os.walk("static/js"),
-                                                            os.walk("static/shared/js")):
+        for dirpath, dirnames, filenames in itertools.chain(
+            os.walk("static/js"), os.walk("static/shared/js")
+        ):
             for filename in [f for f in filenames if f.endswith(".js") or f.endswith(".ts")]:
                 if filename.startswith('.'):
                     continue
@@ -217,8 +238,9 @@ class Command(makemessages.Command):
 
             yield os.path.join(path, self.get_namespace())
 
-    def get_new_strings(self, old_strings: Mapping[str, str],
-                        translation_strings: List[str], locale: str) -> Dict[str, str]:
+    def get_new_strings(
+        self, old_strings: Mapping[str, str], translation_strings: List[str], locale: str
+    ) -> Dict[str, str]:
         """
         Missing strings are removed, new strings are added and already
         translated strings are not touched.
@@ -252,9 +274,7 @@ class Command(makemessages.Command):
 
             new_strings = {
                 k: v
-                for k, v in self.get_new_strings(old_strings,
-                                                 translation_strings,
-                                                 locale).items()
+                for k, v in self.get_new_strings(old_strings, translation_strings, locale).items()
             }
             with open(output_path, 'w') as writer:
                 json.dump(new_strings, writer, indent=2, sort_keys=True)
diff --git a/zerver/management/commands/merge_streams.py b/zerver/management/commands/merge_streams.py
index 9eb69b3075..8877fd04da 100644
--- a/zerver/management/commands/merge_streams.py
+++ b/zerver/management/commands/merge_streams.py
@@ -20,14 +20,15 @@ def bulk_delete_cache_keys(message_ids_to_clear: List[int]) -> None:
 
         message_ids_to_clear = message_ids_to_clear[5000:]
 
+
 class Command(ZulipBaseCommand):
     help = """Merge two streams."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('stream_to_keep',
-                            help='name of stream to keep')
-        parser.add_argument('stream_to_destroy',
-                            help='name of stream to merge into the stream being kept')
+        parser.add_argument('stream_to_keep', help='name of stream to keep')
+        parser.add_argument(
+            'stream_to_destroy', help='name of stream to merge into the stream being kept'
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: str) -> None:
@@ -46,9 +47,12 @@ class Command(ZulipBaseCommand):
         # were only on the now-deactivated stream.
 
         # Move the messages, and delete the old copies from caches.
-        message_ids_to_clear = list(Message.objects.filter(
-            recipient=recipient_to_destroy).values_list("id", flat=True))
-        count = Message.objects.filter(recipient=recipient_to_destroy).update(recipient=recipient_to_keep)
+        message_ids_to_clear = list(
+            Message.objects.filter(recipient=recipient_to_destroy).values_list("id", flat=True)
+        )
+        count = Message.objects.filter(recipient=recipient_to_destroy).update(
+            recipient=recipient_to_keep
+        )
         print(f"Moved {count} messages")
         bulk_delete_cache_keys(message_ids_to_clear)
 
@@ -58,17 +62,23 @@ class Command(ZulipBaseCommand):
         existing_subs = Subscription.objects.filter(recipient=recipient_to_keep)
         users_already_subscribed = {sub.user_profile_id: sub.active for sub in existing_subs}
 
-        subs_to_deactivate = Subscription.objects.filter(recipient=recipient_to_destroy, active=True)
+        subs_to_deactivate = Subscription.objects.filter(
+            recipient=recipient_to_destroy, active=True
+        )
         users_to_activate = [
-            sub.user_profile for sub in subs_to_deactivate
+            sub.user_profile
+            for sub in subs_to_deactivate
             if not users_already_subscribed.get(sub.user_profile_id, False)
         ]
 
         if len(subs_to_deactivate) > 0:
             print(f"Deactivating {len(subs_to_deactivate)} subscriptions")
-            bulk_remove_subscriptions([sub.user_profile for sub in subs_to_deactivate],
-                                      [stream_to_destroy],
-                                      self.get_client(), acting_user=None)
+            bulk_remove_subscriptions(
+                [sub.user_profile for sub in subs_to_deactivate],
+                [stream_to_destroy],
+                self.get_client(),
+                acting_user=None,
+            )
         do_deactivate_stream(stream_to_destroy, acting_user=None)
         if len(users_to_activate) > 0:
             print(f"Adding {len(users_to_activate)} subscriptions")
diff --git a/zerver/management/commands/print_email_delivery_backlog.py b/zerver/management/commands/print_email_delivery_backlog.py
index b8f9934c54..a60070e8b4 100644
--- a/zerver/management/commands/print_email_delivery_backlog.py
+++ b/zerver/management/commands/print_email_delivery_backlog.py
@@ -20,5 +20,8 @@ Usage: ./manage.py print_email_delivery_backlog
 """
 
     def handle(self, *args: Any, **options: Any) -> None:
-        print(ScheduledEmail.objects.filter(
-            scheduled_timestamp__lte=timezone_now()-timedelta(minutes=1)).count())
+        print(
+            ScheduledEmail.objects.filter(
+                scheduled_timestamp__lte=timezone_now() - timedelta(minutes=1)
+            ).count()
+        )
diff --git a/zerver/management/commands/process_queue.py b/zerver/management/commands/process_queue.py
index c059a19b6d..b395aa92ba 100644
--- a/zerver/management/commands/process_queue.py
+++ b/zerver/management/commands/process_queue.py
@@ -16,16 +16,18 @@ from zerver.worker.queue_processors import get_active_worker_queues, get_worker
 
 class Command(BaseCommand):
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--queue_name', metavar='<queue name>',
-                            help="queue to process")
-        parser.add_argument('--worker_num', metavar='<worker number>', type=int, default=0,
-                            help="worker label")
-        parser.add_argument('--all', action="store_true",
-                            help="run all queues")
-        parser.add_argument('--multi_threaded', nargs='+',
-                            metavar='<list of queue name>',
-                            required=False,
-                            help="list of queue to process")
+        parser.add_argument('--queue_name', metavar='<queue name>', help="queue to process")
+        parser.add_argument(
+            '--worker_num', metavar='<worker number>', type=int, default=0, help="worker label"
+        )
+        parser.add_argument('--all', action="store_true", help="run all queues")
+        parser.add_argument(
+            '--multi_threaded',
+            nargs='+',
+            metavar='<list of queue name>',
+            required=False,
+            help="list of queue to process",
+        )
 
     help = "Runs a queue processing worker"
 
@@ -89,6 +91,7 @@ class Command(BaseCommand):
                 worker.ENABLE_TIMEOUTS = True
                 worker.start()
 
+
 class Threaded_worker(threading.Thread):
     def __init__(self, queue_name: str) -> None:
         threading.Thread.__init__(self)
diff --git a/zerver/management/commands/purge_queue.py b/zerver/management/commands/purge_queue.py
index ea27f4462d..ffb4335346 100644
--- a/zerver/management/commands/purge_queue.py
+++ b/zerver/management/commands/purge_queue.py
@@ -10,10 +10,8 @@ from zerver.worker.queue_processors import get_active_worker_queues
 
 class Command(BaseCommand):
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument(dest="queue_name", nargs='?',
-                            help="queue to purge")
-        parser.add_argument('--all', action="store_true",
-                            help="purge all queues")
+        parser.add_argument(dest="queue_name", nargs='?', help="queue to purge")
+        parser.add_argument('--all', action="store_true", help="purge all queues")
 
     help = "Discards all messages from the given queue"
 
@@ -30,8 +28,9 @@ class Command(BaseCommand):
             raise CommandError("Missing queue_name argument!")
         else:
             queue_name = options['queue_name']
-            if not (queue_name in get_active_worker_queues() or
-                    queue_name.startswith("notify_tornado")):
+            if not (
+                queue_name in get_active_worker_queues() or queue_name.startswith("notify_tornado")
+            ):
                 raise CommandError(f"Unknown queue {queue_name}")
 
             print(f"Purging queue {queue_name}")
diff --git a/zerver/management/commands/query_ldap.py b/zerver/management/commands/query_ldap.py
index c195faed89..ef0b691293 100644
--- a/zerver/management/commands/query_ldap.py
+++ b/zerver/management/commands/query_ldap.py
@@ -8,8 +8,7 @@ from zproject.backends import query_ldap
 
 class Command(BaseCommand):
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('email', metavar='<email>',
-                            help="email of user to query")
+        parser.add_argument('email', metavar='<email>', help="email of user to query")
 
     def handle(self, *args: Any, **options: str) -> None:
         email = options['email']
diff --git a/zerver/management/commands/rate_limit.py b/zerver/management/commands/rate_limit.py
index 45a1e702dc..c996e204d2 100644
--- a/zerver/management/commands/rate_limit.py
+++ b/zerver/management/commands/rate_limit.py
@@ -10,28 +10,34 @@ class Command(ZulipBaseCommand):
     help = """Manually block or unblock a user from accessing the API"""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('-e', '--email',
-                            help="Email account of user.")
-        parser.add_argument('-a', '--api-key',
-                            help="API key of user.")
-        parser.add_argument('-s', '--seconds',
-                            default=60,
-                            type=int,
-                            help="Seconds to block for.")
-        parser.add_argument('-d', '--domain',
-                            default='api_by_user',
-                            help="Rate-limiting domain. Defaults to 'api_by_user'.")
-        parser.add_argument('-b', '--all-bots',
-                            dest='bots',
-                            action='store_true',
-                            help="Whether or not to also block all bots for this user.")
-        parser.add_argument('operation', metavar='<operation>', choices=['block', 'unblock'],
-                            help="operation to perform (block or unblock)")
+        parser.add_argument('-e', '--email', help="Email account of user.")
+        parser.add_argument('-a', '--api-key', help="API key of user.")
+        parser.add_argument('-s', '--seconds', default=60, type=int, help="Seconds to block for.")
+        parser.add_argument(
+            '-d',
+            '--domain',
+            default='api_by_user',
+            help="Rate-limiting domain. Defaults to 'api_by_user'.",
+        )
+        parser.add_argument(
+            '-b',
+            '--all-bots',
+            dest='bots',
+            action='store_true',
+            help="Whether or not to also block all bots for this user.",
+        )
+        parser.add_argument(
+            'operation',
+            metavar='<operation>',
+            choices=['block', 'unblock'],
+            help="operation to perform (block or unblock)",
+        )
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: Any) -> None:
-        if (not options['api_key'] and not options['email']) or \
-           (options['api_key'] and options['email']):
+        if (not options['api_key'] and not options['email']) or (
+            options['api_key'] and options['email']
+        ):
             raise CommandError("Please enter either an email or API key to manage")
 
         realm = self.get_realm(options)
@@ -41,12 +47,15 @@ class Command(ZulipBaseCommand):
             try:
                 user_profile = get_user_profile_by_api_key(options['api_key'])
             except UserProfile.DoesNotExist:
-                raise CommandError("Unable to get user profile for API key {}".format(options['api_key']))
+                raise CommandError(
+                    "Unable to get user profile for API key {}".format(options['api_key'])
+                )
 
         users = [user_profile]
         if options['bots']:
-            users.extend(bot for bot in UserProfile.objects.filter(is_bot=True,
-                                                                   bot_owner=user_profile))
+            users.extend(
+                bot for bot in UserProfile.objects.filter(is_bot=True, bot_owner=user_profile)
+            )
 
         operation = options['operation']
         for user in users:
diff --git a/zerver/management/commands/realm_domain.py b/zerver/management/commands/realm_domain.py
index 21ff07f564..e908c70118 100644
--- a/zerver/management/commands/realm_domain.py
+++ b/zerver/management/commands/realm_domain.py
@@ -14,14 +14,13 @@ class Command(ZulipBaseCommand):
     help = """Manage domains for the specified realm"""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--op',
-                            default="show",
-                            help='What operation to do (add, show, remove).')
-        parser.add_argument('--allow-subdomains',
-                            action="store_true",
-                            help='Whether subdomains are allowed or not.')
-        parser.add_argument('domain', metavar='<domain>', nargs='?',
-                            help="domain to add or remove")
+        parser.add_argument(
+            '--op', default="show", help='What operation to do (add, show, remove).'
+        )
+        parser.add_argument(
+            '--allow-subdomains', action="store_true", help='Whether subdomains are allowed or not.'
+        )
+        parser.add_argument('domain', metavar='<domain>', nargs='?', help="domain to add or remove")
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: str) -> None:
@@ -43,8 +42,9 @@ class Command(ZulipBaseCommand):
             raise CommandError(e.messages[0])
         if options["op"] == "add":
             try:
-                RealmDomain.objects.create(realm=realm, domain=domain,
-                                           allow_subdomains=options["allow_subdomains"])
+                RealmDomain.objects.create(
+                    realm=realm, domain=domain, allow_subdomains=options["allow_subdomains"]
+                )
                 sys.exit(0)
             except IntegrityError:
                 raise CommandError(f"The domain {domain} is already a part of your organization.")
diff --git a/zerver/management/commands/realm_filters.py b/zerver/management/commands/realm_filters.py
index 6a68e7d77e..8e34ef554d 100644
--- a/zerver/management/commands/realm_filters.py
+++ b/zerver/management/commands/realm_filters.py
@@ -23,13 +23,18 @@ Example: ./manage.py realm_filters --realm=zulip --op=show
 """
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--op',
-                            default="show",
-                            help='What operation to do (add, show, remove).')
-        parser.add_argument('pattern', metavar='<pattern>', nargs='?',
-                            help="regular expression to match")
-        parser.add_argument('url_format_string', metavar='<URL pattern>', nargs='?',
-                            help="format string to substitute")
+        parser.add_argument(
+            '--op', default="show", help='What operation to do (add, show, remove).'
+        )
+        parser.add_argument(
+            'pattern', metavar='<pattern>', nargs='?', help="regular expression to match"
+        )
+        parser.add_argument(
+            'url_format_string',
+            metavar='<URL pattern>',
+            nargs='?',
+            help="format string to substitute",
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: str) -> None:
diff --git a/zerver/management/commands/register_server.py b/zerver/management/commands/register_server.py
index 8abdb2837b..dceaccc0f0 100644
--- a/zerver/management/commands/register_server.py
+++ b/zerver/management/commands/register_server.py
@@ -14,38 +14,51 @@ if settings.DEVELOPMENT:
 else:
     SECRETS_FILENAME = "/etc/zulip/zulip-secrets.conf"
 
+
 class Command(ZulipBaseCommand):
     help = """Register a remote Zulip server for push notifications."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--agree_to_terms_of_service',
-                            action='store_true',
-                            help="Agree to the Zulipchat Terms of Service: https://zulip.com/terms/.")
-        parser.add_argument('--rotate-key',
-                            action='store_true',
-                            help="Automatically rotate your server's zulip_org_key")
+        parser.add_argument(
+            '--agree_to_terms_of_service',
+            action='store_true',
+            help="Agree to the Zulipchat Terms of Service: https://zulip.com/terms/.",
+        )
+        parser.add_argument(
+            '--rotate-key',
+            action='store_true',
+            help="Automatically rotate your server's zulip_org_key",
+        )
 
     def handle(self, **options: Any) -> None:
         if not settings.DEVELOPMENT:
             check_config()
 
         if not settings.ZULIP_ORG_ID:
-            raise CommandError("Missing zulip_org_id; run scripts/setup/generate_secrets.py to generate.")
+            raise CommandError(
+                "Missing zulip_org_id; run scripts/setup/generate_secrets.py to generate."
+            )
         if not settings.ZULIP_ORG_KEY:
-            raise CommandError("Missing zulip_org_key; run scripts/setup/generate_secrets.py to generate.")
+            raise CommandError(
+                "Missing zulip_org_key; run scripts/setup/generate_secrets.py to generate."
+            )
         if settings.PUSH_NOTIFICATION_BOUNCER_URL is None:
             if settings.DEVELOPMENT:
-                settings.PUSH_NOTIFICATION_BOUNCER_URL = (settings.EXTERNAL_URI_SCHEME +
-                                                          settings.EXTERNAL_HOST)
+                settings.PUSH_NOTIFICATION_BOUNCER_URL = (
+                    settings.EXTERNAL_URI_SCHEME + settings.EXTERNAL_HOST
+                )
             else:
-                raise CommandError("Please uncomment PUSH_NOTIFICATION_BOUNCER_URL "
-                                   "in /etc/zulip/settings.py (remove the '#')")
+                raise CommandError(
+                    "Please uncomment PUSH_NOTIFICATION_BOUNCER_URL "
+                    "in /etc/zulip/settings.py (remove the '#')"
+                )
 
         request = {
             "zulip_org_id": settings.ZULIP_ORG_ID,
             "zulip_org_key": settings.ZULIP_ORG_KEY,
             "hostname": settings.EXTERNAL_HOST,
-            "contact_email": settings.ZULIP_ADMINISTRATOR}
+            "contact_email": settings.ZULIP_ADMINISTRATOR,
+        }
         if options["rotate_key"]:
             request["new_org_key"] = get_random_string(64)
 
@@ -55,16 +68,20 @@ class Command(ZulipBaseCommand):
         print("")
 
         if not options['agree_to_terms_of_service'] and not options["rotate_key"]:
-            print("To register, you must agree to the Zulipchat Terms of Service: "
-                  "https://zulip.com/terms/")
+            print(
+                "To register, you must agree to the Zulipchat Terms of Service: "
+                "https://zulip.com/terms/"
+            )
             tos_prompt = input("Do you agree to the Terms of Service? [Y/n] ")
             print("")
-            if not (tos_prompt.lower() == 'y' or
-                    tos_prompt.lower() == '' or
-                    tos_prompt.lower() == 'yes'):
+            if not (
+                tos_prompt.lower() == 'y' or tos_prompt.lower() == '' or tos_prompt.lower() == 'yes'
+            ):
                 raise CommandError("Aborting, since Terms of Service have not been accepted.")
 
-        registration_url = settings.PUSH_NOTIFICATION_BOUNCER_URL + "/api/v1/remotes/server/register"
+        registration_url = (
+            settings.PUSH_NOTIFICATION_BOUNCER_URL + "/api/v1/remotes/server/register"
+        )
         try:
             response = requests.post(registration_url, params=request)
         except requests.RequestException:
@@ -79,13 +96,25 @@ class Command(ZulipBaseCommand):
             raise CommandError("Error: " + content_dict['msg'])
 
         if response.json()['created']:
-            print("You've successfully registered for the Mobile Push Notification Service!\n"
-                  "To finish setup for sending push notifications:")
-            print("- Restart the server, using /home/zulip/deployments/current/scripts/restart-server")
+            print(
+                "You've successfully registered for the Mobile Push Notification Service!\n"
+                "To finish setup for sending push notifications:"
+            )
+            print(
+                "- Restart the server, using /home/zulip/deployments/current/scripts/restart-server"
+            )
             print("- Return to the documentation to learn how to test push notifications")
         else:
             if options["rotate_key"]:
                 print(f"Success! Updating {SECRETS_FILENAME} with the new key...")
-                subprocess.check_call(["crudini", '--set', SECRETS_FILENAME, "secrets", "zulip_org_key",
-                                       request["new_org_key"]])
+                subprocess.check_call(
+                    [
+                        "crudini",
+                        '--set',
+                        SECRETS_FILENAME,
+                        "secrets",
+                        "zulip_org_key",
+                        request["new_org_key"],
+                    ]
+                )
             print("Mobile Push Notification Service registration successfully updated!")
diff --git a/zerver/management/commands/remove_users_from_stream.py b/zerver/management/commands/remove_users_from_stream.py
index f12f91cdd8..1c80fbd6a7 100644
--- a/zerver/management/commands/remove_users_from_stream.py
+++ b/zerver/management/commands/remove_users_from_stream.py
@@ -11,12 +11,12 @@ class Command(ZulipBaseCommand):
     help = """Remove some or all users in a realm from a stream."""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-s', '--stream',
-                            required=True,
-                            help='A stream name.')
+        parser.add_argument('-s', '--stream', required=True, help='A stream name.')
 
         self.add_realm_args(parser, True)
-        self.add_user_list_args(parser, all_users_help='Remove all users in realm from this stream.')
+        self.add_user_list_args(
+            parser, all_users_help='Remove all users in realm from this stream.'
+        )
 
     def handle(self, **options: Any) -> None:
         realm = self.get_realm(options)
@@ -25,7 +25,9 @@ class Command(ZulipBaseCommand):
         stream_name = options["stream"].strip()
         stream = get_stream(stream_name, realm)
 
-        result = bulk_remove_subscriptions(user_profiles, [stream], self.get_client(), acting_user=None)
+        result = bulk_remove_subscriptions(
+            user_profiles, [stream], self.get_client(), acting_user=None
+        )
         not_subscribed = result[1]
         not_subscribed_users = {tup[0] for tup in not_subscribed}
 
diff --git a/zerver/management/commands/rename_stream.py b/zerver/management/commands/rename_stream.py
index 57a2fd2dea..0730316038 100644
--- a/zerver/management/commands/rename_stream.py
+++ b/zerver/management/commands/rename_stream.py
@@ -10,10 +10,10 @@ class Command(ZulipBaseCommand):
     help = """Change the stream name for a realm."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('old_name', metavar='<old name>',
-                            help='name of stream to be renamed')
-        parser.add_argument('new_name', metavar='<new name>',
-                            help='new name to rename the stream to')
+        parser.add_argument('old_name', metavar='<old name>', help='name of stream to be renamed')
+        parser.add_argument(
+            'new_name', metavar='<new name>', help='new name to rename the stream to'
+        )
         self.add_realm_args(parser, True)
 
     def handle(self, *args: Any, **options: str) -> None:
diff --git a/zerver/management/commands/restore_messages.py b/zerver/management/commands/restore_messages.py
index fa172e2a76..fb105961ad 100644
--- a/zerver/management/commands/restore_messages.py
+++ b/zerver/management/commands/restore_messages.py
@@ -28,15 +28,21 @@ To restore a specific ArchiveTransaction:
 """
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-d', '--restore-deleted',
-                            action='store_true',
-                            help='Restore manually deleted messages.')
-        parser.add_argument('-t', '--transaction-id',
-                            type=int,
-                            help='Restore a specific ArchiveTransaction.')
+        parser.add_argument(
+            '-d',
+            '--restore-deleted',
+            action='store_true',
+            help='Restore manually deleted messages.',
+        )
+        parser.add_argument(
+            '-t', '--transaction-id', type=int, help='Restore a specific ArchiveTransaction.'
+        )
 
-        self.add_realm_args(parser, help='Restore archived messages from the specified realm. '
-                                         '(Does not restore manually deleted messages.)')
+        self.add_realm_args(
+            parser,
+            help='Restore archived messages from the specified realm. '
+            '(Does not restore manually deleted messages.)',
+        )
 
     def handle(self, **options: Any) -> None:
         realm = self.get_realm(options)
diff --git a/zerver/management/commands/runtornado.py b/zerver/management/commands/runtornado.py
index ae9e85c86c..b48dae7627 100644
--- a/zerver/management/commands/runtornado.py
+++ b/zerver/management/commands/runtornado.py
@@ -37,21 +37,31 @@ def handle_callback_exception(callback: Callable[..., Any]) -> None:
     logging.exception("Exception in callback", stack_info=True)
     app_log.error("Exception in callback %r", callback, exc_info=True)
 
+
 class Command(BaseCommand):
     help = "Starts a Tornado Web server wrapping Django."
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('addrport', nargs="?",
-                            help='[optional port number or ipaddr:port]\n '
-                                 '(use multiple ports to start multiple servers)')
+        parser.add_argument(
+            'addrport',
+            nargs="?",
+            help='[optional port number or ipaddr:port]\n '
+            '(use multiple ports to start multiple servers)',
+        )
 
-        parser.add_argument('--nokeepalive', action='store_true',
-                            dest='no_keep_alive',
-                            help="Tells Tornado to NOT keep alive http connections.")
+        parser.add_argument(
+            '--nokeepalive',
+            action='store_true',
+            dest='no_keep_alive',
+            help="Tells Tornado to NOT keep alive http connections.",
+        )
 
-        parser.add_argument('--noxheaders', action='store_false',
-                            dest='xheaders',
-                            help="Tells Tornado to NOT override remote IP with X-Real-IP.")
+        parser.add_argument(
+            '--noxheaders',
+            action='store_false',
+            dest='xheaders',
+            help="Tells Tornado to NOT override remote IP with X-Real-IP.",
+        )
 
     def handle(self, addrport: str, **options: bool) -> None:
         interactive_debug_listen()
@@ -74,12 +84,14 @@ class Command(BaseCommand):
         no_keep_alive = options.get('no_keep_alive', False)
 
         if settings.DEBUG:
-            logging.basicConfig(level=logging.INFO,
-                                format='%(asctime)s %(levelname)-8s %(message)s')
+            logging.basicConfig(
+                level=logging.INFO, format='%(asctime)s %(levelname)-8s %(message)s'
+            )
 
         def inner_run() -> None:
             from django.conf import settings
             from django.utils import translation
+
             translation.activate(settings.LANGUAGE_CODE)
 
             # We pass display_num_errors=False, since Django will
@@ -92,8 +104,9 @@ class Command(BaseCommand):
                 assert isinstance(queue_client, TornadoQueueClient)
                 # Process notifications received via RabbitMQ
                 queue_name = notify_tornado_queue_name(port)
-                queue_client.start_json_consumer(queue_name,
-                                                 get_wrapped_process_notification(queue_name))
+                queue_client.start_json_consumer(
+                    queue_name, get_wrapped_process_notification(queue_name)
+                )
 
             try:
                 # Application is an instance of Django's standard wsgi handler.
@@ -102,12 +115,13 @@ class Command(BaseCommand):
                     zulip_autoreload_start()
 
                 # start tornado web server in single-threaded mode
-                http_server = httpserver.HTTPServer(application,
-                                                    xheaders=xheaders,
-                                                    no_keep_alive=no_keep_alive)
+                http_server = httpserver.HTTPServer(
+                    application, xheaders=xheaders, no_keep_alive=no_keep_alive
+                )
                 http_server.listen(port, address=addr)
 
                 from zerver.tornado.ioloop_logging import logging_data
+
                 logging_data['port'] = str(port)
                 setup_event_queue(port)
                 add_client_gc_hook(missedmessage_hook)
diff --git a/zerver/management/commands/send_custom_email.py b/zerver/management/commands/send_custom_email.py
index 96c127e326..2b9847b29f 100644
--- a/zerver/management/commands/send_custom_email.py
+++ b/zerver/management/commands/send_custom_email.py
@@ -16,37 +16,47 @@ class Command(ZulipBaseCommand):
     document used to generate the email, or on the command line."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--entire-server', action="store_true",
-                            help="Send to every user on the server.")
-        parser.add_argument('--markdown-template-path', '--path',
-                            required=True,
-                            help='Path to a Markdown-format body for the email.')
-        parser.add_argument('--subject',
-                            help='Subject for the email. It can be declared in Markdown file in headers')
-        parser.add_argument('--from-name',
-                            help='From line for the email. It can be declared in Markdown file in headers')
-        parser.add_argument('--reply-to',
-                            help='Optional reply-to line for the email')
-        parser.add_argument('--admins-only',
-                            help='Send only to organization administrators',
-                            action='store_true')
+        parser.add_argument(
+            '--entire-server', action="store_true", help="Send to every user on the server."
+        )
+        parser.add_argument(
+            '--markdown-template-path',
+            '--path',
+            required=True,
+            help='Path to a Markdown-format body for the email.',
+        )
+        parser.add_argument(
+            '--subject',
+            help='Subject for the email. It can be declared in Markdown file in headers',
+        )
+        parser.add_argument(
+            '--from-name',
+            help='From line for the email. It can be declared in Markdown file in headers',
+        )
+        parser.add_argument('--reply-to', help='Optional reply-to line for the email')
+        parser.add_argument(
+            '--admins-only', help='Send only to organization administrators', action='store_true'
+        )
 
-        self.add_user_list_args(parser,
-                                help="Email addresses of user(s) to send emails to.",
-                                all_users_help="Send to every user on the realm.")
+        self.add_user_list_args(
+            parser,
+            help="Email addresses of user(s) to send emails to.",
+            all_users_help="Send to every user on the realm.",
+        )
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: str) -> None:
         if options["entire_server"]:
-            users = UserProfile.objects.filter(is_active=True, is_bot=False,
-                                               is_mirror_dummy=False)
+            users = UserProfile.objects.filter(is_active=True, is_bot=False, is_mirror_dummy=False)
         else:
             realm = self.get_realm(options)
             try:
                 users = self.get_users(options, realm, is_bot=False)
             except CommandError as error:
                 if str(error) == "You have to pass either -u/--users or -a/--all-users.":
-                    raise CommandError("You have to pass -u/--users or -a/--all-users or --entire-server.")
+                    raise CommandError(
+                        "You have to pass -u/--users or -a/--all-users or --entire-server."
+                    )
                 raise error
 
         send_custom_email(users, options)
diff --git a/zerver/management/commands/send_password_reset_email.py b/zerver/management/commands/send_password_reset_email.py
index a1a707b8bb..60d430e207 100644
--- a/zerver/management/commands/send_password_reset_email.py
+++ b/zerver/management/commands/send_password_reset_email.py
@@ -13,32 +13,34 @@ class Command(ZulipBaseCommand):
     help = """Send email to specified email address."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('--entire-server', action="store_true",
-                            help="Send to every user on the server. ")
-        self.add_user_list_args(parser,
-                                help="Email addresses of user(s) to send password reset emails to.",
-                                all_users_help="Send to every user on the realm.")
+        parser.add_argument(
+            '--entire-server', action="store_true", help="Send to every user on the server. "
+        )
+        self.add_user_list_args(
+            parser,
+            help="Email addresses of user(s) to send password reset emails to.",
+            all_users_help="Send to every user on the realm.",
+        )
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: str) -> None:
         if options["entire_server"]:
-            users = UserProfile.objects.filter(is_active=True, is_bot=False,
-                                               is_mirror_dummy=False)
+            users = UserProfile.objects.filter(is_active=True, is_bot=False, is_mirror_dummy=False)
         else:
             realm = self.get_realm(options)
             try:
                 users = self.get_users(options, realm, is_bot=False)
             except CommandError as error:
                 if str(error) == "You have to pass either -u/--users or -a/--all-users.":
-                    raise CommandError("You have to pass -u/--users or -a/--all-users or --entire-server.")
+                    raise CommandError(
+                        "You have to pass -u/--users or -a/--all-users or --entire-server."
+                    )
                 raise error
 
         self.send(users)
 
     def send(self, users: List[UserProfile]) -> None:
-        """Sends one-use only links for resetting password to target users
-
-        """
+        """Sends one-use only links for resetting password to target users"""
         for user_profile in users:
             context = {
                 'email': user_profile.delivery_email,
@@ -47,7 +49,10 @@ class Command(ZulipBaseCommand):
                 'realm_name': user_profile.realm.name,
                 'active_account_in_realm': True,
             }
-            send_email('zerver/emails/password_reset', to_user_ids=[user_profile.id],
-                       from_address=FromAddress.tokenized_no_reply_address(),
-                       from_name=FromAddress.security_email_from_name(user_profile=user_profile),
-                       context=context)
+            send_email(
+                'zerver/emails/password_reset',
+                to_user_ids=[user_profile.id],
+                from_address=FromAddress.tokenized_no_reply_address(),
+                from_name=FromAddress.security_email_from_name(user_profile=user_profile),
+                context=context,
+            )
diff --git a/zerver/management/commands/send_stats.py b/zerver/management/commands/send_stats.py
index 0aca25d733..edfdcf9ea2 100644
--- a/zerver/management/commands/send_stats.py
+++ b/zerver/management/commands/send_stats.py
@@ -9,9 +9,12 @@ class Command(BaseCommand):
     help = """Send some stats to statsd."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('operation', metavar='<operation>',
-                            choices=['incr', 'decr', 'timing', 'timer', 'gauge'],
-                            help="incr|decr|timing|timer|gauge")
+        parser.add_argument(
+            'operation',
+            metavar='<operation>',
+            choices=['incr', 'decr', 'timing', 'timer', 'gauge'],
+            help="incr|decr|timing|timer|gauge",
+        )
         parser.add_argument('name', metavar='<name>')
         parser.add_argument('val', metavar='<val>')
 
diff --git a/zerver/management/commands/send_test_email.py b/zerver/management/commands/send_test_email.py
index 58016d5f2a..1c3a59e5e2 100644
--- a/zerver/management/commands/send_test_email.py
+++ b/zerver/management/commands/send_test_email.py
@@ -11,11 +11,15 @@ from zerver.lib.send_email import FromAddress
 class Command(sendtestemail.Command):
     def handle(self, *args: Any, **kwargs: str) -> None:
         if settings.WARN_NO_EMAIL:
-            raise CommandError("Outgoing email not yet configured, see\n  "
-                               "https://zulip.readthedocs.io/en/latest/production/email.html")
+            raise CommandError(
+                "Outgoing email not yet configured, see\n  "
+                "https://zulip.readthedocs.io/en/latest/production/email.html"
+            )
         if len(kwargs['email']) == 0:
-            raise CommandError("Usage: /home/zulip/deployments/current/manage.py "
-                               "send_test_email username@example.com")
+            raise CommandError(
+                "Usage: /home/zulip/deployments/current/manage.py "
+                "send_test_email username@example.com"
+            )
 
         print("If you run into any trouble, read:")
         print()
@@ -26,11 +30,13 @@ class Command(sendtestemail.Command):
         print()
         print("Sending 2 test emails from:")
 
-        message = ("Success!  If you receive this message (and a second with a different subject), "
-                   "you've successfully configured sending emails from your Zulip server.  "
-                   "Remember that you need to restart "
-                   "the Zulip server with /home/zulip/deployments/current/scripts/restart-server "
-                   "after changing the settings in /etc/zulip before your changes will take effect.")
+        message = (
+            "Success!  If you receive this message (and a second with a different subject), "
+            "you've successfully configured sending emails from your Zulip server.  "
+            "Remember that you need to restart "
+            "the Zulip server with /home/zulip/deployments/current/scripts/restart-server "
+            "after changing the settings in /etc/zulip before your changes will take effect."
+        )
         sender = FromAddress.SUPPORT
         print(f"  * {sender}")
         send_mail("Zulip email test", message, sender, kwargs['email'])
diff --git a/zerver/management/commands/send_to_email_mirror.py b/zerver/management/commands/send_to_email_mirror.py
index 0c0e962566..4851be465d 100644
--- a/zerver/management/commands/send_to_email_mirror.py
+++ b/zerver/management/commands/send_to_email_mirror.py
@@ -27,6 +27,7 @@ from zerver.models import Realm, get_realm, get_stream
 # Value of the TO: header doesn't matter, as it is overridden
 # by the command in order for the email to be sent to the correct stream.
 
+
 class Command(ZulipBaseCommand):
     help = """
 Send specified email from a fixture file to the email mirror
@@ -36,14 +37,20 @@ Example:
 """
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-f', '--fixture',
-                            help='The path to the email message you\'d like to send '
-                                 'to the email mirror.\n'
-                                 'Accepted formats: json or raw email file. '
-                                 'See zerver/tests/fixtures/email/ for examples')
-        parser.add_argument('-s', '--stream',
-                            help='The name of the stream to which you\'d like to send '
-                            'the message. Default: Denmark')
+        parser.add_argument(
+            '-f',
+            '--fixture',
+            help='The path to the email message you\'d like to send '
+            'to the email mirror.\n'
+            'Accepted formats: json or raw email file. '
+            'See zerver/tests/fixtures/email/ for examples',
+        )
+        parser.add_argument(
+            '-s',
+            '--stream',
+            help='The name of the stream to which you\'d like to send '
+            'the message. Default: Denmark',
+        )
 
         self.add_realm_args(parser, help="Specify which realm to connect to; default is zulip")
 
@@ -103,8 +110,14 @@ Example:
 
         # The block below ensures that the imported email message doesn't have any recipient-like
         # headers that are inconsistent with the recipient we want (the stream address).
-        recipient_headers = ["X-Gm-Original-To", "Delivered-To", "Envelope-To",
-                             "Resent-To", "Resent-CC", "CC"]
+        recipient_headers = [
+            "X-Gm-Original-To",
+            "Delivered-To",
+            "Envelope-To",
+            "Resent-To",
+            "Resent-CC",
+            "CC",
+        ]
         for header in recipient_headers:
             if header in message:
                 del message[header]
diff --git a/zerver/management/commands/send_webhook_fixture_message.py b/zerver/management/commands/send_webhook_fixture_message.py
index e7a7d6ef1e..eafa770275 100644
--- a/zerver/management/commands/send_webhook_fixture_message.py
+++ b/zerver/management/commands/send_webhook_fixture_message.py
@@ -31,17 +31,23 @@ approach shown above.
 """
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-f', '--fixture',
-                            help='The path to the fixture you\'d like to send '
-                                 'into Zulip')
+        parser.add_argument(
+            '-f', '--fixture', help='The path to the fixture you\'d like to send ' 'into Zulip'
+        )
 
-        parser.add_argument('-u', '--url',
-                            help='The URL on your Zulip server that you want to post the fixture to')
+        parser.add_argument(
+            '-u', '--url', help='The URL on your Zulip server that you want to post the fixture to'
+        )
 
-        parser.add_argument('-H', '--custom-headers',
-                            help='The headers you want to provide along with your mock request to Zulip.')
+        parser.add_argument(
+            '-H',
+            '--custom-headers',
+            help='The headers you want to provide along with your mock request to Zulip.',
+        )
 
-        self.add_realm_args(parser, help="Specify which realm/subdomain to connect to; default is zulip")
+        self.add_realm_args(
+            parser, help="Specify which realm/subdomain to connect to; default is zulip"
+        )
 
     def parse_headers(self, custom_headers: Union[None, str]) -> Union[None, Dict[str, str]]:
         if not custom_headers:
@@ -49,8 +55,10 @@ approach shown above.
         try:
             custom_headers_dict = orjson.loads(custom_headers)
         except orjson.JSONDecodeError as ve:
-            raise CommandError('Encountered an error while attempting to parse custom headers: {}\n'
-                               'Note: all strings must be enclosed within "" instead of \'\''.format(ve))
+            raise CommandError(
+                'Encountered an error while attempting to parse custom headers: {}\n'
+                'Note: all strings must be enclosed within "" instead of \'\''.format(ve)
+            )
         return standardize_headers(custom_headers_dict)
 
     def handle(self, **options: Optional[str]) -> None:
@@ -71,11 +79,17 @@ approach shown above.
 
         client = Client()
         if headers:
-            result = client.post(options['url'], json, content_type="application/json",
-                                 HTTP_HOST=realm.host, **headers)
+            result = client.post(
+                options['url'],
+                json,
+                content_type="application/json",
+                HTTP_HOST=realm.host,
+                **headers,
+            )
         else:
-            result = client.post(options['url'], json, content_type="application/json",
-                                 HTTP_HOST=realm.host)
+            result = client.post(
+                options['url'], json, content_type="application/json", HTTP_HOST=realm.host
+            )
         if result.status_code != 200:
             raise CommandError(f'Error status {result.status_code}: {result.content}')
 
diff --git a/zerver/management/commands/set_message_flags.py b/zerver/management/commands/set_message_flags.py
index 18650e975c..29a296d714 100644
--- a/zerver/management/commands/set_message_flags.py
+++ b/zerver/management/commands/set_message_flags.py
@@ -15,22 +15,22 @@ class Command(ZulipBaseCommand):
     Expects a comma-delimited list of user message ids via stdin, and an EOF to terminate."""
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-l', '--for-real',
-                            action='store_true',
-                            help="Actually change message flags. Default is a dry run.")
+        parser.add_argument(
+            '-l',
+            '--for-real',
+            action='store_true',
+            help="Actually change message flags. Default is a dry run.",
+        )
 
-        parser.add_argument('-f', '--flag',
-                            help="The flag to add of remove")
+        parser.add_argument('-f', '--flag', help="The flag to add of remove")
 
-        parser.add_argument('-o', '--op',
-                            help="The operation to do: 'add' or 'remove'")
+        parser.add_argument('-o', '--op', help="The operation to do: 'add' or 'remove'")
 
-        parser.add_argument('-u', '--until',
-                            dest='all_until',
-                            help="Mark all messages <= specific usermessage id")
+        parser.add_argument(
+            '-u', '--until', dest='all_until', help="Mark all messages <= specific usermessage id"
+        )
 
-        parser.add_argument('-m', '--email',
-                            help="Email to set messages for")
+        parser.add_argument('-m', '--email', help="Email to set messages for")
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: Any) -> None:
@@ -49,8 +49,10 @@ class Command(ZulipBaseCommand):
             filt = models.Q(id__lte=all_until)
         else:
             filt = models.Q(message__id__in=[mid.strip() for mid in sys.stdin.read().split(',')])
-        mids = [m.id for m in
-                UserMessage.objects.filter(filt, user_profile=user_profile).order_by('-id')]
+        mids = [
+            m.id
+            for m in UserMessage.objects.filter(filt, user_profile=user_profile).order_by('-id')
+        ]
 
         if options["for_real"]:
             sys.stdin.close()
diff --git a/zerver/management/commands/soft_deactivate_users.py b/zerver/management/commands/soft_deactivate_users.py
index d9b29c5b70..8cfea8e346 100644
--- a/zerver/management/commands/soft_deactivate_users.py
+++ b/zerver/management/commands/soft_deactivate_users.py
@@ -15,12 +15,9 @@ from zerver.lib.soft_deactivation import (
 from zerver.models import Realm, UserProfile
 
 
-def get_users_from_emails(emails: List[str],
-                          filter_kwargs: Dict[str, Realm]) -> List[UserProfile]:
+def get_users_from_emails(emails: List[str], filter_kwargs: Dict[str, Realm]) -> List[UserProfile]:
     # Bug: Ideally, this would be case-insensitive like our other email queries.
-    users = UserProfile.objects.filter(
-        delivery_email__in=emails,
-        **filter_kwargs)
+    users = UserProfile.objects.filter(delivery_email__in=emails, **filter_kwargs)
 
     if len(users) != len(emails):
         user_emails_found = {user.delivery_email for user in users}
@@ -32,23 +29,30 @@ def get_users_from_emails(emails: List[str],
         )
     return users
 
+
 class Command(ZulipBaseCommand):
     help = """Soft activate/deactivate users. Users are recognised by their emails here."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         self.add_realm_args(parser)
-        parser.add_argument('-d', '--deactivate',
-                            action='store_true',
-                            help='Used to deactivate user/users.')
-        parser.add_argument('-a', '--activate',
-                            action='store_true',
-                            help='Used to activate user/users.')
-        parser.add_argument('--inactive-for',
-                            type=int,
-                            default=28,
-                            help='Number of days of inactivity before soft-deactivation')
-        parser.add_argument('users', metavar='<users>', nargs='*',
-                            help="A list of user emails to soft activate/deactivate.")
+        parser.add_argument(
+            '-d', '--deactivate', action='store_true', help='Used to deactivate user/users.'
+        )
+        parser.add_argument(
+            '-a', '--activate', action='store_true', help='Used to activate user/users.'
+        )
+        parser.add_argument(
+            '--inactive-for',
+            type=int,
+            default=28,
+            help='Number of days of inactivity before soft-deactivation',
+        )
+        parser.add_argument(
+            'users',
+            metavar='<users>',
+            nargs='*',
+            help="A list of user emails to soft activate/deactivate.",
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         if settings.STAGING:
@@ -80,8 +84,9 @@ class Command(ZulipBaseCommand):
                 print('Soft deactivating forcefully...')
                 users_deactivated = do_soft_deactivate_users(users_to_deactivate)
             else:
-                users_deactivated = do_auto_soft_deactivate_users(int(options['inactive_for']),
-                                                                  realm)
+                users_deactivated = do_auto_soft_deactivate_users(
+                    int(options['inactive_for']), realm
+                )
             logger.info('Soft deactivated %d user(s)', len(users_deactivated))
 
         else:
diff --git a/zerver/management/commands/sync_ldap_user_data.py b/zerver/management/commands/sync_ldap_user_data.py
index ca3106af85..83a304b616 100644
--- a/zerver/management/commands/sync_ldap_user_data.py
+++ b/zerver/management/commands/sync_ldap_user_data.py
@@ -15,7 +15,9 @@ logger = logging.getLogger('zulip.sync_ldap_user_data')
 log_to_file(logger, settings.LDAP_SYNC_LOG_PATH)
 
 # Run this on a cronjob to pick up on name changes.
-def sync_ldap_user_data(user_profiles: List[UserProfile], deactivation_protection: bool=True) -> None:
+def sync_ldap_user_data(
+    user_profiles: List[UserProfile], deactivation_protection: bool = True
+) -> None:
     logger.info("Starting update.")
     with transaction.atomic():
         realms = {u.realm.string_id for u in user_profiles}
@@ -31,30 +33,42 @@ def sync_ldap_user_data(user_profiles: List[UserProfile], deactivation_protectio
 
         if deactivation_protection:
             if not UserProfile.objects.filter(is_bot=False, is_active=True).exists():
-                error_msg = ("Ldap sync would have deactivated all users. This is most likely due " +
-                             "to a misconfiguration of LDAP settings. Rolling back...\n" +
-                             "Use the --force option if the mass deactivation is intended.")
+                error_msg = (
+                    "Ldap sync would have deactivated all users. This is most likely due "
+                    + "to a misconfiguration of LDAP settings. Rolling back...\n"
+                    + "Use the --force option if the mass deactivation is intended."
+                )
                 logger.error(error_msg)
                 # Raising an exception in this atomic block will rollback the transaction.
                 raise Exception(error_msg)
             for string_id in realms:
-                if not UserProfile.objects.filter(is_bot=False, is_active=True, realm__string_id=string_id,
-                                                  role__gte=UserProfile.ROLE_REALM_ADMINISTRATOR).exists():
-                    error_msg = ("Ldap sync would have deactivated all administrators of realm %s. " +
-                                 "This is most likely due " +
-                                 "to a misconfiguration of LDAP settings. Rolling back...\n" +
-                                 "Use the --force option if the mass deactivation is intended.")
+                if not UserProfile.objects.filter(
+                    is_bot=False,
+                    is_active=True,
+                    realm__string_id=string_id,
+                    role__gte=UserProfile.ROLE_REALM_ADMINISTRATOR,
+                ).exists():
+                    error_msg = (
+                        "Ldap sync would have deactivated all administrators of realm %s. "
+                        + "This is most likely due "
+                        + "to a misconfiguration of LDAP settings. Rolling back...\n"
+                        + "Use the --force option if the mass deactivation is intended."
+                    )
                     error_msg = error_msg % (string_id,)
                     logger.error(error_msg)
                     raise Exception(error_msg)
 
     logger.info("Finished update.")
 
+
 class Command(ZulipBaseCommand):
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('-f', '--force',
-                            action="store_true",
-                            help='Disable the protection against deactivating all users.')
+        parser.add_argument(
+            '-f',
+            '--force',
+            action="store_true",
+            help='Disable the protection against deactivating all users.',
+        )
 
         self.add_realm_args(parser)
         self.add_user_list_args(parser)
@@ -62,8 +76,7 @@ class Command(ZulipBaseCommand):
     def handle(self, *args: Any, **options: Any) -> None:
         if options.get('realm_id') is not None:
             realm = self.get_realm(options)
-            user_profiles = self.get_users(options, realm, is_bot=False,
-                                           include_deactivated=True)
+            user_profiles = self.get_users(options, realm, is_bot=False, include_deactivated=True)
         else:
             user_profiles = UserProfile.objects.select_related().filter(is_bot=False)
         sync_ldap_user_data(user_profiles, not options['force'])
diff --git a/zerver/management/commands/transfer_uploads_to_s3.py b/zerver/management/commands/transfer_uploads_to_s3.py
index a1f4b650c5..a4af6fbb0e 100644
--- a/zerver/management/commands/transfer_uploads_to_s3.py
+++ b/zerver/management/commands/transfer_uploads_to_s3.py
@@ -10,9 +10,11 @@ class Command(BaseCommand):
     help = """Transfer uploads to S3 """
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('--processes',
-                            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
-                            help='Processes to use for exporting uploads in parallel')
+        parser.add_argument(
+            '--processes',
+            default=settings.DEFAULT_DATA_EXPORT_IMPORT_PARALLELISM,
+            help='Processes to use for exporting uploads in parallel',
+        )
 
     def handle(self, *args: Any, **options: Any) -> None:
         num_processes = int(options['processes'])
diff --git a/zerver/management/commands/turn_off_digests.py b/zerver/management/commands/turn_off_digests.py
index 8e7e3b3c93..5e2cc4e48f 100644
--- a/zerver/management/commands/turn_off_digests.py
+++ b/zerver/management/commands/turn_off_digests.py
@@ -10,9 +10,11 @@ class Command(ZulipBaseCommand):
     def add_arguments(self, parser: CommandParser) -> None:
         self.add_realm_args(parser)
 
-        self.add_user_list_args(parser,
-                                help='Turn off digests for this comma-separated list of email addresses.',
-                                all_users_help="Turn off digests for everyone in realm.")
+        self.add_user_list_args(
+            parser,
+            help='Turn off digests for this comma-separated list of email addresses.',
+            all_users_help="Turn off digests for everyone in realm.",
+        )
 
     def handle(self, **options: str) -> None:
         realm = self.get_realm(options)
@@ -22,7 +24,11 @@ class Command(ZulipBaseCommand):
         for user_profile in user_profiles:
             already_disabled_prefix = ""
             if user_profile.enable_digest_emails:
-                do_change_notification_settings(user_profile, 'enable_digest_emails', False, acting_user=None)
+                do_change_notification_settings(
+                    user_profile, 'enable_digest_emails', False, acting_user=None
+                )
             else:
                 already_disabled_prefix = "(already off) "
-            print(f"{already_disabled_prefix}{user_profile.full_name} <{user_profile.delivery_email}>")
+            print(
+                f"{already_disabled_prefix}{user_profile.full_name} <{user_profile.delivery_email}>"
+            )
diff --git a/zerver/middleware.py b/zerver/middleware.py
index 9fc76c4697..baabaf358d 100644
--- a/zerver/middleware.py
+++ b/zerver/middleware.py
@@ -37,6 +37,7 @@ from zerver.models import Realm, flush_per_request_caches, get_realm
 logger = logging.getLogger('zulip.requests')
 slow_query_logger = logging.getLogger('zulip.slow_queries')
 
+
 def record_request_stop_data(log_data: MutableMapping[str, Any]) -> None:
     log_data['time_stopped'] = time.time()
     log_data['remote_cache_time_stopped'] = get_remote_cache_time()
@@ -46,9 +47,11 @@ def record_request_stop_data(log_data: MutableMapping[str, Any]) -> None:
     if settings.PROFILE_ALL_REQUESTS:
         log_data["prof"].disable()
 
+
 def async_request_timer_stop(request: HttpRequest) -> None:
     record_request_stop_data(request._log_data)
 
+
 def record_request_restart_data(log_data: MutableMapping[str, Any]) -> None:
     if settings.PROFILE_ALL_REQUESTS:
         log_data["prof"].enable()
@@ -58,6 +61,7 @@ def record_request_restart_data(log_data: MutableMapping[str, Any]) -> None:
     log_data['markdown_time_restarted'] = get_markdown_time()
     log_data['markdown_requests_restarted'] = get_markdown_requests()
 
+
 def async_request_timer_restart(request: HttpRequest) -> None:
     if "time_restarted" in request._log_data:
         # Don't destroy data when being called from
@@ -65,6 +69,7 @@ def async_request_timer_restart(request: HttpRequest) -> None:
         return
     record_request_restart_data(request._log_data)
 
+
 def record_request_start_data(log_data: MutableMapping[str, Any]) -> None:
     if settings.PROFILE_ALL_REQUESTS:
         log_data["prof"] = cProfile.Profile()
@@ -77,40 +82,66 @@ def record_request_start_data(log_data: MutableMapping[str, Any]) -> None:
     log_data['markdown_time_start'] = get_markdown_time()
     log_data['markdown_requests_start'] = get_markdown_requests()
 
+
 def timedelta_ms(timedelta: float) -> float:
     return timedelta * 1000
 
+
 def format_timedelta(timedelta: float) -> str:
-    if (timedelta >= 1):
+    if timedelta >= 1:
         return f"{timedelta:.1f}s"
     return f"{timedelta_ms(timedelta):.0f}ms"
 
+
 def is_slow_query(time_delta: float, path: str) -> bool:
     if time_delta < 1.2:
         return False
-    is_exempt = \
-        path in ["/activity", "/json/report/error",
-                 "/api/v1/deployments/report_error"] \
-        or path.startswith("/realm_activity/") \
+    is_exempt = (
+        path in ["/activity", "/json/report/error", "/api/v1/deployments/report_error"]
+        or path.startswith("/realm_activity/")
         or path.startswith("/user_activity/")
+    )
     if is_exempt:
         return time_delta >= 5
     if 'webathena_kerberos' in path:
         return time_delta >= 10
     return True
 
+
 statsd_blacklisted_requests = [
-    'do_confirm', 'signup_send_confirm', 'new_realm_send_confirm',
-    'eventslast_event_id', 'webreq.content', 'avatar', 'user_uploads',
-    'password.reset', 'static', 'json.bots', 'json.users', 'json.streams',
-    'accounts.unsubscribe', 'apple-touch-icon', 'emoji', 'json.bots',
-    'upload_file', 'realm_activity', 'user_activity',
+    'do_confirm',
+    'signup_send_confirm',
+    'new_realm_send_confirm',
+    'eventslast_event_id',
+    'webreq.content',
+    'avatar',
+    'user_uploads',
+    'password.reset',
+    'static',
+    'json.bots',
+    'json.users',
+    'json.streams',
+    'accounts.unsubscribe',
+    'apple-touch-icon',
+    'emoji',
+    'json.bots',
+    'upload_file',
+    'realm_activity',
+    'user_activity',
 ]
 
-def write_log_line(log_data: MutableMapping[str, Any], path: str, method: str, remote_ip: str,
-                   requestor_for_logs: str, client_name: str, status_code: int=200,
-                   error_content: Optional[AnyStr]=None,
-                   error_content_iter: Optional[Iterable[AnyStr]]=None) -> None:
+
+def write_log_line(
+    log_data: MutableMapping[str, Any],
+    path: str,
+    method: str,
+    remote_ip: str,
+    requestor_for_logs: str,
+    client_name: str,
+    status_code: int = 200,
+    error_content: Optional[AnyStr] = None,
+    error_content_iter: Optional[Iterable[AnyStr]] = None,
+) -> None:
     assert error_content is None or error_content_iter is None
     if error_content is not None:
         error_content_iter = (error_content,)
@@ -126,7 +157,9 @@ def write_log_line(log_data: MutableMapping[str, Any], path: str, method: str, r
             # statsd sad when it sends the key name over the socket
             statsd_path = statsd_path.encode('ascii', errors='ignore').decode("ascii")
         # TODO: This could probably be optimized to use a regular expression rather than a loop.
-        suppress_statsd = any(blacklisted in statsd_path for blacklisted in statsd_blacklisted_requests)
+        suppress_statsd = any(
+            blacklisted in statsd_path for blacklisted in statsd_blacklisted_requests
+        )
     else:
         suppress_statsd = True
         statsd_path = ''
@@ -139,22 +172,30 @@ def write_log_line(log_data: MutableMapping[str, Any], path: str, method: str, r
         time_delta = time.time() - log_data['time_started']
     if 'time_stopped' in log_data:
         orig_time_delta = time_delta
-        time_delta = ((log_data['time_stopped'] - log_data['time_started']) +
-                      (time.time() - log_data['time_restarted']))
+        time_delta = (log_data['time_stopped'] - log_data['time_started']) + (
+            time.time() - log_data['time_restarted']
+        )
         optional_orig_delta = f" (lp: {format_timedelta(orig_time_delta)})"
     remote_cache_output = ""
     if 'remote_cache_time_start' in log_data:
         remote_cache_time_delta = get_remote_cache_time() - log_data['remote_cache_time_start']
-        remote_cache_count_delta = get_remote_cache_requests() - log_data['remote_cache_requests_start']
+        remote_cache_count_delta = (
+            get_remote_cache_requests() - log_data['remote_cache_requests_start']
+        )
         if 'remote_cache_requests_stopped' in log_data:
             # (now - restarted) + (stopped - start) = (now - start) + (stopped - restarted)
-            remote_cache_time_delta += (log_data['remote_cache_time_stopped'] -
-                                        log_data['remote_cache_time_restarted'])
-            remote_cache_count_delta += (log_data['remote_cache_requests_stopped'] -
-                                         log_data['remote_cache_requests_restarted'])
+            remote_cache_time_delta += (
+                log_data['remote_cache_time_stopped'] - log_data['remote_cache_time_restarted']
+            )
+            remote_cache_count_delta += (
+                log_data['remote_cache_requests_stopped']
+                - log_data['remote_cache_requests_restarted']
+            )
 
-        if (remote_cache_time_delta > 0.005):
-            remote_cache_output = f" (mem: {format_timedelta(remote_cache_time_delta)}/{remote_cache_count_delta})"
+        if remote_cache_time_delta > 0.005:
+            remote_cache_output = (
+                f" (mem: {format_timedelta(remote_cache_time_delta)}/{remote_cache_count_delta})"
+            )
 
         if not suppress_statsd:
             statsd.timing(f"{statsd_path}.remote_cache.time", timedelta_ms(remote_cache_time_delta))
@@ -170,13 +211,17 @@ def write_log_line(log_data: MutableMapping[str, Any], path: str, method: str, r
         markdown_count_delta = get_markdown_requests() - log_data['markdown_requests_start']
         if 'markdown_requests_stopped' in log_data:
             # (now - restarted) + (stopped - start) = (now - start) + (stopped - restarted)
-            markdown_time_delta += (log_data['markdown_time_stopped'] -
-                                    log_data['markdown_time_restarted'])
-            markdown_count_delta += (log_data['markdown_requests_stopped'] -
-                                     log_data['markdown_requests_restarted'])
+            markdown_time_delta += (
+                log_data['markdown_time_stopped'] - log_data['markdown_time_restarted']
+            )
+            markdown_count_delta += (
+                log_data['markdown_requests_stopped'] - log_data['markdown_requests_restarted']
+            )
 
-        if (markdown_time_delta > 0.005):
-            markdown_output = f" (md: {format_timedelta(markdown_time_delta)}/{markdown_count_delta})"
+        if markdown_time_delta > 0.005:
+            markdown_output = (
+                f" (md: {format_timedelta(markdown_time_delta)}/{markdown_count_delta})"
+            )
 
             if not suppress_statsd:
                 statsd.timing(f"{statsd_path}.markdown.time", timedelta_ms(markdown_time_delta))
@@ -202,12 +247,12 @@ def write_log_line(log_data: MutableMapping[str, Any], path: str, method: str, r
     logger_client = f"({requestor_for_logs} via {client_name})"
     logger_timing = f'{format_timedelta(time_delta):>5}{optional_orig_delta}{remote_cache_output}{markdown_output}{db_time_output}{startup_output} {path}'
     logger_line = f'{remote_ip:<15} {method:<7} {status_code:3} {logger_timing}{extra_request_data} {logger_client}'
-    if (status_code in [200, 304] and method == "GET" and path.startswith("/static")):
+    if status_code in [200, 304] and method == "GET" and path.startswith("/static"):
         logger.debug(logger_line)
     else:
         logger.info(logger_line)
 
-    if (is_slow_query(time_delta, path)):
+    if is_slow_query(time_delta, path):
         slow_query_logger.info(logger_line)
 
     if settings.PROFILE_ALL_REQUESTS:
@@ -229,6 +274,7 @@ def write_log_line(log_data: MutableMapping[str, Any], path: str, method: str, r
             error_data = "[content more than 200 characters]"
         logger.info('status=%3d, data=%s, uid=%s', status_code, error_data, requestor_for_logs)
 
+
 class RequestContext(MiddlewareMixin):
     def __call__(self, request: HttpRequest) -> HttpResponse:
         set_request(request)
@@ -237,6 +283,7 @@ class RequestContext(MiddlewareMixin):
         finally:
             unset_request()
 
+
 class LogRequests(MiddlewareMixin):
     # We primarily are doing logging using the process_view hook, but
     # for some views, process_view isn't run, so we call the start
@@ -255,8 +302,9 @@ class LogRequests(MiddlewareMixin):
         request._log_data = {}
         record_request_start_data(request._log_data)
 
-    def process_view(self, request: HttpRequest, view_func: ViewFuncT,
-                     args: List[str], kwargs: Dict[str, Any]) -> None:
+    def process_view(
+        self, request: HttpRequest, view_func: ViewFuncT, args: List[str], kwargs: Dict[str, Any]
+    ) -> None:
         if hasattr(request, "saved_response"):
             # The below logging adjustments are unnecessary (because
             # we've already imported everything) and incorrect
@@ -273,8 +321,9 @@ class LogRequests(MiddlewareMixin):
         # done as part of this request
         record_request_start_data(request._log_data)
 
-    def process_response(self, request: HttpRequest,
-                         response: StreamingHttpResponse) -> StreamingHttpResponse:
+    def process_response(
+        self, request: HttpRequest, response: StreamingHttpResponse
+    ) -> StreamingHttpResponse:
         if getattr(response, "asynchronous", False):
             # This special Tornado "asynchronous" response is
             # discarded after going through this code path as Tornado
@@ -303,17 +352,30 @@ class LogRequests(MiddlewareMixin):
             content = response.content
             content_iter = None
 
-        write_log_line(request._log_data, request.path, request.method,
-                       remote_ip, requestor_for_logs, client, status_code=response.status_code,
-                       error_content=content, error_content_iter=content_iter)
+        write_log_line(
+            request._log_data,
+            request.path,
+            request.method,
+            remote_ip,
+            requestor_for_logs,
+            client,
+            status_code=response.status_code,
+            error_content=content,
+            error_content_iter=content_iter,
+        )
         return response
 
+
 class JsonErrorHandler(MiddlewareMixin):
-    def __init__(self, get_response: Callable[[Any, WSGIRequest], Union[HttpResponse, BaseException]]) -> None:
+    def __init__(
+        self, get_response: Callable[[Any, WSGIRequest], Union[HttpResponse, BaseException]]
+    ) -> None:
         super().__init__(get_response)
         ignore_logger("zerver.middleware.json_error_handler")
 
-    def process_exception(self, request: HttpRequest, exception: Exception) -> Optional[HttpResponse]:
+    def process_exception(
+        self, request: HttpRequest, exception: Exception
+    ) -> Optional[HttpResponse]:
         if isinstance(exception, MissingAuthenticationError):
             if 'text/html' in request.META.get('HTTP_ACCEPT', ''):
                 # If this looks like a request from a top-level page in a
@@ -340,9 +402,11 @@ class JsonErrorHandler(MiddlewareMixin):
             return json_error(_("Internal server error"), status=500)
         return None
 
+
 class TagRequests(MiddlewareMixin):
-    def process_view(self, request: HttpRequest, view_func: ViewFuncT,
-                     args: List[str], kwargs: Dict[str, Any]) -> None:
+    def process_view(
+        self, request: HttpRequest, view_func: ViewFuncT, args: List[str], kwargs: Dict[str, Any]
+    ) -> None:
         self.process_request(request)
 
     def process_request(self, request: HttpRequest) -> None:
@@ -351,6 +415,7 @@ class TagRequests(MiddlewareMixin):
         else:
             request.error_format = "HTML"
 
+
 class CsrfFailureError(JsonableError):
     http_status_code = 403
     code = ErrorCode.CSRF_FAILED
@@ -363,12 +428,14 @@ class CsrfFailureError(JsonableError):
     def msg_format() -> str:
         return _("CSRF Error: {reason}")
 
-def csrf_failure(request: HttpRequest, reason: str="") -> HttpResponse:
+
+def csrf_failure(request: HttpRequest, reason: str = "") -> HttpResponse:
     if request.error_format == "JSON":
         return json_response_from_error(CsrfFailureError(reason))
     else:
         return html_csrf_failure(request, reason)
 
+
 class LocaleMiddleware(DjangoLocaleMiddleware):
     def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse:
 
@@ -392,9 +459,11 @@ class LocaleMiddleware(DjangoLocaleMiddleware):
 
         return response
 
+
 class RateLimitMiddleware(MiddlewareMixin):
-    def set_response_headers(self, response: HttpResponse,
-                             rate_limit_results: List[RateLimitResult]) -> None:
+    def set_response_headers(
+        self, response: HttpResponse, rate_limit_results: List[RateLimitResult]
+    ) -> None:
         # The limit on the action that was requested is the minimum of the limits that get applied:
         limit = min(result.entity.max_api_calls() for result in rate_limit_results)
         response['X-RateLimit-Limit'] = str(limit)
@@ -416,6 +485,7 @@ class RateLimitMiddleware(MiddlewareMixin):
 
         return response
 
+
 class FlushDisplayRecipientCache(MiddlewareMixin):
     def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse:
         # We flush the per-request caches after every request, so they
@@ -423,6 +493,7 @@ class FlushDisplayRecipientCache(MiddlewareMixin):
         flush_per_request_caches()
         return response
 
+
 class HostDomainMiddleware(MiddlewareMixin):
     def process_request(self, request: HttpRequest) -> Optional[HttpResponse]:
         # Match against ALLOWED_HOSTS, which is rather permissive;
@@ -447,6 +518,7 @@ class HostDomainMiddleware(MiddlewareMixin):
                 return render(request, "zerver/invalid_realm.html", status=404)
         return None
 
+
 class SetRemoteAddrFromForwardedFor(MiddlewareMixin):
     """
     Middleware that sets REMOTE_ADDR based on the HTTP_X_FORWARDED_FOR.
@@ -468,20 +540,26 @@ class SetRemoteAddrFromForwardedFor(MiddlewareMixin):
             real_ip = real_ip.split(",")[0].strip()
             request.META['REMOTE_ADDR'] = real_ip
 
+
 def alter_content(request: HttpRequest, content: bytes) -> bytes:
     first_paragraph_text = get_content_description(content, request)
-    return content.replace(request.placeholder_open_graph_description.encode("utf-8"),
-                           first_paragraph_text.encode("utf-8"))
+    return content.replace(
+        request.placeholder_open_graph_description.encode("utf-8"),
+        first_paragraph_text.encode("utf-8"),
+    )
+
 
 class FinalizeOpenGraphDescription(MiddlewareMixin):
-    def process_response(self, request: HttpRequest,
-                         response: StreamingHttpResponse) -> StreamingHttpResponse:
+    def process_response(
+        self, request: HttpRequest, response: StreamingHttpResponse
+    ) -> StreamingHttpResponse:
 
         if getattr(request, "placeholder_open_graph_description", None) is not None:
             assert not response.streaming
             response.content = alter_content(request, response.content)
         return response
 
+
 class ZulipCommonMiddleware(CommonMiddleware):
     """
     Patched version of CommonMiddleware to disable the APPEND_SLASH
diff --git a/zerver/migrations/0001_initial.py b/zerver/migrations/0001_initial.py
index 2bd608be4d..cd6296cc7b 100644
--- a/zerver/migrations/0001_initial.py
+++ b/zerver/migrations/0001_initial.py
@@ -12,8 +12,7 @@ from django.db.migrations.state import StateApps
 from zerver.models import generate_email_token_for_stream
 
 
-def migrate_existing_attachment_data(apps: StateApps,
-                                     schema_editor: DatabaseSchemaEditor) -> None:
+def migrate_existing_attachment_data(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Attachment = apps.get_model('zerver', 'Attachment')
     Recipient = apps.get_model('zerver', 'Recipient')
     Stream = apps.get_model('zerver', 'Stream')
@@ -26,11 +25,14 @@ def migrate_existing_attachment_data(apps: StateApps,
             if owner == message.sender:
                 if message.recipient.type == Recipient.STREAM:
                     stream = Stream.objects.get(id=message.recipient.type_id)
-                    is_realm_public = not stream.realm.is_zephyr_mirror_realm and not stream.invite_only
+                    is_realm_public = (
+                        not stream.realm.is_zephyr_mirror_realm and not stream.invite_only
+                    )
                     entry.is_realm_public = entry.is_realm_public or is_realm_public
 
         entry.save()
 
+
 class Migration(migrations.Migration):
 
     initial = True
@@ -79,10 +81,27 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='UserProfile',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                (
+                    'last_login',
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name='last login'
+                    ),
+                ),
+                (
+                    'is_superuser',
+                    models.BooleanField(
+                        default=False,
+                        help_text='Designates that this user has all permissions without explicitly assigning them.',
+                        verbose_name='superuser status',
+                    ),
+                ),
                 ('email', models.EmailField(db_index=True, max_length=75, unique=True)),
                 ('is_staff', models.BooleanField(default=False)),
                 ('is_active', models.BooleanField(default=True)),
@@ -102,20 +121,48 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
                 ('enable_offline_push_notifications', models.BooleanField(default=True)),
                 ('enable_digest_emails', models.BooleanField(default=True)),
                 ('default_desktop_notifications', models.BooleanField(default=True)),
-                ('last_reminder', models.DateTimeField(default=django.utils.timezone.now, null=True)),
+                (
+                    'last_reminder',
+                    models.DateTimeField(default=django.utils.timezone.now, null=True),
+                ),
                 ('rate_limits', models.CharField(default='', max_length=100)),
                 ('default_all_public_streams', models.BooleanField(default=False)),
                 ('enter_sends', models.NullBooleanField(default=True)),
                 ('autoscroll_forever', models.BooleanField(default=False)),
                 ('twenty_four_hour_time', models.BooleanField(default=False)),
-                ('avatar_source', models.CharField(choices=[('G', 'Hosted by Gravatar'), ('U', 'Uploaded by user'), ('S', 'System generated')], default='G', max_length=1)),
-                ('tutorial_status', models.CharField(choices=[('W', 'Waiting'), ('S', 'Started'), ('F', 'Finished')], default='W', max_length=1)),
+                (
+                    'avatar_source',
+                    models.CharField(
+                        choices=[
+                            ('G', 'Hosted by Gravatar'),
+                            ('U', 'Uploaded by user'),
+                            ('S', 'System generated'),
+                        ],
+                        default='G',
+                        max_length=1,
+                    ),
+                ),
+                (
+                    'tutorial_status',
+                    models.CharField(
+                        choices=[('W', 'Waiting'), ('S', 'Started'), ('F', 'Finished')],
+                        default='W',
+                        max_length=1,
+                    ),
+                ),
                 ('onboarding_steps', models.TextField(default='[]')),
                 ('invites_granted', models.IntegerField(default=0)),
                 ('invites_used', models.IntegerField(default=0)),
                 ('alert_words', models.TextField(default='[]')),
                 ('muted_topics', models.TextField(default='[]')),
-                ('bot_owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+                (
+                    'bot_owner',
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
                 'abstract': False,
@@ -124,27 +171,47 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='Client',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.CharField(db_index=True, max_length=30, unique=True)),
             ],
         ),
         migrations.CreateModel(
             name='DefaultStream',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='Huddle',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('huddle_hash', models.CharField(db_index=True, max_length=40, unique=True)),
             ],
         ),
         migrations.CreateModel(
             name='Message',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('subject', models.CharField(db_index=True, max_length=60)),
                 ('content', models.TextField()),
                 ('rendered_content', models.TextField(null=True)),
@@ -160,7 +227,12 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='PreregistrationUser',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('email', models.EmailField(max_length=75)),
                 ('invited_at', models.DateTimeField(auto_now=True)),
                 ('status', models.IntegerField(default=0)),
@@ -169,18 +241,36 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='PushDeviceToken',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('kind', models.PositiveSmallIntegerField(choices=[(1, 'apns'), (2, 'gcm')])),
                 ('token', models.CharField(max_length=4096, unique=True)),
-                ('last_updated', models.DateTimeField(auto_now=True, default=django.utils.timezone.now)),
+                (
+                    'last_updated',
+                    models.DateTimeField(auto_now=True, default=django.utils.timezone.now),
+                ),
                 ('ios_app_id', models.TextField(null=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'user',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='Realm',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('domain', models.CharField(db_index=True, max_length=40, unique=True)),
                 ('name', models.CharField(max_length=40, null=True)),
                 ('restricted_to_domain', models.BooleanField(default=True)),
@@ -199,33 +289,68 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='RealmAlias',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('domain', models.CharField(db_index=True, max_length=80, unique=True)),
-                ('realm', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='RealmEmoji',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.TextField()),
                 ('img_url', models.TextField()),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='RealmFilter',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('pattern', models.TextField()),
                 ('url_format_string', models.TextField()),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='Recipient',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('type_id', models.IntegerField(db_index=True)),
                 ('type', models.PositiveSmallIntegerField(db_index=True)),
             ],
@@ -233,16 +358,31 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='Referral',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('email', models.EmailField(max_length=75)),
                 ('timestamp', models.DateTimeField(auto_now_add=True)),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='ScheduledJob',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('scheduled_timestamp', models.DateTimeField()),
                 ('type', models.PositiveSmallIntegerField()),
                 ('data', models.TextField()),
@@ -253,67 +393,169 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='Stream',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.CharField(db_index=True, max_length=60)),
                 ('invite_only', models.NullBooleanField(default=False)),
-                ('email_token', models.CharField(default=generate_email_token_for_stream, max_length=32)),
+                (
+                    'email_token',
+                    models.CharField(default=generate_email_token_for_stream, max_length=32),
+                ),
                 ('description', models.CharField(default='', max_length=1024)),
                 ('date_created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('deactivated', models.BooleanField(default=False)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='Subscription',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('active', models.BooleanField(default=True)),
                 ('in_home_view', models.NullBooleanField(default=True)),
                 ('color', models.CharField(default='#c2c2c2', max_length=10)),
                 ('desktop_notifications', models.BooleanField(default=True)),
                 ('audible_notifications', models.BooleanField(default=True)),
                 ('notifications', models.BooleanField(default=False)),
-                ('recipient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'recipient',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='UserActivity',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('query', models.CharField(db_index=True, max_length=50)),
                 ('count', models.IntegerField()),
                 ('last_visit', models.DateTimeField(verbose_name='last visit')),
-                ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Client')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'client',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='UserActivityInterval',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('start', models.DateTimeField(db_index=True, verbose_name='start time')),
                 ('end', models.DateTimeField(db_index=True, verbose_name='end time')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='UserMessage',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('flags', bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical', 'is_me_message'], default=0)),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Message')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
+                (
+                    'flags',
+                    bitfield.models.BitField(
+                        [
+                            'read',
+                            'starred',
+                            'collapsed',
+                            'mentioned',
+                            'wildcard_mentioned',
+                            'summarize_in_home',
+                            'summarize_in_stream',
+                            'force_expand',
+                            'force_collapse',
+                            'has_alert_word',
+                            'historical',
+                            'is_me_message',
+                        ],
+                        default=0,
+                    ),
+                ),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Message'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='UserPresence',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('timestamp', models.DateTimeField(verbose_name='presence changed')),
                 ('status', models.PositiveSmallIntegerField(default=1)),
-                ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Client')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'client',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.AlterUniqueTogether(
@@ -351,17 +593,27 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AddField(
             model_name='realm',
             name='notifications_stream',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='zerver.Stream'),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='+',
+                to='zerver.Stream',
+            ),
         ),
         migrations.AddField(
             model_name='preregistrationuser',
             name='realm',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+            ),
         ),
         migrations.AddField(
             model_name='preregistrationuser',
             name='referred_by',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='preregistrationuser',
@@ -371,17 +623,23 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AddField(
             model_name='message',
             name='recipient',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'
+            ),
         ),
         migrations.AddField(
             model_name='message',
             name='sender',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='message',
             name='sending_client',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'
+            ),
         ),
         migrations.AddField(
             model_name='defaultstream',
@@ -391,7 +649,9 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AddField(
             model_name='defaultstream',
             name='stream',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream'
+            ),
         ),
         migrations.AlterUniqueTogether(
             name='defaultstream',
@@ -400,17 +660,34 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AddField(
             model_name='userprofile',
             name='default_events_register_stream',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='zerver.Stream'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='+',
+                to='zerver.Stream',
+            ),
         ),
         migrations.AddField(
             model_name='userprofile',
             name='default_sending_stream',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='zerver.Stream'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='+',
+                to='zerver.Stream',
+            ),
         ),
         migrations.AddField(
             model_name='userprofile',
             name='groups',
-            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
+            field=models.ManyToManyField(
+                blank=True,
+                help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.',
+                related_name='user_set',
+                related_query_name='user',
+                to='auth.Group',
+                verbose_name='groups',
+            ),
         ),
         migrations.AddField(
             model_name='userprofile',
@@ -420,7 +697,14 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AddField(
             model_name='userprofile',
             name='user_permissions',
-            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
+            field=models.ManyToManyField(
+                blank=True,
+                help_text='Specific permissions for this user.',
+                related_name='user_set',
+                related_query_name='user',
+                to='auth.Permission',
+                verbose_name='user permissions',
+            ),
         ),
         migrations.RunSQL(
             sql=fts_sql,
@@ -476,7 +760,12 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         ),
         migrations.AlterModelOptions(
             name='realm',
-            options={'permissions': (('administer', 'Administer a realm'), ('api_super_user', 'Can send messages as other users for mirroring'))},
+            options={
+                'permissions': (
+                    ('administer', 'Administer a realm'),
+                    ('api_super_user', 'Can send messages as other users for mirroring'),
+                )
+            },
         ),
         migrations.RunSQL(
             sql='CREATE INDEX upper_userprofile_email_idx ON zerver_userprofile ((upper(email)));',
@@ -524,7 +813,12 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AlterField(
             model_name='realmemoji',
             name='name',
-            field=models.TextField(validators=[django.core.validators.MinLengthValidator(1), django.core.validators.RegexValidator(regex='^[0-9a-zA-Z.\\-_]+(?<![.\\-_])$')]),
+            field=models.TextField(
+                validators=[
+                    django.core.validators.MinLengthValidator(1),
+                    django.core.validators.RegexValidator(regex='^[0-9a-zA-Z.\\-_]+(?<![.\\-_])$'),
+                ]
+            ),
         ),
         migrations.AlterField(
             model_name='realmemoji',
@@ -534,12 +828,25 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.CreateModel(
             name='Attachment',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('file_name', models.CharField(db_index=True, max_length=100)),
                 ('path_id', models.TextField(db_index=True)),
-                ('create_time', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                (
+                    'create_time',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
                 ('messages', models.ManyToManyField(to='zerver.Message')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'owner',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
                 ('is_realm_public', models.BooleanField(default=False)),
             ],
         ),
@@ -556,7 +863,15 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AlterField(
             model_name='realmemoji',
             name='name',
-            field=models.TextField(validators=[django.core.validators.MinLengthValidator(1), django.core.validators.RegexValidator(message='Invalid characters in emoji name', regex='^[0-9a-zA-Z.\\-_]+(?<![.\\-_])$')]),
+            field=models.TextField(
+                validators=[
+                    django.core.validators.MinLengthValidator(1),
+                    django.core.validators.RegexValidator(
+                        message='Invalid characters in emoji name',
+                        regex='^[0-9a-zA-Z.\\-_]+(?<![.\\-_])$',
+                    ),
+                ]
+            ),
         ),
         migrations.AddField(
             model_name='preregistrationuser',
@@ -566,7 +881,12 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
         migrations.AddField(
             model_name='attachment',
             name='realm',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='zerver.Realm',
+            ),
         ),
         migrations.RunPython(
             code=migrate_existing_attachment_data,
diff --git a/zerver/migrations/0029_realm_subdomain.py b/zerver/migrations/0029_realm_subdomain.py
index e06e73313e..3d1c5243a0 100644
--- a/zerver/migrations/0029_realm_subdomain.py
+++ b/zerver/migrations/0029_realm_subdomain.py
@@ -17,6 +17,7 @@ def set_subdomain_of_default_realm(apps: StateApps, schema_editor: DatabaseSchem
             default_realm.subdomain = "zulip"
             default_realm.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0030_realm_org_type.py b/zerver/migrations/0030_realm_org_type.py
index b086b48584..d771f5031c 100644
--- a/zerver/migrations/0030_realm_org_type.py
+++ b/zerver/migrations/0030_realm_org_type.py
@@ -1,6 +1,8 @@
 from django.db import migrations, models
 
 CORPORATE = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0031_remove_system_avatar_source.py b/zerver/migrations/0031_remove_system_avatar_source.py
index 7e57a2c01a..1dc57b97a8 100644
--- a/zerver/migrations/0031_remove_system_avatar_source.py
+++ b/zerver/migrations/0031_remove_system_avatar_source.py
@@ -11,6 +11,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='userprofile',
             name='avatar_source',
-            field=models.CharField(choices=[('G', 'Hosted by Gravatar'), ('U', 'Uploaded by user')], max_length=1, default='G'),
+            field=models.CharField(
+                choices=[('G', 'Hosted by Gravatar'), ('U', 'Uploaded by user')],
+                max_length=1,
+                default='G',
+            ),
         ),
     ]
diff --git a/zerver/migrations/0032_verify_all_medium_avatar_images.py b/zerver/migrations/0032_verify_all_medium_avatar_images.py
index 779997555a..63a4ac60be 100644
--- a/zerver/migrations/0032_verify_all_medium_avatar_images.py
+++ b/zerver/migrations/0032_verify_all_medium_avatar_images.py
@@ -22,6 +22,7 @@ def patched_user_avatar_path(user_profile: UserProfile) -> str:
     user_key = email.lower() + settings.AVATAR_SALT
     return make_safe_digest(user_key, hashlib.sha1)
 
+
 @patch('zerver.lib.upload.user_avatar_path', patched_user_avatar_path)
 def verify_medium_avatar_image(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     user_profile_model = apps.get_model('zerver', 'UserProfile')
diff --git a/zerver/migrations/0033_migrate_domain_to_realmalias.py b/zerver/migrations/0033_migrate_domain_to_realmalias.py
index 089a324aca..cc9245f78d 100644
--- a/zerver/migrations/0033_migrate_domain_to_realmalias.py
+++ b/zerver/migrations/0033_migrate_domain_to_realmalias.py
@@ -3,7 +3,9 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def add_domain_to_realm_alias_if_needed(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def add_domain_to_realm_alias_if_needed(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     Realm = apps.get_model('zerver', 'Realm')
     RealmAlias = apps.get_model('zerver', 'RealmAlias')
 
@@ -12,6 +14,7 @@ def add_domain_to_realm_alias_if_needed(apps: StateApps, schema_editor: Database
         if not RealmAlias.objects.filter(domain=realm.domain).exists():
             RealmAlias.objects.create(realm=realm, domain=realm.domain)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0037_disallow_null_string_id.py b/zerver/migrations/0037_disallow_null_string_id.py
index 823aefe925..36f7c4c6fc 100644
--- a/zerver/migrations/0037_disallow_null_string_id.py
+++ b/zerver/migrations/0037_disallow_null_string_id.py
@@ -24,6 +24,7 @@ def set_string_id_using_domain(apps: StateApps, schema_editor: DatabaseSchemaEdi
                     pass
             raise RuntimeError(f"Unable to find a good string_id for realm {realm}")
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -32,7 +33,6 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(set_string_id_using_domain, elidable=True),
-
         migrations.AlterField(
             model_name='realm',
             name='string_id',
diff --git a/zerver/migrations/0038_realm_change_to_community_defaults.py b/zerver/migrations/0038_realm_change_to_community_defaults.py
index 50f65f00e5..6d053902e6 100644
--- a/zerver/migrations/0038_realm_change_to_community_defaults.py
+++ b/zerver/migrations/0038_realm_change_to_community_defaults.py
@@ -1,6 +1,8 @@
 from django.db import migrations, models
 
 COMMUNITY = 2
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0040_realm_authentication_methods.py b/zerver/migrations/0040_realm_authentication_methods.py
index b86d5eccb0..2c3d22fa38 100644
--- a/zerver/migrations/0040_realm_authentication_methods.py
+++ b/zerver/migrations/0040_realm_authentication_methods.py
@@ -12,6 +12,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='realm',
             name='authentication_methods',
-            field=bitfield.models.BitField(['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser'], default=2147483647),
+            field=bitfield.models.BitField(
+                ['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser'], default=2147483647
+            ),
         ),
     ]
diff --git a/zerver/migrations/0041_create_attachments_for_old_messages.py b/zerver/migrations/0041_create_attachments_for_old_messages.py
index 57e8b181e1..f1d00ce689 100644
--- a/zerver/migrations/0041_create_attachments_for_old_messages.py
+++ b/zerver/migrations/0041_create_attachments_for_old_messages.py
@@ -7,13 +7,14 @@ from django.db.migrations.state import StateApps
 
 attachment_url_re = re.compile(r'[/\-]user[\-_]uploads[/\.-].*?(?=[ )]|\Z)')
 
+
 def attachment_url_to_path_id(attachment_url: str) -> str:
     path_id_raw = re.sub(r'[/\-]user[\-_]uploads[/\.-]', '', attachment_url)
     # Remove any extra '.' after file extension. These are probably added by the user
     return re.sub('[.]+$', '', path_id_raw, re.M)
 
-def check_and_create_attachments(apps: StateApps,
-                                 schema_editor: DatabaseSchemaEditor) -> None:
+
+def check_and_create_attachments(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     STREAM = 2
     Message = apps.get_model('zerver', 'Message')
     Attachment = apps.get_model('zerver', 'Attachment')
@@ -26,12 +27,18 @@ def check_and_create_attachments(apps: StateApps,
             is_message_realm_public = False
             if message.recipient.type == STREAM:
                 stream = Stream.objects.get(id=message.recipient.type_id)
-                is_message_realm_public = not stream.invite_only and stream.realm.domain != "mit.edu"
+                is_message_realm_public = (
+                    not stream.invite_only and stream.realm.domain != "mit.edu"
+                )
 
             if path_id is not None:
                 attachment = Attachment.objects.create(
-                    file_name=os.path.basename(path_id), path_id=path_id, owner=user_profile,
-                    realm=user_profile.realm, is_realm_public=is_message_realm_public)
+                    file_name=os.path.basename(path_id),
+                    path_id=path_id,
+                    owner=user_profile,
+                    realm=user_profile.realm,
+                    is_realm_public=is_message_realm_public,
+                )
                 attachment.messages.add(message)
 
 
diff --git a/zerver/migrations/0043_realm_filter_validators.py b/zerver/migrations/0043_realm_filter_validators.py
index 6e6ff99df9..9c63b2d261 100644
--- a/zerver/migrations/0043_realm_filter_validators.py
+++ b/zerver/migrations/0043_realm_filter_validators.py
@@ -19,6 +19,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realmfilter',
             name='url_format_string',
-            field=models.TextField(validators=[django.core.validators.URLValidator, filter_format_validator]),
+            field=models.TextField(
+                validators=[django.core.validators.URLValidator, filter_format_validator]
+            ),
         ),
     ]
diff --git a/zerver/migrations/0044_reaction.py b/zerver/migrations/0044_reaction.py
index 36ea5118af..cdeaa694be 100644
--- a/zerver/migrations/0044_reaction.py
+++ b/zerver/migrations/0044_reaction.py
@@ -13,9 +13,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Reaction',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Message')),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Message'
+                    ),
+                ),
                 ('emoji_name', models.TextField()),
             ],
             bases=(models.Model,),
diff --git a/zerver/migrations/0046_realmemoji_author.py b/zerver/migrations/0046_realmemoji_author.py
index e3cee97162..b9d436a541 100644
--- a/zerver/migrations/0046_realmemoji_author.py
+++ b/zerver/migrations/0046_realmemoji_author.py
@@ -14,6 +14,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='realmemoji',
             name='author',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0053_emailchangestatus.py b/zerver/migrations/0053_emailchangestatus.py
index 9f239d0b1e..d635ce8ca4 100644
--- a/zerver/migrations/0053_emailchangestatus.py
+++ b/zerver/migrations/0053_emailchangestatus.py
@@ -14,13 +14,28 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='EmailChangeStatus',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('new_email', models.EmailField(max_length=254)),
                 ('old_email', models.EmailField(max_length=254)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('status', models.IntegerField(default=0)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0054_realm_icon.py b/zerver/migrations/0054_realm_icon.py
index 3a814dc1f8..0567a56535 100644
--- a/zerver/migrations/0054_realm_icon.py
+++ b/zerver/migrations/0054_realm_icon.py
@@ -14,7 +14,9 @@ class Migration(migrations.Migration):
             name='icon_source',
             field=models.CharField(
                 choices=[('G', 'Hosted by Gravatar'), ('U', 'Uploaded by administrator')],
-                default='G', max_length=1),
+                default='G',
+                max_length=1,
+            ),
         ),
         migrations.AddField(
             model_name='realm',
diff --git a/zerver/migrations/0057_realmauditlog.py b/zerver/migrations/0057_realmauditlog.py
index 43ba8600b0..396a5738c4 100644
--- a/zerver/migrations/0057_realmauditlog.py
+++ b/zerver/migrations/0057_realmauditlog.py
@@ -7,20 +7,31 @@ from django.db.migrations.state import StateApps
 from django.utils.timezone import now as timezone_now
 
 
-def backfill_user_activations_and_deactivations(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def backfill_user_activations_and_deactivations(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     migration_time = timezone_now()
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
     UserProfile = apps.get_model('zerver', 'UserProfile')
 
     for user in UserProfile.objects.all():
-        RealmAuditLog.objects.create(realm=user.realm, modified_user=user,
-                                     event_type='user_created', event_time=user.date_joined,
-                                     backfilled=False)
+        RealmAuditLog.objects.create(
+            realm=user.realm,
+            modified_user=user,
+            event_type='user_created',
+            event_time=user.date_joined,
+            backfilled=False,
+        )
 
     for user in UserProfile.objects.filter(is_active=False):
-        RealmAuditLog.objects.create(realm=user.realm, modified_user=user,
-                                     event_type='user_deactivated', event_time=migration_time,
-                                     backfilled=True)
+        RealmAuditLog.objects.create(
+            realm=user.realm,
+            modified_user=user,
+            event_type='user_deactivated',
+            event_time=migration_time,
+            backfilled=True,
+        )
+
 
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
@@ -38,26 +49,48 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RealmAuditLog',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('event_type', models.CharField(max_length=40)),
                 ('backfilled', models.BooleanField(default=False)),
                 ('event_time', models.DateTimeField()),
-                ('acting_user', models.ForeignKey(null=True,
-                                                  on_delete=django.db.models.deletion.CASCADE,
-                                                  related_name='+',
-                                                  to=settings.AUTH_USER_MODEL)),
-                ('modified_stream', models.ForeignKey(null=True,
-                                                      on_delete=django.db.models.deletion.CASCADE,
-                                                      to='zerver.Stream')),
-                ('modified_user', models.ForeignKey(null=True,
-                                                    on_delete=django.db.models.deletion.CASCADE,
-                                                    related_name='+',
-                                                    to=settings.AUTH_USER_MODEL)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'acting_user',
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='+',
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    'modified_stream',
+                    models.ForeignKey(
+                        null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream'
+                    ),
+                ),
+                (
+                    'modified_user',
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='+',
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
-
-        migrations.RunPython(backfill_user_activations_and_deactivations,
-                             reverse_code=reverse_code, elidable=True),
-
+        migrations.RunPython(
+            backfill_user_activations_and_deactivations, reverse_code=reverse_code, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0067_archived_models.py b/zerver/migrations/0067_archived_models.py
index 41cd8a98dc..cf9452c63c 100644
--- a/zerver/migrations/0067_archived_models.py
+++ b/zerver/migrations/0067_archived_models.py
@@ -16,13 +16,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ArchivedAttachment',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('file_name', models.TextField(db_index=True)),
                 ('path_id', models.TextField(db_index=True)),
                 ('is_realm_public', models.BooleanField(default=False)),
-                ('create_time', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                (
+                    'create_time',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
                 ('size', models.IntegerField(null=True)),
-                ('archive_timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                (
+                    'archive_timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
             ],
             options={
                 'abstract': False,
@@ -32,7 +43,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ArchivedMessage',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('subject', models.CharField(db_index=True, max_length=60)),
                 ('content', models.TextField()),
                 ('rendered_content', models.TextField(null=True)),
@@ -43,10 +59,28 @@ class Migration(migrations.Migration):
                 ('has_attachment', models.BooleanField(db_index=True, default=False)),
                 ('has_image', models.BooleanField(db_index=True, default=False)),
                 ('has_link', models.BooleanField(db_index=True, default=False)),
-                ('archive_timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
-                ('recipient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient')),
-                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('sending_client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Client')),
+                (
+                    'archive_timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
+                (
+                    'recipient',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'
+                    ),
+                ),
+                (
+                    'sender',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
+                (
+                    'sending_client',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'
+                    ),
+                ),
             ],
             options={
                 'abstract': False,
@@ -56,11 +90,48 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ArchivedUserMessage',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('flags', bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical', 'is_me_message'], default=0)),
-                ('archive_timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchivedMessage')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
+                (
+                    'flags',
+                    bitfield.models.BitField(
+                        [
+                            'read',
+                            'starred',
+                            'collapsed',
+                            'mentioned',
+                            'wildcard_mentioned',
+                            'summarize_in_home',
+                            'summarize_in_stream',
+                            'force_expand',
+                            'force_collapse',
+                            'has_alert_word',
+                            'historical',
+                            'is_me_message',
+                        ],
+                        default=0,
+                    ),
+                ),
+                (
+                    'archive_timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchivedMessage'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
             options={
                 'abstract': False,
@@ -75,12 +146,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='archivedattachment',
             name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='archivedattachment',
             name='realm',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='zerver.Realm',
+            ),
         ),
         migrations.AlterUniqueTogether(
             name='archivedusermessage',
diff --git a/zerver/migrations/0070_userhotspot.py b/zerver/migrations/0070_userhotspot.py
index 1a9effea9c..8f2d81c751 100644
--- a/zerver/migrations/0070_userhotspot.py
+++ b/zerver/migrations/0070_userhotspot.py
@@ -15,10 +15,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='UserHotspot',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('hotspot', models.CharField(max_length=30)),
                 ('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'user',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.AlterUniqueTogether(
diff --git a/zerver/migrations/0073_custom_profile_fields.py b/zerver/migrations/0073_custom_profile_fields.py
index 01d4b5c256..a933bf4697 100644
--- a/zerver/migrations/0073_custom_profile_fields.py
+++ b/zerver/migrations/0073_custom_profile_fields.py
@@ -14,19 +14,50 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='CustomProfileField',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.CharField(max_length=100)),
-                ('field_type', models.PositiveSmallIntegerField(choices=[(1, 'Integer'), (2, 'Float'), (3, 'Short text'), (4, 'Long text')], default=3)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'field_type',
+                    models.PositiveSmallIntegerField(
+                        choices=[(1, 'Integer'), (2, 'Float'), (3, 'Short text'), (4, 'Long text')],
+                        default=3,
+                    ),
+                ),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='CustomProfileFieldValue',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('value', models.TextField()),
-                ('field', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.CustomProfileField')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'field',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.CustomProfileField'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.AlterUniqueTogether(
diff --git a/zerver/migrations/0074_fix_duplicate_attachments.py b/zerver/migrations/0074_fix_duplicate_attachments.py
index 717f9810cd..3795c29230 100644
--- a/zerver/migrations/0074_fix_duplicate_attachments.py
+++ b/zerver/migrations/0074_fix_duplicate_attachments.py
@@ -18,10 +18,17 @@ def fix_duplicate_attachments(apps: StateApps, schema_editor: DatabaseSchemaEdit
     """
     Attachment = apps.get_model('zerver', 'Attachment')
     # Loop through all groups of Attachment objects with the same `path_id`
-    for group in Attachment.objects.values('path_id').annotate(Count('id')).order_by().filter(id__count__gt=1):
+    for group in (
+        Attachment.objects.values('path_id')
+        .annotate(Count('id'))
+        .order_by()
+        .filter(id__count__gt=1)
+    ):
         # Sort by the minimum message ID, to find the first attachment
-        attachments = sorted(Attachment.objects.filter(path_id=group['path_id']).order_by("id"),
-                             key = lambda x: min(x.messages.all().values_list('id')[0]))
+        attachments = sorted(
+            Attachment.objects.filter(path_id=group['path_id']).order_by("id"),
+            key=lambda x: min(x.messages.all().values_list('id')[0]),
+        )
         surviving = attachments[0]
         to_cleanup = attachments[1:]
         for a in to_cleanup:
@@ -34,6 +41,7 @@ def fix_duplicate_attachments(apps: StateApps, schema_editor: DatabaseSchemaEdit
             surviving.save()
             a.delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0076_userprofile_emojiset.py b/zerver/migrations/0076_userprofile_emojiset.py
index 483db6ea2e..080d7bad15 100644
--- a/zerver/migrations/0076_userprofile_emojiset.py
+++ b/zerver/migrations/0076_userprofile_emojiset.py
@@ -12,6 +12,15 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='userprofile',
             name='emojiset',
-            field=models.CharField(choices=[('apple', 'Apple'), ('emojione', 'Emoji One'), ('google', 'Google'), ('twitter', 'Twitter')], default='google', max_length=20),
+            field=models.CharField(
+                choices=[
+                    ('apple', 'Apple'),
+                    ('emojione', 'Emoji One'),
+                    ('google', 'Google'),
+                    ('twitter', 'Twitter'),
+                ],
+                default='google',
+                max_length=20,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0078_service.py b/zerver/migrations/0078_service.py
index e17f20610e..2cb81f99cd 100644
--- a/zerver/migrations/0078_service.py
+++ b/zerver/migrations/0078_service.py
@@ -14,12 +14,22 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Service',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.CharField(max_length=100)),
                 ('base_url', models.TextField()),
                 ('token', models.TextField()),
                 ('interface', models.PositiveSmallIntegerField(default=1)),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0079_remove_old_scheduled_jobs.py b/zerver/migrations/0079_remove_old_scheduled_jobs.py
index 116ec3d4e2..139d218cf4 100644
--- a/zerver/migrations/0079_remove_old_scheduled_jobs.py
+++ b/zerver/migrations/0079_remove_old_scheduled_jobs.py
@@ -13,6 +13,7 @@ def delete_old_scheduled_jobs(apps: StateApps, schema_editor: DatabaseSchemaEdit
     ScheduledJob = apps.get_model('zerver', 'ScheduledJob')
     ScheduledJob.objects.all().delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0081_make_emoji_lowercase.py b/zerver/migrations/0081_make_emoji_lowercase.py
index cb6f28e942..b4eabd0108 100644
--- a/zerver/migrations/0081_make_emoji_lowercase.py
+++ b/zerver/migrations/0081_make_emoji_lowercase.py
@@ -27,6 +27,14 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realmemoji',
             name='name',
-            field=models.TextField(validators=[django.core.validators.MinLengthValidator(1), django.core.validators.RegexValidator(message='Invalid characters in emoji name', regex='^[0-9a-z.\\-_]+(?<![.\\-_])$')]),
+            field=models.TextField(
+                validators=[
+                    django.core.validators.MinLengthValidator(1),
+                    django.core.validators.RegexValidator(
+                        message='Invalid characters in emoji name',
+                        regex='^[0-9a-z.\\-_]+(?<![.\\-_])$',
+                    ),
+                ]
+            ),
         ),
     ]
diff --git a/zerver/migrations/0085_fix_bots_with_none_bot_type.py b/zerver/migrations/0085_fix_bots_with_none_bot_type.py
index 1972092d65..b17dfea6ac 100644
--- a/zerver/migrations/0085_fix_bots_with_none_bot_type.py
+++ b/zerver/migrations/0085_fix_bots_with_none_bot_type.py
@@ -11,6 +11,7 @@ def fix_bot_type(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
         bot.bot_type = 1
         bot.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0086_realm_alter_default_org_type.py b/zerver/migrations/0086_realm_alter_default_org_type.py
index 6b5096d180..f79687d1bc 100644
--- a/zerver/migrations/0086_realm_alter_default_org_type.py
+++ b/zerver/migrations/0086_realm_alter_default_org_type.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 CORPORATE = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0087_remove_old_scheduled_jobs.py b/zerver/migrations/0087_remove_old_scheduled_jobs.py
index e2f634befc..14a135c155 100644
--- a/zerver/migrations/0087_remove_old_scheduled_jobs.py
+++ b/zerver/migrations/0087_remove_old_scheduled_jobs.py
@@ -13,6 +13,7 @@ def delete_old_scheduled_jobs(apps: StateApps, schema_editor: DatabaseSchemaEdit
     ScheduledJob = apps.get_model('zerver', 'ScheduledJob')
     ScheduledJob.objects.all().delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0092_create_scheduledemail.py b/zerver/migrations/0092_create_scheduledemail.py
index 89d366de7b..ca4f2bba57 100644
--- a/zerver/migrations/0092_create_scheduledemail.py
+++ b/zerver/migrations/0092_create_scheduledemail.py
@@ -14,12 +14,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ScheduledEmail',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('scheduled_timestamp', models.DateTimeField(db_index=True)),
                 ('data', models.TextField()),
                 ('address', models.EmailField(db_index=True, max_length=254, null=True)),
                 ('type', models.PositiveSmallIntegerField()),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'user',
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
                 'abstract': False,
diff --git a/zerver/migrations/0093_subscription_event_log_backfill.py b/zerver/migrations/0093_subscription_event_log_backfill.py
index d87628ecff..4be56c62c2 100644
--- a/zerver/migrations/0093_subscription_event_log_backfill.py
+++ b/zerver/migrations/0093_subscription_event_log_backfill.py
@@ -13,7 +13,8 @@ def backfill_subscription_log_events(apps: StateApps, schema_editor: DatabaseSch
     objects_to_create = []
 
     subs_query = Subscription.objects.select_related(
-        "user_profile", "user_profile__realm", "recipient").filter(recipient__type=2)
+        "user_profile", "user_profile__realm", "recipient"
+    ).filter(recipient__type=2)
     for sub in subs_query:
         entry = RealmAuditLog(
             realm=sub.user_profile.realm,
@@ -22,7 +23,8 @@ def backfill_subscription_log_events(apps: StateApps, schema_editor: DatabaseSch
             event_last_message_id=0,
             event_type='subscription_created',
             event_time=migration_time,
-            backfilled=True)
+            backfilled=True,
+        )
         objects_to_create.append(entry)
     RealmAuditLog.objects.bulk_create(objects_to_create)
     objects_to_create = []
@@ -37,11 +39,13 @@ def backfill_subscription_log_events(apps: StateApps, schema_editor: DatabaseSch
             event_last_message_id=event_last_message_id,
             event_type='subscription_deactivated',
             event_time=migration_time_for_deactivation,
-            backfilled=True)
+            backfilled=True,
+        )
         objects_to_create.append(entry)
     RealmAuditLog.objects.bulk_create(objects_to_create)
     objects_to_create = []
 
+
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
     RealmAuditLog.objects.filter(event_type='subscription_created').delete()
@@ -60,6 +64,7 @@ class Migration(migrations.Migration):
             name='event_last_message_id',
             field=models.IntegerField(null=True),
         ),
-        migrations.RunPython(backfill_subscription_log_events,
-                             reverse_code=reverse_code, elidable=True),
+        migrations.RunPython(
+            backfill_subscription_log_events, reverse_code=reverse_code, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0094_realm_filter_url_validator.py b/zerver/migrations/0094_realm_filter_url_validator.py
index 9f43080770..73ee990f23 100644
--- a/zerver/migrations/0094_realm_filter_url_validator.py
+++ b/zerver/migrations/0094_realm_filter_url_validator.py
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realmfilter',
             name='url_format_string',
-            field=models.TextField(validators=[django.core.validators.URLValidator(), filter_format_validator]),
+            field=models.TextField(
+                validators=[django.core.validators.URLValidator(), filter_format_validator]
+            ),
         ),
     ]
diff --git a/zerver/migrations/0097_reactions_emoji_code.py b/zerver/migrations/0097_reactions_emoji_code.py
index aae9e78164..19c8d3345d 100644
--- a/zerver/migrations/0097_reactions_emoji_code.py
+++ b/zerver/migrations/0097_reactions_emoji_code.py
@@ -9,7 +9,9 @@ from django.db.migrations.state import StateApps
 
 def populate_new_fields(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     # Open the JSON file which contains the data to be used for migration.
-    MIGRATION_DATA_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), "management", "data")
+    MIGRATION_DATA_PATH = os.path.join(
+        os.path.dirname(os.path.dirname(__file__)), "management", "data"
+    )
     path_to_unified_reactions = os.path.join(MIGRATION_DATA_PATH, "unified_reactions.json")
     with open(path_to_unified_reactions, "rb") as f:
         unified_reactions = orjson.loads(f.read())
@@ -27,6 +29,7 @@ def populate_new_fields(apps: StateApps, schema_editor: DatabaseSchemaEditor) ->
                 reaction.reaction_type = 'realm_emoji'
         reaction.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -43,9 +46,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='reaction',
             name='reaction_type',
-            field=models.CharField(choices=[('unicode_emoji', 'Unicode emoji'), ('realm_emoji', 'Custom emoji'), ('zulip_extra_emoji', 'Zulip extra emoji')], default='unicode_emoji', max_length=30),
+            field=models.CharField(
+                choices=[
+                    ('unicode_emoji', 'Unicode emoji'),
+                    ('realm_emoji', 'Custom emoji'),
+                    ('zulip_extra_emoji', 'Zulip extra emoji'),
+                ],
+                default='unicode_emoji',
+                max_length=30,
+            ),
+        ),
+        migrations.RunPython(
+            populate_new_fields, reverse_code=migrations.RunPython.noop, elidable=True
         ),
-        migrations.RunPython(populate_new_fields,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
     ]
diff --git a/zerver/migrations/0100_usermessage_remove_is_me_message.py b/zerver/migrations/0100_usermessage_remove_is_me_message.py
index da8b5ca685..bcbd43c398 100644
--- a/zerver/migrations/0100_usermessage_remove_is_me_message.py
+++ b/zerver/migrations/0100_usermessage_remove_is_me_message.py
@@ -13,11 +13,41 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='archivedusermessage',
             name='flags',
-            field=bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical'], default=0),
+            field=bitfield.models.BitField(
+                [
+                    'read',
+                    'starred',
+                    'collapsed',
+                    'mentioned',
+                    'wildcard_mentioned',
+                    'summarize_in_home',
+                    'summarize_in_stream',
+                    'force_expand',
+                    'force_collapse',
+                    'has_alert_word',
+                    'historical',
+                ],
+                default=0,
+            ),
         ),
         migrations.AlterField(
             model_name='usermessage',
             name='flags',
-            field=bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical'], default=0),
+            field=bitfield.models.BitField(
+                [
+                    'read',
+                    'starred',
+                    'collapsed',
+                    'mentioned',
+                    'wildcard_mentioned',
+                    'summarize_in_home',
+                    'summarize_in_stream',
+                    'force_expand',
+                    'force_collapse',
+                    'has_alert_word',
+                    'historical',
+                ],
+                default=0,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0101_muted_topic.py b/zerver/migrations/0101_muted_topic.py
index bdb956993e..5ab1e432e3 100644
--- a/zerver/migrations/0101_muted_topic.py
+++ b/zerver/migrations/0101_muted_topic.py
@@ -14,11 +14,31 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MutedTopic',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('topic_name', models.CharField(max_length=60)),
-                ('recipient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient')),
-                ('stream', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'recipient',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'
+                    ),
+                ),
+                (
+                    'stream',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
             bases=(models.Model,),
         ),
diff --git a/zerver/migrations/0102_convert_muted_topic.py b/zerver/migrations/0102_convert_muted_topic.py
index 9da9ba4e60..0a1fdfffbb 100644
--- a/zerver/migrations/0102_convert_muted_topic.py
+++ b/zerver/migrations/0102_convert_muted_topic.py
@@ -7,7 +7,8 @@ from psycopg2.sql import SQL
 
 
 def convert_muted_topics(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
-    stream_query = SQL('''
+    stream_query = SQL(
+        '''
         SELECT
             zerver_stream.name,
             zerver_stream.realm_id,
@@ -19,7 +20,8 @@ def convert_muted_topics(apps: StateApps, schema_editor: DatabaseSchemaEditor) -
             zerver_recipient.type_id = zerver_stream.id AND
             zerver_recipient.type = 2
         )
-    ''')
+    '''
+    )
 
     stream_dict = {}
 
@@ -65,6 +67,7 @@ def convert_muted_topics(apps: StateApps, schema_editor: DatabaseSchemaEditor) -
 
     MutedTopic.objects.bulk_create(new_objs)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0104_fix_unreads.py b/zerver/migrations/0104_fix_unreads.py
index 33c3c557b4..4a55df427f 100644
--- a/zerver/migrations/0104_fix_unreads.py
+++ b/zerver/migrations/0104_fix_unreads.py
@@ -12,6 +12,7 @@ def fix_unreads(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     for user_profile in user_profiles:
         fix(user_profile)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0107_multiuseinvite.py b/zerver/migrations/0107_multiuseinvite.py
index dad26044fc..3af1ba899e 100644
--- a/zerver/migrations/0107_multiuseinvite.py
+++ b/zerver/migrations/0107_multiuseinvite.py
@@ -14,9 +14,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MultiuseInvite',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
-                ('referred_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
+                (
+                    'referred_by',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
                 ('streams', models.ManyToManyField(to='zerver.Stream')),
             ],
         ),
diff --git a/zerver/migrations/0108_fix_default_string_id.py b/zerver/migrations/0108_fix_default_string_id.py
index a74db853ed..e2748df4f1 100644
--- a/zerver/migrations/0108_fix_default_string_id.py
+++ b/zerver/migrations/0108_fix_default_string_id.py
@@ -18,6 +18,7 @@ def fix_realm_string_ids(apps: StateApps, schema_editor: DatabaseSchemaEditor) -
     user_realm.string_id = ""
     user_realm.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -25,7 +26,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_realm_string_ids,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            fix_realm_string_ids, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0109_mark_tutorial_status_finished.py b/zerver/migrations/0109_mark_tutorial_status_finished.py
index 31919aa881..5d2eba7988 100644
--- a/zerver/migrations/0109_mark_tutorial_status_finished.py
+++ b/zerver/migrations/0109_mark_tutorial_status_finished.py
@@ -7,6 +7,7 @@ def set_tutorial_status_to_finished(apps: StateApps, schema_editor: DatabaseSche
     UserProfile = apps.get_model('zerver', 'UserProfile')
     UserProfile.objects.update(tutorial_status='F')
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0110_stream_is_in_zephyr_realm.py b/zerver/migrations/0110_stream_is_in_zephyr_realm.py
index e1134d5de6..29c15369e9 100644
--- a/zerver/migrations/0110_stream_is_in_zephyr_realm.py
+++ b/zerver/migrations/0110_stream_is_in_zephyr_realm.py
@@ -13,12 +13,11 @@ def populate_is_zephyr(apps: StateApps, schema_editor: DatabaseSchemaEditor) ->
     )
 
     for realm in realms:
-        Stream.objects.filter(
-            realm_id=realm.id
-        ).update(
+        Stream.objects.filter(realm_id=realm.id).update(
             is_in_zephyr_realm=True,
         )
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -31,7 +30,7 @@ class Migration(migrations.Migration):
             name='is_in_zephyr_realm',
             field=models.BooleanField(default=False),
         ),
-        migrations.RunPython(populate_is_zephyr,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            populate_is_zephyr, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0111_botuserstatedata.py b/zerver/migrations/0111_botuserstatedata.py
index 87cd0ef269..2d0d2ce6b7 100644
--- a/zerver/migrations/0111_botuserstatedata.py
+++ b/zerver/migrations/0111_botuserstatedata.py
@@ -15,10 +15,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='BotUserStateData',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('key', models.TextField(db_index=True)),
                 ('value', models.TextField()),
-                ('bot_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'bot_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.AlterUniqueTogether(
diff --git a/zerver/migrations/0113_default_stream_group.py b/zerver/migrations/0113_default_stream_group.py
index 5db08b8cb0..4bfd94ce7f 100644
--- a/zerver/migrations/0113_default_stream_group.py
+++ b/zerver/migrations/0113_default_stream_group.py
@@ -14,9 +14,19 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='DefaultStreamGroup',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.CharField(db_index=True, max_length=60)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
                 ('streams', models.ManyToManyField(to='zerver.Stream')),
             ],
         ),
diff --git a/zerver/migrations/0115_user_groups.py b/zerver/migrations/0115_user_groups.py
index dc86cac347..47224ef881 100644
--- a/zerver/migrations/0115_user_groups.py
+++ b/zerver/migrations/0115_user_groups.py
@@ -15,22 +15,44 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='UserGroup',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('name', models.CharField(max_length=100)),
             ],
         ),
         migrations.CreateModel(
             name='UserGroupMembership',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.UserGroup')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
+                (
+                    'user_group',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.UserGroup'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.AddField(
             model_name='usergroup',
             name='members',
-            field=models.ManyToManyField(through='zerver.UserGroupMembership', to=settings.AUTH_USER_MODEL),
+            field=models.ManyToManyField(
+                through='zerver.UserGroupMembership', to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='usergroup',
diff --git a/zerver/migrations/0120_botuserconfigdata.py b/zerver/migrations/0120_botuserconfigdata.py
index 77417a381f..4622e08e7f 100644
--- a/zerver/migrations/0120_botuserconfigdata.py
+++ b/zerver/migrations/0120_botuserconfigdata.py
@@ -15,10 +15,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='BotUserConfigData',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('key', models.TextField(db_index=True)),
                 ('value', models.TextField()),
-                ('bot_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'bot_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
         migrations.AlterUniqueTogether(
diff --git a/zerver/migrations/0121_realm_signup_notifications_stream.py b/zerver/migrations/0121_realm_signup_notifications_stream.py
index b7d9937cb8..d70fdd2fe3 100644
--- a/zerver/migrations/0121_realm_signup_notifications_stream.py
+++ b/zerver/migrations/0121_realm_signup_notifications_stream.py
@@ -7,13 +7,15 @@ from django.db.migrations.state import StateApps
 
 
 def set_initial_value_for_signup_notifications_stream(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     realm_model = apps.get_model("zerver", "Realm")
     realms = realm_model.objects.exclude(notifications_stream__isnull=True)
     for realm in realms:
         realm.signup_notifications_stream = realm.notifications_stream
         realm.save(update_fields=["signup_notifications_stream"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -24,9 +26,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='realm',
             name='signup_notifications_stream',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='zerver.Stream'),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='+',
+                to='zerver.Stream',
+            ),
+        ),
+        migrations.RunPython(
+            set_initial_value_for_signup_notifications_stream,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
         ),
-        migrations.RunPython(set_initial_value_for_signup_notifications_stream,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
     ]
diff --git a/zerver/migrations/0126_prereg_remove_users_without_realm.py b/zerver/migrations/0126_prereg_remove_users_without_realm.py
index 7f6a7a4f4b..a581bbf434 100644
--- a/zerver/migrations/0126_prereg_remove_users_without_realm.py
+++ b/zerver/migrations/0126_prereg_remove_users_without_realm.py
@@ -5,11 +5,11 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def remove_prereg_users_without_realm(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def remove_prereg_users_without_realm(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     prereg_model = apps.get_model("zerver", "PreregistrationUser")
     prereg_model.objects.filter(realm=None, realm_creation=False).delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(remove_prereg_users_without_realm,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            remove_prereg_users_without_realm, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0128_scheduledemail_realm.py b/zerver/migrations/0128_scheduledemail_realm.py
index cddd859a3c..56d33cf080 100644
--- a/zerver/migrations/0128_scheduledemail_realm.py
+++ b/zerver/migrations/0128_scheduledemail_realm.py
@@ -7,7 +7,8 @@ from django.db.migrations.state import StateApps
 
 
 def set_realm_for_existing_scheduledemails(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     scheduledemail_model = apps.get_model("zerver", "ScheduledEmail")
     preregistrationuser_model = apps.get_model("zerver", "PreregistrationUser")
     for scheduledemail in scheduledemail_model.objects.all():
@@ -23,6 +24,7 @@ def set_realm_for_existing_scheduledemails(
     # Shouldn't be needed, but just in case
     scheduledemail_model.objects.filter(realm=None).delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -34,14 +36,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='scheduledemail',
             name='realm',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+            ),
         ),
-
         # Sets realm for existing ScheduledEmails
-        migrations.RunPython(set_realm_for_existing_scheduledemails,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
-
+        migrations.RunPython(
+            set_realm_for_existing_scheduledemails,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
         # Require ScheduledEmail.realm to be non-null
         migrations.AlterField(
             model_name='scheduledemail',
diff --git a/zerver/migrations/0130_text_choice_in_emojiset.py b/zerver/migrations/0130_text_choice_in_emojiset.py
index 24b3c359d0..09a2ab185a 100644
--- a/zerver/migrations/0130_text_choice_in_emojiset.py
+++ b/zerver/migrations/0130_text_choice_in_emojiset.py
@@ -10,8 +10,8 @@ def change_emojiset(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> Non
         user.emojiset = "text"
         user.save(update_fields=["emojiset"])
 
-def reverse_change_emojiset(apps: StateApps,
-                            schema_editor: DatabaseSchemaEditor) -> None:
+
+def reverse_change_emojiset(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     UserProfile = apps.get_model("zerver", "UserProfile")
     for user in UserProfile.objects.filter(emojiset="text"):
         # Resetting `emojiset` to "google" (the default) doesn't make an
@@ -21,6 +21,7 @@ def reverse_change_emojiset(apps: StateApps,
         user.emojiset = "google"
         user.save(update_fields=["emoji_alt_code", "emojiset"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -31,7 +32,17 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='userprofile',
             name='emojiset',
-            field=models.CharField(choices=[('google', 'Google'), ('apple', 'Apple'), ('twitter', 'Twitter'), ('emojione', 'EmojiOne'), ('text', 'Plain text')], default='google', max_length=20),
+            field=models.CharField(
+                choices=[
+                    ('google', 'Google'),
+                    ('apple', 'Apple'),
+                    ('twitter', 'Twitter'),
+                    ('emojione', 'EmojiOne'),
+                    ('text', 'Plain text'),
+                ],
+                default='google',
+                max_length=20,
+            ),
         ),
         migrations.RunPython(change_emojiset, reverse_change_emojiset, elidable=True),
         migrations.RemoveField(
diff --git a/zerver/migrations/0134_scheduledmessage.py b/zerver/migrations/0134_scheduledmessage.py
index e6cfbfe8e3..900227ab52 100644
--- a/zerver/migrations/0134_scheduledmessage.py
+++ b/zerver/migrations/0134_scheduledmessage.py
@@ -15,16 +15,46 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ScheduledMessage',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('subject', models.CharField(max_length=60)),
                 ('content', models.TextField()),
                 ('scheduled_timestamp', models.DateTimeField(db_index=True)),
                 ('delivered', models.BooleanField(default=False)),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
-                ('recipient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient')),
-                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('sending_client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Client')),
-                ('stream', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
+                (
+                    'recipient',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Recipient'
+                    ),
+                ),
+                (
+                    'sender',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
+                (
+                    'sending_client',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'
+                    ),
+                ),
+                (
+                    'stream',
+                    models.ForeignKey(
+                        null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream'
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0135_scheduledmessage_delivery_type.py b/zerver/migrations/0135_scheduledmessage_delivery_type.py
index dd219ce8f7..ca20363a14 100644
--- a/zerver/migrations/0135_scheduledmessage_delivery_type.py
+++ b/zerver/migrations/0135_scheduledmessage_delivery_type.py
@@ -13,6 +13,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='scheduledmessage',
             name='delivery_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'send_later'), (2, 'remind')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[(1, 'send_later'), (2, 'remind')], default=1
+            ),
         ),
     ]
diff --git a/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py b/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py
index be5a6cf5fe..9d1aef0178 100644
--- a/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py
+++ b/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py
@@ -7,9 +7,11 @@ def backfill_last_message_id(apps: StateApps, schema_editor: DatabaseSchemaEdito
     event_type = ['subscription_created', 'subscription_deactivated', 'subscription_activated']
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
     subscription_logs = RealmAuditLog.objects.filter(
-        event_last_message_id__isnull=True, event_type__in=event_type)
+        event_last_message_id__isnull=True, event_type__in=event_type
+    )
     subscription_logs.update(event_last_message_id=-1)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -17,7 +19,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(backfill_last_message_id,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            backfill_last_message_id, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0143_realm_bot_creation_policy.py b/zerver/migrations/0143_realm_bot_creation_policy.py
index 7b8e7f0faa..c45234280e 100644
--- a/zerver/migrations/0143_realm_bot_creation_policy.py
+++ b/zerver/migrations/0143_realm_bot_creation_policy.py
@@ -4,7 +4,11 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 BOT_CREATION_EVERYONE = 1
-def set_initial_value_for_bot_creation_policy(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+
+
+def set_initial_value_for_bot_creation_policy(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     Realm = apps.get_model("zerver", "Realm")
     Realm.BOT_CREATION_EVERYONE = 1
     Realm.BOT_CREATION_LIMIT_GENERIC_BOTS = 2
@@ -15,6 +19,7 @@ def set_initial_value_for_bot_creation_policy(apps: StateApps, schema_editor: Da
             realm.bot_creation_policy = Realm.BOT_CREATION_EVERYONE
         realm.save(update_fields=["bot_creation_policy"])
 
+
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Realm = apps.get_model("zerver", "Realm")
     Realm.BOT_CREATION_EVERYONE = 1
@@ -25,6 +30,7 @@ def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
             realm.create_generic_bot_by_admins_only = True
         realm.save(update_fields=["create_generic_bot_by_admins_only"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -37,7 +43,7 @@ class Migration(migrations.Migration):
             name='bot_creation_policy',
             field=models.PositiveSmallIntegerField(default=BOT_CREATION_EVERYONE),
         ),
-        migrations.RunPython(set_initial_value_for_bot_creation_policy,
-                             reverse_code=reverse_code,
-                             elidable=True),
+        migrations.RunPython(
+            set_initial_value_for_bot_creation_policy, reverse_code=reverse_code, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py b/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py
index d7bffafcc7..b515bb782d 100644
--- a/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py
+++ b/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py
@@ -24,18 +24,22 @@ def realm_emoji_name_to_id(apps: StateApps, schema_editor: DatabaseSchemaEditor)
             # Realm emoji used in this reaction has been deleted so this
             # reaction should also be deleted. We don't need to reverse
             # this step in migration reversal code.
-            print(f"Reaction for ({emoji_name}, {reaction.message_id}) refers to deleted custom emoji {reaction.user_profile_id}; deleting")
+            print(
+                f"Reaction for ({emoji_name}, {reaction.message_id}) refers to deleted custom emoji {reaction.user_profile_id}; deleting"
+            )
             reaction.delete()
         else:
             reaction.emoji_code = realm_emoji["id"]
             reaction.save()
 
+
 def reversal(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Reaction = apps.get_model('zerver', 'Reaction')
     for reaction in Reaction.objects.filter(reaction_type='realm_emoji'):
         reaction.emoji_code = reaction.emoji_name
         reaction.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -43,7 +47,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(realm_emoji_name_to_id,
-                             reverse_code=reversal,
-                             elidable=True),
+        migrations.RunPython(realm_emoji_name_to_id, reverse_code=reversal, elidable=True),
     ]
diff --git a/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py b/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py
index 6fddbcf1c0..4b1c2a47f3 100644
--- a/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py
+++ b/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py
@@ -20,19 +20,24 @@ class Uploader:
 
     def ensure_emoji_images(self, realm_id: int, old_filename: str, new_filename: str) -> None:
         # Copy original image file.
-        old_file_path = self.old_orig_image_path_template.format(realm_id=realm_id,
-                                                                 emoji_file_name=old_filename)
-        new_file_path = self.new_orig_image_path_template.format(realm_id=realm_id,
-                                                                 emoji_file_name=new_filename)
+        old_file_path = self.old_orig_image_path_template.format(
+            realm_id=realm_id, emoji_file_name=old_filename
+        )
+        new_file_path = self.new_orig_image_path_template.format(
+            realm_id=realm_id, emoji_file_name=new_filename
+        )
         self.copy_files(old_file_path, new_file_path)
 
         # Copy resized image file.
-        old_file_path = self.old_path_template.format(realm_id=realm_id,
-                                                      emoji_file_name=old_filename)
-        new_file_path = self.new_path_template.format(realm_id=realm_id,
-                                                      emoji_file_name=new_filename)
+        old_file_path = self.old_path_template.format(
+            realm_id=realm_id, emoji_file_name=old_filename
+        )
+        new_file_path = self.new_path_template.format(
+            realm_id=realm_id, emoji_file_name=new_filename
+        )
         self.copy_files(old_file_path, new_file_path)
 
+
 class LocalUploader(Uploader):
     def __init__(self) -> None:
         super().__init__()
@@ -50,26 +55,32 @@ class LocalUploader(Uploader):
         self.mkdirs(dst_path)
         shutil.copyfile(src_path, dst_path)
 
+
 class S3Uploader(Uploader):
     def __init__(self) -> None:
         super().__init__()
         session = boto3.Session(settings.S3_KEY, settings.S3_SECRET_KEY)
         self.bucket_name = settings.S3_AVATAR_BUCKET
-        self.bucket = session.resource('s3', region_name=settings.S3_REGION, endpoint_url=settings.S3_ENDPOINT_URL).Bucket(self.bucket_name)
+        self.bucket = session.resource(
+            's3', region_name=settings.S3_REGION, endpoint_url=settings.S3_ENDPOINT_URL
+        ).Bucket(self.bucket_name)
 
     def copy_files(self, src_key: str, dst_key: str) -> None:
         source = dict(Bucket=self.bucket_name, Key=src_key)
         self.bucket.copy(source, dst_key)
 
+
 def get_uploader() -> Uploader:
     if settings.LOCAL_UPLOADS_DIR is None:
         return S3Uploader()
     return LocalUploader()
 
+
 def get_emoji_file_name(emoji_file_name: str, new_name: str) -> str:
     _, image_ext = os.path.splitext(emoji_file_name)
     return ''.join((new_name, image_ext))
 
+
 def migrate_realm_emoji_image_files(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     RealmEmoji = apps.get_model('zerver', 'RealmEmoji')
     uploader = get_uploader()
@@ -80,6 +91,7 @@ def migrate_realm_emoji_image_files(apps: StateApps, schema_editor: DatabaseSche
         realm_emoji.file_name = new_file_name
         realm_emoji.save(update_fields=['file_name'])
 
+
 def reversal(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     # Ensures that migration can be re-run in case of a failure.
     RealmEmoji = apps.get_model('zerver', 'RealmEmoji')
@@ -89,6 +101,7 @@ def reversal(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
         realm_emoji.file_name = correct_file_name
         realm_emoji.save(update_fields=['file_name'])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -105,8 +118,5 @@ class Migration(migrations.Migration):
             name='file_name',
             field=models.TextField(db_index=True, null=True, blank=True),
         ),
-        migrations.RunPython(
-            migrate_realm_emoji_image_files,
-            reverse_code=reversal,
-            elidable=True),
+        migrations.RunPython(migrate_realm_emoji_image_files, reverse_code=reversal, elidable=True),
     ]
diff --git a/zerver/migrations/0153_remove_int_float_custom_fields.py b/zerver/migrations/0153_remove_int_float_custom_fields.py
index 3cf5ad9bab..7c741ac6b4 100644
--- a/zerver/migrations/0153_remove_int_float_custom_fields.py
+++ b/zerver/migrations/0153_remove_int_float_custom_fields.py
@@ -13,6 +13,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[(1, 'Short text'), (2, 'Long text')], default=1
+            ),
         ),
     ]
diff --git a/zerver/migrations/0154_fix_invalid_bot_owner.py b/zerver/migrations/0154_fix_invalid_bot_owner.py
index a38981b1aa..94af5b5db4 100644
--- a/zerver/migrations/0154_fix_invalid_bot_owner.py
+++ b/zerver/migrations/0154_fix_invalid_bot_owner.py
@@ -5,11 +5,14 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def migrate_fix_invalid_bot_owner_values(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def migrate_fix_invalid_bot_owner_values(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     """Fixes UserProfile objects that incorrectly had a bot_owner set"""
     UserProfile = apps.get_model('zerver', 'UserProfile')
     UserProfile.objects.filter(is_bot=False).exclude(bot_owner=None).update(bot_owner=None)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -20,5 +23,6 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             migrate_fix_invalid_bot_owner_values,
             reverse_code=migrations.RunPython.noop,
-            elidable=True),
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0160_add_choice_field.py b/zerver/migrations/0160_add_choice_field.py
index 59d01cc325..a6a53101a4 100644
--- a/zerver/migrations/0160_add_choice_field.py
+++ b/zerver/migrations/0160_add_choice_field.py
@@ -18,6 +18,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text'), (3, 'Choice')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[(1, 'Short text'), (2, 'Long text'), (3, 'Choice')], default=1
+            ),
         ),
     ]
diff --git a/zerver/migrations/0164_stream_history_public_to_subscribers.py b/zerver/migrations/0164_stream_history_public_to_subscribers.py
index fa384a3c2e..cf199271e6 100644
--- a/zerver/migrations/0164_stream_history_public_to_subscribers.py
+++ b/zerver/migrations/0164_stream_history_public_to_subscribers.py
@@ -7,13 +7,16 @@ from django.db.migrations.state import StateApps
 
 
 def set_initial_value_for_history_public_to_subscribers(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     stream_model = apps.get_model("zerver", "Stream")
     streams = stream_model.objects.all()
 
     for stream in streams:
         if stream.invite_only:
-            stream.history_public_to_subscribers = getattr(settings, 'PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS', False)
+            stream.history_public_to_subscribers = getattr(
+                settings, 'PRIVATE_STREAM_HISTORY_FOR_SUBSCRIBERS', False
+            )
         else:
             stream.history_public_to_subscribers = True
 
@@ -22,6 +25,7 @@ def set_initial_value_for_history_public_to_subscribers(
 
         stream.save(update_fields=["history_public_to_subscribers"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -34,7 +38,9 @@ class Migration(migrations.Migration):
             name='history_public_to_subscribers',
             field=models.BooleanField(default=False),
         ),
-        migrations.RunPython(set_initial_value_for_history_public_to_subscribers,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            set_initial_value_for_history_public_to_subscribers,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0165_add_date_to_profile_field.py b/zerver/migrations/0165_add_date_to_profile_field.py
index 43a4bd4342..f8dcbaf740 100644
--- a/zerver/migrations/0165_add_date_to_profile_field.py
+++ b/zerver/migrations/0165_add_date_to_profile_field.py
@@ -13,6 +13,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text'), (4, 'Date'), (3, 'Choice')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[(1, 'Short text'), (2, 'Long text'), (4, 'Date'), (3, 'Choice')], default=1
+            ),
         ),
     ]
diff --git a/zerver/migrations/0166_add_url_to_profile_field.py b/zerver/migrations/0166_add_url_to_profile_field.py
index d5b1727a95..b07d4182a9 100644
--- a/zerver/migrations/0166_add_url_to_profile_field.py
+++ b/zerver/migrations/0166_add_url_to_profile_field.py
@@ -13,6 +13,15 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text'), (4, 'Date'), (5, 'URL'), (3, 'Choice')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, 'Short text'),
+                    (2, 'Long text'),
+                    (4, 'Date'),
+                    (5, 'URL'),
+                    (3, 'Choice'),
+                ],
+                default=1,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0167_custom_profile_fields_sort_order.py b/zerver/migrations/0167_custom_profile_fields_sort_order.py
index 9d1955c0e5..e41585b953 100644
--- a/zerver/migrations/0167_custom_profile_fields_sort_order.py
+++ b/zerver/migrations/0167_custom_profile_fields_sort_order.py
@@ -10,6 +10,7 @@ def migrate_set_order_value(apps: StateApps, schema_editor: DatabaseSchemaEditor
     CustomProfileField = apps.get_model('zerver', 'CustomProfileField')
     CustomProfileField.objects.all().update(order=F('id'))
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -22,7 +23,7 @@ class Migration(migrations.Migration):
             name='order',
             field=models.IntegerField(default=0),
         ),
-        migrations.RunPython(migrate_set_order_value,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            migrate_set_order_value, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0170_submessage.py b/zerver/migrations/0170_submessage.py
index dfa5a419ca..b1b554da04 100644
--- a/zerver/migrations/0170_submessage.py
+++ b/zerver/migrations/0170_submessage.py
@@ -15,11 +15,26 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='SubMessage',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('msg_type', models.TextField()),
                 ('content', models.TextField()),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Message')),
-                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Message'
+                    ),
+                ),
+                (
+                    'sender',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0172_add_user_type_of_custom_profile_field.py b/zerver/migrations/0172_add_user_type_of_custom_profile_field.py
index aab971821e..4f9f742573 100644
--- a/zerver/migrations/0172_add_user_type_of_custom_profile_field.py
+++ b/zerver/migrations/0172_add_user_type_of_custom_profile_field.py
@@ -13,6 +13,16 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text'), (4, 'Date'), (5, 'URL'), (3, 'Choice'), (6, 'User')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, 'Short text'),
+                    (2, 'Long text'),
+                    (4, 'Date'),
+                    (5, 'URL'),
+                    (3, 'Choice'),
+                    (6, 'User'),
+                ],
+                default=1,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0174_userprofile_delivery_email.py b/zerver/migrations/0174_userprofile_delivery_email.py
index 54c82ef74e..41e3bfb853 100644
--- a/zerver/migrations/0174_userprofile_delivery_email.py
+++ b/zerver/migrations/0174_userprofile_delivery_email.py
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
             field=models.EmailField(db_index=True, default='', max_length=254),
             preserve_default=False,
         ),
-        migrations.RunPython(copy_email_field,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            copy_email_field, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py b/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py
index a264dc6357..5ae9b0cd2e 100644
--- a/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py
+++ b/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py
@@ -3,11 +3,20 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def change_realm_audit_log_event_type_tense(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def change_realm_audit_log_event_type_tense(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
-    RealmAuditLog.objects.filter(event_type="user_change_password").update(event_type="user_password_changed")
-    RealmAuditLog.objects.filter(event_type="user_change_avatar_source").update(event_type="user_avatar_source_changed")
-    RealmAuditLog.objects.filter(event_type="bot_owner_changed").update(event_type="user_bot_owner_changed")
+    RealmAuditLog.objects.filter(event_type="user_change_password").update(
+        event_type="user_password_changed"
+    )
+    RealmAuditLog.objects.filter(event_type="user_change_avatar_source").update(
+        event_type="user_avatar_source_changed"
+    )
+    RealmAuditLog.objects.filter(event_type="bot_owner_changed").update(
+        event_type="user_bot_owner_changed"
+    )
+
 
 class Migration(migrations.Migration):
 
@@ -16,7 +25,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(change_realm_audit_log_event_type_tense,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            change_realm_audit_log_event_type_tense,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py b/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py
index e10d4adfd1..affb0cb7ba 100644
--- a/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py
+++ b/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py
@@ -9,8 +9,7 @@ from django.db.migrations.state import StateApps
 from django.db.models import F
 
 
-def reset_is_private_flag(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def reset_is_private_flag(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     UserMessage = apps.get_model("zerver", "UserMessage")
     UserProfile = apps.get_model("zerver", "UserProfile")
     user_profile_ids = UserProfile.objects.all().order_by("id").values_list("id", flat=True)
@@ -31,20 +30,25 @@ def reset_is_private_flag(
             # on a large server.  We address this issue by doing a bit
             # of hackery to generate the SQL just right (with an
             # `ORDER BY` clause that forces using the new index).
-            flag_set_objects = UserMessage.objects.filter(user_profile__id = user_id).extra(
-                where=["flags & 2048 != 0"]).order_by("message_id")[0:1000]
+            flag_set_objects = (
+                UserMessage.objects.filter(user_profile__id=user_id)
+                .extra(where=["flags & 2048 != 0"])
+                .order_by("message_id")[0:1000]
+            )
             user_message_ids = flag_set_objects.values_list("id", flat=True)
             count = UserMessage.objects.filter(id__in=user_message_ids).update(
-                flags=F('flags').bitand(~UserMessage.flags.is_private))
+                flags=F('flags').bitand(~UserMessage.flags.is_private)
+            )
             if count < 1000:
                 break
 
         i += 1
-        if (i % 50 == 0 or i == total):
+        if i % 50 == 0 or i == total:
             percent = round((i / total) * 100, 2)
             print(f"Processed {i}/{total} {percent}%")
             sys.stdout.flush()
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -56,12 +60,44 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='archivedusermessage',
             name='flags',
-            field=bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical', 'is_private'], default=0),
+            field=bitfield.models.BitField(
+                [
+                    'read',
+                    'starred',
+                    'collapsed',
+                    'mentioned',
+                    'wildcard_mentioned',
+                    'summarize_in_home',
+                    'summarize_in_stream',
+                    'force_expand',
+                    'force_collapse',
+                    'has_alert_word',
+                    'historical',
+                    'is_private',
+                ],
+                default=0,
+            ),
         ),
         migrations.AlterField(
             model_name='usermessage',
             name='flags',
-            field=bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical', 'is_private'], default=0),
+            field=bitfield.models.BitField(
+                [
+                    'read',
+                    'starred',
+                    'collapsed',
+                    'mentioned',
+                    'wildcard_mentioned',
+                    'summarize_in_home',
+                    'summarize_in_stream',
+                    'force_expand',
+                    'force_collapse',
+                    'has_alert_word',
+                    'historical',
+                    'is_private',
+                ],
+                default=0,
+            ),
         ),
         migrations.RunSQL(
             '''
@@ -71,7 +107,7 @@ class Migration(migrations.Migration):
             ''',
             reverse_sql='DROP INDEX zerver_usermessage_is_private_message_id;',
         ),
-        migrations.RunPython(reset_is_private_flag,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            reset_is_private_flag, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0180_usermessage_add_active_mobile_push_notification.py b/zerver/migrations/0180_usermessage_add_active_mobile_push_notification.py
index 155694f511..a63ddfb08d 100644
--- a/zerver/migrations/0180_usermessage_add_active_mobile_push_notification.py
+++ b/zerver/migrations/0180_usermessage_add_active_mobile_push_notification.py
@@ -14,12 +14,46 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='archivedusermessage',
             name='flags',
-            field=bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical', 'is_private', 'active_mobile_push_notification'], default=0),
+            field=bitfield.models.BitField(
+                [
+                    'read',
+                    'starred',
+                    'collapsed',
+                    'mentioned',
+                    'wildcard_mentioned',
+                    'summarize_in_home',
+                    'summarize_in_stream',
+                    'force_expand',
+                    'force_collapse',
+                    'has_alert_word',
+                    'historical',
+                    'is_private',
+                    'active_mobile_push_notification',
+                ],
+                default=0,
+            ),
         ),
         migrations.AlterField(
             model_name='usermessage',
             name='flags',
-            field=bitfield.models.BitField(['read', 'starred', 'collapsed', 'mentioned', 'wildcard_mentioned', 'summarize_in_home', 'summarize_in_stream', 'force_expand', 'force_collapse', 'has_alert_word', 'historical', 'is_private', 'active_mobile_push_notification'], default=0),
+            field=bitfield.models.BitField(
+                [
+                    'read',
+                    'starred',
+                    'collapsed',
+                    'mentioned',
+                    'wildcard_mentioned',
+                    'summarize_in_home',
+                    'summarize_in_stream',
+                    'force_expand',
+                    'force_collapse',
+                    'has_alert_word',
+                    'historical',
+                    'is_private',
+                    'active_mobile_push_notification',
+                ],
+                default=0,
+            ),
         ),
         migrations.RunSQL(
             '''
diff --git a/zerver/migrations/0181_userprofile_change_emojiset.py b/zerver/migrations/0181_userprofile_change_emojiset.py
index 0f39b29165..3105c95c6b 100644
--- a/zerver/migrations/0181_userprofile_change_emojiset.py
+++ b/zerver/migrations/0181_userprofile_change_emojiset.py
@@ -7,6 +7,7 @@ def change_emojiset_choice(apps: StateApps, schema_editor: DatabaseSchemaEditor)
     UserProfile = apps.get_model('zerver', 'UserProfile')
     UserProfile.objects.exclude(emojiset__in=['google', 'text']).update(emojiset='google')
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -15,12 +16,15 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(
-            change_emojiset_choice,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True),
+            change_emojiset_choice, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
         migrations.AlterField(
             model_name='userprofile',
             name='emojiset',
-            field=models.CharField(choices=[('google', 'Google'), ('text', 'Plain text')], default='google', max_length=20),
+            field=models.CharField(
+                choices=[('google', 'Google'), ('text', 'Plain text')],
+                default='google',
+                max_length=20,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0182_set_initial_value_is_private_flag.py b/zerver/migrations/0182_set_initial_value_is_private_flag.py
index 4b40daa396..f5de535264 100644
--- a/zerver/migrations/0182_set_initial_value_is_private_flag.py
+++ b/zerver/migrations/0182_set_initial_value_is_private_flag.py
@@ -7,7 +7,8 @@ from django.db.models import F
 
 
 def set_initial_value_of_is_private_flag(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     UserMessage = apps.get_model("zerver", "UserMessage")
     Message = apps.get_model("zerver", "Message")
     if not Message.objects.exists():
@@ -23,10 +24,14 @@ def set_initial_value_of_is_private_flag(
     while True:
         range_end = i + 10000
         # Can't use [Recipient.PERSONAL, Recipient.HUDDLE] in migration files
-        message_ids = list(Message.objects.filter(recipient__type__in=[1, 3],
-                                                  id__gt=i,
-                                                  id__lte=range_end).values_list("id", flat=True).order_by("id"))
-        count = UserMessage.objects.filter(message_id__in=message_ids).update(flags=F('flags').bitor(UserMessage.flags.is_private))
+        message_ids = list(
+            Message.objects.filter(recipient__type__in=[1, 3], id__gt=i, id__lte=range_end)
+            .values_list("id", flat=True)
+            .order_by("id")
+        )
+        count = UserMessage.objects.filter(message_id__in=message_ids).update(
+            flags=F('flags').bitor(UserMessage.flags.is_private)
+        )
         if count == 0 and range_end >= Message.objects.last().id:
             break
 
@@ -39,6 +44,7 @@ def set_initial_value_of_is_private_flag(
         print(f"Processed {processed}/{total} {percent}%")
         sys.stdout.flush()
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -47,7 +53,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(set_initial_value_of_is_private_flag,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            set_initial_value_of_is_private_flag,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0184_rename_custom_field_types.py b/zerver/migrations/0184_rename_custom_field_types.py
index aaa01b777d..2952469da6 100644
--- a/zerver/migrations/0184_rename_custom_field_types.py
+++ b/zerver/migrations/0184_rename_custom_field_types.py
@@ -13,6 +13,16 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text'), (4, 'Date picker'), (5, 'Link'), (3, 'List of options'), (6, 'Person picker')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, 'Short text'),
+                    (2, 'Long text'),
+                    (4, 'Date picker'),
+                    (5, 'Link'),
+                    (3, 'List of options'),
+                    (6, 'Person picker'),
+                ],
+                default=1,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0185_realm_plan_type.py b/zerver/migrations/0185_realm_plan_type.py
index c7349655df..405213282c 100644
--- a/zerver/migrations/0185_realm_plan_type.py
+++ b/zerver/migrations/0185_realm_plan_type.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 SELF_HOSTED = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0189_userprofile_add_some_emojisets.py b/zerver/migrations/0189_userprofile_add_some_emojisets.py
index 01b51861e4..bee60afec2 100644
--- a/zerver/migrations/0189_userprofile_add_some_emojisets.py
+++ b/zerver/migrations/0189_userprofile_add_some_emojisets.py
@@ -9,6 +9,7 @@ def change_emojiset_choice(apps: StateApps, schema_editor: DatabaseSchemaEditor)
     UserProfile = apps.get_model('zerver', 'UserProfile')
     UserProfile.objects.filter(emojiset='google').update(emojiset='google-blob')
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -19,10 +20,18 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='userprofile',
             name='emojiset',
-            field=models.CharField(choices=[('google', 'Google modern'), ('google-blob', 'Google classic'), ('twitter', 'Twitter'), ('text', 'Plain text')], default='google-blob', max_length=20),
+            field=models.CharField(
+                choices=[
+                    ('google', 'Google modern'),
+                    ('google-blob', 'Google classic'),
+                    ('twitter', 'Twitter'),
+                    ('text', 'Plain text'),
+                ],
+                default='google-blob',
+                max_length=20,
+            ),
         ),
         migrations.RunPython(
-            change_emojiset_choice,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True),
+            change_emojiset_choice, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0193_realm_email_address_visibility.py b/zerver/migrations/0193_realm_email_address_visibility.py
index 6d9546bf0d..e819292231 100644
--- a/zerver/migrations/0193_realm_email_address_visibility.py
+++ b/zerver/migrations/0193_realm_email_address_visibility.py
@@ -3,6 +3,8 @@
 from django.db import migrations, models
 
 EMAIL_ADDRESS_VISIBILITY_EVERYONE = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0196_add_realm_logo_fields.py b/zerver/migrations/0196_add_realm_logo_fields.py
index 18cb6e49af..7ceacad60a 100644
--- a/zerver/migrations/0196_add_realm_logo_fields.py
+++ b/zerver/migrations/0196_add_realm_logo_fields.py
@@ -13,7 +13,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='realm',
             name='logo_source',
-            field=models.CharField(choices=[('D', 'Default to Zulip'), ('U', 'Uploaded by administrator')], default='D', max_length=1),
+            field=models.CharField(
+                choices=[('D', 'Default to Zulip'), ('U', 'Uploaded by administrator')],
+                default='D',
+                max_length=1,
+            ),
         ),
         migrations.AddField(
             model_name='realm',
diff --git a/zerver/migrations/0197_azure_active_directory_auth.py b/zerver/migrations/0197_azure_active_directory_auth.py
index 4c4ff6e57c..c745148524 100644
--- a/zerver/migrations/0197_azure_active_directory_auth.py
+++ b/zerver/migrations/0197_azure_active_directory_auth.py
@@ -14,6 +14,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realm',
             name='authentication_methods',
-            field=bitfield.models.BitField(['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser', 'AzureAD'], default=2147483647),
+            field=bitfield.models.BitField(
+                ['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser', 'AzureAD'],
+                default=2147483647,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0198_preregistrationuser_invited_as.py b/zerver/migrations/0198_preregistrationuser_invited_as.py
index 41459f174b..4cb43ae044 100644
--- a/zerver/migrations/0198_preregistrationuser_invited_as.py
+++ b/zerver/migrations/0198_preregistrationuser_invited_as.py
@@ -9,20 +9,22 @@ def set_initial_value_for_invited_as(apps: StateApps, schema_editor: DatabaseSch
     PreregistrationUser = apps.get_model("zerver", "PreregistrationUser")
     for user in PreregistrationUser.objects.all():
         if user.invited_as_admin:
-            user.invited_as = 2     # PreregistrationUser.INVITE_AS['REALM_ADMIN']
+            user.invited_as = 2  # PreregistrationUser.INVITE_AS['REALM_ADMIN']
         else:
-            user.invited_as = 1     # PreregistrationUser.INVITE_AS['MEMBER']
+            user.invited_as = 1  # PreregistrationUser.INVITE_AS['MEMBER']
         user.save(update_fields=["invited_as"])
 
+
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     PreregistrationUser = apps.get_model("zerver", "PreregistrationUser")
     for user in PreregistrationUser.objects.all():
-        if user.invited_as == 2:    # PreregistrationUser.INVITE_AS['REALM_ADMIN']
+        if user.invited_as == 2:  # PreregistrationUser.INVITE_AS['REALM_ADMIN']
             user.invited_as_admin = True
-        else:                       # PreregistrationUser.INVITE_AS['MEMBER']
+        else:  # PreregistrationUser.INVITE_AS['MEMBER']
             user.invited_as_admin = False
         user.save(update_fields=["invited_as_admin"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0199_userstatus.py b/zerver/migrations/0199_userstatus.py
index ffed2ba840..8d57fefcde 100644
--- a/zerver/migrations/0199_userstatus.py
+++ b/zerver/migrations/0199_userstatus.py
@@ -15,11 +15,26 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='UserStatus',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('timestamp', models.DateTimeField()),
                 ('status', models.PositiveSmallIntegerField(default=1)),
-                ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Client')),
-                ('user_profile', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'client',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Client'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0206_stream_rendered_description.py b/zerver/migrations/0206_stream_rendered_description.py
index 706c0fe9ff..310e7b11ef 100644
--- a/zerver/migrations/0206_stream_rendered_description.py
+++ b/zerver/migrations/0206_stream_rendered_description.py
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
             name='rendered_description',
             field=models.TextField(default=''),
         ),
-        migrations.RunPython(render_all_stream_descriptions,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            render_all_stream_descriptions, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0208_add_realm_night_logo_fields.py b/zerver/migrations/0208_add_realm_night_logo_fields.py
index b6b35eabc2..b10b2bf385 100644
--- a/zerver/migrations/0208_add_realm_night_logo_fields.py
+++ b/zerver/migrations/0208_add_realm_night_logo_fields.py
@@ -13,7 +13,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='realm',
             name='night_logo_source',
-            field=models.CharField(choices=[('D', 'Default to Zulip'), ('U', 'Uploaded by administrator')], default='D', max_length=1),
+            field=models.CharField(
+                choices=[('D', 'Default to Zulip'), ('U', 'Uploaded by administrator')],
+                default='D',
+                max_length=1,
+            ),
         ),
         migrations.AddField(
             model_name='realm',
diff --git a/zerver/migrations/0209_user_profile_no_empty_password.py b/zerver/migrations/0209_user_profile_no_empty_password.py
index 9ffb209043..122e145c96 100644
--- a/zerver/migrations/0209_user_profile_no_empty_password.py
+++ b/zerver/migrations/0209_user_profile_no_empty_password.py
@@ -82,8 +82,11 @@ def ensure_no_empty_passwords(apps: StateApps, schema_editor: DatabaseSchemaEdit
     # password, we can prove their current API key cannot have been
     # exposed; we store those users in
     # password_change_user_ids_no_reset_needed.
-    password_change_user_ids = set(RealmAuditLog.objects.filter(
-        event_type=USER_PASSWORD_CHANGED).values_list("modified_user_id", flat=True))
+    password_change_user_ids = set(
+        RealmAuditLog.objects.filter(event_type=USER_PASSWORD_CHANGED).values_list(
+            "modified_user_id", flat=True
+        )
+    )
     password_change_user_ids_api_key_reset_needed: Set[int] = set()
     password_change_user_ids_no_reset_needed: Set[int] = set()
 
@@ -93,8 +96,8 @@ def ensure_no_empty_passwords(apps: StateApps, schema_editor: DatabaseSchemaEdit
 
         # We check if the user changed their API key since their first password change.
         query = RealmAuditLog.objects.filter(
-            modified_user=user_id, event_type__in=[USER_PASSWORD_CHANGED,
-                                                   USER_API_KEY_CHANGED],
+            modified_user=user_id,
+            event_type__in=[USER_PASSWORD_CHANGED, USER_API_KEY_CHANGED],
         ).order_by("event_time")
 
         earliest_password_change = query.filter(event_type=USER_PASSWORD_CHANGED).first()
@@ -138,18 +141,20 @@ def ensure_no_empty_passwords(apps: StateApps, schema_editor: DatabaseSchemaEdit
     AFFECTED_USER_TYPE_CHANGED_PASSWORD = 'changed_password'
     MIGRATION_ID = '0209_user_profile_no_empty_password'
 
-    def write_realm_audit_log_entry(user_profile: Any,
-                                    event_time: Any, event_type: Any,
-                                    affected_user_type: str) -> None:
+    def write_realm_audit_log_entry(
+        user_profile: Any, event_time: Any, event_type: Any, affected_user_type: str
+    ) -> None:
         RealmAuditLog.objects.create(
             realm=user_profile.realm,
             modified_user=user_profile,
             event_type=event_type,
             event_time=event_time,
-            extra_data=orjson.dumps({
-                'migration_id': MIGRATION_ID,
-                'affected_user_type': affected_user_type,
-            }).decode(),
+            extra_data=orjson.dumps(
+                {
+                    'migration_id': MIGRATION_ID,
+                    'affected_user_type': affected_user_type,
+                }
+            ).decode(),
         )
 
     # If Zulip's built-in password authentication is not enabled on
@@ -173,9 +178,9 @@ def ensure_no_empty_passwords(apps: StateApps, schema_editor: DatabaseSchemaEdit
             # Change their password and record that we did so.
             user_profile.password = make_password(None)
             update_fields = ["password"]
-            write_realm_audit_log_entry(user_profile, event_time,
-                                        USER_PASSWORD_CHANGED,
-                                        AFFECTED_USER_TYPE_EMPTY_PASSWORD)
+            write_realm_audit_log_entry(
+                user_profile, event_time, USER_PASSWORD_CHANGED, AFFECTED_USER_TYPE_EMPTY_PASSWORD
+            )
 
             if email_auth_enabled and not user_profile.is_bot:
                 # As explained above, if the built-in password authentication
@@ -185,22 +190,27 @@ def ensure_no_empty_passwords(apps: StateApps, schema_editor: DatabaseSchemaEdit
                 update_fields.append("api_key")
 
                 event_time = timezone_now()
-                write_realm_audit_log_entry(user_profile, event_time,
-                                            USER_API_KEY_CHANGED,
-                                            AFFECTED_USER_TYPE_EMPTY_PASSWORD)
+                write_realm_audit_log_entry(
+                    user_profile,
+                    event_time,
+                    USER_API_KEY_CHANGED,
+                    AFFECTED_USER_TYPE_EMPTY_PASSWORD,
+                )
 
             user_profile.save(update_fields=update_fields)
             continue
 
-        elif email_auth_enabled and \
-                user_profile.id in password_change_user_ids_api_key_reset_needed:
+        elif (
+            email_auth_enabled and user_profile.id in password_change_user_ids_api_key_reset_needed
+        ):
             # For these users, we just need to reset the API key.
             reset_user_api_key(user_profile)
             user_profile.save(update_fields=["api_key"])
 
-            write_realm_audit_log_entry(user_profile, event_time,
-                                        USER_API_KEY_CHANGED,
-                                        AFFECTED_USER_TYPE_CHANGED_PASSWORD)
+            write_realm_audit_log_entry(
+                user_profile, event_time, USER_API_KEY_CHANGED, AFFECTED_USER_TYPE_CHANGED_PASSWORD
+            )
+
 
 def reset_user_api_key(user_profile: Any) -> None:
     old_api_key = user_profile.api_key
@@ -212,10 +222,10 @@ def reset_user_api_key(user_profile: Any) -> None:
     # could have been registered with the old API key.  Fortunately,
     # we can just write to the queue processor that handles sending
     # those notices to the push notifications bouncer service.
-    event = {'type': 'clear_push_device_tokens',
-             'user_profile_id': user_profile.id}
+    event = {'type': 'clear_push_device_tokens', 'user_profile_id': user_profile.id}
     queue_json_publish("deferred_work", event)
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -224,7 +234,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(ensure_no_empty_passwords,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            ensure_no_empty_passwords, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0210_stream_first_message_id.py b/zerver/migrations/0210_stream_first_message_id.py
index ad24c4c9a0..24c31490aa 100644
--- a/zerver/migrations/0210_stream_first_message_id.py
+++ b/zerver/migrations/0210_stream_first_message_id.py
@@ -10,8 +10,8 @@ def backfill_first_message_id(apps: StateApps, schema_editor: DatabaseSchemaEdit
     Message = apps.get_model('zerver', 'Message')
     for stream in Stream.objects.all():
         first_message = Message.objects.filter(
-            recipient__type_id=stream.id,
-            recipient__type=2).first()
+            recipient__type_id=stream.id, recipient__type=2
+        ).first()
         if first_message is None:
             # No need to change anything if the outcome is the default of None
             continue
@@ -19,13 +19,14 @@ def backfill_first_message_id(apps: StateApps, schema_editor: DatabaseSchemaEdit
         stream.first_message_id = first_message.id
         stream.save()
 
+
 class Migration(migrations.Migration):
     dependencies = [
         ('zerver', '0209_stream_first_message_id'),
     ]
 
     operations = [
-        migrations.RunPython(backfill_first_message_id,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            backfill_first_message_id, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0211_add_users_field_to_scheduled_email.py b/zerver/migrations/0211_add_users_field_to_scheduled_email.py
index be16c03b88..28cafd88ee 100644
--- a/zerver/migrations/0211_add_users_field_to_scheduled_email.py
+++ b/zerver/migrations/0211_add_users_field_to_scheduled_email.py
@@ -7,7 +7,8 @@ from django.db.migrations.state import StateApps
 
 
 def set_users_for_existing_scheduledemails(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     ScheduledEmail = apps.get_model("zerver", "ScheduledEmail")
     for email in ScheduledEmail.objects.all():
         if email.user is not None:
@@ -27,7 +28,11 @@ class Migration(migrations.Migration):
             name='users',
             field=models.ManyToManyField(to=settings.AUTH_USER_MODEL),
         ),
-        migrations.RunPython(set_users_for_existing_scheduledemails, reverse_code=migrations.RunPython.noop, elidable=True),
+        migrations.RunPython(
+            set_users_for_existing_scheduledemails,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
         migrations.RemoveField(
             model_name='scheduledemail',
             name='user',
diff --git a/zerver/migrations/0212_make_stream_email_token_unique.py b/zerver/migrations/0212_make_stream_email_token_unique.py
index 180a649d63..89ee82f8d8 100644
--- a/zerver/migrations/0212_make_stream_email_token_unique.py
+++ b/zerver/migrations/0212_make_stream_email_token_unique.py
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='stream',
             name='email_token',
-            field=models.CharField(default=generate_email_token_for_stream, max_length=32, unique=True),
+            field=models.CharField(
+                default=generate_email_token_for_stream, max_length=32, unique=True
+            ),
         ),
     ]
diff --git a/zerver/migrations/0214_realm_invite_to_stream_policy.py b/zerver/migrations/0214_realm_invite_to_stream_policy.py
index f9d3d85f2a..d26868cc08 100644
--- a/zerver/migrations/0214_realm_invite_to_stream_policy.py
+++ b/zerver/migrations/0214_realm_invite_to_stream_policy.py
@@ -4,11 +4,15 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 INVITE_TO_STREAM_POLICY_MEMBERS = 1
+
+
 def handle_waiting_period(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Realm = apps.get_model('zerver', 'Realm')
     Realm.INVITE_TO_STREAM_POLICY_WAITING_PERIOD = 3
     Realm.objects.filter(waiting_period_threshold__gt=0).update(
-        invite_to_stream_policy=Realm.INVITE_TO_STREAM_POLICY_WAITING_PERIOD)
+        invite_to_stream_policy=Realm.INVITE_TO_STREAM_POLICY_WAITING_PERIOD
+    )
+
 
 class Migration(migrations.Migration):
 
@@ -22,7 +26,7 @@ class Migration(migrations.Migration):
             name='invite_to_stream_policy',
             field=models.PositiveSmallIntegerField(default=INVITE_TO_STREAM_POLICY_MEMBERS),
         ),
-        migrations.RunPython(handle_waiting_period,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            handle_waiting_period, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0217_migrate_create_stream_policy.py b/zerver/migrations/0217_migrate_create_stream_policy.py
index 3e20d1f56e..b4afb33cbe 100644
--- a/zerver/migrations/0217_migrate_create_stream_policy.py
+++ b/zerver/migrations/0217_migrate_create_stream_policy.py
@@ -10,14 +10,16 @@ def upgrade_create_stream_policy(apps: StateApps, schema_editor: DatabaseSchemaE
     Realm.CREATE_STREAM_POLICY_MEMBERS = 1
     Realm.CREATE_STREAM_POLICY_ADMINS = 2
     Realm.CREATE_STREAM_POLICY_WAITING_PERIOD = 3
-    Realm.objects.filter(waiting_period_threshold__exact=0) \
-        .filter(create_stream_by_admins_only=False) \
-        .update(create_stream_policy=Realm.CREATE_STREAM_POLICY_MEMBERS)
-    Realm.objects.filter(create_stream_by_admins_only=True) \
-        .update(create_stream_policy=Realm.CREATE_STREAM_POLICY_ADMINS)
-    Realm.objects.filter(waiting_period_threshold__gt=0) \
-        .filter(create_stream_by_admins_only=False) \
-        .update(create_stream_policy=Realm.CREATE_STREAM_POLICY_WAITING_PERIOD)
+    Realm.objects.filter(waiting_period_threshold__exact=0).filter(
+        create_stream_by_admins_only=False
+    ).update(create_stream_policy=Realm.CREATE_STREAM_POLICY_MEMBERS)
+    Realm.objects.filter(create_stream_by_admins_only=True).update(
+        create_stream_policy=Realm.CREATE_STREAM_POLICY_ADMINS
+    )
+    Realm.objects.filter(waiting_period_threshold__gt=0).filter(
+        create_stream_by_admins_only=False
+    ).update(create_stream_policy=Realm.CREATE_STREAM_POLICY_WAITING_PERIOD)
+
 
 class Migration(migrations.Migration):
 
@@ -26,7 +28,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(upgrade_create_stream_policy,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            upgrade_create_stream_policy, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py b/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py
index d12d9b8ffd..9d2741994c 100644
--- a/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py
+++ b/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py
@@ -5,11 +5,14 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def disable_realm_digest_emails_enabled(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def disable_realm_digest_emails_enabled(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     Realm = apps.get_model("zerver", "Realm")
     realms = Realm.objects.filter(digest_emails_enabled=True)
     realms.update(digest_emails_enabled=False)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -22,7 +25,9 @@ class Migration(migrations.Migration):
             name='digest_emails_enabled',
             field=models.BooleanField(default=False),
         ),
-        migrations.RunPython(disable_realm_digest_emails_enabled,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            disable_realm_digest_emails_enabled,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0221_subscription_notifications_data_migration.py b/zerver/migrations/0221_subscription_notifications_data_migration.py
index a63646d0df..e73038e4b9 100644
--- a/zerver/migrations/0221_subscription_notifications_data_migration.py
+++ b/zerver/migrations/0221_subscription_notifications_data_migration.py
@@ -12,6 +12,7 @@ SETTINGS_MAP = {
     'email_notifications': 'enable_stream_email_notifications',
 }
 
+
 def update_notification_settings(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Subscription = apps.get_model('zerver', 'Subscription')
     UserProfile = apps.get_model('zerver', 'UserProfile')
@@ -21,9 +22,12 @@ def update_notification_settings(apps: StateApps, schema_editor: DatabaseSchemaE
             sub_filter_kwargs = {sub_setting_name: setting_value}
             user_filter_kwargs = {user_setting_name: setting_value}
             update_kwargs = {sub_setting_name: None}
-            Subscription.objects.filter(user_profile__in=UserProfile.objects.filter(**user_filter_kwargs),
-                                        recipient__type=RECIPIENT_STREAM,
-                                        **sub_filter_kwargs).update(**update_kwargs)
+            Subscription.objects.filter(
+                user_profile__in=UserProfile.objects.filter(**user_filter_kwargs),
+                recipient__type=RECIPIENT_STREAM,
+                **sub_filter_kwargs,
+            ).update(**update_kwargs)
+
 
 def reverse_notification_settings(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Subscription = apps.get_model('zerver', 'Subscription')
@@ -34,14 +38,19 @@ def reverse_notification_settings(apps: StateApps, schema_editor: DatabaseSchema
             sub_filter_kwargs = {sub_setting_name: None}
             user_filter_kwargs = {user_setting_name: setting_value}
             update_kwargs = {sub_setting_name: setting_value}
-            Subscription.objects.filter(user_profile__in=UserProfile.objects.filter(**user_filter_kwargs),
-                                        recipient__type=RECIPIENT_STREAM,
-                                        **sub_filter_kwargs).update(**update_kwargs)
+            Subscription.objects.filter(
+                user_profile__in=UserProfile.objects.filter(**user_filter_kwargs),
+                recipient__type=RECIPIENT_STREAM,
+                **sub_filter_kwargs,
+            ).update(**update_kwargs)
 
     for sub_setting_name, user_setting_name in SETTINGS_MAP.items():
         sub_filter_kwargs = {sub_setting_name: None}
         update_kwargs = {sub_setting_name: True}
-        Subscription.objects.filter(recipient__type__in=[1, 3], **sub_filter_kwargs).update(**update_kwargs)
+        Subscription.objects.filter(recipient__type__in=[1, 3], **sub_filter_kwargs).update(
+            **update_kwargs
+        )
+
 
 class Migration(migrations.Migration):
 
@@ -50,7 +59,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(update_notification_settings,
-                             reverse_notification_settings,
-                             elidable=True),
+        migrations.RunPython(
+            update_notification_settings, reverse_notification_settings, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0223_rename_to_is_muted.py b/zerver/migrations/0223_rename_to_is_muted.py
index 1668df2a22..e51fd9c410 100644
--- a/zerver/migrations/0223_rename_to_is_muted.py
+++ b/zerver/migrations/0223_rename_to_is_muted.py
@@ -8,17 +8,23 @@ from django.db.models import Case, Value, When
 
 def set_initial_value_for_is_muted(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Subscription = apps.get_model("zerver", "Subscription")
-    Subscription.objects.update(is_muted=Case(
-        When(in_home_view=True, then=Value(False)),
-        When(in_home_view=False, then=Value(True)),
-    ))
+    Subscription.objects.update(
+        is_muted=Case(
+            When(in_home_view=True, then=Value(False)),
+            When(in_home_view=False, then=Value(True)),
+        )
+    )
+
 
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Subscription = apps.get_model("zerver", "Subscription")
-    Subscription.objects.update(in_home_view=Case(
-        When(is_muted=True, then=Value(False)),
-        When(is_muted=False, then=Value(True)),
-    ))
+    Subscription.objects.update(
+        in_home_view=Case(
+            When(is_muted=True, then=Value(False)),
+            When(is_muted=False, then=Value(True)),
+        )
+    )
+
 
 class Migration(migrations.Migration):
     atomic = False
diff --git a/zerver/migrations/0224_alter_field_realm_video_chat_provider.py b/zerver/migrations/0224_alter_field_realm_video_chat_provider.py
index ee36efd51a..249997edb1 100644
--- a/zerver/migrations/0224_alter_field_realm_video_chat_provider.py
+++ b/zerver/migrations/0224_alter_field_realm_video_chat_provider.py
@@ -22,34 +22,43 @@ VIDEO_CHAT_PROVIDERS = {
         'id': 3,
     },
 }
-def get_video_chat_provider_detail(providers_dict: Dict[str, Dict[str, Any]],
-                                   p_name: Optional[str]=None, p_id: Optional[int]=None,
-                                   ) -> Dict[str, Any]:
+
+
+def get_video_chat_provider_detail(
+    providers_dict: Dict[str, Dict[str, Any]],
+    p_name: Optional[str] = None,
+    p_id: Optional[int] = None,
+) -> Dict[str, Any]:
     for provider in providers_dict.values():
-        if (p_name and provider['name'] == p_name):
+        if p_name and provider['name'] == p_name:
             return provider
-        if (p_id and provider['id'] == p_id):
+        if p_id and provider['id'] == p_id:
             return provider
     return {}
 
-def update_existing_video_chat_provider_values(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+
+def update_existing_video_chat_provider_values(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     Realm = apps.get_model('zerver', 'Realm')
 
     for realm in Realm.objects.all():
         realm.video_chat_provider = get_video_chat_provider_detail(
-            VIDEO_CHAT_PROVIDERS,
-            p_name=realm.video_chat_provider_old)['id']
+            VIDEO_CHAT_PROVIDERS, p_name=realm.video_chat_provider_old
+        )['id']
         realm.save(update_fields=["video_chat_provider"])
 
+
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Realm = apps.get_model("zerver", "Realm")
 
     for realm in Realm.objects.all():
         realm.video_chat_provider_old = get_video_chat_provider_detail(
-            VIDEO_CHAT_PROVIDERS,
-            p_id=realm.video_chat_provider)['name']
+            VIDEO_CHAT_PROVIDERS, p_id=realm.video_chat_provider
+        )['name']
         realm.save(update_fields=["video_chat_provider_old"])
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -66,11 +75,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='realm',
             name='video_chat_provider',
-            field=models.PositiveSmallIntegerField(default=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']),
+            field=models.PositiveSmallIntegerField(
+                default=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
+            ),
+        ),
+        migrations.RunPython(
+            update_existing_video_chat_provider_values, reverse_code=reverse_code, elidable=True
         ),
-        migrations.RunPython(update_existing_video_chat_provider_values,
-                             reverse_code=reverse_code,
-                             elidable=True),
         migrations.RemoveField(
             model_name='realm',
             name='video_chat_provider_old',
diff --git a/zerver/migrations/0225_archived_reaction_model.py b/zerver/migrations/0225_archived_reaction_model.py
index 990f1f3e04..bac7f5fd33 100644
--- a/zerver/migrations/0225_archived_reaction_model.py
+++ b/zerver/migrations/0225_archived_reaction_model.py
@@ -16,13 +16,42 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ArchivedReaction',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('emoji_name', models.TextField()),
-                ('reaction_type', models.CharField(choices=[('unicode_emoji', 'Unicode emoji'), ('realm_emoji', 'Custom emoji'), ('zulip_extra_emoji', 'Zulip extra emoji')], default='unicode_emoji', max_length=30)),
+                (
+                    'reaction_type',
+                    models.CharField(
+                        choices=[
+                            ('unicode_emoji', 'Unicode emoji'),
+                            ('realm_emoji', 'Custom emoji'),
+                            ('zulip_extra_emoji', 'Zulip extra emoji'),
+                        ],
+                        default='unicode_emoji',
+                        max_length=30,
+                    ),
+                ),
                 ('emoji_code', models.TextField()),
-                ('archive_timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchivedMessage')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'archive_timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchivedMessage'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
             options={
                 'abstract': False,
diff --git a/zerver/migrations/0226_archived_submessage_model.py b/zerver/migrations/0226_archived_submessage_model.py
index 5cc45c2ca2..ae4a7164f2 100644
--- a/zerver/migrations/0226_archived_submessage_model.py
+++ b/zerver/migrations/0226_archived_submessage_model.py
@@ -16,12 +16,30 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ArchivedSubMessage',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('msg_type', models.TextField()),
                 ('content', models.TextField()),
-                ('archive_timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchivedMessage')),
-                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'archive_timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchivedMessage'
+                    ),
+                ),
+                (
+                    'sender',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
             options={
                 'abstract': False,
diff --git a/zerver/migrations/0227_inline_url_embed_preview_default_off.py b/zerver/migrations/0227_inline_url_embed_preview_default_off.py
index ca8da82c8c..310913ded2 100644
--- a/zerver/migrations/0227_inline_url_embed_preview_default_off.py
+++ b/zerver/migrations/0227_inline_url_embed_preview_default_off.py
@@ -5,7 +5,9 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def disable_realm_inline_url_embed_preview(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def disable_realm_inline_url_embed_preview(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     Realm = apps.get_model("zerver", "Realm")
     realms = Realm.objects.filter(inline_url_embed_preview=True)
     realms.update(inline_url_embed_preview=False)
@@ -23,8 +25,9 @@ class Migration(migrations.Migration):
             name='inline_url_embed_preview',
             field=models.BooleanField(default=False),
         ),
-        migrations.RunPython(disable_realm_inline_url_embed_preview,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
-
+        migrations.RunPython(
+            disable_realm_inline_url_embed_preview,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0228_userprofile_demote_inactive_streams.py b/zerver/migrations/0228_userprofile_demote_inactive_streams.py
index bdb779d0b0..9cb999ab13 100644
--- a/zerver/migrations/0228_userprofile_demote_inactive_streams.py
+++ b/zerver/migrations/0228_userprofile_demote_inactive_streams.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 DEMOTE_STREAMS_AUTOMATIC = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0231_add_archive_transaction_model.py b/zerver/migrations/0231_add_archive_transaction_model.py
index 7fe187e909..ef77bb434a 100644
--- a/zerver/migrations/0231_add_archive_transaction_model.py
+++ b/zerver/migrations/0231_add_archive_transaction_model.py
@@ -15,11 +15,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ArchiveTransaction',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
+                (
+                    'timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
                 ('restored', models.BooleanField(db_index=True, default=False)),
                 ('type', models.PositiveSmallIntegerField(db_index=True)),
-                ('realm', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
         migrations.RemoveField(
@@ -45,6 +58,10 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='archivedmessage',
             name='archive_transaction',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchiveTransaction'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='zerver.ArchiveTransaction',
+            ),
         ),
     ]
diff --git a/zerver/migrations/0232_make_archive_transaction_field_not_nullable.py b/zerver/migrations/0232_make_archive_transaction_field_not_nullable.py
index 1c2becd673..0c4c1f8142 100644
--- a/zerver/migrations/0232_make_archive_transaction_field_not_nullable.py
+++ b/zerver/migrations/0232_make_archive_transaction_field_not_nullable.py
@@ -8,6 +8,7 @@ class Migration(migrations.Migration):
     but we need the DELETEs to be atomic together. So we set atomic=False for the migration
     in general, and run the DELETEs in one transaction, and AlterField in another.
     """
+
     atomic = False
 
     dependencies = [
@@ -15,7 +16,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         BEGIN;
         DELETE FROM zerver_archivedusermessage;
         DELETE FROM zerver_archivedreaction;
@@ -25,10 +27,14 @@ class Migration(migrations.Migration):
         DELETE FROM zerver_archivedmessage;
         DELETE FROM zerver_archivetransaction;
         COMMIT;
-        """, elidable=True),
+        """,
+            elidable=True,
+        ),
         migrations.AlterField(
             model_name='archivedmessage',
             name='archive_transaction',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchiveTransaction'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to='zerver.ArchiveTransaction'
+            ),
         ),
     ]
diff --git a/zerver/migrations/0234_add_external_account_custom_profile_field.py b/zerver/migrations/0234_add_external_account_custom_profile_field.py
index e18b7a0b42..af23fab1f3 100644
--- a/zerver/migrations/0234_add_external_account_custom_profile_field.py
+++ b/zerver/migrations/0234_add_external_account_custom_profile_field.py
@@ -13,6 +13,17 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='customprofilefield',
             name='field_type',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'Short text'), (2, 'Long text'), (4, 'Date picker'), (5, 'Link'), (7, 'External account'), (3, 'List of options'), (6, 'Person picker')], default=1),
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, 'Short text'),
+                    (2, 'Long text'),
+                    (4, 'Date picker'),
+                    (5, 'Link'),
+                    (7, 'External account'),
+                    (3, 'List of options'),
+                    (6, 'Person picker'),
+                ],
+                default=1,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0235_userprofile_desktop_icon_count_display.py b/zerver/migrations/0235_userprofile_desktop_icon_count_display.py
index c62476ff87..d35e781068 100644
--- a/zerver/migrations/0235_userprofile_desktop_icon_count_display.py
+++ b/zerver/migrations/0235_userprofile_desktop_icon_count_display.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 DESKTOP_ICON_COUNT_DISPLAY_MESSAGES = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0236_remove_illegal_characters_email_full.py b/zerver/migrations/0236_remove_illegal_characters_email_full.py
index 48c61762ee..831efe93dc 100644
--- a/zerver/migrations/0236_remove_illegal_characters_email_full.py
+++ b/zerver/migrations/0236_remove_illegal_characters_email_full.py
@@ -19,6 +19,7 @@ def remove_name_illegal_chars(apps: StateApps, schema_editor: DatabaseSchemaEdit
         user.full_name = "".join(stripped)
         user.save(update_fields=["full_name"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py b/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py
index e71421d88a..f723e2afa9 100644
--- a/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py
+++ b/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py
@@ -4,7 +4,9 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def rename_zulip_realm_to_zulipinternal(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def rename_zulip_realm_to_zulipinternal(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     if not settings.PRODUCTION:
         return
 
@@ -32,6 +34,7 @@ def rename_zulip_realm_to_zulipinternal(apps: StateApps, schema_editor: Database
     internal_realm.name = "System use only"
     internal_realm.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py b/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py
index b31ccb7716..af28f9b778 100644
--- a/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py
+++ b/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py
@@ -10,17 +10,24 @@ from psycopg2.sql import SQL
 
 BATCH_SIZE = 10000
 
+
 def sql_copy_id_to_bigint_id(id_range_lower_bound: int, id_range_upper_bound: int) -> None:
-    query = SQL("""
+    query = SQL(
+        """
             UPDATE zerver_usermessage
             SET bigint_id = id
             WHERE id BETWEEN %(lower_bound)s AND %(upper_bound)s
-    """)
+    """
+    )
     with connection.cursor() as cursor:
-        cursor.execute(query, {
-            "lower_bound": id_range_lower_bound,
-            "upper_bound": id_range_upper_bound,
-        })
+        cursor.execute(
+            query,
+            {
+                "lower_bound": id_range_lower_bound,
+                "upper_bound": id_range_upper_bound,
+            },
+        )
+
 
 def copy_id_to_bigid(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     UserMessage = apps.get_model('zerver', 'UserMessage')
@@ -29,8 +36,9 @@ def copy_id_to_bigid(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> No
         return
 
     #  TODO: is  the below lookup fast enough, considering there's no index on bigint_id?
-    first_uncopied_id = UserMessage.objects.filter(bigint_id__isnull=True
-                                                   ).aggregate(Min('id'))['id__min']
+    first_uncopied_id = UserMessage.objects.filter(bigint_id__isnull=True).aggregate(Min('id'))[
+        'id__min'
+    ]
     # Note: the below id can fall in a segment
     # where bigint_id = id already, but it's not a big problem
     # this will just do some redundant UPDATEs.
@@ -56,7 +64,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         CREATE FUNCTION zerver_usermessage_bigint_id_to_id_trigger_function()
         RETURNS trigger AS $$
         BEGIN
@@ -69,9 +78,12 @@ class Migration(migrations.Migration):
         BEFORE INSERT ON zerver_usermessage
         FOR EACH ROW
         EXECUTE PROCEDURE zerver_usermessage_bigint_id_to_id_trigger_function();
-        """),
+        """
+        ),
         migrations.RunPython(copy_id_to_bigid, elidable=True),
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         CREATE UNIQUE INDEX CONCURRENTLY zerver_usermessage_bigint_id_idx ON zerver_usermessage (bigint_id);
-        """),
+        """
+        ),
     ]
diff --git a/zerver/migrations/0242_fix_bot_email_property.py b/zerver/migrations/0242_fix_bot_email_property.py
index b52d9473b8..589ce4732f 100644
--- a/zerver/migrations/0242_fix_bot_email_property.py
+++ b/zerver/migrations/0242_fix_bot_email_property.py
@@ -12,6 +12,7 @@ def fix_bot_email_property(apps: StateApps, schema_editor: DatabaseSchemaEditor)
             user_profile.email = user_profile.delivery_email
             user_profile.save(update_fields=["email"])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_bot_email_property,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            fix_bot_email_property, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py b/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py
index 304b60cb91..0094cb0037 100644
--- a/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py
+++ b/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py
@@ -8,17 +8,24 @@ from psycopg2.sql import SQL
 
 BATCH_SIZE = 1000
 
+
 def sql_copy_pub_date_to_date_sent(id_range_lower_bound: int, id_range_upper_bound: int) -> None:
-    query = SQL("""
+    query = SQL(
+        """
             UPDATE zerver_message
             SET date_sent = pub_date
             WHERE id BETWEEN %(lower_bound)s AND %(upper_bound)s
-    """)
+    """
+    )
     with connection.cursor() as cursor:
-        cursor.execute(query, {
-            "lower_bound": id_range_lower_bound,
-            "upper_bound": id_range_upper_bound,
-        })
+        cursor.execute(
+            query,
+            {
+                "lower_bound": id_range_lower_bound,
+                "upper_bound": id_range_upper_bound,
+            },
+        )
+
 
 def copy_pub_date_to_date_sent(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Message = apps.get_model('zerver', 'Message')
@@ -26,8 +33,9 @@ def copy_pub_date_to_date_sent(apps: StateApps, schema_editor: DatabaseSchemaEdi
         # Nothing to do
         return
 
-    first_uncopied_id = Message.objects.filter(date_sent__isnull=True
-                                               ).aggregate(Min('id'))['id__min']
+    first_uncopied_id = Message.objects.filter(date_sent__isnull=True).aggregate(Min('id'))[
+        'id__min'
+    ]
     # Note: the below id can fall in a segment
     # where date_sent = pub_date already, but it's not a big problem
     # this will just do some redundant UPDATEs.
@@ -53,7 +61,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         CREATE FUNCTION zerver_message_date_sent_to_pub_date_trigger_function()
         RETURNS trigger AS $$
         BEGIN
@@ -66,11 +75,14 @@ class Migration(migrations.Migration):
         BEFORE INSERT ON zerver_message
         FOR EACH ROW
         EXECUTE PROCEDURE zerver_message_date_sent_to_pub_date_trigger_function();
-        """),
+        """
+        ),
         migrations.RunPython(copy_pub_date_to_date_sent, elidable=True),
         # The name for the index was chosen to match the name of the index Django would create
         # in a normal migration with AlterField of date_sent to have db_index=True:
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         CREATE INDEX CONCURRENTLY zerver_message_date_sent_3b5b05d8 ON zerver_message (date_sent);
-        """),
+        """
+        ),
     ]
diff --git a/zerver/migrations/0246_message_date_sent_finalize_part2.py b/zerver/migrations/0246_message_date_sent_finalize_part2.py
index 93f37b0527..3000ba0a04 100644
--- a/zerver/migrations/0246_message_date_sent_finalize_part2.py
+++ b/zerver/migrations/0246_message_date_sent_finalize_part2.py
@@ -33,9 +33,11 @@ class Migration(migrations.Migration):
         # Django doesn't rename the index when renaming a column, which can be confusing
         # for someone inspecting the table in the future who's not aware of the old name.
         # We should rename appropriately here.
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         ALTER INDEX IF EXISTS zerver_archivedmessage_pub_date_509062c8 RENAME TO zerver_archivedmessage_date_sent_509062c8
-        """),
+        """
+        ),
         migrations.RemoveField(
             model_name='message',
             name='pub_date',
diff --git a/zerver/migrations/0247_realmauditlog_event_type_to_int.py b/zerver/migrations/0247_realmauditlog_event_type_to_int.py
index 75ede04305..ec0376d670 100644
--- a/zerver/migrations/0247_realmauditlog_event_type_to_int.py
+++ b/zerver/migrations/0247_realmauditlog_event_type_to_int.py
@@ -18,23 +18,19 @@ INT_VALUE = {
     'user_tos_version_changed': '126',
     'user_api_key_changed': '127',
     'user_bot_owner_changed': '128',
-
     'realm_deactivated': '201',
     'realm_reactivated': '202',
     'realm_scrubbed': '203',
     'realm_plan_type_changed': '204',
     'realm_logo_changed': '205',
     'realm_exported': '206',
-
     'subscription_created': '301',
     'subscription_activated': '302',
     'subscription_deactivated': '303',
-
     'stripe_customer_created': '401',
     'stripe_card_changed': '402',
     'stripe_plan_changed': '403',
     'stripe_plan_quantity_reset': '404',
-
     'customer_created': '501',
     'customer_plan_created': '502',
 }
@@ -44,7 +40,6 @@ STR_VALUE = {
     102: 'user_activated',
     103: 'user_deactivated',
     104: 'user_reactivated',
-
     120: 'user_soft_activated',
     121: 'user_soft_deactivated',
     122: 'user_password_changed',
@@ -54,39 +49,38 @@ STR_VALUE = {
     126: 'user_tos_version_changed',
     127: 'user_api_key_changed',
     128: 'user_bot_owner_changed',
-
     201: 'realm_deactivated',
     202: 'realm_reactivated',
     203: 'realm_scrubbed',
     204: 'realm_plan_type_changed',
     205: 'realm_logo_changed',
     206: 'realm_exported',
-
     301: 'subscription_created',
     302: 'subscription_activated',
     303: 'subscription_deactivated',
-
     401: 'stripe_customer_created',
     402: 'stripe_card_changed',
     403: 'stripe_plan_changed',
     404: 'stripe_plan_quantity_reset',
-
     501: 'customer_created',
     502: 'customer_plan_created',
 }
 
+
 def update_existing_event_type_values(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
     for log_entry in RealmAuditLog.objects.all():
         log_entry.event_type_int = INT_VALUE[log_entry.event_type]
         log_entry.save(update_fields=['event_type_int'])
 
+
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     RealmAuditLog = apps.get_model('zerver', 'RealmAuditLog')
     for log_entry in RealmAuditLog.objects.all():
         log_entry.event_type = STR_VALUE[log_entry.event_type_int]
         log_entry.save(update_fields=['event_type'])
 
+
 class Migration(migrations.Migration):
     dependencies = [
         ('zerver', '0246_message_date_sent_finalize_part2'),
@@ -103,9 +97,9 @@ class Migration(migrations.Migration):
             name='event_type',
             field=models.CharField(max_length=40, null=True),
         ),
-        migrations.RunPython(update_existing_event_type_values,
-                             reverse_code=reverse_code,
-                             elidable=True),
+        migrations.RunPython(
+            update_existing_event_type_values, reverse_code=reverse_code, elidable=True
+        ),
         migrations.RemoveField(
             model_name='realmauditlog',
             name='event_type',
diff --git a/zerver/migrations/0248_userprofile_role_start.py b/zerver/migrations/0248_userprofile_role_start.py
index 9408ef52dd..14dedce143 100644
--- a/zerver/migrations/0248_userprofile_role_start.py
+++ b/zerver/migrations/0248_userprofile_role_start.py
@@ -19,6 +19,7 @@ def update_role(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
             user.role = UserProfile.ROLE_MEMBER
         user.save(update_fields=['role'])
 
+
 def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     UserProfile = apps.get_model('zerver', 'UserProfile')
     UserProfile.ROLE_REALM_ADMINISTRATOR = 200
@@ -31,6 +32,7 @@ def reverse_code(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
             user.is_guest = True
             user.save(update_fields=['is_guest'])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -43,6 +45,5 @@ class Migration(migrations.Migration):
             name='role',
             field=models.PositiveSmallIntegerField(null=True),
         ),
-
         migrations.RunPython(update_role, reverse_code=reverse_code, elidable=True),
     ]
diff --git a/zerver/migrations/0249_userprofile_role_finish.py b/zerver/migrations/0249_userprofile_role_finish.py
index 0bfe4dc37f..9533f370c9 100644
--- a/zerver/migrations/0249_userprofile_role_finish.py
+++ b/zerver/migrations/0249_userprofile_role_finish.py
@@ -5,6 +5,7 @@ from django.db import migrations, models
 # The values at the time of this migration
 ROLE_MEMBER = 400
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -20,7 +21,6 @@ class Migration(migrations.Migration):
             model_name='userprofile',
             name='is_realm_admin',
         ),
-
         migrations.AlterField(
             model_name='userprofile',
             name='role',
diff --git a/zerver/migrations/0250_saml_auth.py b/zerver/migrations/0250_saml_auth.py
index 8c199c9aa8..7b84d1ced5 100644
--- a/zerver/migrations/0250_saml_auth.py
+++ b/zerver/migrations/0250_saml_auth.py
@@ -14,6 +14,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realm',
             name='authentication_methods',
-            field=bitfield.models.BitField(['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser', 'AzureAD', 'SAML'], default=2147483647),
+            field=bitfield.models.BitField(
+                ['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser', 'AzureAD', 'SAML'],
+                default=2147483647,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0252_realm_user_group_edit_policy.py b/zerver/migrations/0252_realm_user_group_edit_policy.py
index 193fc7b1dd..ff3b043a1e 100644
--- a/zerver/migrations/0252_realm_user_group_edit_policy.py
+++ b/zerver/migrations/0252_realm_user_group_edit_policy.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 USER_GROUP_EDIT_POLICY_MEMBERS = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0254_merge_0209_0253.py b/zerver/migrations/0254_merge_0209_0253.py
index 23a583e21e..c8a8a96402 100644
--- a/zerver/migrations/0254_merge_0209_0253.py
+++ b/zerver/migrations/0254_merge_0209_0253.py
@@ -12,5 +12,4 @@ class Migration(migrations.Migration):
         ('zerver', '0209_user_profile_no_empty_password'),
     ]
 
-    operations: List[Any] = [
-    ]
+    operations: List[Any] = []
diff --git a/zerver/migrations/0255_userprofile_stream_add_recipient_column.py b/zerver/migrations/0255_userprofile_stream_add_recipient_column.py
index 9e0e9e0509..9758ae198d 100644
--- a/zerver/migrations/0255_userprofile_stream_add_recipient_column.py
+++ b/zerver/migrations/0255_userprofile_stream_add_recipient_column.py
@@ -14,11 +14,15 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='userprofile',
             name='recipient',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient'
+            ),
         ),
         migrations.AddField(
             model_name='stream',
             name='recipient',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient'
+            ),
         ),
     ]
diff --git a/zerver/migrations/0256_userprofile_stream_set_recipient_column_values.py b/zerver/migrations/0256_userprofile_stream_set_recipient_column_values.py
index bea82c81e9..e6b8889ee0 100644
--- a/zerver/migrations/0256_userprofile_stream_set_recipient_column_values.py
+++ b/zerver/migrations/0256_userprofile_stream_set_recipient_column_values.py
@@ -16,7 +16,8 @@ class Migration(migrations.Migration):
             WHERE zerver_recipient.type_id = zerver_userprofile.id AND zerver_recipient.type = 1;
             """,
             reverse_sql='UPDATE zerver_userprofile SET recipient_id = NULL',
-            elidable=True),
+            elidable=True,
+        ),
         migrations.RunSQL(
             """
             UPDATE zerver_stream
@@ -25,5 +26,6 @@ class Migration(migrations.Migration):
             WHERE zerver_recipient.type_id = zerver_stream.id AND zerver_recipient.type = 2;
             """,
             reverse_sql='UPDATE zerver_stream SET recipient_id = NULL',
-            elidable=True),
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0257_fix_has_link_attribute.py b/zerver/migrations/0257_fix_has_link_attribute.py
index 8f031795f4..8f03100344 100644
--- a/zerver/migrations/0257_fix_has_link_attribute.py
+++ b/zerver/migrations/0257_fix_has_link_attribute.py
@@ -9,6 +9,7 @@ from django.db.migrations.state import StateApps
 
 BATCH_SIZE = 1000
 
+
 def process_batch(apps: StateApps, id_start: int, id_end: int, last_id: int) -> None:
     Message = apps.get_model('zerver', 'Message')
     for message in Message.objects.filter(id__gte=id_start, id__lte=id_end).order_by("id"):
@@ -44,9 +45,11 @@ def process_batch(apps: StateApps, id_start: int, id_end: int, last_id: int) ->
             has_image = True
             break
 
-        if (message.has_link == has_link and
-                message.has_attachment == has_attachment and
-                message.has_image == has_image):
+        if (
+            message.has_link == has_link
+            and message.has_attachment == has_attachment
+            and message.has_image == has_image
+        ):
             # No need to spend time with the database if there aren't changes.
             continue
         message.has_image = has_image
@@ -54,6 +57,7 @@ def process_batch(apps: StateApps, id_start: int, id_end: int, last_id: int) ->
         message.has_attachment = has_attachment
         message.save(update_fields=['has_link', 'has_attachment', 'has_image'])
 
+
 def fix_has_link(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     Message = apps.get_model('zerver', 'Message')
     if not Message.objects.exists():
@@ -79,6 +83,7 @@ def fix_has_link(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
         # Copy for the last batch.
         process_batch(apps, id_range_lower_bound, last_id, last_id)
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -87,7 +92,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_has_link,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(fix_has_link, reverse_code=migrations.RunPython.noop, elidable=True),
     ]
diff --git a/zerver/migrations/0259_missedmessageemailaddress.py b/zerver/migrations/0259_missedmessageemailaddress.py
index 401621d5ce..0a547aa0fa 100644
--- a/zerver/migrations/0259_missedmessageemailaddress.py
+++ b/zerver/migrations/0259_missedmessageemailaddress.py
@@ -16,12 +16,30 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MissedMessageEmailAddress',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('email_token', models.CharField(db_index=True, max_length=34, unique=True)),
-                ('timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                (
+                    'timestamp',
+                    models.DateTimeField(db_index=True, default=django.utils.timezone.now),
+                ),
                 ('times_used', models.PositiveIntegerField(db_index=True, default=0)),
-                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Message')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'message',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Message'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py b/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py
index 620ffb38e0..ce7c0ac6d5 100644
--- a/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py
+++ b/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py
@@ -12,7 +12,10 @@ from zerver.lib.redis_utils import get_redis_client
 def generate_missed_message_token() -> str:
     return 'mm' + secrets.token_hex(16)
 
-def move_missed_message_addresses_to_database(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+
+def move_missed_message_addresses_to_database(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     redis_client = get_redis_client()
     MissedMessageEmailAddress = apps.get_model('zerver', 'MissedMessageEmailAddress')
     UserProfile = apps.get_model('zerver', 'UserProfile')
@@ -50,16 +53,18 @@ def move_missed_message_addresses_to_database(apps: StateApps, schema_editor: Da
             recipient = Recipient.objects.get(id=recipient_id)
 
             if recipient.type == RECIPIENT_STREAM:
-                message = Message.objects.filter(subject__iexact=topic_name,
-                                                 recipient_id=recipient.id).latest('id')
+                message = Message.objects.filter(
+                    subject__iexact=topic_name, recipient_id=recipient.id
+                ).latest('id')
             elif recipient.type == RECIPIENT_PERSONAL:
                 # Tie to the latest PM from the sender to this user;
                 # we expect at least one existed because it generated
                 # this missed-message email, so we can skip the
                 # normally required additioanl check for messages we
                 # ourselves sent to the target user.
-                message = Message.objects.filter(recipient_id=user_profile.recipient_id,
-                                                 sender_id=recipient.type_id).latest('id')
+                message = Message.objects.filter(
+                    recipient_id=user_profile.recipient_id, sender_id=recipient.type_id
+                ).latest('id')
             else:
                 message = Message.objects.filter(recipient_id=recipient.id).latest('id')
         except ObjectDoesNotExist:
@@ -75,13 +80,14 @@ def move_missed_message_addresses_to_database(apps: StateApps, schema_editor: Da
         # the address will take longer to expire than it would have in
         # Redis, but this small issue is probably worth the simplicity
         # of not having to figure out the precise timestamp.
-        MissedMessageEmailAddress.objects.create(message=message,
-                                                 user_profile=user_profile,
-                                                 email_token=generate_missed_message_token())
+        MissedMessageEmailAddress.objects.create(
+            message=message, user_profile=user_profile, email_token=generate_missed_message_token()
+        )
         # We successfully transferred this missed-message email's data
         # to the database, so this message can be deleted from Redis.
         redis_client.delete(key)
 
+
 class Migration(migrations.Migration):
     # Atomicity is not feasible here, since we're doing operations on Redis too.
     # It's better to be non-atomic on both Redis and database, than atomic
@@ -93,7 +99,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(move_missed_message_addresses_to_database,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            move_missed_message_addresses_to_database,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0261_pregistrationuser_clear_invited_as_admin.py b/zerver/migrations/0261_pregistrationuser_clear_invited_as_admin.py
index 08c9167305..4b27004564 100644
--- a/zerver/migrations/0261_pregistrationuser_clear_invited_as_admin.py
+++ b/zerver/migrations/0261_pregistrationuser_clear_invited_as_admin.py
@@ -8,7 +8,8 @@ from django.db.migrations.state import StateApps
 
 
 def clear_preregistrationuser_invited_as_admin(
-        apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     """This migration fixes any PreregistrationUser objects that might
     have been already corrupted to have the administrator role by the
     buggy original version of migration
@@ -25,9 +26,10 @@ def clear_preregistrationuser_invited_as_admin(
     INVITED_AS_MEMBER = 1
     INVITED_AS_REALM_ADMIN = 2
     PreregistrationUser = apps.get_model("zerver", "PreregistrationUser")
-    PreregistrationUser.objects.filter(
-        invited_as=INVITED_AS_REALM_ADMIN).update(
-            invited_as=INVITED_AS_MEMBER)
+    PreregistrationUser.objects.filter(invited_as=INVITED_AS_REALM_ADMIN).update(
+        invited_as=INVITED_AS_MEMBER
+    )
+
 
 class Migration(migrations.Migration):
 
@@ -37,7 +39,6 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(
-            clear_preregistrationuser_invited_as_admin,
-            reverse_code=migrations.RunPython.noop
+            clear_preregistrationuser_invited_as_admin, reverse_code=migrations.RunPython.noop
         ),
     ]
diff --git a/zerver/migrations/0261_realm_private_message_policy.py b/zerver/migrations/0261_realm_private_message_policy.py
index 8688872bcc..a011afc07d 100644
--- a/zerver/migrations/0261_realm_private_message_policy.py
+++ b/zerver/migrations/0261_realm_private_message_policy.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 PRIVATE_MESSAGE_POLICY_UNLIMITED = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0262_mutedtopic_date_muted.py b/zerver/migrations/0262_mutedtopic_date_muted.py
index f42dd83e2b..cb5979d2e0 100644
--- a/zerver/migrations/0262_mutedtopic_date_muted.py
+++ b/zerver/migrations/0262_mutedtopic_date_muted.py
@@ -14,6 +14,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='mutedtopic',
             name='date_muted',
-            field=models.DateTimeField(default=datetime.datetime(2020, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)),
+            field=models.DateTimeField(
+                default=datetime.datetime(2020, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)
+            ),
         ),
     ]
diff --git a/zerver/migrations/0263_stream_stream_post_policy.py b/zerver/migrations/0263_stream_stream_post_policy.py
index e619f5c859..3f573c93ce 100644
--- a/zerver/migrations/0263_stream_stream_post_policy.py
+++ b/zerver/migrations/0263_stream_stream_post_policy.py
@@ -2,6 +2,8 @@
 from django.db import migrations, models
 
 STREAM_POST_POLICY_EVERYONE = 1
+
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0264_migrate_is_announcement_only.py b/zerver/migrations/0264_migrate_is_announcement_only.py
index 2f80ff3b6d..9c10e94377 100644
--- a/zerver/migrations/0264_migrate_is_announcement_only.py
+++ b/zerver/migrations/0264_migrate_is_announcement_only.py
@@ -9,10 +9,13 @@ def upgrade_stream_post_policy(apps: StateApps, schema_editor: DatabaseSchemaEdi
     Stream = apps.get_model('zerver', 'Stream')
     Stream.STREAM_POST_POLICY_EVERYONE = 1
     Stream.STREAM_POST_POLICY_ADMINS = 2
-    Stream.objects.filter(is_announcement_only=False) \
-        .update(stream_post_policy=Stream.STREAM_POST_POLICY_EVERYONE)
-    Stream.objects.filter(is_announcement_only=True) \
-        .update(stream_post_policy=Stream.STREAM_POST_POLICY_ADMINS)
+    Stream.objects.filter(is_announcement_only=False).update(
+        stream_post_policy=Stream.STREAM_POST_POLICY_EVERYONE
+    )
+    Stream.objects.filter(is_announcement_only=True).update(
+        stream_post_policy=Stream.STREAM_POST_POLICY_ADMINS
+    )
+
 
 class Migration(migrations.Migration):
 
@@ -21,7 +24,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(upgrade_stream_post_policy,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            upgrade_stream_post_policy, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0266_userpresence_realm.py b/zerver/migrations/0266_userpresence_realm.py
index 4d0d7cae9e..6af57f8d35 100644
--- a/zerver/migrations/0266_userpresence_realm.py
+++ b/zerver/migrations/0266_userpresence_realm.py
@@ -13,6 +13,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='userpresence',
             name='realm',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+            ),
         ),
     ]
diff --git a/zerver/migrations/0267_backfill_userpresence_realm_id.py b/zerver/migrations/0267_backfill_userpresence_realm_id.py
index a13c40daef..ea57d37495 100644
--- a/zerver/migrations/0267_backfill_userpresence_realm_id.py
+++ b/zerver/migrations/0267_backfill_userpresence_realm_id.py
@@ -16,5 +16,6 @@ class Migration(migrations.Migration):
             WHERE zerver_userprofile.id = zerver_userpresence.user_profile_id;
             """,
             reverse_sql='UPDATE zerver_userpresence SET realm_id = NULL',
-            elidable=True),
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0269_gitlab_auth.py b/zerver/migrations/0269_gitlab_auth.py
index ee3eb38236..58b80982eb 100644
--- a/zerver/migrations/0269_gitlab_auth.py
+++ b/zerver/migrations/0269_gitlab_auth.py
@@ -14,6 +14,19 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realm',
             name='authentication_methods',
-            field=bitfield.models.BitField(['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser', 'AzureAD', 'SAML', 'GitLab'], default=2147483647),
+            field=bitfield.models.BitField(
+                [
+                    'Google',
+                    'Email',
+                    'GitHub',
+                    'LDAP',
+                    'Dev',
+                    'RemoteUser',
+                    'AzureAD',
+                    'SAML',
+                    'GitLab',
+                ],
+                default=2147483647,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0270_huddle_recipient.py b/zerver/migrations/0270_huddle_recipient.py
index 3273c63d74..6a16d97a85 100644
--- a/zerver/migrations/0270_huddle_recipient.py
+++ b/zerver/migrations/0270_huddle_recipient.py
@@ -13,6 +13,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='huddle',
             name='recipient',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient'),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient'
+            ),
         ),
     ]
diff --git a/zerver/migrations/0271_huddle_set_recipient_column_values.py b/zerver/migrations/0271_huddle_set_recipient_column_values.py
index 61610c2a6c..cacf1d8491 100644
--- a/zerver/migrations/0271_huddle_set_recipient_column_values.py
+++ b/zerver/migrations/0271_huddle_set_recipient_column_values.py
@@ -16,5 +16,6 @@ class Migration(migrations.Migration):
             WHERE zerver_recipient.type_id = zerver_huddle.id AND zerver_recipient.type = 3;
             """,
             reverse_sql='UPDATE zerver_huddle SET recipient_id = NULL',
-            elidable=True),
+            elidable=True,
+        ),
     ]
diff --git a/zerver/migrations/0273_migrate_old_bot_messages.py b/zerver/migrations/0273_migrate_old_bot_messages.py
index 9494b09318..0b9c4e615f 100644
--- a/zerver/migrations/0273_migrate_old_bot_messages.py
+++ b/zerver/migrations/0273_migrate_old_bot_messages.py
@@ -38,19 +38,22 @@ def fix_messages(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
         return
 
     def get_bot_by_delivery_email(email: str) -> Any:
-        return UserProfile.objects.select_related().get(delivery_email__iexact=email.strip(),
-                                                        realm=internal_realm)
+        return UserProfile.objects.select_related().get(
+            delivery_email__iexact=email.strip(), realm=internal_realm
+        )
 
     notification_bot = get_bot_by_delivery_email(settings.NOTIFICATION_BOT)
 
     def fix_messages_by_bot(bot_profile: Any) -> None:
         Message.objects.filter(sender=bot_profile).update(sender=notification_bot)
-        Message.objects.filter(recipient=bot_profile.recipient).update(recipient=notification_bot.recipient)
+        Message.objects.filter(recipient=bot_profile.recipient).update(
+            recipient=notification_bot.recipient
+        )
 
     def clean_up_bot(bot_profile: Any) -> None:
-        huddle_recipient_ids = Subscription.objects \
-            .filter(user_profile_id=bot_profile.id, recipient__type=RECIPIENT_HUDDLE) \
-            .values_list('recipient_id', flat=True)
+        huddle_recipient_ids = Subscription.objects.filter(
+            user_profile_id=bot_profile.id, recipient__type=RECIPIENT_HUDDLE
+        ).values_list('recipient_id', flat=True)
         Huddle.objects.filter(recipient_id__in=huddle_recipient_ids).delete()
         Recipient.objects.filter(id__in=huddle_recipient_ids).delete()
 
@@ -74,6 +77,7 @@ def fix_messages(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     except UserProfile.DoesNotExist:
         pass
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -81,7 +85,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_messages,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(fix_messages, reverse_code=migrations.RunPython.noop, elidable=True),
     ]
diff --git a/zerver/migrations/0276_alertword.py b/zerver/migrations/0276_alertword.py
index 4de29acc54..b310e45ccb 100644
--- a/zerver/migrations/0276_alertword.py
+++ b/zerver/migrations/0276_alertword.py
@@ -13,10 +13,25 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='AlertWord',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('word', models.TextField()),
-                ('realm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'realm',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
             options={
                 'unique_together': {('user_profile', 'word')},
diff --git a/zerver/migrations/0277_migrate_alert_word.py b/zerver/migrations/0277_migrate_alert_word.py
index 0021aad471..a7e37e5ee7 100644
--- a/zerver/migrations/0277_migrate_alert_word.py
+++ b/zerver/migrations/0277_migrate_alert_word.py
@@ -23,6 +23,7 @@ def move_to_seperate_table(apps: StateApps, schema_editor: DatabaseSchemaEditor)
             for word in word_dict.values()
         )
 
+
 def move_back_to_user_profile(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     AlertWord = apps.get_model('zerver', 'AlertWord')
     UserProfile = apps.get_model('zerver', 'UserProfile')
@@ -39,6 +40,7 @@ def move_back_to_user_profile(apps: StateApps, schema_editor: DatabaseSchemaEdit
         user_profile.alert_words = orjson.dumps(words).decode()
         user_profile.save(update_fields=['alert_words'])
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
diff --git a/zerver/migrations/0279_message_recipient_subject_indexes.py b/zerver/migrations/0279_message_recipient_subject_indexes.py
index 7142b4531d..cf4116fc00 100644
--- a/zerver/migrations/0279_message_recipient_subject_indexes.py
+++ b/zerver/migrations/0279_message_recipient_subject_indexes.py
@@ -11,10 +11,14 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
         CREATE INDEX CONCURRENTLY IF NOT EXISTS zerver_message_recipient_upper_subject ON zerver_message (recipient_id, upper(subject::text), id DESC NULLS LAST);
-        """),
-        migrations.RunSQL("""
+        """
+        ),
+        migrations.RunSQL(
+            """
         CREATE INDEX CONCURRENTLY IF NOT EXISTS zerver_message_recipient_subject ON zerver_message (recipient_id, subject, id DESC NULLS LAST);
-        """),
+        """
+        ),
     ]
diff --git a/zerver/migrations/0283_apple_auth.py b/zerver/migrations/0283_apple_auth.py
index 65b04082fe..71420aef64 100644
--- a/zerver/migrations/0283_apple_auth.py
+++ b/zerver/migrations/0283_apple_auth.py
@@ -14,6 +14,20 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='realm',
             name='authentication_methods',
-            field=bitfield.models.BitField(['Google', 'Email', 'GitHub', 'LDAP', 'Dev', 'RemoteUser', 'AzureAD', 'SAML', 'GitLab', 'Apple'], default=2147483647),
+            field=bitfield.models.BitField(
+                [
+                    'Google',
+                    'Email',
+                    'GitHub',
+                    'LDAP',
+                    'Dev',
+                    'RemoteUser',
+                    'AzureAD',
+                    'SAML',
+                    'GitLab',
+                    'Apple',
+                ],
+                default=2147483647,
+            ),
         ),
     ]
diff --git a/zerver/migrations/0284_convert_realm_admins_to_realm_owners.py b/zerver/migrations/0284_convert_realm_admins_to_realm_owners.py
index 59b5fbcae1..4ecebe35f6 100644
--- a/zerver/migrations/0284_convert_realm_admins_to_realm_owners.py
+++ b/zerver/migrations/0284_convert_realm_admins_to_realm_owners.py
@@ -26,12 +26,17 @@ def set_realm_admins_as_realm_owners(apps: StateApps, schema_editor: DatabaseSch
     RealmAuditLog.ROLE_COUNT_BOTS = '12'
 
     def realm_user_count_by_role(realm: Any) -> Dict[str, Any]:
-        human_counts = {str(UserProfile.ROLE_REALM_ADMINISTRATOR): 0,
-                        str(UserProfile.ROLE_REALM_OWNER): 0,
-                        str(UserProfile.ROLE_MEMBER): 0,
-                        str(UserProfile.ROLE_GUEST): 0}
-        for value_dict in list(UserProfile.objects.filter(
-                realm=realm, is_bot=False, is_active=True).values('role').annotate(Count('role'))):
+        human_counts = {
+            str(UserProfile.ROLE_REALM_ADMINISTRATOR): 0,
+            str(UserProfile.ROLE_REALM_OWNER): 0,
+            str(UserProfile.ROLE_MEMBER): 0,
+            str(UserProfile.ROLE_GUEST): 0,
+        }
+        for value_dict in list(
+            UserProfile.objects.filter(realm=realm, is_bot=False, is_active=True)
+            .values('role')
+            .annotate(Count('role'))
+        ):
             human_counts[str(value_dict['role'])] = value_dict['role__count']
         bot_count = UserProfile.objects.filter(realm=realm, is_bot=True, is_active=True).count()
         return {
@@ -41,20 +46,28 @@ def set_realm_admins_as_realm_owners(apps: StateApps, schema_editor: DatabaseSch
 
     objects_to_create = []
 
-    for user in UserProfile.objects.filter(is_active=True, role=UserProfile.ROLE_REALM_ADMINISTRATOR):
+    for user in UserProfile.objects.filter(
+        is_active=True, role=UserProfile.ROLE_REALM_ADMINISTRATOR
+    ):
         user.role = UserProfile.ROLE_REALM_OWNER
         user.save(update_fields=['role'])
-        audit_log_entry = RealmAuditLog(realm=user.realm, modified_user=user,
-                                        event_type=RealmAuditLog.USER_ROLE_CHANGED,
-                                        event_time=timezone_now(),
-                                        extra_data=orjson.dumps({
-                                            RealmAuditLog.OLD_VALUE: UserProfile.ROLE_REALM_ADMINISTRATOR,
-                                            RealmAuditLog.NEW_VALUE: UserProfile.ROLE_REALM_OWNER,
-                                            RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user.realm),
-                                        }).decode())
+        audit_log_entry = RealmAuditLog(
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.USER_ROLE_CHANGED,
+            event_time=timezone_now(),
+            extra_data=orjson.dumps(
+                {
+                    RealmAuditLog.OLD_VALUE: UserProfile.ROLE_REALM_ADMINISTRATOR,
+                    RealmAuditLog.NEW_VALUE: UserProfile.ROLE_REALM_OWNER,
+                    RealmAuditLog.ROLE_COUNT: realm_user_count_by_role(user.realm),
+                }
+            ).decode(),
+        )
         objects_to_create.append(audit_log_entry)
     RealmAuditLog.objects.bulk_create(objects_to_create)
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -62,7 +75,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(set_realm_admins_as_realm_owners,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            set_realm_admins_as_realm_owners, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0285_remove_realm_google_hangouts_domain.py b/zerver/migrations/0285_remove_realm_google_hangouts_domain.py
index d185494086..d0ff8bf9f9 100644
--- a/zerver/migrations/0285_remove_realm_google_hangouts_domain.py
+++ b/zerver/migrations/0285_remove_realm_google_hangouts_domain.py
@@ -15,6 +15,7 @@ VIDEO_CHAT_PROVIDERS = {
     },
 }
 
+
 def remove_google_hangouts_provider(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
     # We are removing the Google Hangout integration because Google has
     # removed the Hangouts brand. All the realms that used Hangouts as
@@ -24,6 +25,7 @@ def remove_google_hangouts_provider(apps: StateApps, schema_editor: DatabaseSche
         video_chat_provider=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
     )
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -36,8 +38,6 @@ class Migration(migrations.Migration):
             name='google_hangouts_domain',
         ),
         migrations.RunPython(
-            remove_google_hangouts_provider,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True
+            remove_google_hangouts_provider, reverse_code=migrations.RunPython.noop, elidable=True
         ),
     ]
diff --git a/zerver/migrations/0286_merge_0260_0285.py b/zerver/migrations/0286_merge_0260_0285.py
index e95366e43a..35e510aca2 100644
--- a/zerver/migrations/0286_merge_0260_0285.py
+++ b/zerver/migrations/0286_merge_0260_0285.py
@@ -12,5 +12,4 @@ class Migration(migrations.Migration):
         ('zerver', '0285_remove_realm_google_hangouts_domain'),
     ]
 
-    operations: List[Any] = [
-    ]
+    operations: List[Any] = []
diff --git a/zerver/migrations/0287_clear_duplicate_reactions.py b/zerver/migrations/0287_clear_duplicate_reactions.py
index d15371b71f..cef4ee2b60 100644
--- a/zerver/migrations/0287_clear_duplicate_reactions.py
+++ b/zerver/migrations/0287_clear_duplicate_reactions.py
@@ -13,15 +13,19 @@ def clear_duplicate_reactions(apps: StateApps, schema_editor: DatabaseSchemaEdit
     """
     Reaction = apps.get_model('zerver', 'Reaction')
 
-    duplicate_reactions = Reaction.objects.all().values(
-        "user_profile_id", "message_id", "reaction_type", "emoji_code").annotate(
-            Count('id')).filter(id__count__gt=1)
+    duplicate_reactions = (
+        Reaction.objects.all()
+        .values("user_profile_id", "message_id", "reaction_type", "emoji_code")
+        .annotate(Count('id'))
+        .filter(id__count__gt=1)
+    )
     for duplicate_reaction in duplicate_reactions:
         duplicate_reaction.pop('id__count')
         to_cleanup = Reaction.objects.filter(**duplicate_reaction)[1:]
         for reaction in to_cleanup:
             reaction.delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -29,7 +33,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(clear_duplicate_reactions,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            clear_duplicate_reactions, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0288_reaction_unique_on_emoji_code.py b/zerver/migrations/0288_reaction_unique_on_emoji_code.py
index d47b92f1f5..9318bcfd93 100644
--- a/zerver/migrations/0288_reaction_unique_on_emoji_code.py
+++ b/zerver/migrations/0288_reaction_unique_on_emoji_code.py
@@ -12,10 +12,16 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterUniqueTogether(
             name='archivedreaction',
-            unique_together={('user_profile', 'message', 'emoji_name'), ('user_profile', 'message', 'reaction_type', 'emoji_code')},
+            unique_together={
+                ('user_profile', 'message', 'emoji_name'),
+                ('user_profile', 'message', 'reaction_type', 'emoji_code'),
+            },
         ),
         migrations.AlterUniqueTogether(
             name='reaction',
-            unique_together={('user_profile', 'message', 'emoji_name'), ('user_profile', 'message', 'reaction_type', 'emoji_code')},
+            unique_together={
+                ('user_profile', 'message', 'emoji_name'),
+                ('user_profile', 'message', 'reaction_type', 'emoji_code'),
+            },
         ),
     ]
diff --git a/zerver/migrations/0290_remove_night_mode_add_color_scheme.py b/zerver/migrations/0290_remove_night_mode_add_color_scheme.py
index d4cc31144a..11d64c1c81 100644
--- a/zerver/migrations/0290_remove_night_mode_add_color_scheme.py
+++ b/zerver/migrations/0290_remove_night_mode_add_color_scheme.py
@@ -12,6 +12,7 @@ def set_color_scheme_to_night_mode(apps: StateApps, schema_editor: DatabaseSchem
     UserProfile = apps.get_model("zerver", "UserProfile")
     UserProfile.objects.filter(night_mode=True).update(color_scheme=COLOR_SCHEME_NIGHT)
 
+
 class Migration(migrations.Migration):
     atomic = False
 
@@ -26,9 +27,8 @@ class Migration(migrations.Migration):
             field=models.PositiveSmallIntegerField(default=COLOR_SCHEME_AUTOMATIC),
         ),
         migrations.RunPython(
-            set_color_scheme_to_night_mode,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True),
+            set_color_scheme_to_night_mode, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
         migrations.RemoveField(
             model_name='userprofile',
             name='night_mode',
diff --git a/zerver/migrations/0293_update_invite_as_dict_values.py b/zerver/migrations/0293_update_invite_as_dict_values.py
index 736ed8587a..be33279237 100644
--- a/zerver/migrations/0293_update_invite_as_dict_values.py
+++ b/zerver/migrations/0293_update_invite_as_dict_values.py
@@ -10,35 +10,44 @@ def update_invite_as_dict_values(apps: StateApps, schema_editor: DatabaseSchemaE
     MultiuseInvite = apps.get_model('zerver', 'MultiuseInvite')
 
     OLD_INVITE_AS_DICT = dict(
-        MEMBER = 1,
-        REALM_ADMIN = 2,
-        GUEST_USER = 3,
-        REALM_OWNER = 4,
+        MEMBER=1,
+        REALM_ADMIN=2,
+        GUEST_USER=3,
+        REALM_OWNER=4,
     )
     NEW_INVITE_AS_DICT = dict(
-        REALM_OWNER = 100,
-        REALM_ADMIN = 200,
-        MEMBER = 400,
-        GUEST_USER = 600,
+        REALM_OWNER=100,
+        REALM_ADMIN=200,
+        MEMBER=400,
+        GUEST_USER=600,
     )
 
-    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_OWNER']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['REALM_OWNER'])
-    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_ADMIN']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['REALM_ADMIN'])
-    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['MEMBER']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['MEMBER'])
-    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['GUEST_USER']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['GUEST_USER'])
+    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_OWNER']).update(
+        invited_as=NEW_INVITE_AS_DICT['REALM_OWNER']
+    )
+    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_ADMIN']).update(
+        invited_as=NEW_INVITE_AS_DICT['REALM_ADMIN']
+    )
+    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['MEMBER']).update(
+        invited_as=NEW_INVITE_AS_DICT['MEMBER']
+    )
+    PreregistrationUser.objects.filter(invited_as=OLD_INVITE_AS_DICT['GUEST_USER']).update(
+        invited_as=NEW_INVITE_AS_DICT['GUEST_USER']
+    )
+
+    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_OWNER']).update(
+        invited_as=NEW_INVITE_AS_DICT['REALM_OWNER']
+    )
+    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_ADMIN']).update(
+        invited_as=NEW_INVITE_AS_DICT['REALM_ADMIN']
+    )
+    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['MEMBER']).update(
+        invited_as=NEW_INVITE_AS_DICT['MEMBER']
+    )
+    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['GUEST_USER']).update(
+        invited_as=NEW_INVITE_AS_DICT['GUEST_USER']
+    )
 
-    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_OWNER']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['REALM_OWNER'])
-    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['REALM_ADMIN']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['REALM_ADMIN'])
-    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['MEMBER']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['MEMBER'])
-    MultiuseInvite.objects.filter(invited_as=OLD_INVITE_AS_DICT['GUEST_USER']) \
-        .update(invited_as=NEW_INVITE_AS_DICT['GUEST_USER'])
 
 class Migration(migrations.Migration):
 
@@ -47,7 +56,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(update_invite_as_dict_values,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            update_invite_as_dict_values, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0295_case_insensitive_email_indexes.py b/zerver/migrations/0295_case_insensitive_email_indexes.py
index 8a66407b8d..d08614d3e9 100644
--- a/zerver/migrations/0295_case_insensitive_email_indexes.py
+++ b/zerver/migrations/0295_case_insensitive_email_indexes.py
@@ -20,10 +20,12 @@ class Migration(migrations.Migration):
         # organizations with EMAIL_ADDRESS_VISIBILITY_ADMINS.  We
         # correct this by adding the appropriate unique index there as
         # well.
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
             CREATE UNIQUE INDEX zerver_userprofile_realm_id_email_uniq ON zerver_userprofile (realm_id, upper(email::text));
             CREATE UNIQUE INDEX zerver_userprofile_realm_id_delivery_email_uniq ON zerver_userprofile (realm_id, upper(delivery_email::text));
-        """),
+        """
+        ),
         migrations.AlterUniqueTogether(
             name='userprofile',
             unique_together=set(),
diff --git a/zerver/migrations/0297_draft.py b/zerver/migrations/0297_draft.py
index 710571a0be..55f148ba24 100644
--- a/zerver/migrations/0297_draft.py
+++ b/zerver/migrations/0297_draft.py
@@ -15,12 +15,29 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Draft',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('topic', models.CharField(db_index=True, max_length=60)),
                 ('content', models.TextField()),
                 ('last_edit_time', models.DateTimeField(db_index=True)),
-                ('recipient', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='zerver.Recipient')),
-                ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    'recipient',
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to='zerver.Recipient',
+                    ),
+                ),
+                (
+                    'user_profile',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zerver/migrations/0298_fix_realmauditlog_format.py b/zerver/migrations/0298_fix_realmauditlog_format.py
index a39f14af00..1213c5df43 100644
--- a/zerver/migrations/0298_fix_realmauditlog_format.py
+++ b/zerver/migrations/0298_fix_realmauditlog_format.py
@@ -96,11 +96,13 @@ def update_realmauditlog_values(apps: StateApps, schema_editor: DatabaseSchemaEd
         # Sanity check that the original event has exactly the keys we expect.
         assert set(extra_data.keys()) <= {OLD_VALUE, NEW_VALUE}
 
-        ra.extra_data = json.dumps({
-            OLD_VALUE: old_value,
-            NEW_VALUE: new_value,
-            "property": prop,
-        })
+        ra.extra_data = json.dumps(
+            {
+                OLD_VALUE: old_value,
+                NEW_VALUE: new_value,
+                "property": prop,
+            }
+        )
         ra.save(update_fields=["extra_data"])
 
 
@@ -111,7 +113,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(update_realmauditlog_values,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            update_realmauditlog_values, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]
diff --git a/zerver/migrations/0301_fix_unread_messages_in_deactivated_streams.py b/zerver/migrations/0301_fix_unread_messages_in_deactivated_streams.py
index 96c22b907b..e561d593b0 100644
--- a/zerver/migrations/0301_fix_unread_messages_in_deactivated_streams.py
+++ b/zerver/migrations/0301_fix_unread_messages_in_deactivated_streams.py
@@ -8,6 +8,7 @@ class Migration(migrations.Migration):
     deactivated before this change, we need a migration to fix those old streams,
     to have all messages marked as read.
     """
+
     dependencies = [
         ('zerver', '0300_add_attachment_is_web_public'),
     ]
diff --git a/zerver/migrations/0302_case_insensitive_stream_name_index.py b/zerver/migrations/0302_case_insensitive_stream_name_index.py
index 22da83715c..8991166c6c 100644
--- a/zerver/migrations/0302_case_insensitive_stream_name_index.py
+++ b/zerver/migrations/0302_case_insensitive_stream_name_index.py
@@ -10,9 +10,11 @@ class Migration(migrations.Migration):
         # We do Stream lookups case-insensitively with respect to the name, but we were missing
         # the appropriate (realm_id, upper(name::text)) unique index to enforce uniqueness
         # on database level.
-        migrations.RunSQL("""
+        migrations.RunSQL(
+            """
             CREATE UNIQUE INDEX zerver_stream_realm_id_name_uniq ON zerver_stream (realm_id, upper(name::text));
-        """),
+        """
+        ),
         migrations.AlterUniqueTogether(
             name='stream',
             unique_together=set(),
diff --git a/zerver/migrations/0304_remove_default_status_of_default_private_streams.py b/zerver/migrations/0304_remove_default_status_of_default_private_streams.py
index 6b870f2638..e63c8862b1 100644
--- a/zerver/migrations/0304_remove_default_status_of_default_private_streams.py
+++ b/zerver/migrations/0304_remove_default_status_of_default_private_streams.py
@@ -5,10 +5,13 @@ from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
-def remove_default_status_of_default_private_streams(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
+def remove_default_status_of_default_private_streams(
+    apps: StateApps, schema_editor: DatabaseSchemaEditor
+) -> None:
     DefaultStream = apps.get_model('zerver', 'DefaultStream')
     DefaultStream.objects.filter(stream__invite_only=True).delete()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -16,7 +19,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(remove_default_status_of_default_private_streams,
-                             reverse_code=migrations.RunPython.noop,
-                             elidable=True),
+        migrations.RunPython(
+            remove_default_status_of_default_private_streams,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]
diff --git a/zerver/models.py b/zerver/models.py
index 761a7edc94..1ef30011d4 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -97,8 +97,9 @@ MAX_LANGUAGE_ID_LENGTH: int = 50
 
 STREAM_NAMES = TypeVar('STREAM_NAMES', Sequence[str], AbstractSet[str])
 
+
 def query_for_ids(query: QuerySet, user_ids: List[int], field: str) -> QuerySet:
-    '''
+    """
     This function optimizes searches of the form
     `user_profile_id in (1, 2, 3, 4)` by quickly
     building the where clauses.  Profiling shows significant
@@ -106,14 +107,16 @@ def query_for_ids(query: QuerySet, user_ids: List[int], field: str) -> QuerySet:
 
     Use this very carefully!  Also, the caller should
     guard against empty lists of user_ids.
-    '''
-    assert(user_ids)
+    """
+    assert user_ids
     clause = f'{field} IN %s'
     query = query.extra(
-        where=[clause], params=(tuple(user_ids),),
+        where=[clause],
+        params=(tuple(user_ids),),
     )
     return query
 
+
 # Doing 1000 remote cache requests to get_display_recipient is quite slow,
 # so add a local cache as well as the remote cache cache.
 #
@@ -123,8 +126,11 @@ def query_for_ids(query: QuerySet, user_ids: List[int], field: str) -> QuerySet:
 # queries for the same recipient; this is just a convenient way to
 # write that code.
 per_request_display_recipient_cache: Dict[int, DisplayRecipientT] = {}
-def get_display_recipient_by_id(recipient_id: int, recipient_type: int,
-                                recipient_type_id: Optional[int]) -> DisplayRecipientT:
+
+
+def get_display_recipient_by_id(
+    recipient_id: int, recipient_type: int, recipient_type_id: Optional[int]
+) -> DisplayRecipientT:
     """
     returns: an object describing the recipient (using a cache).
     If the type is a stream, the type_id must be an int; a string is returned.
@@ -138,6 +144,7 @@ def get_display_recipient_by_id(recipient_id: int, recipient_type: int,
         per_request_display_recipient_cache[recipient_id] = result
     return per_request_display_recipient_cache[recipient_id]
 
+
 def get_display_recipient(recipient: 'Recipient') -> DisplayRecipientT:
     return get_display_recipient_by_id(
         recipient.id,
@@ -145,18 +152,23 @@ def get_display_recipient(recipient: 'Recipient') -> DisplayRecipientT:
         recipient.type_id,
     )
 
+
 def get_realm_emoji_cache_key(realm: 'Realm') -> str:
     return f'realm_emoji:{realm.id}'
 
+
 def get_active_realm_emoji_cache_key(realm: 'Realm') -> str:
     return f'active_realm_emoji:{realm.id}'
 
+
 # This simple call-once caching saves ~500us in auth_enabled_helper,
 # which is a significant optimization for common_context.  Note that
 # these values cannot change in a running production system, but do
 # regularly change within unit tests; we address the latter by calling
 # clear_supported_auth_backends_cache in our standard tearDown code.
 supported_backends: Optional[Set[type]] = None
+
+
 def supported_auth_backends() -> Set[type]:
     global supported_backends
     # Caching temporarily disabled for debugging
@@ -164,10 +176,12 @@ def supported_auth_backends() -> Set[type]:
     assert supported_backends is not None
     return supported_backends
 
+
 def clear_supported_auth_backends_cache() -> None:
     global supported_backends
     supported_backends = None
 
+
 class Realm(models.Model):
     MAX_REALM_NAME_LENGTH = 40
     MAX_REALM_SUBDOMAIN_LENGTH = 40
@@ -175,8 +189,18 @@ class Realm(models.Model):
 
     INVITES_STANDARD_REALM_DAILY_MAX = 3000
     MESSAGE_VISIBILITY_LIMITED = 10000
-    AUTHENTICATION_FLAGS = ['Google', 'Email', 'GitHub', 'LDAP', 'Dev',
-                            'RemoteUser', 'AzureAD', 'SAML', 'GitLab', 'Apple']
+    AUTHENTICATION_FLAGS = [
+        'Google',
+        'Email',
+        'GitHub',
+        'LDAP',
+        'Dev',
+        'RemoteUser',
+        'AzureAD',
+        'SAML',
+        'GitLab',
+        'Apple',
+    ]
     SUBDOMAIN_FOR_ROOT_DOMAIN = ''
     WILDCARD_MENTION_THRESHOLD = 15
 
@@ -205,7 +229,8 @@ class Realm(models.Model):
     _max_invites: Optional[int] = models.IntegerField(null=True, db_column='max_invites')
     disallow_disposable_email_addresses: bool = models.BooleanField(default=True)
     authentication_methods: BitHandler = BitField(
-        flags=AUTHENTICATION_FLAGS, default=2**31 - 1,
+        flags=AUTHENTICATION_FLAGS,
+        default=2 ** 31 - 1,
     )
 
     # Whether the organization has enabled inline image and URL previews.
@@ -237,17 +262,16 @@ class Realm(models.Model):
     ]
 
     # Who in the organization is allowed to create streams.
-    create_stream_policy: int = models.PositiveSmallIntegerField(
-        default=POLICY_MEMBERS_ONLY)
+    create_stream_policy: int = models.PositiveSmallIntegerField(default=POLICY_MEMBERS_ONLY)
 
     # Who in the organization is allowed to invite other users to streams.
-    invite_to_stream_policy: int = models.PositiveSmallIntegerField(
-        default=POLICY_MEMBERS_ONLY)
+    invite_to_stream_policy: int = models.PositiveSmallIntegerField(default=POLICY_MEMBERS_ONLY)
 
     USER_GROUP_EDIT_POLICY_MEMBERS = 1
     USER_GROUP_EDIT_POLICY_ADMINS = 2
     user_group_edit_policy: int = models.PositiveSmallIntegerField(
-        default=USER_GROUP_EDIT_POLICY_MEMBERS)
+        default=USER_GROUP_EDIT_POLICY_MEMBERS
+    )
     USER_GROUP_EDIT_POLICY_TYPES = [
         USER_GROUP_EDIT_POLICY_MEMBERS,
         USER_GROUP_EDIT_POLICY_ADMINS,
@@ -256,7 +280,8 @@ class Realm(models.Model):
     PRIVATE_MESSAGE_POLICY_UNLIMITED = 1
     PRIVATE_MESSAGE_POLICY_DISABLED = 2
     private_message_policy: int = models.PositiveSmallIntegerField(
-        default=PRIVATE_MESSAGE_POLICY_UNLIMITED)
+        default=PRIVATE_MESSAGE_POLICY_UNLIMITED
+    )
     PRIVATE_MESSAGE_POLICY_TYPES = [
         PRIVATE_MESSAGE_POLICY_UNLIMITED,
         PRIVATE_MESSAGE_POLICY_DISABLED,
@@ -306,13 +331,17 @@ class Realm(models.Model):
     waiting_period_threshold: int = models.PositiveIntegerField(default=0)
 
     allow_message_deleting: bool = models.BooleanField(default=False)
-    DEFAULT_MESSAGE_CONTENT_DELETE_LIMIT_SECONDS = 600  # if changed, also change in admin.js, setting_org.js
+    DEFAULT_MESSAGE_CONTENT_DELETE_LIMIT_SECONDS = (
+        600  # if changed, also change in admin.js, setting_org.js
+    )
     message_content_delete_limit_seconds: int = models.IntegerField(
         default=DEFAULT_MESSAGE_CONTENT_DELETE_LIMIT_SECONDS,
     )
 
     allow_message_editing: bool = models.BooleanField(default=True)
-    DEFAULT_MESSAGE_CONTENT_EDIT_LIMIT_SECONDS = 600  # if changed, also change in admin.js, setting_org.js
+    DEFAULT_MESSAGE_CONTENT_EDIT_LIMIT_SECONDS = (
+        600  # if changed, also change in admin.js, setting_org.js
+    )
     message_content_edit_limit_seconds: int = models.IntegerField(
         default=DEFAULT_MESSAGE_CONTENT_EDIT_LIMIT_SECONDS,
     )
@@ -331,10 +360,18 @@ class Realm(models.Model):
     INITIAL_PRIVATE_STREAM_NAME = 'core team'
     STREAM_EVENTS_NOTIFICATION_TOPIC = ugettext_lazy('stream events')
     notifications_stream: Optional["Stream"] = models.ForeignKey(
-        "Stream", related_name="+", null=True, blank=True, on_delete=CASCADE,
+        "Stream",
+        related_name="+",
+        null=True,
+        blank=True,
+        on_delete=CASCADE,
     )
     signup_notifications_stream: Optional["Stream"] = models.ForeignKey(
-        "Stream", related_name="+", null=True, blank=True, on_delete=CASCADE,
+        "Stream",
+        related_name="+",
+        null=True,
+        blank=True,
+        on_delete=CASCADE,
     )
 
     MESSAGE_RETENTION_SPECIAL_VALUES_MAP = {
@@ -403,12 +440,11 @@ class Realm(models.Model):
         }
 
     if settings.BIG_BLUE_BUTTON_SECRET is not None and settings.BIG_BLUE_BUTTON_URL is not None:
-        VIDEO_CHAT_PROVIDERS['big_blue_button'] = {
-            'name': "Big Blue Button",
-            'id': 4
-        }
+        VIDEO_CHAT_PROVIDERS['big_blue_button'] = {'name': "Big Blue Button", 'id': 4}
 
-    video_chat_provider: int = models.PositiveSmallIntegerField(default=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'])
+    video_chat_provider: int = models.PositiveSmallIntegerField(
+        default=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
+    )
 
     default_code_block_language: Optional[str] = models.TextField(null=True, default=None)
 
@@ -421,7 +457,7 @@ class Realm(models.Model):
         create_stream_policy=int,
         invite_to_stream_policy=int,
         default_language=str,
-        default_twenty_four_hour_time = bool,
+        default_twenty_four_hour_time=bool,
         description=str,
         digest_emails_enabled=bool,
         disallow_disposable_email_addresses=bool,
@@ -459,7 +495,9 @@ class Realm(models.Model):
         (ICON_UPLOADED, 'Uploaded by administrator'),
     )
     icon_source: str = models.CharField(
-        default=ICON_FROM_GRAVATAR, choices=ICON_SOURCES, max_length=1,
+        default=ICON_FROM_GRAVATAR,
+        choices=ICON_SOURCES,
+        max_length=1,
     )
     icon_version: int = models.PositiveSmallIntegerField(default=1)
 
@@ -471,12 +509,16 @@ class Realm(models.Model):
         (LOGO_UPLOADED, 'Uploaded by administrator'),
     )
     logo_source: str = models.CharField(
-        default=LOGO_DEFAULT, choices=LOGO_SOURCES, max_length=1,
+        default=LOGO_DEFAULT,
+        choices=LOGO_SOURCES,
+        max_length=1,
     )
     logo_version: int = models.PositiveSmallIntegerField(default=1)
 
     night_logo_source: str = models.CharField(
-        default=LOGO_DEFAULT, choices=LOGO_SOURCES, max_length=1,
+        default=LOGO_DEFAULT,
+        choices=LOGO_SOURCES,
+        max_length=1,
     )
     night_logo_version: int = models.PositiveSmallIntegerField(default=1)
 
@@ -503,11 +545,11 @@ class Realm(models.Model):
     def __str__(self) -> str:
         return f"<Realm: {self.string_id} {self.id}>"
 
-    @cache_with_key(get_realm_emoji_cache_key, timeout=3600*24*7)
+    @cache_with_key(get_realm_emoji_cache_key, timeout=3600 * 24 * 7)
     def get_emoji(self) -> Dict[str, Dict[str, Iterable[str]]]:
         return get_realm_emoji_uncached(self)
 
-    @cache_with_key(get_active_realm_emoji_cache_key, timeout=3600*24*7)
+    @cache_with_key(get_active_realm_emoji_cache_key, timeout=3600 * 24 * 7)
     def get_active_emoji(self) -> Dict[str, Dict[str, Iterable[str]]]:
         return get_active_realm_emoji_uncached(self)
 
@@ -517,9 +559,11 @@ class Realm(models.Model):
         notifications to all administrator users.
         """
         # TODO: Change return type to QuerySet[UserProfile]
-        return UserProfile.objects.filter(realm=self, is_active=True,
-                                          role__in=[UserProfile.ROLE_REALM_ADMINISTRATOR,
-                                                    UserProfile.ROLE_REALM_OWNER])
+        return UserProfile.objects.filter(
+            realm=self,
+            is_active=True,
+            role__in=[UserProfile.ROLE_REALM_ADMINISTRATOR, UserProfile.ROLE_REALM_OWNER],
+        )
 
     def get_human_admin_users(self) -> QuerySet:
         """Use this in contexts where we want only human users with
@@ -527,22 +571,29 @@ class Realm(models.Model):
         realm's administrators (bots don't have real email addresses).
         """
         # TODO: Change return type to QuerySet[UserProfile]
-        return UserProfile.objects.filter(realm=self, is_bot=False, is_active=True,
-                                          role__in=[UserProfile.ROLE_REALM_ADMINISTRATOR,
-                                                    UserProfile.ROLE_REALM_OWNER])
+        return UserProfile.objects.filter(
+            realm=self,
+            is_bot=False,
+            is_active=True,
+            role__in=[UserProfile.ROLE_REALM_ADMINISTRATOR, UserProfile.ROLE_REALM_OWNER],
+        )
 
     def get_human_billing_admin_users(self) -> Sequence['UserProfile']:
-        return UserProfile.objects.filter(Q(role=UserProfile.ROLE_REALM_OWNER) | Q(is_billing_admin=True),
-                                          realm=self, is_bot=False, is_active=True)
+        return UserProfile.objects.filter(
+            Q(role=UserProfile.ROLE_REALM_OWNER) | Q(is_billing_admin=True),
+            realm=self,
+            is_bot=False,
+            is_active=True,
+        )
 
     def get_active_users(self) -> Sequence['UserProfile']:
         # TODO: Change return type to QuerySet[UserProfile]
         return UserProfile.objects.filter(realm=self, is_active=True).select_related()
 
     def get_human_owner_users(self) -> QuerySet:
-        return UserProfile.objects.filter(realm=self, is_bot=False,
-                                          role=UserProfile.ROLE_REALM_OWNER,
-                                          is_active=True)
+        return UserProfile.objects.filter(
+            realm=self, is_bot=False, role=UserProfile.ROLE_REALM_OWNER, is_active=True
+        )
 
     def get_bot_domain(self) -> str:
         return get_fake_email_domain(self)
@@ -553,7 +604,10 @@ class Realm(models.Model):
         return None
 
     def get_signup_notifications_stream(self) -> Optional['Stream']:
-        if self.signup_notifications_stream is not None and not self.signup_notifications_stream.deactivated:
+        if (
+            self.signup_notifications_stream is not None
+            and not self.signup_notifications_stream.deactivated
+        ):
             return self.signup_notifications_stream
         return None
 
@@ -574,7 +628,7 @@ class Realm(models.Model):
         # it as gibibytes (GiB) to be a bit more generous in case of confusion.
         return self.upload_quota_gb << 30
 
-    @cache_with_key(get_realm_used_upload_space_cache_key, timeout=3600*24*7)
+    @cache_with_key(get_realm_used_upload_space_cache_key, timeout=3600 * 24 * 7)
     def currently_used_upload_space_bytes(self) -> int:
         used_space = Attachment.objects.filter(realm=self).aggregate(Sum('size'))['size__sum']
         if used_space is None:
@@ -626,28 +680,35 @@ class Realm(models.Model):
     def presence_disabled(self) -> bool:
         return self.is_zephyr_mirror_realm
 
+
 def realm_post_delete_handler(sender: Any, **kwargs: Any) -> None:
     # This would be better as a functools.partial, but for some reason
     # Django doesn't call it even when it's registered as a post_delete handler.
     flush_realm(sender, from_deletion=True, **kwargs)
 
+
 post_save.connect(flush_realm, sender=Realm)
 post_delete.connect(realm_post_delete_handler, sender=Realm)
 
+
 def get_realm(string_id: str) -> Realm:
     return Realm.objects.get(string_id=string_id)
 
+
 def name_changes_disabled(realm: Optional[Realm]) -> bool:
     if realm is None:
         return settings.NAME_CHANGES_DISABLED
     return settings.NAME_CHANGES_DISABLED or realm.name_changes_disabled
 
+
 def avatar_changes_disabled(realm: Realm) -> bool:
     return settings.AVATAR_CHANGES_DISABLED or realm.avatar_changes_disabled
 
+
 class RealmDomain(models.Model):
     """For an organization with emails_restricted_to_domains enabled, the list of
     allowed domains"""
+
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
     # should always be stored lowercase
@@ -657,6 +718,7 @@ class RealmDomain(models.Model):
     class Meta:
         unique_together = ("realm", "domain")
 
+
 # These functions should only be used on email addresses that have
 # been validated via django.core.validators.validate_email
 #
@@ -666,34 +728,48 @@ class RealmDomain(models.Model):
 def email_to_username(email: str) -> str:
     return "@".join(email.split("@")[:-1]).lower()
 
+
 # Returns the raw domain portion of the desired email address
 def email_to_domain(email: str) -> str:
     return email.split("@")[-1].lower()
 
+
 class DomainNotAllowedForRealmError(Exception):
     pass
 
+
 class DisposableEmailError(Exception):
     pass
 
+
 class EmailContainsPlusError(Exception):
     pass
 
+
 def get_realm_domains(realm: Realm) -> List[Dict[str, str]]:
     return list(realm.realmdomain_set.values('domain', 'allow_subdomains'))
 
+
 class RealmEmoji(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     author: Optional["UserProfile"] = models.ForeignKey(
-        "UserProfile", blank=True, null=True, on_delete=CASCADE,
+        "UserProfile",
+        blank=True,
+        null=True,
+        on_delete=CASCADE,
     )
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
-    name: str = models.TextField(validators=[
-        MinLengthValidator(1),
-        # The second part of the regex (negative lookbehind) disallows names
-        # ending with one of the punctuation characters.
-        RegexValidator(regex=r'^[0-9a-z.\-_]+(?<![.\-_])$',
-                       message=ugettext_lazy("Invalid characters in emoji name"))])
+    name: str = models.TextField(
+        validators=[
+            MinLengthValidator(1),
+            # The second part of the regex (negative lookbehind) disallows names
+            # ending with one of the punctuation characters.
+            RegexValidator(
+                regex=r'^[0-9a-z.\-_]+(?<![.\-_])$',
+                message=ugettext_lazy("Invalid characters in emoji name"),
+            ),
+        ]
+    )
 
     # The basename of the custom emoji's filename; see PATH_ID_TEMPLATE for the full path.
     file_name: Optional[str] = models.TextField(db_index=True, null=True, blank=True)
@@ -705,8 +781,10 @@ class RealmEmoji(models.Model):
     def __str__(self) -> str:
         return f"<RealmEmoji({self.realm.string_id}): {self.id} {self.name} {self.deactivated} {self.file_name}>"
 
-def get_realm_emoji_dicts(realm: Realm,
-                          only_active_emojis: bool=False) -> Dict[str, Dict[str, Any]]:
+
+def get_realm_emoji_dicts(
+    realm: Realm, only_active_emojis: bool = False
+) -> Dict[str, Dict[str, Any]]:
     query = RealmEmoji.objects.filter(realm=realm).select_related('author')
     if only_active_emojis:
         query = query.filter(deactivated=False)
@@ -718,16 +796,20 @@ def get_realm_emoji_dicts(realm: Realm,
         if realm_emoji.author:
             author_id = realm_emoji.author_id
         emoji_url = get_emoji_url(realm_emoji.file_name, realm_emoji.realm_id)
-        d[str(realm_emoji.id)] = dict(id=str(realm_emoji.id),
-                                      name=realm_emoji.name,
-                                      source_url=emoji_url,
-                                      deactivated=realm_emoji.deactivated,
-                                      author_id=author_id)
+        d[str(realm_emoji.id)] = dict(
+            id=str(realm_emoji.id),
+            name=realm_emoji.name,
+            source_url=emoji_url,
+            deactivated=realm_emoji.deactivated,
+            author_id=author_id,
+        )
     return d
 
+
 def get_realm_emoji_uncached(realm: Realm) -> Dict[str, Dict[str, Any]]:
     return get_realm_emoji_dicts(realm)
 
+
 def get_active_realm_emoji_uncached(realm: Realm) -> Dict[str, Dict[str, Any]]:
     realm_emojis = get_realm_emoji_dicts(realm, only_active_emojis=True)
     d = {}
@@ -735,22 +817,28 @@ def get_active_realm_emoji_uncached(realm: Realm) -> Dict[str, Dict[str, Any]]:
         d[emoji_dict['name']] = emoji_dict
     return d
 
+
 def flush_realm_emoji(sender: Any, **kwargs: Any) -> None:
     realm = kwargs['instance'].realm
-    cache_set(get_realm_emoji_cache_key(realm),
-              get_realm_emoji_uncached(realm),
-              timeout=3600*24*7)
-    cache_set(get_active_realm_emoji_cache_key(realm),
-              get_active_realm_emoji_uncached(realm),
-              timeout=3600*24*7)
+    cache_set(
+        get_realm_emoji_cache_key(realm), get_realm_emoji_uncached(realm), timeout=3600 * 24 * 7
+    )
+    cache_set(
+        get_active_realm_emoji_cache_key(realm),
+        get_active_realm_emoji_uncached(realm),
+        timeout=3600 * 24 * 7,
+    )
+
 
 post_save.connect(flush_realm_emoji, sender=RealmEmoji)
 post_delete.connect(flush_realm_emoji, sender=RealmEmoji)
 
+
 def filter_pattern_validator(value: str) -> None:
     regex = re.compile(r'^(?:(?:[\w\-#_= /:]*|[+]|[!])(\(\?P<\w+>.+\)))+$')
     error_msg = _('Invalid filter pattern.  Valid characters are {}.').format(
-        '[ a-zA-Z_#=/:+!-]',)
+        '[ a-zA-Z_#=/:+!-]',
+    )
 
     if not regex.match(str(value)):
         raise ValidationError(error_msg)
@@ -761,16 +849,19 @@ def filter_pattern_validator(value: str) -> None:
         # Regex is invalid
         raise ValidationError(error_msg)
 
+
 def filter_format_validator(value: str) -> None:
     regex = re.compile(r'^([\.\/:a-zA-Z0-9#_?=&;~-]+%\(([a-zA-Z0-9_-]+)\)s)+[/a-zA-Z0-9#_?=&;~-]*$')
 
     if not regex.match(value):
         raise ValidationError(_('Invalid URL format string.'))
 
+
 class RealmFilter(models.Model):
     """Realm-specific regular expressions to automatically linkify certain
     strings inside the Markdown processor.  See "Custom filters" in the settings UI.
     """
+
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
     pattern: str = models.TextField(validators=[filter_pattern_validator])
@@ -782,21 +873,26 @@ class RealmFilter(models.Model):
     def __str__(self) -> str:
         return f"<RealmFilter({self.realm.string_id}): {self.pattern} {self.url_format_string}>"
 
+
 def get_realm_filters_cache_key(realm_id: int) -> str:
     return f'{cache.KEY_PREFIX}:all_realm_filters:{realm_id}'
 
+
 # We have a per-process cache to avoid doing 1000 remote cache queries during page load
 per_request_realm_filters_cache: Dict[int, List[Tuple[str, str, int]]] = {}
 
+
 def realm_in_local_realm_filters_cache(realm_id: int) -> bool:
     return realm_id in per_request_realm_filters_cache
 
+
 def realm_filters_for_realm(realm_id: int) -> List[Tuple[str, str, int]]:
     if not realm_in_local_realm_filters_cache(realm_id):
         per_request_realm_filters_cache[realm_id] = realm_filters_for_realm_remote_cache(realm_id)
     return per_request_realm_filters_cache[realm_id]
 
-@cache_with_key(get_realm_filters_cache_key, timeout=3600*24*7)
+
+@cache_with_key(get_realm_filters_cache_key, timeout=3600 * 24 * 7)
 def realm_filters_for_realm_remote_cache(realm_id: int) -> List[Tuple[str, str, int]]:
     filters = []
     for realm_filter in RealmFilter.objects.filter(realm_id=realm_id):
@@ -804,15 +900,17 @@ def realm_filters_for_realm_remote_cache(realm_id: int) -> List[Tuple[str, str,
 
     return filters
 
+
 def all_realm_filters() -> Dict[int, List[Tuple[str, str, int]]]:
     filters: DefaultDict[int, List[Tuple[str, str, int]]] = defaultdict(list)
     for realm_filter in RealmFilter.objects.all():
-        filters[realm_filter.realm_id].append((realm_filter.pattern,
-                                               realm_filter.url_format_string,
-                                               realm_filter.id))
+        filters[realm_filter.realm_id].append(
+            (realm_filter.pattern, realm_filter.url_format_string, realm_filter.id)
+        )
 
     return filters
 
+
 def flush_realm_filter(sender: Any, **kwargs: Any) -> None:
     realm_id = kwargs['instance'].realm_id
     cache_delete(get_realm_filters_cache_key(realm_id))
@@ -821,15 +919,18 @@ def flush_realm_filter(sender: Any, **kwargs: Any) -> None:
     except KeyError:
         pass
 
+
 post_save.connect(flush_realm_filter, sender=RealmFilter)
 post_delete.connect(flush_realm_filter, sender=RealmFilter)
 
+
 def flush_per_request_caches() -> None:
     global per_request_display_recipient_cache
     per_request_display_recipient_cache = {}
     global per_request_realm_filters_cache
     per_request_realm_filters_cache = {}
 
+
 # The Recipient table is used to map Messages to the set of users who
 # received the message.  It is implemented as a set of triples (id,
 # type_id, type). We have 3 types of recipients: Huddles (for group
@@ -850,10 +951,7 @@ class Recipient(models.Model):
         unique_together = ("type", "type_id")
 
     # N.B. If we used Django's choice=... we would get this for free (kinda)
-    _type_names = {
-        PERSONAL: 'personal',
-        STREAM: 'stream',
-        HUDDLE: 'huddle'}
+    _type_names = {PERSONAL: 'personal', STREAM: 'stream', HUDDLE: 'huddle'}
 
     def type_name(self) -> str:
         # Raises KeyError if invalid
@@ -863,6 +961,7 @@ class Recipient(models.Model):
         display_recipient = get_display_recipient(self)
         return f"<Recipient: {display_recipient} ({self.type_id}, {self.type})>"
 
+
 class UserProfile(AbstractBaseUser, PermissionsMixin):
     USERNAME_FIELD = 'email'
     MAX_NAME_LENGTH = 100
@@ -946,7 +1045,9 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
 
     is_bot: bool = models.BooleanField(default=False, db_index=True)
     bot_type: Optional[int] = models.PositiveSmallIntegerField(null=True, db_index=True)
-    bot_owner: Optional["UserProfile"] = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
+    bot_owner: Optional["UserProfile"] = models.ForeignKey(
+        'self', null=True, on_delete=models.SET_NULL
+    )
 
     # Each role has a superset of the permissions of the next higher
     # numbered role.  When adding new roles, leave enough space for
@@ -1010,7 +1111,8 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
     DESKTOP_ICON_COUNT_DISPLAY_NOTIFIABLE = 2
     DESKTOP_ICON_COUNT_DISPLAY_NONE = 3
     desktop_icon_count_display: int = models.PositiveSmallIntegerField(
-        default=DESKTOP_ICON_COUNT_DISPLAY_MESSAGES)
+        default=DESKTOP_ICON_COUNT_DISPLAY_MESSAGES
+    )
 
     enable_digest_emails: bool = models.BooleanField(default=True)
     enable_login_emails: bool = models.BooleanField(default=True)
@@ -1032,10 +1134,16 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
 
     # Default streams for some deprecated/legacy classes of bot users.
     default_sending_stream: Optional["Stream"] = models.ForeignKey(
-        "zerver.Stream", null=True, related_name="+", on_delete=CASCADE,
+        "zerver.Stream",
+        null=True,
+        related_name="+",
+        on_delete=CASCADE,
     )
     default_events_register_stream: Optional["Stream"] = models.ForeignKey(
-        "zerver.Stream", null=True, related_name="+", on_delete=CASCADE,
+        "zerver.Stream",
+        null=True,
+        related_name="+",
+        on_delete=CASCADE,
     )
     default_all_public_streams: bool = models.BooleanField(default=False)
 
@@ -1054,11 +1162,7 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
     COLOR_SCHEME_AUTOMATIC = 1
     COLOR_SCHEME_NIGHT = 2
     COLOR_SCHEME_LIGHT = 3
-    COLOR_SCHEME_CHOICES = [
-        COLOR_SCHEME_AUTOMATIC,
-        COLOR_SCHEME_NIGHT,
-        COLOR_SCHEME_LIGHT
-    ]
+    COLOR_SCHEME_CHOICES = [COLOR_SCHEME_AUTOMATIC, COLOR_SCHEME_NIGHT, COLOR_SCHEME_LIGHT]
     color_scheme: int = models.PositiveSmallIntegerField(default=COLOR_SCHEME_AUTOMATIC)
 
     # UI setting controlling Zulip's behavior of demoting in the sort
@@ -1073,7 +1177,9 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
         DEMOTE_STREAMS_ALWAYS,
         DEMOTE_STREAMS_NEVER,
     ]
-    demote_inactive_streams: int = models.PositiveSmallIntegerField(default=DEMOTE_STREAMS_AUTOMATIC)
+    demote_inactive_streams: int = models.PositiveSmallIntegerField(
+        default=DEMOTE_STREAMS_AUTOMATIC
+    )
 
     # A timezone name from the `tzdata` database, as found in pytz.all_timezones.
     #
@@ -1086,15 +1192,19 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
     timezone: str = models.CharField(max_length=40, default='')
 
     # Emojisets
-    GOOGLE_EMOJISET         = 'google'
-    GOOGLE_BLOB_EMOJISET    = 'google-blob'
-    TEXT_EMOJISET           = 'text'
-    TWITTER_EMOJISET        = 'twitter'
-    EMOJISET_CHOICES        = ((GOOGLE_EMOJISET, "Google modern"),
-                               (GOOGLE_BLOB_EMOJISET, "Google classic"),
-                               (TWITTER_EMOJISET, "Twitter"),
-                               (TEXT_EMOJISET, "Plain text"))
-    emojiset: str = models.CharField(default=GOOGLE_BLOB_EMOJISET, choices=EMOJISET_CHOICES, max_length=20)
+    GOOGLE_EMOJISET = 'google'
+    GOOGLE_BLOB_EMOJISET = 'google-blob'
+    TEXT_EMOJISET = 'text'
+    TWITTER_EMOJISET = 'twitter'
+    EMOJISET_CHOICES = (
+        (GOOGLE_EMOJISET, "Google modern"),
+        (GOOGLE_BLOB_EMOJISET, "Google classic"),
+        (TWITTER_EMOJISET, "Twitter"),
+        (TEXT_EMOJISET, "Plain text"),
+    )
+    emojiset: str = models.CharField(
+        default=GOOGLE_BLOB_EMOJISET, choices=EMOJISET_CHOICES, max_length=20
+    )
 
     AVATAR_FROM_GRAVATAR = 'G'
     AVATAR_FROM_USER = 'U'
@@ -1102,17 +1212,23 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
         (AVATAR_FROM_GRAVATAR, 'Hosted by Gravatar'),
         (AVATAR_FROM_USER, 'Uploaded by user'),
     )
-    avatar_source: str = models.CharField(default=AVATAR_FROM_GRAVATAR, choices=AVATAR_SOURCES, max_length=1)
+    avatar_source: str = models.CharField(
+        default=AVATAR_FROM_GRAVATAR, choices=AVATAR_SOURCES, max_length=1
+    )
     avatar_version: int = models.PositiveSmallIntegerField(default=1)
     avatar_hash: Optional[str] = models.CharField(null=True, max_length=64)
 
-    TUTORIAL_WAITING  = 'W'
-    TUTORIAL_STARTED  = 'S'
+    TUTORIAL_WAITING = 'W'
+    TUTORIAL_STARTED = 'S'
     TUTORIAL_FINISHED = 'F'
-    TUTORIAL_STATES   = ((TUTORIAL_WAITING, "Waiting"),
-                         (TUTORIAL_STARTED, "Started"),
-                         (TUTORIAL_FINISHED, "Finished"))
-    tutorial_status: str = models.CharField(default=TUTORIAL_WAITING, choices=TUTORIAL_STATES, max_length=1)
+    TUTORIAL_STATES = (
+        (TUTORIAL_WAITING, "Waiting"),
+        (TUTORIAL_STARTED, "Started"),
+        (TUTORIAL_FINISHED, "Finished"),
+    )
+    tutorial_status: str = models.CharField(
+        default=TUTORIAL_WAITING, choices=TUTORIAL_STATES, max_length=1
+    )
 
     # Contains serialized JSON of the form:
     #    [("step 1", true), ("step 2", false)]
@@ -1174,12 +1290,16 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
     @property
     def profile_data(self) -> ProfileData:
         values = CustomProfileFieldValue.objects.filter(user_profile=self)
-        user_data = {v.field_id: {"value": v.value, "rendered_value": v.rendered_value} for v in values}
+        user_data = {
+            v.field_id: {"value": v.value, "rendered_value": v.rendered_value} for v in values
+        }
         data: ProfileData = []
         for field in custom_profile_fields_for_realm(self.realm_id):
             field_values = user_data.get(field.id, None)
             if field_values:
-                value, rendered_value = field_values.get("value"), field_values.get("rendered_value")
+                value, rendered_value = field_values.get("value"), field_values.get(
+                    "rendered_value"
+                )
             else:
                 value, rendered_value = None, None
             field_type = field.field_type
@@ -1188,16 +1308,18 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
                 value = converter(value)
 
             field_data = field.as_dict()
-            data.append({
-                'id': field_data['id'],
-                'name': field_data['name'],
-                'type': field_data['type'],
-                'hint': field_data['hint'],
-                'field_data': field_data['field_data'],
-                'order': field_data['order'],
-                'value': value,
-                'rendered_value': rendered_value,
-            })
+            data.append(
+                {
+                    'id': field_data['id'],
+                    'name': field_data['name'],
+                    'type': field_data['type'],
+                    'hint': field_data['hint'],
+                    'field_data': field_data['field_data'],
+                    'order': field_data['order'],
+                    'value': value,
+                    'rendered_value': rendered_value,
+                }
+            )
 
         return data
 
@@ -1222,8 +1344,10 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
 
     @property
     def is_realm_admin(self) -> bool:
-        return self.role == UserProfile.ROLE_REALM_ADMINISTRATOR or \
-            self.role == UserProfile.ROLE_REALM_OWNER
+        return (
+            self.role == UserProfile.ROLE_REALM_ADMINISTRATOR
+            or self.role == UserProfile.ROLE_REALM_OWNER
+        )
 
     @is_realm_admin.setter
     def is_realm_admin(self, value: bool) -> None:
@@ -1262,8 +1386,10 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
     @property
     def allowed_bot_types(self) -> List[int]:
         allowed_bot_types = []
-        if self.is_realm_admin or \
-                not self.realm.bot_creation_policy == Realm.BOT_CREATION_LIMIT_GENERIC_BOTS:
+        if (
+            self.is_realm_admin
+            or not self.realm.bot_creation_policy == Realm.BOT_CREATION_LIMIT_GENERIC_BOTS
+        ):
             allowed_bot_types.append(UserProfile.DEFAULT_BOT)
         allowed_bot_types += [
             UserProfile.INCOMING_WEBHOOK_BOT,
@@ -1275,7 +1401,9 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
 
     @staticmethod
     def emojiset_choices() -> List[Dict[str, str]]:
-        return [dict(key=emojiset[0], text=emojiset[1]) for emojiset in UserProfile.EMOJISET_CHOICES]
+        return [
+            dict(key=emojiset[0], text=emojiset[1]) for emojiset in UserProfile.EMOJISET_CHOICES
+        ]
 
     @staticmethod
     def emails_from_ids(user_ids: Sequence[int]) -> Dict[int, str]:
@@ -1334,14 +1462,17 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
             return
 
         from zproject.backends import check_password_strength
+
         if not check_password_strength(password):
             raise PasswordTooWeakError
 
         super().set_password(password)
 
+
 class PasswordTooWeakError(Exception):
     pass
 
+
 class UserGroup(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     name: str = models.CharField(max_length=100)
@@ -1352,6 +1483,7 @@ class UserGroup(models.Model):
     class Meta:
         unique_together = (('realm', 'name'),)
 
+
 class UserGroupMembership(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user_group: UserGroup = models.ForeignKey(UserGroup, on_delete=CASCADE)
@@ -1360,31 +1492,34 @@ class UserGroupMembership(models.Model):
     class Meta:
         unique_together = (('user_group', 'user_profile'),)
 
+
 def receives_offline_push_notifications(user_profile: UserProfile) -> bool:
-    return (user_profile.enable_offline_push_notifications and
-            not user_profile.is_bot)
+    return user_profile.enable_offline_push_notifications and not user_profile.is_bot
+
 
 def receives_offline_email_notifications(user_profile: UserProfile) -> bool:
-    return (user_profile.enable_offline_email_notifications and
-            not user_profile.is_bot)
+    return user_profile.enable_offline_email_notifications and not user_profile.is_bot
+
 
 def receives_online_notifications(user_profile: UserProfile) -> bool:
-    return (user_profile.enable_online_push_notifications and
-            not user_profile.is_bot)
+    return user_profile.enable_online_push_notifications and not user_profile.is_bot
+
 
 def receives_stream_notifications(user_profile: UserProfile) -> bool:
-    return (user_profile.enable_stream_push_notifications and
-            not user_profile.is_bot)
+    return user_profile.enable_stream_push_notifications and not user_profile.is_bot
+
 
 def remote_user_to_email(remote_user: str) -> str:
     if settings.SSO_APPEND_DOMAIN is not None:
         remote_user += "@" + settings.SSO_APPEND_DOMAIN
     return remote_user
 
+
 # Make sure we flush the UserProfile object from our remote cache
 # whenever we save it.
 post_save.connect(flush_user_profile, sender=UserProfile)
 
+
 class PreregistrationUser(models.Model):
     # Data on a partially created user, before the completion of
     # registration.  This is used in at least three major code paths:
@@ -1403,7 +1538,9 @@ class PreregistrationUser(models.Model):
     # store it here to use it to prepopulate the Full Name field in the registration form:
     full_name: Optional[str] = models.CharField(max_length=UserProfile.MAX_NAME_LENGTH, null=True)
     full_name_validated: bool = models.BooleanField(default=False)
-    referred_by: Optional[UserProfile] = models.ForeignKey(UserProfile, null=True, on_delete=CASCADE)
+    referred_by: Optional[UserProfile] = models.ForeignKey(
+        UserProfile, null=True, on_delete=CASCADE
+    )
     streams: Manager = models.ManyToManyField('Stream')
     invited_at: datetime.datetime = models.DateTimeField(auto_now=True)
     realm_creation: bool = models.BooleanField(default=False)
@@ -1423,27 +1560,33 @@ class PreregistrationUser(models.Model):
     # settings_invites.invited_as_values in
     # static/js/settings_invites.js
     INVITE_AS = dict(
-        REALM_OWNER = 100,
-        REALM_ADMIN = 200,
-        MEMBER = 400,
-        GUEST_USER = 600,
+        REALM_OWNER=100,
+        REALM_ADMIN=200,
+        MEMBER=400,
+        GUEST_USER=600,
     )
     invited_as: int = models.PositiveSmallIntegerField(default=INVITE_AS['MEMBER'])
 
+
 def filter_to_valid_prereg_users(query: QuerySet) -> QuerySet:
     days_to_activate = settings.INVITATION_LINK_VALIDITY_DAYS
     active_value = confirmation_settings.STATUS_ACTIVE
     revoked_value = confirmation_settings.STATUS_REVOKED
     lowest_datetime = timezone_now() - datetime.timedelta(days=days_to_activate)
     return query.exclude(status__in=[active_value, revoked_value]).filter(
-        invited_at__gte=lowest_datetime)
+        invited_at__gte=lowest_datetime
+    )
+
 
 class MultiuseInvite(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     referred_by: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
     streams: Manager = models.ManyToManyField('Stream')
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
-    invited_as: int = models.PositiveSmallIntegerField(default=PreregistrationUser.INVITE_AS['MEMBER'])
+    invited_as: int = models.PositiveSmallIntegerField(
+        default=PreregistrationUser.INVITE_AS['MEMBER']
+    )
+
 
 class EmailChangeStatus(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
@@ -1458,6 +1601,7 @@ class EmailChangeStatus(models.Model):
 
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
 
+
 class AbstractPushDeviceToken(models.Model):
     APNS = 1
     GCM = 2
@@ -1485,6 +1629,7 @@ class AbstractPushDeviceToken(models.Model):
     class Meta:
         abstract = True
 
+
 class PushDeviceToken(AbstractPushDeviceToken):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
 
@@ -1494,9 +1639,11 @@ class PushDeviceToken(AbstractPushDeviceToken):
     class Meta:
         unique_together = ("user", "kind", "token")
 
+
 def generate_email_token_for_stream() -> str:
     return secrets.token_hex(16)
 
+
 class Stream(models.Model):
     MAX_NAME_LENGTH = 60
     MAX_DESCRIPTION_LENGTH = 1024
@@ -1545,7 +1692,9 @@ class Stream(models.Model):
     # e-mail length of 254, and our max stream length is 30, so we
     # have plenty of room for the token.
     email_token: str = models.CharField(
-        max_length=32, default=generate_email_token_for_stream, unique=True,
+        max_length=32,
+        default=generate_email_token_for_stream,
+        unique=True,
     )
 
     # For old messages being automatically deleted.
@@ -1615,9 +1764,11 @@ class Stream(models.Model):
         result['is_announcement_only'] = self.stream_post_policy == Stream.STREAM_POST_POLICY_ADMINS
         return result
 
+
 post_save.connect(flush_stream, sender=Stream)
 post_delete.connect(flush_stream, sender=Stream)
 
+
 class MutedTopic(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -1627,13 +1778,16 @@ class MutedTopic(models.Model):
     # The default value for date_muted is a few weeks before tracking
     # of when topics were muted was first introduced.  It's designed
     # to be obviously incorrect so that users can tell it's backfilled data.
-    date_muted: datetime.datetime = models.DateTimeField(default=datetime.datetime(2020, 1, 1, 0, 0, tzinfo=datetime.timezone.utc))
+    date_muted: datetime.datetime = models.DateTimeField(
+        default=datetime.datetime(2020, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)
+    )
 
     class Meta:
         unique_together = ('user_profile', 'stream', 'topic_name')
 
     def __str__(self) -> str:
-        return (f"<MutedTopic: ({self.user_profile.email}, {self.stream.name}, {self.topic_name}, {self.date_muted})>")
+        return f"<MutedTopic: ({self.user_profile.email}, {self.stream.name}, {self.topic_name}, {self.date_muted})>"
+
 
 class Client(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
@@ -1642,7 +1796,10 @@ class Client(models.Model):
     def __str__(self) -> str:
         return f"<Client: {self.name}>"
 
+
 get_client_cache: Dict[str, Client] = {}
+
+
 def get_client(name: str) -> Client:
     # Accessing KEY_PREFIX through the module is necessary
     # because we need the updated value of the variable.
@@ -1652,18 +1809,21 @@ def get_client(name: str) -> Client:
         get_client_cache[cache_name] = result
     return get_client_cache[cache_name]
 
+
 def get_client_cache_key(name: str) -> str:
     return f'get_client:{make_safe_digest(name)}'
 
-@cache_with_key(get_client_cache_key, timeout=3600*24*7)
+
+@cache_with_key(get_client_cache_key, timeout=3600 * 24 * 7)
 def get_client_remote_cache(name: str) -> Client:
     (client, _) = Client.objects.get_or_create(name=name)
     return client
 
-@cache_with_key(get_stream_cache_key, timeout=3600*24*7)
+
+@cache_with_key(get_stream_cache_key, timeout=3600 * 24 * 7)
 def get_realm_stream(stream_name: str, realm_id: int) -> Stream:
-    return Stream.objects.select_related().get(
-        name__iexact=stream_name.strip(), realm_id=realm_id)
+    return Stream.objects.select_related().get(name__iexact=stream_name.strip(), realm_id=realm_id)
+
 
 def stream_name_in_use(stream_name: str, realm_id: int) -> bool:
     return Stream.objects.filter(
@@ -1671,6 +1831,7 @@ def stream_name_in_use(stream_name: str, realm_id: int) -> bool:
         realm_id=realm_id,
     ).exists()
 
+
 def get_active_streams(realm: Optional[Realm]) -> QuerySet:
     # TODO: Change return type to QuerySet[Stream]
     # NOTE: Return value is used as a QuerySet, so cannot currently be Sequence[QuerySet]
@@ -1679,19 +1840,21 @@ def get_active_streams(realm: Optional[Realm]) -> QuerySet:
     """
     return Stream.objects.filter(realm=realm, deactivated=False)
 
+
 def get_stream(stream_name: str, realm: Realm) -> Stream:
-    '''
+    """
     Callers that don't have a Realm object already available should use
     get_realm_stream directly, to avoid unnecessarily fetching the
     Realm object.
-    '''
+    """
     return get_realm_stream(stream_name, realm.id)
 
+
 def get_stream_by_id_in_realm(stream_id: int, realm: Realm) -> Stream:
     return Stream.objects.select_related().get(id=stream_id, realm=realm)
 
-def bulk_get_streams(realm: Realm, stream_names: STREAM_NAMES) -> Dict[str, Any]:
 
+def bulk_get_streams(realm: Realm, stream_names: STREAM_NAMES) -> Dict[str, Any]:
     def fetch_streams_by_name(stream_names: List[str]) -> Sequence[Stream]:
         #
         # This should be just
@@ -1701,10 +1864,14 @@ def bulk_get_streams(realm: Realm, stream_names: STREAM_NAMES) -> Dict[str, Any]
         #
         # But chaining __in and __iexact doesn't work with Django's
         # ORM, so we have the following hack to construct the relevant where clause
-        where_clause = "upper(zerver_stream.name::text) IN (SELECT upper(name) FROM unnest(%s) AS name)"
-        return get_active_streams(realm).select_related().extra(
-            where=[where_clause],
-            params=(list(stream_names),))
+        where_clause = (
+            "upper(zerver_stream.name::text) IN (SELECT upper(name) FROM unnest(%s) AS name)"
+        )
+        return (
+            get_active_streams(realm)
+            .select_related()
+            .extra(where=[where_clause], params=(list(stream_names),))
+        )
 
     def stream_name_to_cache_key(stream_name: str) -> str:
         return get_stream_cache_key(stream_name, realm.id)
@@ -1719,6 +1886,7 @@ def bulk_get_streams(realm: Realm, stream_names: STREAM_NAMES) -> Dict[str, Any]
         id_fetcher=stream_to_lower_name,
     )
 
+
 def get_huddle_recipient(user_profile_ids: Set[int]) -> Recipient:
 
     # The caller should ensure that user_profile_ids includes
@@ -1728,12 +1896,18 @@ def get_huddle_recipient(user_profile_ids: Set[int]) -> Recipient:
     huddle = get_huddle(list(user_profile_ids))
     return huddle.recipient
 
-def get_huddle_user_ids(recipient: Recipient) -> List[int]:
-    assert(recipient.type == Recipient.HUDDLE)
 
-    return Subscription.objects.filter(
-        recipient=recipient,
-    ).order_by('user_profile_id').values_list('user_profile_id', flat=True)
+def get_huddle_user_ids(recipient: Recipient) -> List[int]:
+    assert recipient.type == Recipient.HUDDLE
+
+    return (
+        Subscription.objects.filter(
+            recipient=recipient,
+        )
+        .order_by('user_profile_id')
+        .values_list('user_profile_id', flat=True)
+    )
+
 
 def bulk_get_huddle_user_ids(recipients: List[Recipient]) -> Dict[int, List[int]]:
     """
@@ -1750,12 +1924,15 @@ def bulk_get_huddle_user_ids(recipients: List[Recipient]) -> Dict[int, List[int]
 
     result_dict: Dict[int, List[int]] = {}
     for recipient in recipients:
-        result_dict[recipient.id] = [subscription.user_profile_id
-                                     for subscription in subscriptions
-                                     if subscription.recipient_id == recipient.id]
+        result_dict[recipient.id] = [
+            subscription.user_profile_id
+            for subscription in subscriptions
+            if subscription.recipient_id == recipient.id
+        ]
 
     return result_dict
 
+
 class AbstractMessage(models.Model):
     sender: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
     recipient: Recipient = models.ForeignKey(Recipient, on_delete=CASCADE)
@@ -1793,6 +1970,7 @@ class AbstractMessage(models.Model):
         display_recipient = get_display_recipient(self.recipient)
         return f"<{self.__class__.__name__}: {display_recipient} / {self.subject} / {self.sender}>"
 
+
 class ArchiveTransaction(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     timestamp: datetime.datetime = models.DateTimeField(default=timezone_now, db_index=True)
@@ -1816,13 +1994,18 @@ class ArchiveTransaction(models.Model):
             timestamp=self.timestamp,
         )
 
+
 class ArchivedMessage(AbstractMessage):
     """Used as a temporary holding place for deleted messages before they
     are permanently deleted.  This is an important part of a robust
     'message retention' feature.
     """
+
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
-    archive_transaction: ArchiveTransaction = models.ForeignKey(ArchiveTransaction, on_delete=CASCADE)
+    archive_transaction: ArchiveTransaction = models.ForeignKey(
+        ArchiveTransaction, on_delete=CASCADE
+    )
+
 
 class Message(AbstractMessage):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
@@ -1838,13 +2021,13 @@ class Message(AbstractMessage):
         self.subject = topic_name
 
     def is_stream_message(self) -> bool:
-        '''
+        """
         Find out whether a message is a stream message by
         looking up its recipient.type.  TODO: Make this
         an easier operation by denormalizing the message
         type onto Message, either explicitly (message.type)
         or implicitly (message.stream_id is not None).
-        '''
+        """
         return self.recipient.type == Recipient.STREAM
 
     def get_realm(self) -> Realm:
@@ -1854,12 +2037,16 @@ class Message(AbstractMessage):
         self.save(update_fields=["rendered_content", "rendered_content_version"])
 
     @staticmethod
-    def need_to_render_content(rendered_content: Optional[str],
-                               rendered_content_version: Optional[int],
-                               markdown_version: int) -> bool:
-        return (rendered_content is None or
-                rendered_content_version is None or
-                rendered_content_version < markdown_version)
+    def need_to_render_content(
+        rendered_content: Optional[str],
+        rendered_content_version: Optional[int],
+        markdown_version: int,
+    ) -> bool:
+        return (
+            rendered_content is None
+            or rendered_content_version is None
+            or rendered_content_version < markdown_version
+        )
 
     def sent_by_human(self) -> bool:
         """Used to determine whether a message was sent by a full Zulip UI
@@ -1872,10 +2059,21 @@ class Message(AbstractMessage):
         """
         sending_client = self.sending_client.name.lower()
 
-        return (sending_client in ('zulipandroid', 'zulipios', 'zulipdesktop',
-                                   'zulipmobile', 'zulipelectron', 'zulipterminal', 'snipe',
-                                   'website', 'ios', 'android')) or (
-                                       'desktop app' in sending_client)
+        return (
+            sending_client
+            in (
+                'zulipandroid',
+                'zulipios',
+                'zulipdesktop',
+                'zulipmobile',
+                'zulipelectron',
+                'zulipterminal',
+                'snipe',
+                'website',
+                'ios',
+                'android',
+            )
+        ) or ('desktop app' in sending_client)
 
     @staticmethod
     def is_status_message(content: str, rendered_content: str) -> bool:
@@ -1887,6 +2085,7 @@ class Message(AbstractMessage):
             return True
         return False
 
+
 def get_context_for_message(message: Message) -> Sequence[Message]:
     # TODO: Change return type to QuerySet[Message]
     return Message.objects.filter(
@@ -1896,8 +2095,10 @@ def get_context_for_message(message: Message) -> Sequence[Message]:
         date_sent__gt=message.date_sent - timedelta(minutes=15),
     ).order_by('-id')[:10]
 
+
 post_save.connect(flush_message, sender=Message)
 
+
 class AbstractSubMessage(models.Model):
     # We can send little text messages that are associated with a regular
     # Zulip message.  These can be used for experimental widgets like embedded
@@ -1911,6 +2112,7 @@ class AbstractSubMessage(models.Model):
     class Meta:
         abstract = True
 
+
 class SubMessage(AbstractSubMessage):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     message: Message = models.ForeignKey(Message, on_delete=CASCADE)
@@ -1922,18 +2124,24 @@ class SubMessage(AbstractSubMessage):
         query = query.order_by('message_id', 'id')
         return list(query)
 
+
 class ArchivedSubMessage(AbstractSubMessage):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     message: ArchivedMessage = models.ForeignKey(ArchivedMessage, on_delete=CASCADE)
 
+
 post_save.connect(flush_submessage, sender=SubMessage)
 
+
 class Draft(models.Model):
-    """ Server-side storage model for storing drafts so that drafts can be synced across
+    """Server-side storage model for storing drafts so that drafts can be synced across
     multiple clients/devices.
     """
+
     user_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=models.CASCADE)
-    recipient: Optional[Recipient] = models.ForeignKey(Recipient, null=True, on_delete=models.SET_NULL)
+    recipient: Optional[Recipient] = models.ForeignKey(
+        Recipient, null=True, on_delete=models.SET_NULL
+    )
     topic: str = models.CharField(max_length=MAX_TOPIC_NAME_LENGTH, db_index=True)
     content: str = models.TextField()  # Length should not exceed MAX_MESSAGE_LENGTH
     last_edit_time: datetime.datetime = models.DateTimeField(db_index=True)
@@ -1955,7 +2163,7 @@ class Draft(models.Model):
             else:
                 to = []
                 for r in get_display_recipient(self.recipient):
-                    assert(not isinstance(r, str))  # It will only be a string for streams
+                    assert not isinstance(r, str)  # It will only be a string for streams
                     if not r["id"] == self.user_profile_id:
                         to.append(r["id"])
         return {
@@ -1967,6 +2175,7 @@ class Draft(models.Model):
             "timestamp": int(self.last_edit_time.timestamp()),
         }
 
+
 class AbstractReaction(models.Model):
     """For emoji reactions to messages (and potentially future reaction types).
 
@@ -1974,6 +2183,7 @@ class AbstractReaction(models.Model):
     on how this subsystem works, see:
       https://zulip.readthedocs.io/en/latest/subsystems/emoji.html
     """
+
     user_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
 
     # The user-facing name for an emoji reaction.  With emoji aliases,
@@ -1981,13 +2191,17 @@ class AbstractReaction(models.Model):
     # field encodes which one the user selected.
     emoji_name: str = models.TextField()
 
-    UNICODE_EMOJI       = 'unicode_emoji'
-    REALM_EMOJI         = 'realm_emoji'
-    ZULIP_EXTRA_EMOJI   = 'zulip_extra_emoji'
-    REACTION_TYPES      = ((UNICODE_EMOJI, ugettext_lazy("Unicode emoji")),
-                           (REALM_EMOJI, ugettext_lazy("Custom emoji")),
-                           (ZULIP_EXTRA_EMOJI, ugettext_lazy("Zulip extra emoji")))
-    reaction_type: str = models.CharField(default=UNICODE_EMOJI, choices=REACTION_TYPES, max_length=30)
+    UNICODE_EMOJI = 'unicode_emoji'
+    REALM_EMOJI = 'realm_emoji'
+    ZULIP_EXTRA_EMOJI = 'zulip_extra_emoji'
+    REACTION_TYPES = (
+        (UNICODE_EMOJI, ugettext_lazy("Unicode emoji")),
+        (REALM_EMOJI, ugettext_lazy("Custom emoji")),
+        (ZULIP_EXTRA_EMOJI, ugettext_lazy("Zulip extra emoji")),
+    )
+    reaction_type: str = models.CharField(
+        default=UNICODE_EMOJI, choices=REACTION_TYPES, max_length=30
+    )
 
     # A string that uniquely identifies a particular emoji.  The format varies
     # by type:
@@ -2006,8 +2220,11 @@ class AbstractReaction(models.Model):
 
     class Meta:
         abstract = True
-        unique_together = (("user_profile", "message", "emoji_name"),
-                           ("user_profile", "message", "reaction_type", "emoji_code"))
+        unique_together = (
+            ("user_profile", "message", "emoji_name"),
+            ("user_profile", "message", "reaction_type", "emoji_code"),
+        )
+
 
 class Reaction(AbstractReaction):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
@@ -2015,17 +2232,26 @@ class Reaction(AbstractReaction):
 
     @staticmethod
     def get_raw_db_rows(needed_ids: List[int]) -> List[Dict[str, Any]]:
-        fields = ['message_id', 'emoji_name', 'emoji_code', 'reaction_type',
-                  'user_profile__email', 'user_profile__id', 'user_profile__full_name']
+        fields = [
+            'message_id',
+            'emoji_name',
+            'emoji_code',
+            'reaction_type',
+            'user_profile__email',
+            'user_profile__id',
+            'user_profile__full_name',
+        ]
         return Reaction.objects.filter(message_id__in=needed_ids).values(*fields)
 
     def __str__(self) -> str:
         return f"{self.user_profile.email} / {self.message.id} / {self.emoji_name}"
 
+
 class ArchivedReaction(AbstractReaction):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     message: ArchivedMessage = models.ForeignKey(ArchivedMessage, on_delete=CASCADE)
 
+
 # Whenever a message is sent, for each user subscribed to the
 # corresponding Recipient object, we add a row to the UserMessage
 # table indicating that that user received that message.  This table
@@ -2121,10 +2347,10 @@ class AbstractUserMessage(models.Model):
 
     @staticmethod
     def flags_list_for_flags(val: int) -> List[str]:
-        '''
+        """
         This function is highly optimized, because it actually slows down
         sending messages in a naive implementation.
-        '''
+        """
         flags = []
         mask = 1
         for flag in UserMessage.ALL_FLAGS:
@@ -2141,20 +2367,27 @@ class AbstractUserMessage(models.Model):
 class UserMessage(AbstractUserMessage):
     message: Message = models.ForeignKey(Message, on_delete=CASCADE)
 
-def get_usermessage_by_message_id(user_profile: UserProfile, message_id: int) -> Optional[UserMessage]:
+
+def get_usermessage_by_message_id(
+    user_profile: UserProfile, message_id: int
+) -> Optional[UserMessage]:
     try:
-        return UserMessage.objects.select_related().get(user_profile=user_profile,
-                                                        message__id=message_id)
+        return UserMessage.objects.select_related().get(
+            user_profile=user_profile, message__id=message_id
+        )
     except UserMessage.DoesNotExist:
         return None
 
+
 class ArchivedUserMessage(AbstractUserMessage):
     """Used as a temporary holding place for deleted UserMessages objects
     before they are permanently deleted.  This is an important part of
     a robust 'message retention' feature.
     """
+
     message: Message = models.ForeignKey(ArchivedMessage, on_delete=CASCADE)
 
+
 class AbstractAttachment(models.Model):
     file_name: str = models.TextField(db_index=True)
 
@@ -2166,7 +2399,8 @@ class AbstractAttachment(models.Model):
     realm: Optional[Realm] = models.ForeignKey(Realm, blank=True, null=True, on_delete=CASCADE)
 
     create_time: datetime.datetime = models.DateTimeField(
-        default=timezone_now, db_index=True,
+        default=timezone_now,
+        db_index=True,
     )
     # Size of the uploaded file, in bytes
     size: int = models.IntegerField()
@@ -2196,9 +2430,11 @@ class ArchivedAttachment(AbstractAttachment):
     before they are permanently deleted.  This is an important part of
     a robust 'message retention' feature.
     """
+
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     messages: Manager = models.ManyToManyField(ArchivedMessage)
 
+
 class Attachment(AbstractAttachment):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     messages: Manager = models.ManyToManyField(Message)
@@ -2215,15 +2451,20 @@ class Attachment(AbstractAttachment):
             # convert to JavaScript-style UNIX timestamp so we can take
             # advantage of client timezones.
             'create_time': int(time.mktime(self.create_time.timetuple()) * 1000),
-            'messages': [{
-                'id': m.id,
-                'date_sent': int(time.mktime(m.date_sent.timetuple()) * 1000),
-            } for m in self.messages.all()],
+            'messages': [
+                {
+                    'id': m.id,
+                    'date_sent': int(time.mktime(m.date_sent.timetuple()) * 1000),
+                }
+                for m in self.messages.all()
+            ],
         }
 
+
 post_save.connect(flush_used_upload_space_cache, sender=Attachment)
 post_delete.connect(flush_used_upload_space_cache, sender=Attachment)
 
+
 def validate_attachment_request(user_profile: UserProfile, path_id: str) -> Optional[bool]:
     try:
         attachment = Attachment.objects.get(path_id=path_id)
@@ -2233,8 +2474,11 @@ def validate_attachment_request(user_profile: UserProfile, path_id: str) -> Opti
     if user_profile == attachment.owner:
         # If you own the file, you can access it.
         return True
-    if (attachment.is_realm_public and attachment.realm == user_profile.realm and
-            user_profile.can_access_public_streams()):
+    if (
+        attachment.is_realm_public
+        and attachment.realm == user_profile.realm
+        and user_profile.can_access_public_streams()
+    ):
         # Any user in the realm can access realm-public files
         return True
 
@@ -2254,12 +2498,15 @@ def validate_attachment_request(user_profile: UserProfile, path_id: str) -> Opti
         user_profile=user_profile,
         active=True,
         recipient__type=Recipient.STREAM,
-        recipient__in=[m.recipient_id for m in messages]).values_list("recipient__type_id", flat=True)
+        recipient__in=[m.recipient_id for m in messages],
+    ).values_list("recipient__type_id", flat=True)
     if len(relevant_stream_ids) == 0:
         return False
 
-    return Stream.objects.filter(id__in=relevant_stream_ids,
-                                 history_public_to_subscribers=True).exists()
+    return Stream.objects.filter(
+        id__in=relevant_stream_ids, history_public_to_subscribers=True
+    ).exists()
+
 
 def get_old_unclaimed_attachments(weeks_ago: int) -> Sequence[Attachment]:
     # TODO: Change return type to QuerySet[Attachment]
@@ -2267,6 +2514,7 @@ def get_old_unclaimed_attachments(weeks_ago: int) -> Sequence[Attachment]:
     old_attachments = Attachment.objects.filter(messages=None, create_time__lt=delta_weeks_ago)
     return old_attachments
 
+
 class Subscription(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -2341,11 +2589,13 @@ class Subscription(models.Model):
         "role",
     ]
 
-@cache_with_key(user_profile_by_id_cache_key, timeout=3600*24*7)
+
+@cache_with_key(user_profile_by_id_cache_key, timeout=3600 * 24 * 7)
 def get_user_profile_by_id(uid: int) -> UserProfile:
     return UserProfile.objects.select_related().get(id=uid)
 
-@cache_with_key(user_profile_by_email_cache_key, timeout=3600*24*7)
+
+@cache_with_key(user_profile_by_email_cache_key, timeout=3600 * 24 * 7)
 def get_user_profile_by_email(email: str) -> UserProfile:
     """This function is intended to be used by our unit tests and for
     manual manage.py shell work; robust code must use get_user or
@@ -2355,7 +2605,8 @@ def get_user_profile_by_email(email: str) -> UserProfile:
     """
     return UserProfile.objects.select_related().get(delivery_email__iexact=email.strip())
 
-@cache_with_key(user_profile_by_api_key_cache_key, timeout=3600*24*7)
+
+@cache_with_key(user_profile_by_api_key_cache_key, timeout=3600 * 24 * 7)
 def maybe_get_user_profile_by_api_key(api_key: str) -> Optional[UserProfile]:
     try:
         return UserProfile.objects.select_related().get(api_key=api_key)
@@ -2366,6 +2617,7 @@ def maybe_get_user_profile_by_api_key(api_key: str) -> Optional[UserProfile]:
         # we want to handle that as quickly as possible.
         return None
 
+
 def get_user_profile_by_api_key(api_key: str) -> UserProfile:
     user_profile = maybe_get_user_profile_by_api_key(api_key)
     if user_profile is None:
@@ -2373,6 +2625,7 @@ def get_user_profile_by_api_key(api_key: str) -> UserProfile:
 
     return user_profile
 
+
 def get_user_by_delivery_email(email: str, realm: Realm) -> UserProfile:
     """Fetches a user given their delivery email.  For use in
     authentication/registration contexts.  Do not use for user-facing
@@ -2381,7 +2634,9 @@ def get_user_by_delivery_email(email: str, realm: Realm) -> UserProfile:
     those code paths.
     """
     return UserProfile.objects.select_related().get(
-        delivery_email__iexact=email.strip(), realm=realm)
+        delivery_email__iexact=email.strip(), realm=realm
+    )
+
 
 def get_users_by_delivery_email(emails: Set[str], realm: Realm) -> QuerySet:
     """This is similar to get_user_by_delivery_email, and
@@ -2405,7 +2660,8 @@ def get_users_by_delivery_email(emails: Set[str], realm: Realm) -> QuerySet:
 
     return UserProfile.objects.filter(realm=realm).filter(email_filter)
 
-@cache_with_key(user_profile_cache_key, timeout=3600*24*7)
+
+@cache_with_key(user_profile_cache_key, timeout=3600 * 24 * 7)
 def get_user(email: str, realm: Realm) -> UserProfile:
     """Fetches the user by its visible-to-other users username (in the
     `email` field).  For use in API contexts; do not use in
@@ -2416,6 +2672,7 @@ def get_user(email: str, realm: Realm) -> UserProfile:
     """
     return UserProfile.objects.select_related().get(email__iexact=email.strip(), realm=realm)
 
+
 def get_active_user(email: str, realm: Realm) -> UserProfile:
     """Variant of get_user_by_email that excludes deactivated users.
     See get_user docstring for important usage notes."""
@@ -2424,28 +2681,33 @@ def get_active_user(email: str, realm: Realm) -> UserProfile:
         raise UserProfile.DoesNotExist()
     return user_profile
 
+
 def get_user_profile_by_id_in_realm(uid: int, realm: Realm) -> UserProfile:
     return UserProfile.objects.select_related().get(id=uid, realm=realm)
 
+
 def get_active_user_profile_by_id_in_realm(uid: int, realm: Realm) -> UserProfile:
     user_profile = get_user_profile_by_id_in_realm(uid, realm)
     if not user_profile.is_active:
         raise UserProfile.DoesNotExist()
     return user_profile
 
-def get_user_including_cross_realm(email: str, realm: Optional[Realm]=None) -> UserProfile:
+
+def get_user_including_cross_realm(email: str, realm: Optional[Realm] = None) -> UserProfile:
     if is_cross_realm_bot_email(email):
         return get_system_bot(email)
     assert realm is not None
     return get_user(email, realm)
 
-@cache_with_key(bot_profile_cache_key, timeout=3600*24*7)
+
+@cache_with_key(bot_profile_cache_key, timeout=3600 * 24 * 7)
 def get_system_bot(email: str) -> UserProfile:
     return UserProfile.objects.select_related().get(email__iexact=email.strip())
 
+
 def get_user_by_id_in_realm_including_cross_realm(
-        uid: int,
-        realm: Optional[Realm],
+    uid: int,
+    realm: Optional[Realm],
 ) -> UserProfile:
     user_profile = get_user_profile_by_id(uid)
     if user_profile.realm == realm:
@@ -2458,13 +2720,15 @@ def get_user_by_id_in_realm_including_cross_realm(
 
     raise UserProfile.DoesNotExist()
 
-@cache_with_key(realm_user_dicts_cache_key, timeout=3600*24*7)
+
+@cache_with_key(realm_user_dicts_cache_key, timeout=3600 * 24 * 7)
 def get_realm_user_dicts(realm_id: int) -> List[Dict[str, Any]]:
     return UserProfile.objects.filter(
         realm_id=realm_id,
     ).values(*realm_user_dict_fields)
 
-@cache_with_key(active_user_ids_cache_key, timeout=3600*24*7)
+
+@cache_with_key(active_user_ids_cache_key, timeout=3600 * 24 * 7)
 def active_user_ids(realm_id: int) -> List[int]:
     query = UserProfile.objects.filter(
         realm_id=realm_id,
@@ -2472,29 +2736,38 @@ def active_user_ids(realm_id: int) -> List[int]:
     ).values_list('id', flat=True)
     return list(query)
 
-@cache_with_key(active_non_guest_user_ids_cache_key, timeout=3600*24*7)
+
+@cache_with_key(active_non_guest_user_ids_cache_key, timeout=3600 * 24 * 7)
 def active_non_guest_user_ids(realm_id: int) -> List[int]:
-    query = UserProfile.objects.filter(
-        realm_id=realm_id,
-        is_active=True,
-    ).exclude(
-        role=UserProfile.ROLE_GUEST,
-    ).values_list('id', flat=True)
+    query = (
+        UserProfile.objects.filter(
+            realm_id=realm_id,
+            is_active=True,
+        )
+        .exclude(
+            role=UserProfile.ROLE_GUEST,
+        )
+        .values_list('id', flat=True)
+    )
     return list(query)
 
+
 def get_source_profile(email: str, string_id: str) -> Optional[UserProfile]:
     try:
         return get_user_by_delivery_email(email, get_realm(string_id))
     except (Realm.DoesNotExist, UserProfile.DoesNotExist):
         return None
 
-@cache_with_key(bot_dicts_in_realm_cache_key, timeout=3600*24*7)
+
+@cache_with_key(bot_dicts_in_realm_cache_key, timeout=3600 * 24 * 7)
 def get_bot_dicts_in_realm(realm: Realm) -> List[Dict[str, Any]]:
     return UserProfile.objects.filter(realm=realm, is_bot=True).values(*bot_dict_fields)
 
+
 def is_cross_realm_bot_email(email: str) -> bool:
     return email.lower() in settings.CROSS_REALM_BOT_EMAILS
 
+
 # The Huddle class represents a group of individuals who have had a
 # group private message conversation together.  The actual membership
 # of the Huddle is stored in the Subscription table just like with
@@ -2509,33 +2782,40 @@ class Huddle(models.Model):
     # Foreign key to the Recipient object for this Huddle.
     recipient = models.ForeignKey(Recipient, null=True, on_delete=models.SET_NULL)
 
+
 def get_huddle_hash(id_list: List[int]) -> str:
     id_list = sorted(set(id_list))
     hash_key = ",".join(str(x) for x in id_list)
     return make_safe_digest(hash_key)
 
+
 def huddle_hash_cache_key(huddle_hash: str) -> str:
     return f"huddle_by_hash:{huddle_hash}"
 
+
 def get_huddle(id_list: List[int]) -> Huddle:
     huddle_hash = get_huddle_hash(id_list)
     return get_huddle_backend(huddle_hash, id_list)
 
-@cache_with_key(lambda huddle_hash, id_list: huddle_hash_cache_key(huddle_hash), timeout=3600*24*7)
+
+@cache_with_key(
+    lambda huddle_hash, id_list: huddle_hash_cache_key(huddle_hash), timeout=3600 * 24 * 7
+)
 def get_huddle_backend(huddle_hash: str, id_list: List[int]) -> Huddle:
     with transaction.atomic():
         (huddle, created) = Huddle.objects.get_or_create(huddle_hash=huddle_hash)
         if created:
-            recipient = Recipient.objects.create(type_id=huddle.id,
-                                                 type=Recipient.HUDDLE)
+            recipient = Recipient.objects.create(type_id=huddle.id, type=Recipient.HUDDLE)
             huddle.recipient = recipient
             huddle.save(update_fields=["recipient"])
-            subs_to_create = [Subscription(recipient=recipient,
-                                           user_profile_id=user_profile_id)
-                              for user_profile_id in id_list]
+            subs_to_create = [
+                Subscription(recipient=recipient, user_profile_id=user_profile_id)
+                for user_profile_id in id_list
+            ]
             Subscription.objects.bulk_create(subs_to_create)
         return huddle
 
+
 class UserActivity(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -2548,6 +2828,7 @@ class UserActivity(models.Model):
     class Meta:
         unique_together = ("user_profile", "client", "query")
 
+
 class UserActivityInterval(models.Model):
     MIN_INTERVAL_LENGTH = datetime.timedelta(minutes=15)
 
@@ -2563,6 +2844,7 @@ class UserPresence(models.Model):
     This is a tricky subsystem, because it is highly optimized.  See the docs:
       https://zulip.readthedocs.io/en/latest/subsystems/presence.html
     """
+
     class Meta:
         unique_together = ("user_profile", "client")
         index_together = [
@@ -2605,8 +2887,13 @@ class UserPresence(models.Model):
             raise ValueError(f'Unknown status: {status}')
 
     @staticmethod
-    def to_presence_dict(client_name: str, status: int, dt: datetime.datetime, push_enabled: bool=False,
-                         has_push_devices: bool=False) -> Dict[str, Any]:
+    def to_presence_dict(
+        client_name: str,
+        status: int,
+        dt: datetime.datetime,
+        push_enabled: bool = False,
+        has_push_devices: bool = False,
+    ) -> Dict[str, Any]:
         presence_val = UserPresence.status_to_string(status)
 
         timestamp = datetime_to_timestamp(dt)
@@ -2636,6 +2923,7 @@ class UserPresence(models.Model):
 
         return status_val
 
+
 class UserStatus(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user_profile: UserProfile = models.OneToOneField(UserProfile, on_delete=CASCADE)
@@ -2649,6 +2937,7 @@ class UserStatus(models.Model):
     status: int = models.PositiveSmallIntegerField(default=NORMAL)
     status_text: str = models.CharField(max_length=255, default='')
 
+
 class DefaultStream(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
@@ -2657,6 +2946,7 @@ class DefaultStream(models.Model):
     class Meta:
         unique_together = ("realm", "stream")
 
+
 class DefaultStreamGroup(models.Model):
     MAX_NAME_LENGTH = 60
 
@@ -2670,14 +2960,18 @@ class DefaultStreamGroup(models.Model):
         unique_together = ("realm", "name")
 
     def to_dict(self) -> Dict[str, Any]:
-        return dict(name=self.name,
-                    id=self.id,
-                    description=self.description,
-                    streams=[stream.to_dict() for stream in self.streams.all()])
+        return dict(
+            name=self.name,
+            id=self.id,
+            description=self.description,
+            streams=[stream.to_dict() for stream in self.streams.all()],
+        )
+
 
 def get_default_stream_groups(realm: Realm) -> List[DefaultStreamGroup]:
     return DefaultStreamGroup.objects.filter(realm=realm)
 
+
 class AbstractScheduledJob(models.Model):
     scheduled_timestamp: datetime.datetime = models.DateTimeField(db_index=True)
     # JSON representation of arguments to consumer
@@ -2687,6 +2981,7 @@ class AbstractScheduledJob(models.Model):
     class Meta:
         abstract = True
 
+
 class ScheduledEmail(AbstractScheduledJob):
     # Exactly one of users or address should be set. These are
     # duplicate values, used to efficiently filter the set of
@@ -2707,6 +3002,7 @@ class ScheduledEmail(AbstractScheduledJob):
     def __str__(self) -> str:
         return f"<ScheduledEmail: {self.type} {self.address or list(self.users.all())} {self.scheduled_timestamp}>"
 
+
 class MissedMessageEmailAddress(models.Model):
     EXPIRY_SECONDS = 60 * 60 * 24 * 5
     ALLOWED_USES = 1
@@ -2733,6 +3029,7 @@ class MissedMessageEmailAddress(models.Model):
         self.times_used += 1
         self.save(update_fields=["times_used"])
 
+
 class ScheduledMessage(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     sender: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -2754,7 +3051,8 @@ class ScheduledMessage(models.Model):
     )
 
     delivery_type: int = models.PositiveSmallIntegerField(
-        choices=DELIVERY_TYPES, default=SEND_LATER,
+        choices=DELIVERY_TYPES,
+        default=SEND_LATER,
     )
 
     def topic_name(self) -> str:
@@ -2767,6 +3065,7 @@ class ScheduledMessage(models.Model):
         display_recipient = get_display_recipient(self.recipient)
         return f"<ScheduledMessage: {display_recipient} {self.subject} {self.sender} {self.scheduled_timestamp}>"
 
+
 EMAIL_TYPES = {
     'followup_day1': ScheduledEmail.WELCOME,
     'followup_day2': ScheduledEmail.WELCOME,
@@ -2774,8 +3073,10 @@ EMAIL_TYPES = {
     'invitation_reminder': ScheduledEmail.INVITATION_REMINDER,
 }
 
+
 class AbstractRealmAuditLog(models.Model):
     """Defines fields common to RealmAuditLog and RemoteRealmAuditLog."""
+
     event_time: datetime.datetime = models.DateTimeField(db_index=True)
     # If True, event_time is an overestimate of the true time. Can be used
     # by migrations when introducing a new event_type.
@@ -2846,12 +3147,19 @@ class AbstractRealmAuditLog(models.Model):
     # billing for mobile push notifications is enabled.  Every billing
     # event_type should have ROLE_COUNT populated in extra_data.
     SYNCED_BILLING_EVENTS = [
-        USER_CREATED, USER_ACTIVATED, USER_DEACTIVATED, USER_REACTIVATED, USER_ROLE_CHANGED,
-        REALM_DEACTIVATED, REALM_REACTIVATED]
+        USER_CREATED,
+        USER_ACTIVATED,
+        USER_DEACTIVATED,
+        USER_REACTIVATED,
+        USER_ROLE_CHANGED,
+        REALM_DEACTIVATED,
+        REALM_REACTIVATED,
+    ]
 
     class Meta:
         abstract = True
 
+
 class RealmAuditLog(AbstractRealmAuditLog):
     """
     RealmAuditLog tracks important changes to users, streams, and
@@ -2872,16 +3180,25 @@ class RealmAuditLog(AbstractRealmAuditLog):
       acting_user is that administrator and both modified_user and
       modified_stream will be None.
     """
+
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
     acting_user: Optional[UserProfile] = models.ForeignKey(
-        UserProfile, null=True, related_name="+", on_delete=CASCADE,
+        UserProfile,
+        null=True,
+        related_name="+",
+        on_delete=CASCADE,
     )
     modified_user: Optional[UserProfile] = models.ForeignKey(
-        UserProfile, null=True, related_name="+", on_delete=CASCADE,
+        UserProfile,
+        null=True,
+        related_name="+",
+        on_delete=CASCADE,
     )
     modified_stream: Optional[Stream] = models.ForeignKey(
-        Stream, null=True, on_delete=CASCADE,
+        Stream,
+        null=True,
+        on_delete=CASCADE,
     )
     event_last_message_id: Optional[int] = models.IntegerField(null=True)
 
@@ -2892,6 +3209,7 @@ class RealmAuditLog(AbstractRealmAuditLog):
             return f"<RealmAuditLog: {self.modified_stream} {self.event_type} {self.event_time} {self.id}>"
         return f"<RealmAuditLog: {self.realm} {self.event_type} {self.event_time} {self.id}>"
 
+
 class UserHotspot(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -2901,8 +3219,8 @@ class UserHotspot(models.Model):
     class Meta:
         unique_together = ("user", "hotspot")
 
-def check_valid_user_ids(realm_id: int, val: object,
-                         allow_deactivated: bool=False) -> List[int]:
+
+def check_valid_user_ids(realm_id: int, val: object, allow_deactivated: bool = False) -> List[int]:
     user_ids = check_list(check_int)("User IDs", val)
     realm = Realm.objects.get(id=realm_id)
     for user_id in user_ids:
@@ -2919,17 +3237,19 @@ def check_valid_user_ids(realm_id: int, val: object,
             if not user_profile.is_active:
                 raise ValidationError(_('User with ID {} is deactivated').format(user_id))
 
-        if (user_profile.is_bot):
+        if user_profile.is_bot:
             raise ValidationError(_('User with ID {} is a bot').format(user_id))
 
     return user_ids
 
+
 class CustomProfileField(models.Model):
     """Defines a form field for the per-realm custom profile fields feature.
 
     See CustomProfileFieldValue for an individual user's values for one of
     these fields.
     """
+
     HINT_MAX_LENGTH = 80
     NAME_MAX_LENGTH = 40
 
@@ -2970,17 +3290,28 @@ class CustomProfileField(models.Model):
         (LONG_TEXT, ugettext_lazy('Long text'), check_long_string, str, "LONG_TEXT"),
         (DATE, ugettext_lazy('Date picker'), check_date, str, "DATE"),
         (URL, ugettext_lazy('Link'), check_url, str, "URL"),
-        (EXTERNAL_ACCOUNT, ugettext_lazy('External account'), check_short_string, str, "EXTERNAL_ACCOUNT"),
+        (
+            EXTERNAL_ACCOUNT,
+            ugettext_lazy('External account'),
+            check_short_string,
+            str,
+            "EXTERNAL_ACCOUNT",
+        ),
     ]
 
     ALL_FIELD_TYPES = [*FIELD_TYPE_DATA, *CHOICE_FIELD_TYPE_DATA, *USER_FIELD_TYPE_DATA]
 
-    FIELD_VALIDATORS: Dict[int, Validator[Union[int, str, List[int]]]] = {item[0]: item[2] for item in FIELD_TYPE_DATA}
-    FIELD_CONVERTERS: Dict[int, Callable[[Any], Any]] = {item[0]: item[3] for item in ALL_FIELD_TYPES}
+    FIELD_VALIDATORS: Dict[int, Validator[Union[int, str, List[int]]]] = {
+        item[0]: item[2] for item in FIELD_TYPE_DATA
+    }
+    FIELD_CONVERTERS: Dict[int, Callable[[Any], Any]] = {
+        item[0]: item[3] for item in ALL_FIELD_TYPES
+    }
     FIELD_TYPE_CHOICES: List[Tuple[int, Promise]] = [(item[0], item[1]) for item in ALL_FIELD_TYPES]
 
     field_type: int = models.PositiveSmallIntegerField(
-        choices=FIELD_TYPE_CHOICES, default=SHORT_TEXT,
+        choices=FIELD_TYPE_CHOICES,
+        default=SHORT_TEXT,
     )
 
     # A JSON blob of any additional data needed to define the field beyond
@@ -3015,9 +3346,11 @@ class CustomProfileField(models.Model):
     def __str__(self) -> str:
         return f"<CustomProfileField: {self.realm} {self.name} {self.field_type} {self.order}>"
 
+
 def custom_profile_fields_for_realm(realm_id: int) -> List[CustomProfileField]:
     return CustomProfileField.objects.filter(realm=realm_id).order_by('order')
 
+
 class CustomProfileFieldValue(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     user_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -3031,6 +3364,7 @@ class CustomProfileFieldValue(models.Model):
     def __str__(self) -> str:
         return f"<CustomProfileFieldValue: {self.user_profile} {self.field} {self.value}>"
 
+
 # Interfaces for services
 # They provide additional functionality like parsing message to obtain query URL, data to be sent to URL,
 # and parsing the response.
@@ -3085,6 +3419,7 @@ class Service(models.Model):
 def get_bot_services(user_profile_id: int) -> List[Service]:
     return list(Service.objects.filter(user_profile__id=user_profile_id))
 
+
 def get_service_profile(user_profile_id: int, service_name: str) -> Service:
     return Service.objects.get(user_profile__id=user_profile_id, name=service_name)
 
@@ -3098,6 +3433,7 @@ class BotStorageData(models.Model):
     class Meta:
         unique_together = ("bot_profile", "key")
 
+
 class BotConfigData(models.Model):
     id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name='ID')
     bot_profile: UserProfile = models.ForeignKey(UserProfile, on_delete=CASCADE)
@@ -3107,9 +3443,11 @@ class BotConfigData(models.Model):
     class Meta:
         unique_together = ("bot_profile", "key")
 
+
 class InvalidFakeEmailDomain(Exception):
     pass
 
+
 def get_fake_email_domain(realm: Realm) -> str:
     try:
         # Check that realm.host can be used to form valid email addresses.
@@ -3122,11 +3460,14 @@ def get_fake_email_domain(realm: Realm) -> str:
         # Check that the fake email domain can be used to form valid email addresses.
         validate_email("bot@" + settings.FAKE_EMAIL_DOMAIN)
     except ValidationError:
-        raise InvalidFakeEmailDomain(settings.FAKE_EMAIL_DOMAIN + ' is not a valid domain. '
-                                     'Consider setting the FAKE_EMAIL_DOMAIN setting.')
+        raise InvalidFakeEmailDomain(
+            settings.FAKE_EMAIL_DOMAIN + ' is not a valid domain. '
+            'Consider setting the FAKE_EMAIL_DOMAIN setting.'
+        )
 
     return settings.FAKE_EMAIL_DOMAIN
 
+
 class AlertWord(models.Model):
     # Realm isn't necessary, but it's a nice denormalization.  Users
     # never move to another realm, so it's static, and having Realm
@@ -3141,13 +3482,16 @@ class AlertWord(models.Model):
     class Meta:
         unique_together = ("user_profile", "word")
 
+
 def flush_realm_alert_words(realm: Realm) -> None:
     cache_delete(realm_alert_words_cache_key(realm))
     cache_delete(realm_alert_words_automaton_cache_key(realm))
 
+
 def flush_alert_word(sender: Any, **kwargs: Any) -> None:
     realm = kwargs['instance'].realm
     flush_realm_alert_words(realm)
 
+
 post_save.connect(flush_alert_word, sender=AlertWord)
 post_delete.connect(flush_alert_word, sender=AlertWord)
diff --git a/zerver/openapi/curl_param_value_generators.py b/zerver/openapi/curl_param_value_generators.py
index 421ce4faa3..c3eb96bb65 100644
--- a/zerver/openapi/curl_param_value_generators.py
+++ b/zerver/openapi/curl_param_value_generators.py
@@ -28,6 +28,7 @@ CALLED_GENERATOR_FUNCTIONS: Set[str] = set()
 
 helpers = ZulipTestCase()
 
+
 def openapi_param_value_generator(
     endpoints: List[str],
 ) -> Callable[[Callable[[], Dict[str, object]]], Callable[[], Dict[str, object]]]:
@@ -37,6 +38,7 @@ def openapi_param_value_generator(
     @openapi_param_value_generator(["/messages/render:post"])
     def ...
     """
+
     def wrapper(generator_func: Callable[[], Dict[str, object]]) -> Callable[[], Dict[str, object]]:
         @wraps(generator_func)
         def _record_calls_wrapper() -> Dict[str, object]:
@@ -48,10 +50,13 @@ def openapi_param_value_generator(
             GENERATOR_FUNCTIONS[endpoint] = _record_calls_wrapper
 
         return _record_calls_wrapper
+
     return wrapper
 
+
 def patch_openapi_example_values(
-    entry: str, params: List[Dict[str, Any]],
+    entry: str,
+    params: List[Dict[str, Any]],
     request_body: Optional[Dict[str, Any]] = None,
 ) -> Tuple[List[Dict[str, object]], Optional[Dict[str, object]]]:
     if entry not in GENERATOR_FUNCTIONS:
@@ -74,6 +79,7 @@ def patch_openapi_example_values(
                 property["example"] = realm_example_values[key]
     return params, request_body
 
+
 @openapi_param_value_generator(["/fetch_api_key:post"])
 def fetch_api_key() -> Dict[str, object]:
     email = helpers.example_email("iago")
@@ -84,13 +90,21 @@ def fetch_api_key() -> Dict[str, object]:
         "password": password,
     }
 
-@openapi_param_value_generator(["/messages/{message_id}:get", "/messages/{message_id}/history:get",
-                                "/messages/{message_id}:patch", "/messages/{message_id}:delete"])
+
+@openapi_param_value_generator(
+    [
+        "/messages/{message_id}:get",
+        "/messages/{message_id}/history:get",
+        "/messages/{message_id}:patch",
+        "/messages/{message_id}:delete",
+    ]
+)
 def iago_message_id() -> Dict[str, object]:
     return {
         "message_id": helpers.send_stream_message(helpers.example_user("iago"), "Denmark"),
     }
 
+
 @openapi_param_value_generator(["/messages/{message_id}/reactions:delete"])
 def add_emoji_to_message() -> Dict[str, object]:
     user_profile = helpers.example_user('iago')
@@ -106,6 +120,7 @@ def add_emoji_to_message() -> Dict[str, object]:
 
     return {}
 
+
 @openapi_param_value_generator(["/messages/flags:post"])
 def update_flags_message_ids() -> Dict[str, object]:
     stream_name = "Venice"
@@ -118,12 +133,14 @@ def update_flags_message_ids() -> Dict[str, object]:
         "messages": messages,
     }
 
+
 @openapi_param_value_generator(["/mark_stream_as_read:post", "/users/me/{stream_id}/topics:get"])
 def get_venice_stream_id() -> Dict[str, object]:
     return {
         "stream_id": helpers.get_stream_id("Venice"),
     }
 
+
 @openapi_param_value_generator(["/streams/{stream_id}:patch"])
 def update_stream() -> Dict[str, object]:
     stream = helpers.subscribe(helpers.example_user("iago"), "temp_stream 1")
@@ -131,6 +148,7 @@ def update_stream() -> Dict[str, object]:
         "stream_id": stream.id,
     }
 
+
 @openapi_param_value_generator(["/streams/{stream_id}:delete"])
 def create_temp_stream_and_get_id() -> Dict[str, object]:
     stream = helpers.subscribe(helpers.example_user("iago"), "temp_stream 2")
@@ -138,6 +156,7 @@ def create_temp_stream_and_get_id() -> Dict[str, object]:
         "stream_id": stream.id,
     }
 
+
 @openapi_param_value_generator(["/mark_topic_as_read:post"])
 def get_denmark_stream_id_and_topic() -> Dict[str, object]:
     stream_name = "Denmark"
@@ -151,6 +170,7 @@ def get_denmark_stream_id_and_topic() -> Dict[str, object]:
         "topic_name": topic_name,
     }
 
+
 @openapi_param_value_generator(["/users/me/subscriptions/properties:post"])
 def update_subscription_data() -> Dict[str, object]:
     profile = helpers.example_user("iago")
@@ -163,6 +183,7 @@ def update_subscription_data() -> Dict[str, object]:
         ],
     }
 
+
 @openapi_param_value_generator(["/users/me/subscriptions:delete"])
 def delete_subscription_data() -> Dict[str, object]:
     iago = helpers.example_user("iago")
@@ -173,6 +194,7 @@ def delete_subscription_data() -> Dict[str, object]:
     helpers.subscribe(zoe, "social")
     return {}
 
+
 @openapi_param_value_generator(["/events:get"])
 def get_events() -> Dict[str, object]:
     profile = helpers.example_user("iago")
@@ -185,6 +207,7 @@ def get_events() -> Dict[str, object]:
         "last_event_id": response["last_event_id"],
     }
 
+
 @openapi_param_value_generator(["/events:delete"])
 def delete_event_queue() -> Dict[str, object]:
     profile = helpers.example_user("iago")
@@ -195,6 +218,7 @@ def delete_event_queue() -> Dict[str, object]:
         "last_event_id": response["last_event_id"],
     }
 
+
 @openapi_param_value_generator(["/users/{email}/presence:get"])
 def get_user_presence() -> Dict[str, object]:
     iago = helpers.example_user("iago")
@@ -202,44 +226,51 @@ def get_user_presence() -> Dict[str, object]:
     update_user_presence(iago, client, timezone_now(), UserPresence.ACTIVE, False)
     return {}
 
+
 @openapi_param_value_generator(["/users:post"])
 def create_user() -> Dict[str, object]:
     return {
         "email": helpers.nonreg_email("test"),
     }
 
+
 @openapi_param_value_generator(["/user_groups/create:post"])
 def create_user_group_data() -> Dict[str, object]:
     return {
         "members": [helpers.example_user("hamlet").id, helpers.example_user("othello").id],
     }
 
-@openapi_param_value_generator(["/user_groups/{user_group_id}:patch", "/user_groups/{user_group_id}:delete"])
+
+@openapi_param_value_generator(
+    ["/user_groups/{user_group_id}:patch", "/user_groups/{user_group_id}:delete"]
+)
 def get_temp_user_group_id() -> Dict[str, object]:
     user_group, _ = UserGroup.objects.get_or_create(name="temp", realm=get_realm("zulip"))
     return {
         "user_group_id": user_group.id,
     }
 
+
 @openapi_param_value_generator(["/realm/filters/{filter_id}:delete"])
 def remove_realm_filters() -> Dict[str, object]:
-    filter_id = do_add_realm_filter(get_realm("zulip"), "#(?P<id>[0-9]{2,8})", "https://github.com/zulip/zulip/pull/%(id)s")
+    filter_id = do_add_realm_filter(
+        get_realm("zulip"), "#(?P<id>[0-9]{2,8})", "https://github.com/zulip/zulip/pull/%(id)s"
+    )
     return {
         "filter_id": filter_id,
     }
 
+
 @openapi_param_value_generator(["/realm/emoji/{emoji_name}:post", "/user_uploads:post"])
 def upload_custom_emoji() -> Dict[str, object]:
     return {
         "filename": "zerver/tests/images/animated_img.gif",
     }
 
+
 @openapi_param_value_generator(["/users/{user_id}:delete"])
 def deactivate_user() -> Dict[str, object]:
     user_profile = do_create_user(
-        email='testuser@zulip.com', password=None,
-        full_name='test_user', realm=get_realm('zulip')
+        email='testuser@zulip.com', password=None, full_name='test_user', realm=get_realm('zulip')
     )
-    return {
-        "user_id": user_profile.id
-    }
+    return {"user_id": user_profile.id}
diff --git a/zerver/openapi/javascript_examples.py b/zerver/openapi/javascript_examples.py
index 5fc74f3226..1687cf52ee 100644
--- a/zerver/openapi/javascript_examples.py
+++ b/zerver/openapi/javascript_examples.py
@@ -26,9 +26,11 @@ def test_js_bindings(client: Client) -> None:
 
     for response_data in endpoint_responses:
         print(f"Testing javascript example: {response_data['name']} ...")
-        validate_against_openapi_schema(response_data['result'],
-                                        response_data['endpoint'],
-                                        response_data['method'],
-                                        response_data['status_code'])
+        validate_against_openapi_schema(
+            response_data['result'],
+            response_data['endpoint'],
+            response_data['method'],
+            response_data['status_code'],
+        )
 
     print('JavaScript examples validated.')
diff --git a/zerver/openapi/markdown_extension.py b/zerver/openapi/markdown_extension.py
index ab82ba57de..d89fda5813 100644
--- a/zerver/openapi/markdown_extension.py
+++ b/zerver/openapi/markdown_extension.py
@@ -21,7 +21,8 @@ import zerver.openapi.python_examples
 from zerver.openapi.openapi import get_openapi_description, get_openapi_fixture, openapi_spec
 
 MACRO_REGEXP = re.compile(
-    r'\{generate_code_example(\(\s*(.+?)\s*\))*\|\s*(.+?)\s*\|\s*(.+?)\s*(\(\s*(.+)\s*\))?\}')
+    r'\{generate_code_example(\(\s*(.+?)\s*\))*\|\s*(.+?)\s*\|\s*(.+?)\s*(\(\s*(.+)\s*\))?\}'
+)
 PYTHON_EXAMPLE_REGEX = re.compile(r'\# \{code_example\|\s*(.+?)\s*\}')
 JS_EXAMPLE_REGEX = re.compile(r'\/\/ \{code_example\|\s*(.+?)\s*\}')
 MACRO_REGEXP_DESC = re.compile(r'\{generate_api_description(\(\s*(.+?)\s*\))}')
@@ -70,14 +71,17 @@ DEFAULT_EXAMPLE = {
     "boolean": False,
 }
 
+
 def parse_language_and_options(input_str: Optional[str]) -> Tuple[str, Dict[str, Any]]:
     if not input_str:
         return ("", {})
-    language_and_options = re.match(r"(?P<language>\w+)(,\s*(?P<options>[\"\'\w\d\[\],= ]+))?", input_str)
-    assert(language_and_options is not None)
+    language_and_options = re.match(
+        r"(?P<language>\w+)(,\s*(?P<options>[\"\'\w\d\[\],= ]+))?", input_str
+    )
+    assert language_and_options is not None
     kwargs_pattern = re.compile(r"(?P<key>\w+)\s*=\s*(?P<value>[\'\"\w\d]+|\[[\'\",\w\d ]+\])")
     language = language_and_options.group("language")
-    assert(language is not None)
+    assert language is not None
     if language_and_options.group("options"):
         _options = kwargs_pattern.finditer(language_and_options.group("options"))
         options = {}
@@ -86,8 +90,10 @@ def parse_language_and_options(input_str: Optional[str]) -> Tuple[str, Dict[str,
         return (language, options)
     return (language, {})
 
-def extract_code_example(source: List[str], snippet: List[Any],
-                         example_regex: Pattern[str]) -> List[Any]:
+
+def extract_code_example(
+    source: List[str], snippet: List[Any], example_regex: Pattern[str]
+) -> List[Any]:
     start = -1
     end = -1
     for line in source:
@@ -99,15 +105,17 @@ def extract_code_example(source: List[str], snippet: List[Any],
                 end = source.index(line)
                 break
 
-    if (start == -1 and end == -1):
+    if start == -1 and end == -1:
         return snippet
 
-    snippet.append(source[start + 1: end])
-    source = source[end + 1:]
+    snippet.append(source[start + 1 : end])
+    source = source[end + 1 :]
     return extract_code_example(source, snippet, example_regex)
 
-def render_python_code_example(function: str, admin_config: bool=False,
-                               **kwargs: Any) -> List[str]:
+
+def render_python_code_example(
+    function: str, admin_config: bool = False, **kwargs: Any
+) -> List[str]:
     method = zerver.openapi.python_examples.TEST_FUNCTIONS[function]
     function_source_lines = inspect.getsourcelines(method)[0]
 
@@ -133,8 +141,10 @@ def render_python_code_example(function: str, admin_config: bool=False,
 
     return code_example
 
-def render_javascript_code_example(function: str, admin_config: bool=False,
-                                   **kwargs: Any) -> List[str]:
+
+def render_javascript_code_example(
+    function: str, admin_config: bool = False, **kwargs: Any
+) -> List[str]:
     pattern = fr'^add_example\(\s*"[^"]*",\s*{re.escape(json.dumps(function))},\s*\d+,\s*async \(client, console\) => \{{\n(.*?)^(?:\}}| *\}},\n)\);$'
     with open('zerver/openapi/javascript_examples.js') as f:
         m = re.search(pattern, f.read(), re.M | re.S)
@@ -164,8 +174,8 @@ def render_javascript_code_example(function: str, admin_config: bool=False,
 
     return code_example
 
-def curl_method_arguments(endpoint: str, method: str,
-                          api_url: str) -> List[str]:
+
+def curl_method_arguments(endpoint: str, method: str, api_url: str) -> List[str]:
     # We also include the -sS verbosity arguments here.
     method = method.upper()
     url = f"{api_url}/v1{endpoint}"
@@ -181,8 +191,10 @@ def curl_method_arguments(endpoint: str, method: str,
         msg = f"The request method {method} is not one of {valid_methods}"
         raise ValueError(msg)
 
-def get_openapi_param_example_value_as_string(endpoint: str, method: str, param: Dict[str, Any],
-                                              curl_argument: bool=False) -> str:
+
+def get_openapi_param_example_value_as_string(
+    endpoint: str, method: str, param: Dict[str, Any], curl_argument: bool = False
+) -> str:
     jsonify = False
     param_name = param["name"]
     if "content" in param:
@@ -206,7 +218,7 @@ cURL example."""
             raise ValueError(msg)
         ordered_ex_val_str = json.dumps(example_value, sort_keys=True)
         # We currently don't have any non-JSON encoded arrays.
-        assert(jsonify)
+        assert jsonify
         if curl_argument:
             return "    --data-urlencode " + shlex.quote(f"{param_name}={ordered_ex_val_str}")
         return ordered_ex_val_str  # nocoverage
@@ -220,12 +232,16 @@ cURL example."""
             return "    --data-urlencode " + shlex.quote(f"{param_name}={example_value}")
         return example_value
 
-def generate_curl_example(endpoint: str, method: str,
-                          api_url: str,
-                          auth_email: str=DEFAULT_AUTH_EMAIL,
-                          auth_api_key: str=DEFAULT_AUTH_API_KEY,
-                          exclude: Optional[List[str]]=None,
-                          include: Optional[List[str]]=None) -> List[str]:
+
+def generate_curl_example(
+    endpoint: str,
+    method: str,
+    api_url: str,
+    auth_email: str = DEFAULT_AUTH_EMAIL,
+    auth_api_key: str = DEFAULT_AUTH_API_KEY,
+    exclude: Optional[List[str]] = None,
+    include: Optional[List[str]] = None,
+) -> List[str]:
     if exclude is not None and include is not None:
         raise AssertionError("exclude and include cannot be set at the same time.")
 
@@ -240,8 +256,10 @@ def generate_curl_example(endpoint: str, method: str,
 
     if settings.RUNNING_OPENAPI_CURL_TEST:  # nocoverage
         from zerver.openapi.curl_param_value_generators import patch_openapi_example_values
-        operation_params, operation_request_body = patch_openapi_example_values(operation, operation_params,
-                                                                                operation_request_body)
+
+        operation_params, operation_request_body = patch_openapi_example_values(
+            operation, operation_params, operation_request_body
+        )
 
     format_dict = {}
     for param in operation_params:
@@ -251,8 +269,7 @@ def generate_curl_example(endpoint: str, method: str,
         format_dict[param["name"]] = example_value
     example_endpoint = endpoint.format_map(format_dict)
 
-    curl_first_line_parts = ["curl", *curl_method_arguments(example_endpoint, method,
-                                                            api_url)]
+    curl_first_line_parts = ["curl", *curl_method_arguments(example_endpoint, method, api_url)]
     lines.append(" ".join(map(shlex.quote, curl_first_line_parts)))
 
     insecure_operations = ['/dev_fetch_api_key:post', '/fetch_api_key:post']
@@ -260,16 +277,22 @@ def generate_curl_example(endpoint: str, method: str,
         if global_security == [{'basicAuth': []}]:
             authentication_required = True
         else:
-            raise AssertionError("Unhandled global securityScheme."
-                                 + " Please update the code to handle this scheme.")
+            raise AssertionError(
+                "Unhandled global securityScheme."
+                + " Please update the code to handle this scheme."
+            )
     elif operation_security == []:
         if operation in insecure_operations:
             authentication_required = False
         else:
-            raise AssertionError("Unknown operation without a securityScheme. "
-                                 + "Please update insecure_operations.")
+            raise AssertionError(
+                "Unknown operation without a securityScheme. "
+                + "Please update insecure_operations."
+            )
     else:
-        raise AssertionError("Unhandled securityScheme. Please update the code to handle this scheme.")
+        raise AssertionError(
+            "Unhandled securityScheme. Please update the code to handle this scheme."
+        )
 
     if authentication_required:
         lines.append("    -u " + shlex.quote(f"{auth_email}:{auth_api_key}"))
@@ -285,25 +308,32 @@ def generate_curl_example(endpoint: str, method: str,
         if exclude is not None and param_name in exclude:
             continue
 
-        example_value = get_openapi_param_example_value_as_string(endpoint, method, param,
-                                                                  curl_argument=True)
+        example_value = get_openapi_param_example_value_as_string(
+            endpoint, method, param, curl_argument=True
+        )
         lines.append(example_value)
 
     if "requestBody" in operation_entry:
-        properties = operation_entry["requestBody"]["content"]["multipart/form-data"]["schema"]["properties"]
+        properties = operation_entry["requestBody"]["content"]["multipart/form-data"]["schema"][
+            "properties"
+        ]
         for key, property in properties.items():
             lines.append('    -F ' + shlex.quote('{}=@{}'.format(key, property["example"])))
 
-    for i in range(1, len(lines)-1):
+    for i in range(1, len(lines) - 1):
         lines[i] = lines[i] + " \\"
 
     lines.append("```")
 
     return lines
 
-def render_curl_example(function: str, api_url: str,
-                        exclude: Optional[List[str]]=None,
-                        include: Optional[List[str]]=None) -> List[str]:
+
+def render_curl_example(
+    function: str,
+    api_url: str,
+    exclude: Optional[List[str]] = None,
+    include: Optional[List[str]] = None,
+) -> List[str]:
     """ A simple wrapper around generate_curl_example. """
     parts = function.split(":")
     endpoint = parts[0]
@@ -318,6 +348,7 @@ def render_curl_example(function: str, api_url: str,
     kwargs["include"] = include
     return generate_curl_example(endpoint, method, **kwargs)
 
+
 SUPPORTED_LANGUAGES: Dict[str, Any] = {
     'python': {
         'client_config': PYTHON_CLIENT_CONFIG,
@@ -334,6 +365,7 @@ SUPPORTED_LANGUAGES: Dict[str, Any] = {
     },
 }
 
+
 class APIMarkdownExtension(Extension):
     def __init__(self, api_url: Optional[str]) -> None:
         self.config = {
@@ -351,6 +383,7 @@ class APIMarkdownExtension(Extension):
             APIDescriptionPreprocessor(md, self.getConfigs()), 'generate_api_description', 530
         )
 
+
 class APICodeExamplesPreprocessor(Preprocessor):
     def __init__(self, md: markdown.Markdown, config: Mapping[str, Any]) -> None:
         super().__init__(md)
@@ -377,7 +410,9 @@ class APICodeExamplesPreprocessor(Preprocessor):
                             text = self.render_fixture(function, name=argument)
                     elif key == 'example':
                         if argument == 'admin_config=True':
-                            text = SUPPORTED_LANGUAGES[language]['render'](function, admin_config=True)
+                            text = SUPPORTED_LANGUAGES[language]['render'](
+                                function, admin_config=True
+                            )
                         else:
                             text = SUPPORTED_LANGUAGES[language]['render'](function, **options)
 
@@ -389,19 +424,18 @@ class APICodeExamplesPreprocessor(Preprocessor):
                     preceding = line_split[0]
                     following = line_split[-1]
                     text = [preceding, *text, following]
-                    lines = lines[:loc] + text + lines[loc+1:]
+                    lines = lines[:loc] + text + lines[loc + 1 :]
                     break
             else:
                 done = True
         return lines
 
-    def render_fixture(self, function: str, name: Optional[str]=None) -> List[str]:
+    def render_fixture(self, function: str, name: Optional[str] = None) -> List[str]:
         fixture = []
 
         path, method = function.rsplit(':', 1)
         fixture_dict = get_openapi_fixture(path, method, name)
-        fixture_json = json.dumps(fixture_dict, indent=4, sort_keys=True,
-                                  separators=(',', ': '))
+        fixture_json = json.dumps(fixture_dict, indent=4, sort_keys=True, separators=(',', ': '))
 
         fixture.append('``` json')
         fixture.extend(fixture_json.splitlines())
@@ -409,6 +443,7 @@ class APICodeExamplesPreprocessor(Preprocessor):
 
         return fixture
 
+
 class APIDescriptionPreprocessor(Preprocessor):
     def __init__(self, md: markdown.Markdown, config: Mapping[str, Any]) -> None:
         super().__init__(md)
@@ -432,7 +467,7 @@ class APIDescriptionPreprocessor(Preprocessor):
                     preceding = line_split[0]
                     following = line_split[-1]
                     text = [preceding, *text, following]
-                    lines = lines[:loc] + text + lines[loc+1:]
+                    lines = lines[:loc] + text + lines[loc + 1 :]
                     break
             else:
                 done = True
@@ -446,5 +481,6 @@ class APIDescriptionPreprocessor(Preprocessor):
         description.extend(description_dict.splitlines())
         return description
 
+
 def makeExtension(*args: Any, **kwargs: str) -> APIMarkdownExtension:
     return APIMarkdownExtension(*args, **kwargs)
diff --git a/zerver/openapi/openapi.py b/zerver/openapi/openapi.py
index 1fa7e76fe5..c7c9decf56 100644
--- a/zerver/openapi/openapi.py
+++ b/zerver/openapi/openapi.py
@@ -15,9 +15,9 @@ from openapi_core.testing import MockRequest
 from openapi_core.validation.request.validators import RequestValidator
 from openapi_schema_validator import OAS30Validator
 
-OPENAPI_SPEC_PATH = os.path.abspath(os.path.join(
-    os.path.dirname(__file__),
-    '../openapi/zulip.yaml'))
+OPENAPI_SPEC_PATH = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '../openapi/zulip.yaml')
+)
 
 # A list of endpoint-methods such that the endpoint
 # has documentation but not with this particular method.
@@ -49,6 +49,7 @@ def naively_merge(a: Dict[str, object], b: Dict[str, object]) -> Dict[str, objec
             ret[key] = naively_merge(a_value, b_value)
     return ret
 
+
 def naively_merge_allOf(obj: object) -> object:
     if isinstance(obj, dict):
         return naively_merge_allOf_dict(obj)
@@ -57,6 +58,7 @@ def naively_merge_allOf(obj: object) -> object:
     else:
         return obj
 
+
 def naively_merge_allOf_dict(obj: Dict[str, object]) -> Dict[str, object]:
     if "allOf" in obj:
         ret = obj.copy()
@@ -69,7 +71,8 @@ def naively_merge_allOf_dict(obj: Dict[str, object]) -> Dict[str, object]:
         return ret
     return {key: naively_merge_allOf(value) for key, value in obj.items()}
 
-class OpenAPISpec():
+
+class OpenAPISpec:
     def __init__(self, openapi_path: str) -> None:
         self.openapi_path = openapi_path
         self.mtime: Optional[float] = None
@@ -148,7 +151,7 @@ class OpenAPISpec():
         it was read, and then return the parsed data.
         """
         self.check_reload()
-        assert(len(self._openapi) > 0)
+        assert len(self._openapi) > 0
         return self._openapi
 
     def endpoints_dict(self) -> Dict[str, str]:
@@ -156,7 +159,7 @@ class OpenAPISpec():
         it was read, and then return the parsed data.
         """
         self.check_reload()
-        assert(len(self._endpoints_dict) > 0)
+        assert len(self._endpoints_dict) > 0
         return self._endpoints_dict
 
     def request_validator(self) -> RequestValidator:
@@ -168,45 +171,55 @@ class OpenAPISpec():
         assert self._request_validator is not None
         return self._request_validator
 
+
 class SchemaError(Exception):
     pass
 
+
 openapi_spec = OpenAPISpec(OPENAPI_SPEC_PATH)
 
+
 def get_schema(endpoint: str, method: str, status_code: str) -> Dict[str, Any]:
-    if len(status_code) == 3 and ('oneOf' in openapi_spec.openapi()['paths'][endpoint]
-                                  [method.lower()]['responses'][status_code]['content']
-                                  ['application/json']['schema']):
+    if len(status_code) == 3 and (
+        'oneOf'
+        in openapi_spec.openapi()['paths'][endpoint][method.lower()]['responses'][status_code][
+            'content'
+        ]['application/json']['schema']
+    ):
         # Currently at places where multiple schemas are defined they only
         # differ in example so either can be used.
         status_code += '_0'
     if len(status_code) == 3:
-        schema = (openapi_spec.openapi()['paths'][endpoint][method.lower()]['responses']
-                  [status_code]['content']['application/json']['schema'])
+        schema = openapi_spec.openapi()['paths'][endpoint][method.lower()]['responses'][
+            status_code
+        ]['content']['application/json']['schema']
         return schema
     else:
         subschema_index = int(status_code[4])
         status_code = status_code[0:3]
-        schema = (openapi_spec.openapi()['paths'][endpoint][method.lower()]['responses']
-                  [status_code]['content']['application/json']['schema']["oneOf"][subschema_index])
+        schema = openapi_spec.openapi()['paths'][endpoint][method.lower()]['responses'][
+            status_code
+        ]['content']['application/json']['schema']["oneOf"][subschema_index]
         return schema
 
-def get_openapi_fixture(endpoint: str, method: str,
-                        status_code: str='200') -> Dict[str, Any]:
-    """Fetch a fixture from the full spec object.
-    """
+
+def get_openapi_fixture(endpoint: str, method: str, status_code: str = '200') -> Dict[str, Any]:
+    """Fetch a fixture from the full spec object."""
     return get_schema(endpoint, method, status_code)['example']
 
+
 def get_openapi_description(endpoint: str, method: str) -> str:
-    """Fetch a description from the full spec object.
-    """
+    """Fetch a description from the full spec object."""
     return openapi_spec.openapi()['paths'][endpoint][method.lower()]['description']
 
+
 def get_openapi_paths() -> Set[str]:
     return set(openapi_spec.openapi()['paths'].keys())
 
-def get_openapi_parameters(endpoint: str, method: str,
-                           include_url_parameters: bool=True) -> List[Dict[str, Any]]:
+
+def get_openapi_parameters(
+    endpoint: str, method: str, include_url_parameters: bool = True
+) -> List[Dict[str, Any]]:
     operation = openapi_spec.openapi()['paths'][endpoint][method.lower()]
     # We do a `.get()` for this last bit to distinguish documented
     # endpoints with no parameters (empty list) from undocumented
@@ -214,10 +227,10 @@ def get_openapi_parameters(endpoint: str, method: str,
     parameters = operation.get('parameters', [])
     # Also, we skip parameters defined in the URL.
     if not include_url_parameters:
-        parameters = [parameter for parameter in parameters if
-                      parameter['in'] != 'path']
+        parameters = [parameter for parameter in parameters if parameter['in'] != 'path']
     return parameters
 
+
 def get_openapi_return_values(endpoint: str, method: str) -> List[Dict[str, Any]]:
     operation = openapi_spec.openapi()['paths'][endpoint][method.lower()]
     schema = operation['responses']['200']['content']['application/json']['schema']
@@ -227,6 +240,7 @@ def get_openapi_return_values(endpoint: str, method: str) -> List[Dict[str, Any]
         schema = schema['oneOf'][0]
     return schema['properties']
 
+
 def find_openapi_endpoint(path: str) -> Optional[str]:
     for path_regex, endpoint in openapi_spec.endpoints_dict().items():
         matches = re.match(path_regex, path)
@@ -234,9 +248,11 @@ def find_openapi_endpoint(path: str) -> Optional[str]:
             return endpoint
     return None
 
+
 def get_event_type(event: Dict[str, Any]) -> str:
     return event['type'] + ':' + event.get('op', '')
 
+
 def fix_events(content: Dict[str, Any]) -> None:
     """Remove undocumented events from events array. This is a makeshift
     function so that further documentation of `/events` can happen with
@@ -247,8 +263,14 @@ def fix_events(content: Dict[str, Any]) -> None:
     for event in content['events']:
         event.pop('user', None)
 
-def validate_against_openapi_schema(content: Dict[str, Any], path: str,
-                                    method: str, status_code: str, display_brief_error: bool = False) -> bool:
+
+def validate_against_openapi_schema(
+    content: Dict[str, Any],
+    path: str,
+    method: str,
+    status_code: str,
+    display_brief_error: bool = False,
+) -> bool:
     """Compare a "content" dict with the defined schema for a specific method
     in an endpoint. Return true if validated and false if skipped.
     """
@@ -304,10 +326,7 @@ def validate_against_openapi_schema(content: Dict[str, Any], path: str,
         # (E.g. the several dozen format variants for individual
         # events returned by GET /events) and instead just display the
         # specific variant we expect to match the response.
-        brief_error_display_schema = {
-            "nullable": False,
-            "oneOf": list()
-        }
+        brief_error_display_schema = {"nullable": False, "oneOf": list()}
         brief_error_display_schema_oneOf = []
         brief_error_validator_value = []
 
@@ -334,6 +353,7 @@ def validate_against_openapi_schema(content: Dict[str, Any], path: str,
 
     return True
 
+
 def validate_schema(schema: Dict[str, Any]) -> None:
     """Check if opaque objects are present in the OpenAPI spec; this is an
     important part of our policy for ensuring every detail of Zulip's
@@ -349,13 +369,16 @@ def validate_schema(schema: Dict[str, Any]) -> None:
         validate_schema(schema['items'])
     elif schema['type'] == 'object':
         if 'additionalProperties' not in schema:
-            raise SchemaError('additionalProperties needs to be defined for objects to make' +
-                              'sure they have no additional properties left to be documented.')
+            raise SchemaError(
+                'additionalProperties needs to be defined for objects to make'
+                + 'sure they have no additional properties left to be documented.'
+            )
         for property_schema in schema.get('properties', {}).values():
             validate_schema(property_schema)
         if schema['additionalProperties']:
             validate_schema(schema['additionalProperties'])
 
+
 def to_python_type(py_type: str) -> type:
     """Transform an OpenAPI-like type to a Python one.
     https://swagger.io/docs/specification/data-models/data-types
@@ -371,12 +394,14 @@ def to_python_type(py_type: str) -> type:
 
     return TYPES[py_type]
 
+
 def likely_deprecated_parameter(parameter_description: str) -> bool:
     if '**Changes**: Deprecated' in parameter_description:
         return True
 
     return "**Deprecated**" in parameter_description
 
+
 # Skip those JSON endpoints whose query parameters are different from
 # their `/api/v1` counterpart.  This is a legacy code issue that we
 # plan to fix by changing the implementation.
@@ -384,9 +409,16 @@ SKIP_JSON = {
     ('/fetch_api_key', 'post'),
 }
 
-def validate_request(url: str, method: str, data: Dict[str, Any],
-                     http_headers: Dict[str, Any], json_url: bool,
-                     status_code: str, intentionally_undocumented: bool=False) -> None:
+
+def validate_request(
+    url: str,
+    method: str,
+    data: Dict[str, Any],
+    http_headers: Dict[str, Any],
+    json_url: bool,
+    status_code: str,
+    intentionally_undocumented: bool = False,
+) -> None:
     # Some JSON endpoints have different parameters compared to
     # their `/api/v1` counterparts.
     if json_url and (url, method) in SKIP_JSON:
@@ -399,8 +431,9 @@ def validate_request(url: str, method: str, data: Dict[str, Any],
 
     # Now using the openapi_core APIs, validate the request schema
     # against the OpenAPI documentation.
-    mock_request = MockRequest('http://localhost:9991/', method, '/api/v1' + url,
-                               headers=http_headers, args=data)
+    mock_request = MockRequest(
+        'http://localhost:9991/', method, '/api/v1' + url, headers=http_headers, args=data
+    )
     result = openapi_spec.request_validator().validate(mock_request)
     if len(result.errors) != 0:
         # Requests that do not validate against the OpenAPI spec must either:
diff --git a/zerver/openapi/python_examples.py b/zerver/openapi/python_examples.py
index 9ba0ef5312..c9444018ee 100644
--- a/zerver/openapi/python_examples.py
+++ b/zerver/openapi/python_examples.py
@@ -32,6 +32,7 @@ CALLED_TEST_FUNCTIONS: Set[str] = set()
 
 FuncT = TypeVar("FuncT", bound=Callable[..., object])
 
+
 def openapi_test_function(endpoint: str) -> Callable[[FuncT], FuncT]:
     """This decorator is used to register an OpenAPI test function with
     its endpoint. Example usage:
@@ -39,6 +40,7 @@ def openapi_test_function(endpoint: str) -> Callable[[FuncT], FuncT]:
     @openapi_test_function("/messages/render:post")
     def ...
     """
+
     def wrapper(test_func: FuncT) -> FuncT:
         @wraps(test_func)
         def _record_calls_wrapper(*args: object, **kwargs: object) -> object:
@@ -49,8 +51,10 @@ def openapi_test_function(endpoint: str) -> Callable[[FuncT], FuncT]:
         TEST_FUNCTIONS[endpoint] = _record_calls_wrapper
 
         return cast(FuncT, _record_calls_wrapper)  # https://github.com/python/mypy/issues/1927
+
     return wrapper
 
+
 def ensure_users(ids_list: List[int], user_names: List[str]) -> None:
     # Ensure that the list of user ids (ids_list)
     # matches the users we want to refer to (user_names).
@@ -59,6 +63,7 @@ def ensure_users(ids_list: List[int], user_names: List[str]) -> None:
 
     assert ids_list == user_ids
 
+
 @openapi_test_function("/users/me/subscriptions:post")
 def add_subscriptions(client: Client) -> None:
 
@@ -74,8 +79,7 @@ def add_subscriptions(client: Client) -> None:
     )
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post',
-                                    '200_0')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post', '200_0')
 
     # {code_example|start}
     # To subscribe other users to a stream, you may pass
@@ -91,6 +95,7 @@ def add_subscriptions(client: Client) -> None:
     assert result['result'] == 'success'
     assert 'newbie@zulip.com' in result['subscribed']
 
+
 def test_add_subscriptions_already_subscribed(client: Client) -> None:
     result = client.add_subscriptions(
         streams=[
@@ -99,8 +104,8 @@ def test_add_subscriptions_already_subscribed(client: Client) -> None:
         principals=['newbie@zulip.com'],
     )
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post',
-                                    '200_1')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post', '200_1')
+
 
 def test_authorization_errors_fatal(client: Client, nonadmin_client: Client) -> None:
     client.add_subscriptions(
@@ -123,8 +128,7 @@ def test_authorization_errors_fatal(client: Client, nonadmin_client: Client) ->
         authorization_errors_fatal=False,
     )
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post',
-                                    '400_0')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post', '400_0')
 
     result = nonadmin_client.add_subscriptions(
         streams=[
@@ -133,8 +137,8 @@ def test_authorization_errors_fatal(client: Client, nonadmin_client: Client) ->
         authorization_errors_fatal=True,
     )
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post',
-                                    '400_1')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'post', '400_1')
+
 
 @openapi_test_function("/users/{email}/presence:get")
 def get_user_presence(client: Client) -> None:
@@ -146,6 +150,7 @@ def get_user_presence(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/users/{email}/presence', 'get', '200')
 
+
 @openapi_test_function("/users/me/presence:post")
 def update_presence(client: Client) -> None:
     request = {
@@ -158,6 +163,7 @@ def update_presence(client: Client) -> None:
 
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/users:post")
 def create_user(client: Client) -> None:
 
@@ -178,6 +184,7 @@ def create_user(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/users', 'post', '400')
 
+
 @openapi_test_function("/users:get")
 def get_members(client: Client) -> None:
 
@@ -214,6 +221,7 @@ def get_members(client: Client) -> None:
         else:
             assert member.get('profile_data', None) is not None
 
+
 @openapi_test_function("/users/{user_id}:get")
 def get_single_user(client: Client) -> None:
 
@@ -230,6 +238,7 @@ def get_single_user(client: Client) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/users/{user_id}', 'get', '200')
 
+
 @openapi_test_function("/users/{user_id}:delete")
 def deactivate_user(client: Client) -> None:
 
@@ -240,6 +249,7 @@ def deactivate_user(client: Client) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/users/{user_id}', 'delete', '200')
 
+
 @openapi_test_function("/users/{user_id}/reactivate:post")
 def reactivate_user(client: Client) -> None:
     # {code_example|start}
@@ -249,23 +259,25 @@ def reactivate_user(client: Client) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/users/{user_id}/reactivate', 'post', '200')
 
+
 @openapi_test_function("/users/{user_id}:patch")
 def update_user(client: Client) -> None:
 
     # {code_example|start}
     # Change a user's full name.
     user_id = 10
-    result = client.update_user_by_id(user_id, full_name = "New Name")
+    result = client.update_user_by_id(user_id, full_name="New Name")
     # {code_example|end}
     validate_against_openapi_schema(result, '/users/{user_id}', 'patch', '200')
 
     # {code_example|start}
     # Change value of the custom profile field with ID 9.
     user_id = 8
-    result = client.update_user_by_id(user_id, profile_data = [{'id': 9, 'value': 'some data'}])
+    result = client.update_user_by_id(user_id, profile_data=[{'id': 9, 'value': 'some data'}])
     # {code_example|end}
     validate_against_openapi_schema(result, '/users/{user_id}', 'patch', '400')
 
+
 @openapi_test_function("/users/{user_id}/subscriptions/{stream_id}:get")
 def get_subscription_status(client: Client) -> None:
     # {code_example|start}
@@ -277,7 +289,10 @@ def get_subscription_status(client: Client) -> None:
         method='GET',
     )
     # {code_example|end}
-    validate_against_openapi_schema(result, '/users/{user_id}/subscriptions/{stream_id}', 'get', '200')
+    validate_against_openapi_schema(
+        result, '/users/{user_id}/subscriptions/{stream_id}', 'get', '200'
+    )
+
 
 @openapi_test_function("/realm/filters:get")
 def get_realm_filters(client: Client) -> None:
@@ -289,6 +304,7 @@ def get_realm_filters(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/realm/filters', 'get', '200')
 
+
 @openapi_test_function("/realm/profile_fields:get")
 def get_realm_profile_fields(client: Client) -> None:
     # {code_example|start}
@@ -300,54 +316,45 @@ def get_realm_profile_fields(client: Client) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/realm/profile_fields', 'get', '200')
 
+
 @openapi_test_function("/realm/profile_fields:patch")
 def reorder_realm_profile_fields(client: Client) -> None:
     # {code_example|start}
     # Reorder the custom profile fields in the user's organization.
     order = [8, 7, 6, 5, 4, 3, 2, 1]
-    request = {
-        'order': json.dumps(order)
-    }
+    request = {'order': json.dumps(order)}
 
-    result = client.call_endpoint(
-        url='/realm/profile_fields',
-        method='PATCH',
-        request=request
-    )
+    result = client.call_endpoint(url='/realm/profile_fields', method='PATCH', request=request)
     # {code_example|end}
     validate_against_openapi_schema(result, '/realm/profile_fields', 'patch', '200')
 
+
 @openapi_test_function("/realm/profile_fields:post")
 def create_realm_profile_field(client: Client) -> None:
     # {code_example|start}
     # Create a custom profile field in the user's organization.
-    request = {
-        'name': 'Phone',
-        'hint': 'Contact No.',
-        'field_type': 1
-    }
+    request = {'name': 'Phone', 'hint': 'Contact No.', 'field_type': 1}
 
-    result = client.call_endpoint(
-        url='/realm/profile_fields',
-        method='POST',
-        request=request
-    )
+    result = client.call_endpoint(url='/realm/profile_fields', method='POST', request=request)
     # {code_example|end}
 
     validate_against_openapi_schema(result, '/realm/profile_fields', 'post', '200')
 
+
 @openapi_test_function("/realm/filters:post")
 def add_realm_filter(client: Client) -> None:
 
     # {code_example|start}
     # Add a filter to automatically linkify #<number> to the corresponding
     # issue in Zulip's server repo
-    result = client.add_realm_filter('#(?P<id>[0-9]+)',
-                                     'https://github.com/zulip/zulip/issues/%(id)s')
+    result = client.add_realm_filter(
+        '#(?P<id>[0-9]+)', 'https://github.com/zulip/zulip/issues/%(id)s'
+    )
     # {code_example|end}
 
     validate_against_openapi_schema(result, '/realm/filters', 'post', '200')
 
+
 @openapi_test_function("/realm/filters/{filter_id}:delete")
 def remove_realm_filter(client: Client) -> None:
 
@@ -358,6 +365,7 @@ def remove_realm_filter(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/realm/filters/{filter_id}', 'delete', '200')
 
+
 @openapi_test_function("/users/me:get")
 def get_profile(client: Client) -> None:
 
@@ -369,6 +377,7 @@ def get_profile(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/users/me', 'get', '200')
 
+
 @openapi_test_function("/get_stream_id:get")
 def get_stream_id(client: Client) -> int:
 
@@ -382,6 +391,7 @@ def get_stream_id(client: Client) -> int:
 
     return result['stream_id']
 
+
 @openapi_test_function("/streams/{stream_id}:delete")
 def delete_stream(client: Client, stream_id: int) -> None:
     result = client.add_subscriptions(
@@ -402,6 +412,7 @@ def delete_stream(client: Client, stream_id: int) -> None:
 
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/streams:get")
 def get_streams(client: Client) -> None:
 
@@ -423,6 +434,7 @@ def get_streams(client: Client) -> None:
     validate_against_openapi_schema(result, '/streams', 'get', '200')
     assert len(result['streams']) == 4
 
+
 @openapi_test_function("/streams/{stream_id}:patch")
 def update_stream(client: Client, stream_id: int) -> None:
 
@@ -440,6 +452,7 @@ def update_stream(client: Client, stream_id: int) -> None:
     validate_against_openapi_schema(result, '/streams/{stream_id}', 'patch', '200')
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/user_groups:get")
 def get_user_groups(client: Client) -> int:
 
@@ -449,29 +462,31 @@ def get_user_groups(client: Client) -> int:
     # {code_example|end}
 
     validate_against_openapi_schema(result, '/user_groups', 'get', '200')
-    hamlet_user_group = [u for u in result['user_groups']
-                         if u['name'] == "hamletcharacters"][0]
+    hamlet_user_group = [u for u in result['user_groups'] if u['name'] == "hamletcharacters"][0]
     assert hamlet_user_group['description'] == 'Characters of Hamlet'
 
-    marketing_user_group = [u for u in result['user_groups']
-                            if u['name'] == "marketing"][0]
+    marketing_user_group = [u for u in result['user_groups'] if u['name'] == "marketing"][0]
     return marketing_user_group['id']
 
+
 def test_user_not_authorized_error(nonadmin_client: Client) -> None:
     result = nonadmin_client.get_streams(include_all_active=True)
 
     validate_against_openapi_schema(result, '/rest-error-handling', 'post', '400_2')
 
+
 def get_subscribers(client: Client) -> None:
 
     result = client.get_subscribers(stream='new stream')
     assert result['subscribers'] == ['iago@zulip.com', 'newbie@zulip.com']
 
+
 def get_user_agent(client: Client) -> None:
 
     result = client.get_user_agent()
     assert result.startswith('ZulipPython/')
 
+
 @openapi_test_function("/users/me/subscriptions:get")
 def list_subscriptions(client: Client) -> None:
     # {code_example|start}
@@ -479,12 +494,12 @@ def list_subscriptions(client: Client) -> None:
     result = client.list_subscriptions()
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions',
-                                    'get', '200')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'get', '200')
 
     streams = [s for s in result['subscriptions'] if s['name'] == 'new stream']
     assert streams[0]['description'] == 'New stream for testing'
 
+
 @openapi_test_function("/users/me/subscriptions:delete")
 def remove_subscriptions(client: Client) -> None:
 
@@ -495,8 +510,7 @@ def remove_subscriptions(client: Client) -> None:
     )
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions',
-                                    'delete', '200')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'delete', '200')
 
     # test it was actually removed
     result = client.list_subscriptions()
@@ -512,8 +526,8 @@ def remove_subscriptions(client: Client) -> None:
     )
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/users/me/subscriptions',
-                                    'delete', '200')
+    validate_against_openapi_schema(result, '/users/me/subscriptions', 'delete', '200')
+
 
 @openapi_test_function("/users/me/subscriptions/muted_topics:patch")
 def toggle_mute_topic(client: Client) -> None:
@@ -540,9 +554,7 @@ def toggle_mute_topic(client: Client) -> None:
     result = client.mute_topic(request)
     # {code_example|end}
 
-    validate_against_openapi_schema(result,
-                                    '/users/me/subscriptions/muted_topics',
-                                    'patch', '200')
+    validate_against_openapi_schema(result, '/users/me/subscriptions/muted_topics', 'patch', '200')
 
     # {code_example|start}
     # Unmute the topic "boat party" in the stream "Denmark"
@@ -555,9 +567,8 @@ def toggle_mute_topic(client: Client) -> None:
     result = client.mute_topic(request)
     # {code_example|end}
 
-    validate_against_openapi_schema(result,
-                                    '/users/me/subscriptions/muted_topics',
-                                    'patch', '200')
+    validate_against_openapi_schema(result, '/users/me/subscriptions/muted_topics', 'patch', '200')
+
 
 @openapi_test_function("/mark_all_as_read:post")
 def mark_all_as_read(client: Client) -> None:
@@ -569,6 +580,7 @@ def mark_all_as_read(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/mark_all_as_read', 'post', '200')
 
+
 @openapi_test_function("/mark_stream_as_read:post")
 def mark_stream_as_read(client: Client) -> None:
 
@@ -579,6 +591,7 @@ def mark_stream_as_read(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/mark_stream_as_read', 'post', '200')
 
+
 @openapi_test_function("/mark_topic_as_read:post")
 def mark_topic_as_read(client: Client) -> None:
 
@@ -592,27 +605,30 @@ def mark_topic_as_read(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/mark_stream_as_read', 'post', '200')
 
+
 @openapi_test_function("/users/me/subscriptions/properties:post")
 def update_subscription_settings(client: Client) -> None:
 
     # {code_example|start}
     # Update the user's subscription in stream #1 to pin it to the top of the
     # stream list; and in stream #3 to have the hex color "f00"
-    request = [{
-        'stream_id': 1,
-        'property': 'pin_to_top',
-        'value': True,
-    }, {
-        'stream_id': 3,
-        'property': 'color',
-        'value': '#f00f00',
-    }]
+    request = [
+        {
+            'stream_id': 1,
+            'property': 'pin_to_top',
+            'value': True,
+        },
+        {
+            'stream_id': 3,
+            'property': 'color',
+            'value': '#f00f00',
+        },
+    ]
     result = client.update_subscription_settings(request)
     # {code_example|end}
 
-    validate_against_openapi_schema(result,
-                                    '/users/me/subscriptions/properties',
-                                    'POST', '200')
+    validate_against_openapi_schema(result, '/users/me/subscriptions/properties', 'POST', '200')
+
 
 @openapi_test_function("/messages/render:post")
 def render_message(client: Client) -> None:
@@ -627,6 +643,7 @@ def render_message(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/messages/render', 'post', '200')
 
+
 @openapi_test_function("/messages:get")
 def get_messages(client: Client) -> None:
 
@@ -636,8 +653,10 @@ def get_messages(client: Client) -> None:
         'anchor': 'newest',
         'num_before': 100,
         'num_after': 0,
-        'narrow': [{'operator': 'sender', 'operand': 'iago@zulip.com'},
-                   {'operator': 'stream', 'operand': 'Verona'}],
+        'narrow': [
+            {'operator': 'sender', 'operand': 'iago@zulip.com'},
+            {'operator': 'stream', 'operand': 'Verona'},
+        ],
     }
     result = client.get_messages(request)
     # {code_example|end}
@@ -645,14 +664,10 @@ def get_messages(client: Client) -> None:
     validate_against_openapi_schema(result, '/messages', 'get', '200')
     assert len(result['messages']) <= request['num_before']
 
+
 @openapi_test_function("/messages/matches_narrow:get")
 def check_messages_match_narrow(client: Client) -> None:
-    message = {
-        "type": "stream",
-        "to": "Verona",
-        "topic": "test_topic",
-        "content": "http://foo.com"
-    }
+    message = {"type": "stream", "to": "Verona", "topic": "test_topic", "content": "http://foo.com"}
     msg_ids = []
     response = client.send_message(message)
     msg_ids.append(response['id'])
@@ -667,15 +682,12 @@ def check_messages_match_narrow(client: Client) -> None:
         'narrow': [{'operator': 'has', 'operand': 'link'}],
     }
 
-    result = client.call_endpoint(
-        url='messages/matches_narrow',
-        method='GET',
-        request=request
-    )
+    result = client.call_endpoint(url='messages/matches_narrow', method='GET', request=request)
     # {code_example|end}
 
     validate_against_openapi_schema(result, '/messages/matches_narrow', 'get', '200')
 
+
 @openapi_test_function("/messages/{message_id}:get")
 def get_raw_message(client: Client, message_id: int) -> None:
 
@@ -686,8 +698,8 @@ def get_raw_message(client: Client, message_id: int) -> None:
     result = client.get_raw_message(message_id)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/messages/{message_id}', 'get',
-                                    '200')
+    validate_against_openapi_schema(result, '/messages/{message_id}', 'get', '200')
+
 
 @openapi_test_function("/attachments:get")
 def get_attachments(client: Client) -> None:
@@ -698,6 +710,7 @@ def get_attachments(client: Client) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/attachments', 'get', '200')
 
+
 @openapi_test_function("/messages:post")
 def send_message(client: Client) -> int:
 
@@ -753,6 +766,7 @@ def send_message(client: Client) -> int:
 
     return message_id
 
+
 @openapi_test_function("/messages/{message_id}/reactions:post")
 def add_reaction(client: Client, message_id: int) -> None:
     # {code_example|start}
@@ -766,6 +780,7 @@ def add_reaction(client: Client, message_id: int) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/messages/{message_id}/reactions', 'post', '200')
 
+
 @openapi_test_function("/messages/{message_id}/reactions:delete")
 def remove_reaction(client: Client, message_id: int) -> None:
     # {code_example|start}
@@ -779,6 +794,7 @@ def remove_reaction(client: Client, message_id: int) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/messages/{message_id}/reactions', 'delete', '200')
 
+
 def test_nonexistent_stream_error(client: Client) -> None:
     request = {
         "type": "stream",
@@ -788,8 +804,8 @@ def test_nonexistent_stream_error(client: Client) -> None:
     }
     result = client.send_message(request)
 
-    validate_against_openapi_schema(result, '/messages', 'post',
-                                    '400_0')
+    validate_against_openapi_schema(result, '/messages', 'post', '400_0')
+
 
 def test_private_message_invalid_recipient(client: Client) -> None:
     request = {
@@ -799,8 +815,8 @@ def test_private_message_invalid_recipient(client: Client) -> None:
     }
     result = client.send_message(request)
 
-    validate_against_openapi_schema(result, '/messages', 'post',
-                                    '400_1')
+    validate_against_openapi_schema(result, '/messages', 'post', '400_1')
+
 
 @openapi_test_function("/messages/{message_id}:patch")
 def update_message(client: Client, message_id: int) -> None:
@@ -818,8 +834,7 @@ def update_message(client: Client, message_id: int) -> None:
     result = client.update_message(request)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/messages/{message_id}', 'patch',
-                                    '200')
+    validate_against_openapi_schema(result, '/messages/{message_id}', 'patch', '200')
 
     # test it was actually updated
     url = 'messages/' + str(message_id)
@@ -830,6 +845,7 @@ def update_message(client: Client, message_id: int) -> None:
     assert result['result'] == 'success'
     assert result['raw_content'] == request['content']
 
+
 def test_update_message_edit_permission_error(client: Client, nonadmin_client: Client) -> None:
     request = {
         "type": "stream",
@@ -847,6 +863,7 @@ def test_update_message_edit_permission_error(client: Client, nonadmin_client: C
 
     validate_against_openapi_schema(result, '/messages/{message_id}', 'patch', '400')
 
+
 @openapi_test_function("/messages/{message_id}:delete")
 def delete_message(client: Client, message_id: int) -> None:
 
@@ -855,8 +872,8 @@ def delete_message(client: Client, message_id: int) -> None:
     result = client.delete_message(message_id)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/messages/{message_id}', 'delete',
-                                    '200')
+    validate_against_openapi_schema(result, '/messages/{message_id}', 'delete', '200')
+
 
 def test_delete_message_edit_permission_error(client: Client, nonadmin_client: Client) -> None:
     request = {
@@ -869,8 +886,8 @@ def test_delete_message_edit_permission_error(client: Client, nonadmin_client: C
 
     result = nonadmin_client.delete_message(result['id'])
 
-    validate_against_openapi_schema(result, '/messages/{message_id}', 'delete',
-                                    '400_1')
+    validate_against_openapi_schema(result, '/messages/{message_id}', 'delete', '400_1')
+
 
 @openapi_test_function("/messages/{message_id}/history:get")
 def get_message_history(client: Client, message_id: int) -> None:
@@ -880,8 +897,8 @@ def get_message_history(client: Client, message_id: int) -> None:
     result = client.get_message_history(message_id)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/messages/{message_id}/history',
-                                    'get', '200')
+    validate_against_openapi_schema(result, '/messages/{message_id}/history', 'get', '200')
+
 
 @openapi_test_function("/realm/emoji:get")
 def get_realm_emoji(client: Client) -> None:
@@ -892,6 +909,7 @@ def get_realm_emoji(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/realm/emoji', 'GET', '200')
 
+
 @openapi_test_function("/messages/flags:post")
 def update_message_flags(client: Client) -> None:
 
@@ -916,8 +934,7 @@ def update_message_flags(client: Client) -> None:
     result = client.update_message_flags(request)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/messages/flags', 'post',
-                                    '200')
+    validate_against_openapi_schema(result, '/messages/flags', 'post', '200')
 
     # {code_example|start}
     # Remove the "starred" flag from the messages with IDs in "message_ids"
@@ -929,8 +946,8 @@ def update_message_flags(client: Client) -> None:
     result = client.update_message_flags(request)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/messages/flags', 'post',
-                                    '200')
+    validate_against_openapi_schema(result, '/messages/flags', 'post', '200')
+
 
 def register_queue_all_events(client: Client) -> str:
 
@@ -941,6 +958,7 @@ def register_queue_all_events(client: Client) -> str:
     validate_against_openapi_schema(result, '/register', 'post', '200')
     return result['queue_id']
 
+
 @openapi_test_function("/register:post")
 def register_queue(client: Client) -> str:
 
@@ -954,6 +972,7 @@ def register_queue(client: Client) -> str:
     validate_against_openapi_schema(result, '/register', 'post', '200')
     return result['queue_id']
 
+
 @openapi_test_function("/events:delete")
 def deregister_queue(client: Client, queue_id: str) -> None:
 
@@ -969,6 +988,7 @@ def deregister_queue(client: Client, queue_id: str) -> None:
     result = client.deregister(queue_id)
     validate_against_openapi_schema(result, '/events', 'delete', '400')
 
+
 @openapi_test_function("/server_settings:get")
 def get_server_settings(client: Client) -> None:
 
@@ -979,6 +999,7 @@ def get_server_settings(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/server_settings', 'get', '200')
 
+
 @openapi_test_function("/settings/notifications:patch")
 def update_notification_settings(client: Client) -> None:
 
@@ -993,6 +1014,7 @@ def update_notification_settings(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/settings/notifications', 'patch', '200')
 
+
 @openapi_test_function("/user_uploads:post")
 def upload_file(client: Client) -> None:
     path_to_file = os.path.join(ZULIP_DIR, 'zerver', 'tests', 'images', 'img.jpg')
@@ -1006,16 +1028,19 @@ def upload_file(client: Client) -> None:
             files=[fp],
         )
 
-    client.send_message({
-        "type": "stream",
-        "to": "Denmark",
-        "topic": "Castle",
-        "content": "Check out [this picture]({}) of my castle!".format(result['uri']),
-    })
+    client.send_message(
+        {
+            "type": "stream",
+            "to": "Denmark",
+            "topic": "Castle",
+            "content": "Check out [this picture]({}) of my castle!".format(result['uri']),
+        }
+    )
     # {code_example|end}
 
     validate_against_openapi_schema(result, '/user_uploads', 'post', '200')
 
+
 @openapi_test_function("/users/me/{stream_id}/topics:get")
 def get_stream_topics(client: Client, stream_id: int) -> None:
 
@@ -1023,8 +1048,8 @@ def get_stream_topics(client: Client, stream_id: int) -> None:
     result = client.get_stream_topics(stream_id)
     # {code_example|end}
 
-    validate_against_openapi_schema(result, '/users/me/{stream_id}/topics',
-                                    'get', '200')
+    validate_against_openapi_schema(result, '/users/me/{stream_id}/topics', 'get', '200')
+
 
 @openapi_test_function("/typing:post")
 def set_typing_status(client: Client) -> None:
@@ -1058,6 +1083,7 @@ def set_typing_status(client: Client) -> None:
 
     validate_against_openapi_schema(result, '/typing', 'post', '200')
 
+
 @openapi_test_function("/realm/emoji/{emoji_name}:post")
 def upload_custom_emoji(client: Client) -> None:
     emoji_path = os.path.join(ZULIP_DIR, 'zerver', 'tests', 'images', 'img.jpg')
@@ -1073,9 +1099,8 @@ def upload_custom_emoji(client: Client) -> None:
         )
     # {code_example|end}
 
-    validate_against_openapi_schema(result,
-                                    '/realm/emoji/{emoji_name}',
-                                    'post', '200')
+    validate_against_openapi_schema(result, '/realm/emoji/{emoji_name}', 'post', '200')
+
 
 @openapi_test_function("/users/me/alert_words:get")
 def get_alert_words(client: Client) -> None:
@@ -1083,6 +1108,7 @@ def get_alert_words(client: Client) -> None:
 
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/users/me/alert_words:post")
 def add_alert_words(client: Client) -> None:
     word = ['foo', 'bar']
@@ -1091,6 +1117,7 @@ def add_alert_words(client: Client) -> None:
 
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/users/me/alert_words:delete")
 def remove_alert_words(client: Client) -> None:
     word = ['foo']
@@ -1099,6 +1126,7 @@ def remove_alert_words(client: Client) -> None:
 
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/user_groups/create:post")
 def create_user_group(client: Client) -> None:
     ensure_users([6, 7, 8, 10], ['aaron', 'zoe', 'cordelia', 'hamlet'])
@@ -1116,6 +1144,7 @@ def create_user_group(client: Client) -> None:
 
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/user_groups/{user_group_id}:patch")
 def update_user_group(client: Client, user_group_id: int) -> None:
     # {code_example|start}
@@ -1129,6 +1158,7 @@ def update_user_group(client: Client, user_group_id: int) -> None:
     # {code_example|end}
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/user_groups/{user_group_id}:delete")
 def remove_user_group(client: Client, user_group_id: int) -> None:
     # {code_example|start}
@@ -1138,6 +1168,7 @@ def remove_user_group(client: Client, user_group_id: int) -> None:
     validate_against_openapi_schema(result, '/user_groups/{user_group_id}', 'delete', '200')
     assert result['result'] == 'success'
 
+
 @openapi_test_function("/user_groups/{user_group_id}/members:post")
 def update_user_group_members(client: Client, user_group_id: int) -> None:
     ensure_users([8, 10, 11], ['cordelia', 'hamlet', 'iago'])
@@ -1152,10 +1183,12 @@ def update_user_group_members(client: Client, user_group_id: int) -> None:
     # {code_example|end}
     validate_against_openapi_schema(result, '/user_groups/{group_id}/members', 'post', '200')
 
+
 def test_invalid_api_key(client_with_invalid_key: Client) -> None:
     result = client_with_invalid_key.list_subscriptions()
     validate_against_openapi_schema(result, '/rest-error-handling', 'post', '400_0')
 
+
 def test_missing_request_argument(client: Client) -> None:
     result = client.render_message({})
 
@@ -1169,7 +1202,12 @@ def test_invalid_stream_error(client: Client) -> None:
 
 
 # SETUP METHODS FOLLOW
-def test_against_fixture(result: Dict[str, Any], fixture: Dict[str, Any], check_if_equal: Optional[Iterable[str]] = None, check_if_exists: Optional[Iterable[str]] = None) -> None:
+def test_against_fixture(
+    result: Dict[str, Any],
+    fixture: Dict[str, Any],
+    check_if_equal: Optional[Iterable[str]] = None,
+    check_if_exists: Optional[Iterable[str]] = None,
+) -> None:
     assertLength(result, fixture)
 
     if check_if_equal is None and check_if_exists is None:
@@ -1184,24 +1222,31 @@ def test_against_fixture(result: Dict[str, Any], fixture: Dict[str, Any], check_
         for key in check_if_exists:
             assertIn(key, result)
 
+
 def assertEqual(key: str, result: Dict[str, Any], fixture: Dict[str, Any]) -> None:
     if result[key] != fixture[key]:
         first = f"{key} = {result[key]}"
         second = f"{key} = {fixture[key]}"
-        raise AssertionError("Actual and expected outputs do not match; showing diff:\n" +
-                             mdiff.diff_strings(first, second))
+        raise AssertionError(
+            "Actual and expected outputs do not match; showing diff:\n"
+            + mdiff.diff_strings(first, second)
+        )
     else:
         assert result[key] == fixture[key]
 
+
 def assertLength(result: Dict[str, Any], fixture: Dict[str, Any]) -> None:
     if len(result) != len(fixture):
         result_string = json.dumps(result, indent=4, sort_keys=True)
         fixture_string = json.dumps(fixture, indent=4, sort_keys=True)
-        raise AssertionError("The lengths of the actual and expected outputs do not match; showing diff:\n" +
-                             mdiff.diff_strings(result_string, fixture_string))
+        raise AssertionError(
+            "The lengths of the actual and expected outputs do not match; showing diff:\n"
+            + mdiff.diff_strings(result_string, fixture_string)
+        )
     else:
         assert len(result) == len(fixture)
 
+
 def assertIn(key: str, result: Dict[str, Any]) -> None:
     if key not in result.keys():
         raise AssertionError(
@@ -1210,6 +1255,7 @@ def assertIn(key: str, result: Dict[str, Any]) -> None:
     else:
         assert key in result
 
+
 def test_messages(client: Client, nonadmin_client: Client) -> None:
 
     render_message(client)
@@ -1232,6 +1278,7 @@ def test_messages(client: Client, nonadmin_client: Client) -> None:
     test_update_message_edit_permission_error(client, nonadmin_client)
     test_delete_message_edit_permission_error(client, nonadmin_client)
 
+
 def test_users(client: Client) -> None:
 
     create_user(client)
@@ -1257,6 +1304,7 @@ def test_users(client: Client) -> None:
     add_alert_words(client)
     remove_alert_words(client)
 
+
 def test_streams(client: Client, nonadmin_client: Client) -> None:
 
     add_subscriptions(client)
@@ -1287,6 +1335,7 @@ def test_queues(client: Client) -> None:
     deregister_queue(client, queue_id)
     register_queue_all_events(client)
 
+
 def test_server_organizations(client: Client) -> None:
 
     get_realm_filters(client)
@@ -1299,10 +1348,12 @@ def test_server_organizations(client: Client) -> None:
     reorder_realm_profile_fields(client)
     create_realm_profile_field(client)
 
+
 def test_errors(client: Client) -> None:
     test_missing_request_argument(client)
     test_invalid_stream_error(client)
 
+
 def test_the_api(client: Client, nonadmin_client: Client) -> None:
 
     get_user_agent(client)
diff --git a/zerver/openapi/test_curl_examples.py b/zerver/openapi/test_curl_examples.py
index 3ef703b492..387fda9870 100644
--- a/zerver/openapi/test_curl_examples.py
+++ b/zerver/openapi/test_curl_examples.py
@@ -26,8 +26,9 @@ def test_generated_curl_examples_for_success(client: Client) -> None:
     authentication_line = f"{client.email}:{client.api_key}"
     # A limited Markdown engine that just processes the code example syntax.
     realm = get_realm("zulip")
-    md_engine = markdown.Markdown(extensions=[markdown_extension.makeExtension(
-        api_url=realm.uri + "/api")])
+    md_engine = markdown.Markdown(
+        extensions=[markdown_extension.makeExtension(api_url=realm.uri + "/api")]
+    )
 
     # We run our curl tests in alphabetical order (except that we
     # delay the deactivate-user test to the very end), since we depend
@@ -47,25 +48,27 @@ def test_generated_curl_examples_for_success(client: Client) -> None:
                 # example, and then run that to test it.
                 curl_command_html = md_engine.convert(line.strip())
                 unescaped_html = html.unescape(curl_command_html)
-                curl_command_text = unescaped_html[len("<p><code>curl\n"):-len("</code></p>")]
+                curl_command_text = unescaped_html[len("<p><code>curl\n") : -len("</code></p>")]
 
                 curl_command_text = curl_command_text.replace(
-                    "BOT_EMAIL_ADDRESS:BOT_API_KEY", authentication_line)
+                    "BOT_EMAIL_ADDRESS:BOT_API_KEY", authentication_line
+                )
 
                 print("Testing {} ...".format(curl_command_text.split("\n")[0]))
 
                 # Turn the text into an arguments list.
-                generated_curl_command = [
-                    x for x in shlex.split(curl_command_text) if x != "\n"]
+                generated_curl_command = [x for x in shlex.split(curl_command_text) if x != "\n"]
 
                 response_json = None
                 response = None
                 try:
                     # We split this across two lines so if curl fails and
                     # returns non-JSON output, we'll still print it.
-                    response_json = subprocess.check_output(generated_curl_command, universal_newlines=True)
+                    response_json = subprocess.check_output(
+                        generated_curl_command, universal_newlines=True
+                    )
                     response = json.loads(response_json)
-                    assert(response["result"] == "success")
+                    assert response["result"] == "success"
                 except (AssertionError, Exception):
                     error_template = """
 Error verifying the success of the API documentation curl example.
@@ -89,13 +92,20 @@ Common reasons for why this could occur:
 
 To learn more about the test itself, see zerver/openapi/test_curl_examples.py.
 """
-                    print(error_template.format(
-                        file_name=file_name,
-                        line=line,
-                        curl_command=generated_curl_command,
-                        response=response_json if response is None else json.dumps(response, indent=4)))
+                    print(
+                        error_template.format(
+                            file_name=file_name,
+                            line=line,
+                            curl_command=generated_curl_command,
+                            response=response_json
+                            if response is None
+                            else json.dumps(response, indent=4),
+                        )
+                    )
                     raise
 
     if REGISTERED_GENERATOR_FUNCTIONS != CALLED_GENERATOR_FUNCTIONS:
-        raise Exception("Some registered generator functions were not called:\n"
-                        " " + str(REGISTERED_GENERATOR_FUNCTIONS - CALLED_GENERATOR_FUNCTIONS))
+        raise Exception(
+            "Some registered generator functions were not called:\n"
+            " " + str(REGISTERED_GENERATOR_FUNCTIONS - CALLED_GENERATOR_FUNCTIONS)
+        )
diff --git a/zerver/signals.py b/zerver/signals.py
index 29cef88a77..c1a1a72a47 100644
--- a/zerver/signals.py
+++ b/zerver/signals.py
@@ -16,6 +16,7 @@ from zerver.models import UserProfile
 
 JUST_CREATED_THRESHOLD = 60
 
+
 def get_device_browser(user_agent: str) -> Optional[str]:
     user_agent = user_agent.lower()
     if "zulip" in user_agent:
@@ -97,7 +98,8 @@ def email_on_new_login(sender: Any, user: UserProfile, request: Any, **kwargs: A
             'to_user_ids': [user.id],
             'from_name': FromAddress.security_email_from_name(user_profile=user),
             'from_address': FromAddress.NOREPLY,
-            'context': context}
+            'context': context,
+        }
         queue_json_publish("email_senders", email_dict)
 
 
diff --git a/zerver/templatetags/app_filters.py b/zerver/templatetags/app_filters.py
index dced2b0550..85ec289f2f 100644
--- a/zerver/templatetags/app_filters.py
+++ b/zerver/templatetags/app_filters.py
@@ -23,13 +23,16 @@ from zerver.lib.cache import dict_to_items_tuple, ignore_unhashable_lru_cache, i
 
 register = Library()
 
+
 def and_n_others(values: List[str], limit: int) -> str:
     # A helper for the commonly appended "and N other(s)" string, with
     # the appropriate pluralization.
     return " and {} other{}".format(
-        len(values) - limit, "" if len(values) == limit + 1 else "s",
+        len(values) - limit,
+        "" if len(values) == limit + 1 else "s",
     )
 
+
 @register.filter(name='display_list', is_safe=True)
 def display_list(values: List[str], display_limit: int) -> str:
     """
@@ -48,17 +51,16 @@ def display_list(values: List[str], display_limit: int) -> str:
         display_string = f"{values[0]}"
     elif len(values) <= display_limit:
         # Fewer than `display_limit` values, show all of them.
-        display_string = ", ".join(
-            f"{value}" for value in values[:-1])
+        display_string = ", ".join(f"{value}" for value in values[:-1])
         display_string += f" and {values[-1]}"
     else:
         # More than `display_limit` values, only mention a few.
-        display_string = ", ".join(
-            f"{value}" for value in values[:display_limit])
+        display_string = ", ".join(f"{value}" for value in values[:display_limit])
         display_string += and_n_others(values, display_limit)
 
     return display_string
 
+
 md_extensions: Optional[List[Any]] = None
 md_macro_extension: Optional[Any] = None
 # Prevent the automatic substitution of macros in these docs. If
@@ -75,9 +77,9 @@ docs_without_macros = [
 @ignore_unhashable_lru_cache(512)
 @items_tuple_to_dict
 @register.filter(name='render_markdown_path', is_safe=True)
-def render_markdown_path(markdown_file_path: str,
-                         context: Mapping[str, Any]={},
-                         pure_markdown: bool=False) -> str:
+def render_markdown_path(
+    markdown_file_path: str, context: Mapping[str, Any] = {}, pure_markdown: bool = False
+) -> str:
     """Given a path to a Markdown file, return the rendered HTML.
 
     Note that this assumes that any HTML in the Markdown file is
@@ -86,8 +88,10 @@ def render_markdown_path(markdown_file_path: str,
 
     # We set this global hackishly
     from zerver.lib.markdown.help_settings_links import set_relative_settings_links
+
     set_relative_settings_links(bool(context.get('html_settings_links')))
     from zerver.lib.markdown.help_relative_links import set_relative_help_links
+
     set_relative_help_links(bool(context.get('html_settings_links')))
 
     global md_extensions
@@ -105,9 +109,11 @@ def render_markdown_path(markdown_file_path: str,
                 run_content_validators=context.get('run_content_validators', False),
             ),
             zerver.lib.markdown.api_arguments_table_generator.makeExtension(
-                base_path='templates/zerver/api/'),
+                base_path='templates/zerver/api/'
+            ),
             zerver.lib.markdown.api_return_values_table_generator.makeExtension(
-                base_path='templates/zerver/api/'),
+                base_path='templates/zerver/api/'
+            ),
             zerver.lib.markdown.nested_code_blocks.makeExtension(),
             zerver.lib.markdown.tabbed_sections.makeExtension(),
             zerver.lib.markdown.help_settings_links.makeExtension(),
@@ -116,7 +122,8 @@ def render_markdown_path(markdown_file_path: str,
         ]
     if md_macro_extension is None:
         md_macro_extension = zerver.lib.markdown.include.makeExtension(
-            base_path='templates/zerver/help/include/')
+            base_path='templates/zerver/help/include/'
+        )
     extensions = md_extensions
     if 'api_url' in context:
         # We need to generate the API code examples extension each
@@ -124,9 +131,12 @@ def render_markdown_path(markdown_file_path: str,
         #
         # TODO: Convert this to something more efficient involving
         # passing the API URL as a direct parameter.
-        extensions = [*extensions, zerver.openapi.markdown_extension.makeExtension(
-            api_url=context["api_url"],
-        )]
+        extensions = [
+            *extensions,
+            zerver.openapi.markdown_extension.makeExtension(
+                api_url=context["api_url"],
+            ),
+        ]
     if not any(doc in markdown_file_path for doc in docs_without_macros):
         extensions = [md_macro_extension, *extensions]
 
diff --git a/zerver/tests/test_alert_words.py b/zerver/tests/test_alert_words.py
index 09d3eeba5d..899f880e30 100644
--- a/zerver/tests/test_alert_words.py
+++ b/zerver/tests/test_alert_words.py
@@ -86,8 +86,7 @@ class AlertWordTests(ZulipTestCase):
             do_remove_alert_words(user, [alert_word])
             expected_remaining_alerts.remove(alert_word)
             actual_remaining_alerts = user_alert_words(user)
-            self.assertEqual(set(actual_remaining_alerts),
-                             expected_remaining_alerts)
+            self.assertEqual(set(actual_remaining_alerts), expected_remaining_alerts)
 
     def test_realm_words(self) -> None:
         """
@@ -109,8 +108,7 @@ class AlertWordTests(ZulipTestCase):
         realm_words = alert_words_in_realm(user2.realm)
         self.assertEqual(len(realm_words), 2)
         self.assertEqual(set(realm_words.keys()), {user1.id, user2.id})
-        self.assertEqual(set(realm_words[user1.id]),
-                         set(self.interesting_alert_word_list))
+        self.assertEqual(set(realm_words[user1.id]), set(self.interesting_alert_word_list))
         self.assertEqual(set(realm_words[user2.id]), {'another'})
 
     def test_json_list_default(self) -> None:
@@ -134,8 +132,10 @@ class AlertWordTests(ZulipTestCase):
         user = self.get_user()
         self.login_user(user)
 
-        result = self.client_post('/json/users/me/alert_words',
-                                  {'alert_words': orjson.dumps(['one ', '\n two', 'three']).decode()})
+        result = self.client_post(
+            '/json/users/me/alert_words',
+            {'alert_words': orjson.dumps(['one ', '\n two', 'three']).decode()},
+        )
         self.assert_json_success(result)
         self.assertEqual(set(result.json()['alert_words']), {'one', 'two', 'three'})
 
@@ -143,13 +143,16 @@ class AlertWordTests(ZulipTestCase):
         user = self.get_user()
         self.login_user(user)
 
-        result = self.client_post('/json/users/me/alert_words',
-                                  {'alert_words': orjson.dumps(['one', 'two', 'three']).decode()})
+        result = self.client_post(
+            '/json/users/me/alert_words',
+            {'alert_words': orjson.dumps(['one', 'two', 'three']).decode()},
+        )
         self.assert_json_success(result)
         self.assertEqual(set(result.json()['alert_words']), {'one', 'two', 'three'})
 
-        result = self.client_delete('/json/users/me/alert_words',
-                                    {'alert_words': orjson.dumps(['one']).decode()})
+        result = self.client_delete(
+            '/json/users/me/alert_words', {'alert_words': orjson.dumps(['one']).decode()}
+        )
         self.assert_json_success(result)
         self.assertEqual(set(result.json()['alert_words']), {'two', 'three'})
 
@@ -163,8 +166,10 @@ class AlertWordTests(ZulipTestCase):
         user = self.get_user()
         self.login_user(user)
 
-        result = self.client_post('/json/users/me/alert_words',
-                                  {'alert_words': orjson.dumps(['one', 'two', 'three']).decode()})
+        result = self.client_post(
+            '/json/users/me/alert_words',
+            {'alert_words': orjson.dumps(['one', 'two', 'three']).decode()},
+        )
         self.assert_json_success(result)
         self.assertEqual(set(result.json()['alert_words']), {'one', 'two', 'three'})
 
@@ -191,8 +196,9 @@ class AlertWordTests(ZulipTestCase):
         user = self.get_user()
         self.login_user(user)
 
-        result = self.client_post('/json/users/me/alert_words',
-                                  {'alert_words': orjson.dumps(['ALERT']).decode()})
+        result = self.client_post(
+            '/json/users/me/alert_words', {'alert_words': orjson.dumps(['ALERT']).decode()}
+        )
 
         content = 'this is an ALERT for you'
         self.send_stream_message(user, "Denmark", content)
@@ -203,20 +209,26 @@ class AlertWordTests(ZulipTestCase):
         user_message = most_recent_usermessage(user)
         self.assertIn('has_alert_word', user_message.flags_list())
 
-        result = self.client_patch("/json/messages/" + str(original_message.id), {
-            'message_id': original_message.id,
-            'content': 'new ALERT for you',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(original_message.id),
+            {
+                'message_id': original_message.id,
+                'content': 'new ALERT for you',
+            },
+        )
         self.assert_json_success(result)
 
         user_message = most_recent_usermessage(user)
         self.assertEqual(user_message.message.content, 'new ALERT for you')
         self.assertIn('has_alert_word', user_message.flags_list())
 
-        result = self.client_patch("/json/messages/" + str(original_message.id), {
-            'message_id': original_message.id,
-            'content': 'sorry false alarm',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(original_message.id),
+            {
+                'message_id': original_message.id,
+                'content': 'sorry false alarm',
+            },
+        )
         self.assert_json_success(result)
 
         user_message = most_recent_usermessage(user)
diff --git a/zerver/tests/test_archive.py b/zerver/tests/test_archive.py
index 550cf33245..fb35895944 100644
--- a/zerver/tests/test_archive.py
+++ b/zerver/tests/test_archive.py
@@ -84,6 +84,7 @@ class GlobalPublicStreamTest(ZulipTestCase):
         self.assert_length(info.unsubscribed, 0)
         self.assert_length(info.never_subscribed, 0)
 
+
 class WebPublicTopicHistoryTest(ZulipTestCase):
     def test_non_existant_stream_id(self) -> None:
         result = self.client_get("/archive/streams/100000000/topics")
diff --git a/zerver/tests/test_attachments.py b/zerver/tests/test_attachments.py
index dcef604ca9..9a980a836a 100644
--- a/zerver/tests/test_attachments.py
+++ b/zerver/tests/test_attachments.py
@@ -11,8 +11,8 @@ class AttachmentsTests(ZulipTestCase):
         super().setUp()
         user_profile = self.example_user('cordelia')
         self.attachment = Attachment.objects.create(
-            file_name='test.txt', path_id='foo/bar/test.txt', owner=user_profile,
-            size=512)
+            file_name='test.txt', path_id='foo/bar/test.txt', owner=user_profile, size=512
+        )
 
     def test_list_by_user(self) -> None:
         user_profile = self.example_user('cordelia')
@@ -27,7 +27,9 @@ class AttachmentsTests(ZulipTestCase):
         self.login_user(user_profile)
         with mock.patch('zerver.lib.attachments.delete_message_image', side_effect=Exception()):
             result = self.client_delete(f'/json/attachments/{self.attachment.id}')
-        self.assert_json_error(result, "An error occurred while deleting the attachment. Please try again later.")
+        self.assert_json_error(
+            result, "An error occurred while deleting the attachment. Please try again later."
+        )
 
     @mock.patch('zerver.lib.attachments.delete_message_image')
     def test_remove_attachment(self, ignored: Any) -> None:
@@ -56,8 +58,12 @@ class AttachmentsTests(ZulipTestCase):
 
     def test_list_unauthenticated(self) -> None:
         result = self.client_get('/json/attachments')
-        self.assert_json_error(result, 'Not logged in: API authentication or user session required', status_code=401)
+        self.assert_json_error(
+            result, 'Not logged in: API authentication or user session required', status_code=401
+        )
 
     def test_delete_unauthenticated(self) -> None:
         result = self.client_delete(f'/json/attachments/{self.attachment.id}')
-        self.assert_json_error(result, 'Not logged in: API authentication or user session required', status_code=401)
+        self.assert_json_error(
+            result, 'Not logged in: API authentication or user session required', status_code=401
+        )
diff --git a/zerver/tests/test_audit_log.py b/zerver/tests/test_audit_log.py
index 2847197424..9ce2dca155 100644
--- a/zerver/tests/test_audit_log.py
+++ b/zerver/tests/test_audit_log.py
@@ -53,10 +53,12 @@ from zerver.models import (
 
 class TestRealmAuditLog(ZulipTestCase):
     def check_role_count_schema(self, role_counts: Dict[str, Any]) -> None:
-        for key in [UserProfile.ROLE_REALM_ADMINISTRATOR,
-                    UserProfile.ROLE_MEMBER,
-                    UserProfile.ROLE_GUEST,
-                    UserProfile.ROLE_REALM_OWNER]:
+        for key in [
+            UserProfile.ROLE_REALM_ADMINISTRATOR,
+            UserProfile.ROLE_MEMBER,
+            UserProfile.ROLE_GUEST,
+            UserProfile.ROLE_REALM_OWNER,
+        ]:
             # str(key) since json keys are always strings, and ujson.dumps will have converted
             # the UserProfile.role values into strings
             self.assertTrue(isinstance(role_counts[RealmAuditLog.ROLE_COUNT_HUMANS][str(key)], int))
@@ -71,16 +73,36 @@ class TestRealmAuditLog(ZulipTestCase):
         do_deactivate_user(user, acting_user=user)
         do_reactivate_user(user, acting_user=user)
         self.assertEqual(RealmAuditLog.objects.filter(event_time__gte=now).count(), 5)
-        event_types = list(RealmAuditLog.objects.filter(
-            realm=realm, acting_user=user, modified_user=user, modified_stream=None,
-            event_time__gte=now, event_time__lte=now+timedelta(minutes=60))
-            .order_by('event_time').values_list('event_type', flat=True))
-        self.assertEqual(event_types, [RealmAuditLog.USER_CREATED, RealmAuditLog.USER_DEACTIVATED,
-                                       RealmAuditLog.USER_ACTIVATED, RealmAuditLog.USER_DEACTIVATED,
-                                       RealmAuditLog.USER_REACTIVATED])
+        event_types = list(
+            RealmAuditLog.objects.filter(
+                realm=realm,
+                acting_user=user,
+                modified_user=user,
+                modified_stream=None,
+                event_time__gte=now,
+                event_time__lte=now + timedelta(minutes=60),
+            )
+            .order_by('event_time')
+            .values_list('event_type', flat=True)
+        )
+        self.assertEqual(
+            event_types,
+            [
+                RealmAuditLog.USER_CREATED,
+                RealmAuditLog.USER_DEACTIVATED,
+                RealmAuditLog.USER_ACTIVATED,
+                RealmAuditLog.USER_DEACTIVATED,
+                RealmAuditLog.USER_REACTIVATED,
+            ],
+        )
         for event in RealmAuditLog.objects.filter(
-                realm=realm, acting_user=user, modified_user=user, modified_stream=None,
-                event_time__gte=now, event_time__lte=now+timedelta(minutes=60)):
+            realm=realm,
+            acting_user=user,
+            modified_user=user,
+            modified_stream=None,
+            event_time__gte=now,
+            event_time__lte=now + timedelta(minutes=60),
+        ):
             extra_data = orjson.loads(event.extra_data)
             self.check_role_count_schema(extra_data[RealmAuditLog.ROLE_COUNT])
             self.assertNotIn(RealmAuditLog.OLD_VALUE, extra_data)
@@ -90,7 +112,9 @@ class TestRealmAuditLog(ZulipTestCase):
         now = timezone_now()
         user_profile = self.example_user("hamlet")
         acting_user = self.example_user('iago')
-        do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR, acting_user=acting_user)
+        do_change_user_role(
+            user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR, acting_user=acting_user
+        )
         do_change_user_role(user_profile, UserProfile.ROLE_MEMBER, acting_user=acting_user)
         do_change_user_role(user_profile, UserProfile.ROLE_GUEST, acting_user=acting_user)
         do_change_user_role(user_profile, UserProfile.ROLE_MEMBER, acting_user=acting_user)
@@ -99,18 +123,28 @@ class TestRealmAuditLog(ZulipTestCase):
         old_values_seen = set()
         new_values_seen = set()
         for event in RealmAuditLog.objects.filter(
-                event_type=RealmAuditLog.USER_ROLE_CHANGED,
-                realm=realm, modified_user=user_profile, acting_user=acting_user,
-                event_time__gte=now, event_time__lte=now+timedelta(minutes=60)):
+            event_type=RealmAuditLog.USER_ROLE_CHANGED,
+            realm=realm,
+            modified_user=user_profile,
+            acting_user=acting_user,
+            event_time__gte=now,
+            event_time__lte=now + timedelta(minutes=60),
+        ):
             extra_data = orjson.loads(event.extra_data)
             self.check_role_count_schema(extra_data[RealmAuditLog.ROLE_COUNT])
             self.assertIn(RealmAuditLog.OLD_VALUE, extra_data)
             self.assertIn(RealmAuditLog.NEW_VALUE, extra_data)
             old_values_seen.add(extra_data[RealmAuditLog.OLD_VALUE])
             new_values_seen.add(extra_data[RealmAuditLog.NEW_VALUE])
-        self.assertEqual(old_values_seen, {UserProfile.ROLE_GUEST, UserProfile.ROLE_MEMBER,
-                                           UserProfile.ROLE_REALM_ADMINISTRATOR,
-                                           UserProfile.ROLE_REALM_OWNER})
+        self.assertEqual(
+            old_values_seen,
+            {
+                UserProfile.ROLE_GUEST,
+                UserProfile.ROLE_MEMBER,
+                UserProfile.ROLE_REALM_ADMINISTRATOR,
+                UserProfile.ROLE_REALM_OWNER,
+            },
+        )
         self.assertEqual(old_values_seen, new_values_seen)
 
     def test_change_password(self) -> None:
@@ -118,8 +152,12 @@ class TestRealmAuditLog(ZulipTestCase):
         user = self.example_user('hamlet')
         password = 'test1'
         do_change_password(user, password)
-        self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_PASSWORD_CHANGED,
-                                                      event_time__gte=now).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                event_type=RealmAuditLog.USER_PASSWORD_CHANGED, event_time__gte=now
+            ).count(),
+            1,
+        )
         self.assertIsNone(validate_password(password, user))
 
     def test_change_email(self) -> None:
@@ -127,22 +165,38 @@ class TestRealmAuditLog(ZulipTestCase):
         user = self.example_user('hamlet')
         new_email = 'test@example.com'
         do_change_user_delivery_email(user, new_email)
-        self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_EMAIL_CHANGED,
-                                                      event_time__gte=now).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                event_type=RealmAuditLog.USER_EMAIL_CHANGED, event_time__gte=now
+            ).count(),
+            1,
+        )
         self.assertEqual(new_email, user.delivery_email)
 
         # Test the RealmAuditLog stringification
-        audit_entry = RealmAuditLog.objects.get(event_type=RealmAuditLog.USER_EMAIL_CHANGED, event_time__gte=now)
-        self.assertTrue(str(audit_entry).startswith(f"<RealmAuditLog: <UserProfile: {user.email} {user.realm}> {RealmAuditLog.USER_EMAIL_CHANGED} "))
+        audit_entry = RealmAuditLog.objects.get(
+            event_type=RealmAuditLog.USER_EMAIL_CHANGED, event_time__gte=now
+        )
+        self.assertTrue(
+            str(audit_entry).startswith(
+                f"<RealmAuditLog: <UserProfile: {user.email} {user.realm}> {RealmAuditLog.USER_EMAIL_CHANGED} "
+            )
+        )
 
     def test_change_avatar_source(self) -> None:
         now = timezone_now()
         user = self.example_user('hamlet')
         avatar_source = 'G'
         do_change_avatar_fields(user, avatar_source, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_AVATAR_SOURCE_CHANGED,
-                                                      modified_user=user, acting_user=user,
-                                                      event_time__gte=now).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                event_type=RealmAuditLog.USER_AVATAR_SOURCE_CHANGED,
+                modified_user=user,
+                acting_user=user,
+                event_time__gte=now,
+            ).count(),
+            1,
+        )
         self.assertEqual(avatar_source, user.avatar_source)
 
     def test_change_full_name(self) -> None:
@@ -152,8 +206,9 @@ class TestRealmAuditLog(ZulipTestCase):
         req = dict(full_name=orjson.dumps(new_name).decode())
         result = self.client_patch('/json/users/{}'.format(self.example_user("hamlet").id), req)
         self.assertTrue(result.status_code == 200)
-        query = RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_FULL_NAME_CHANGED,
-                                             event_time__gte=start)
+        query = RealmAuditLog.objects.filter(
+            event_type=RealmAuditLog.USER_FULL_NAME_CHANGED, event_time__gte=start
+        )
         self.assertEqual(query.count(), 1)
 
     def test_change_tos_version(self) -> None:
@@ -161,8 +216,12 @@ class TestRealmAuditLog(ZulipTestCase):
         user = self.example_user("hamlet")
         tos_version = 'android'
         do_change_tos_version(user, tos_version)
-        self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_TOS_VERSION_CHANGED,
-                                                      event_time__gte=now).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                event_type=RealmAuditLog.USER_TOS_VERSION_CHANGED, event_time__gte=now
+            ).count(),
+            1,
+        )
         self.assertEqual(tos_version, user.tos_version)
 
     def test_change_bot_owner(self) -> None:
@@ -171,16 +230,24 @@ class TestRealmAuditLog(ZulipTestCase):
         bot = self.notification_bot()
         bot_owner = self.example_user('hamlet')
         do_change_bot_owner(bot, bot_owner, admin)
-        self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_BOT_OWNER_CHANGED,
-                                                      event_time__gte=now).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                event_type=RealmAuditLog.USER_BOT_OWNER_CHANGED, event_time__gte=now
+            ).count(),
+            1,
+        )
         self.assertEqual(bot_owner, bot.bot_owner)
 
     def test_regenerate_api_key(self) -> None:
         now = timezone_now()
         user = self.example_user('hamlet')
         do_regenerate_api_key(user, user)
-        self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_API_KEY_CHANGED,
-                                                      event_time__gte=now).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                event_type=RealmAuditLog.USER_API_KEY_CHANGED, event_time__gte=now
+            ).count(),
+            1,
+        )
         self.assertTrue(user.api_key)
 
     def test_get_streams_traffic(self) -> None:
@@ -210,17 +277,25 @@ class TestRealmAuditLog(ZulipTestCase):
         stream = self.make_stream('test_stream')
         acting_user = self.example_user('iago')
         bulk_add_subscriptions(user.realm, [stream], [user], acting_user=acting_user)
-        subscription_creation_logs = RealmAuditLog.objects.filter(event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
-                                                                  event_time__gte=now, acting_user=acting_user, modified_user=user,
-                                                                  modified_stream=stream)
+        subscription_creation_logs = RealmAuditLog.objects.filter(
+            event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
+            event_time__gte=now,
+            acting_user=acting_user,
+            modified_user=user,
+            modified_stream=stream,
+        )
         self.assertEqual(subscription_creation_logs.count(), 1)
         self.assertEqual(subscription_creation_logs[0].modified_stream.id, stream.id)
         self.assertEqual(subscription_creation_logs[0].modified_user, user)
 
         bulk_remove_subscriptions([user], [stream], get_client("website"), acting_user=acting_user)
-        subscription_deactivation_logs = RealmAuditLog.objects.filter(event_type=RealmAuditLog.SUBSCRIPTION_DEACTIVATED,
-                                                                      event_time__gte=now, acting_user=acting_user, modified_user=user,
-                                                                      modified_stream=stream)
+        subscription_deactivation_logs = RealmAuditLog.objects.filter(
+            event_type=RealmAuditLog.SUBSCRIPTION_DEACTIVATED,
+            event_time__gte=now,
+            acting_user=acting_user,
+            modified_user=user,
+            modified_stream=stream,
+        )
         self.assertEqual(subscription_deactivation_logs.count(), 1)
         self.assertEqual(subscription_deactivation_logs[0].modified_stream.id, stream.id)
         self.assertEqual(subscription_deactivation_logs[0].modified_user, user)
@@ -228,12 +303,16 @@ class TestRealmAuditLog(ZulipTestCase):
     def test_realm_activation(self) -> None:
         realm = get_realm('zulip')
         do_deactivate_realm(realm)
-        log_entry = RealmAuditLog.objects.get(realm=realm, event_type=RealmAuditLog.REALM_DEACTIVATED)
+        log_entry = RealmAuditLog.objects.get(
+            realm=realm, event_type=RealmAuditLog.REALM_DEACTIVATED
+        )
         extra_data = orjson.loads(log_entry.extra_data)
         self.check_role_count_schema(extra_data[RealmAuditLog.ROLE_COUNT])
 
         do_reactivate_realm(realm)
-        log_entry = RealmAuditLog.objects.get(realm=realm, event_type=RealmAuditLog.REALM_REACTIVATED)
+        log_entry = RealmAuditLog.objects.get(
+            realm=realm, event_type=RealmAuditLog.REALM_REACTIVATED
+        )
         extra_data = orjson.loads(log_entry.extra_data)
         self.check_role_count_schema(extra_data[RealmAuditLog.ROLE_COUNT])
 
@@ -241,10 +320,23 @@ class TestRealmAuditLog(ZulipTestCase):
         now = timezone_now()
         realm = get_realm('zulip')
         user = self.example_user('hamlet')
-        stream = create_stream_if_needed(realm, "test", invite_only=False, stream_description="Test Description", acting_user=user)[0]
-        self.assertEqual(RealmAuditLog.objects.filter(realm=realm, event_type=RealmAuditLog.STREAM_CREATED,
-                                                      event_time__gte=now, acting_user=user,
-                                                      modified_stream=stream).count(), 1)
+        stream = create_stream_if_needed(
+            realm,
+            "test",
+            invite_only=False,
+            stream_description="Test Description",
+            acting_user=user,
+        )[0]
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=realm,
+                event_type=RealmAuditLog.STREAM_CREATED,
+                event_time__gte=now,
+                acting_user=user,
+                modified_stream=stream,
+            ).count(),
+            1,
+        )
 
     def test_deactivate_stream(self) -> None:
         now = timezone_now()
@@ -253,9 +345,16 @@ class TestRealmAuditLog(ZulipTestCase):
         stream_name = 'test'
         stream = self.make_stream(stream_name, realm)
         do_deactivate_stream(stream, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(realm=realm, event_type=RealmAuditLog.STREAM_DEACTIVATED,
-                                                      event_time__gte=now, acting_user=user,
-                                                      modified_stream=stream).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=realm,
+                event_type=RealmAuditLog.STREAM_DEACTIVATED,
+                event_time__gte=now,
+                acting_user=user,
+                modified_stream=stream,
+            ).count(),
+            1,
+        )
         self.assertEqual(stream.deactivated, True)
 
     def test_set_realm_authentication_methods(self) -> None:
@@ -263,11 +362,23 @@ class TestRealmAuditLog(ZulipTestCase):
         realm = get_realm('zulip')
         user = self.example_user('hamlet')
         expected_old_value = realm.authentication_methods_dict()
-        auth_method_dict = {'Google': False, 'Email': False, 'GitHub': False, 'Apple': False, 'Dev': True, 'SAML': True, 'GitLab': False}
+        auth_method_dict = {
+            'Google': False,
+            'Email': False,
+            'GitHub': False,
+            'Apple': False,
+            'Dev': True,
+            'SAML': True,
+            'GitLab': False,
+        }
 
         do_set_realm_authentication_methods(realm, auth_method_dict, acting_user=user)
-        realm_audit_logs = RealmAuditLog.objects.filter(realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
-                                                        event_time__gte=now, acting_user=user)
+        realm_audit_logs = RealmAuditLog.objects.filter(
+            realm=realm,
+            event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+            event_time__gte=now,
+            acting_user=user,
+        )
         self.assertEqual(realm_audit_logs.count(), 1)
         extra_data = orjson.loads(realm_audit_logs[0].extra_data)
         expected_new_value = auth_method_dict
@@ -303,11 +414,16 @@ class TestRealmAuditLog(ZulipTestCase):
         ]
 
         do_set_realm_message_editing(realm, True, 1000, False, acting_user=user)
-        realm_audit_logs = RealmAuditLog.objects.filter(realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
-                                                        event_time__gte=now, acting_user=user).order_by("id")
+        realm_audit_logs = RealmAuditLog.objects.filter(
+            realm=realm,
+            event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+            event_time__gte=now,
+            acting_user=user,
+        ).order_by("id")
         self.assertEqual(realm_audit_logs.count(), 2)
-        self.assertEqual([orjson.loads(entry.extra_data) for entry in realm_audit_logs],
-                         values_expected)
+        self.assertEqual(
+            [orjson.loads(entry.extra_data) for entry in realm_audit_logs], values_expected
+        )
 
     def test_set_realm_notifications_stream(self) -> None:
         now = timezone_now()
@@ -318,14 +434,22 @@ class TestRealmAuditLog(ZulipTestCase):
         stream = self.make_stream(stream_name, realm)
 
         do_set_realm_notifications_stream(realm, stream, stream.id, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(
-            realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
-            event_time__gte=now, acting_user=user,
-            extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_value,
-                RealmAuditLog.NEW_VALUE: stream.id,
-                'property': 'notifications_stream',
-            }).decode()).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=realm,
+                event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+                event_time__gte=now,
+                acting_user=user,
+                extra_data=orjson.dumps(
+                    {
+                        RealmAuditLog.OLD_VALUE: old_value,
+                        RealmAuditLog.NEW_VALUE: stream.id,
+                        'property': 'notifications_stream',
+                    }
+                ).decode(),
+            ).count(),
+            1,
+        )
 
     def test_set_realm_signup_notifications_stream(self) -> None:
         now = timezone_now()
@@ -336,14 +460,22 @@ class TestRealmAuditLog(ZulipTestCase):
         stream = self.make_stream(stream_name, realm)
 
         do_set_realm_signup_notifications_stream(realm, stream, stream.id, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(
-            realm=realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
-            event_time__gte=now, acting_user=user,
-            extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_value,
-                RealmAuditLog.NEW_VALUE: stream.id,
-                'property': 'signup_notifications_stream',
-            }).decode()).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=realm,
+                event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+                event_time__gte=now,
+                acting_user=user,
+                extra_data=orjson.dumps(
+                    {
+                        RealmAuditLog.OLD_VALUE: old_value,
+                        RealmAuditLog.NEW_VALUE: stream.id,
+                        'property': 'signup_notifications_stream',
+                    }
+                ).decode(),
+            ).count(),
+            1,
+        )
 
     def test_change_icon_source(self) -> None:
         test_start = timezone_now()
@@ -355,26 +487,31 @@ class TestRealmAuditLog(ZulipTestCase):
             realm=realm,
             event_type=RealmAuditLog.REALM_ICON_SOURCE_CHANGED,
             acting_user=user,
-            event_time__gte=test_start)
+            event_time__gte=test_start,
+        )
         self.assertEqual(len(audit_entries), 1)
         self.assertEqual(icon_source, realm.icon_source)
-        self.assertEqual(audit_entries.first().extra_data,
-                         "{'icon_source': 'G', 'icon_version': 2}")
+        self.assertEqual(
+            audit_entries.first().extra_data, "{'icon_source': 'G', 'icon_version': 2}"
+        )
 
     def test_change_subscription_property(self) -> None:
         user = self.example_user('hamlet')
         # Fetch the Denmark stream for testing
         stream = get_stream("Denmark", user.realm)
-        sub = Subscription.objects.get(user_profile=user, recipient__type=Recipient.STREAM,
-                                       recipient__type_id=stream.id)
-        properties = {"color": True,
-                      "is_muted": True,
-                      "desktop_notifications": False,
-                      "audible_notifications": False,
-                      "push_notifications": True,
-                      "email_notifications": True,
-                      "pin_to_top": True,
-                      "wildcard_mentions_notify": False}
+        sub = Subscription.objects.get(
+            user_profile=user, recipient__type=Recipient.STREAM, recipient__type_id=stream.id
+        )
+        properties = {
+            "color": True,
+            "is_muted": True,
+            "desktop_notifications": False,
+            "audible_notifications": False,
+            "push_notifications": True,
+            "email_notifications": True,
+            "pin_to_top": True,
+            "wildcard_mentions_notify": False,
+        }
 
         for property, value in properties.items():
             now = timezone_now()
@@ -387,10 +524,17 @@ class TestRealmAuditLog(ZulipTestCase):
                 RealmAuditLog.NEW_VALUE: value,
                 'property': property,
             }
-            self.assertEqual(RealmAuditLog.objects.filter(
-                realm=user.realm, event_type=RealmAuditLog.SUBSCRIPTION_PROPERTY_CHANGED,
-                event_time__gte=now, acting_user=user, modified_user=user,
-                extra_data=orjson.dumps(expected_extra_data).decode()).count(), 1)
+            self.assertEqual(
+                RealmAuditLog.objects.filter(
+                    realm=user.realm,
+                    event_type=RealmAuditLog.SUBSCRIPTION_PROPERTY_CHANGED,
+                    event_time__gte=now,
+                    acting_user=user,
+                    modified_user=user,
+                    extra_data=orjson.dumps(expected_extra_data).decode(),
+                ).count(),
+                1,
+            )
             self.assertEqual(getattr(sub, property), value)
 
     def test_change_default_streams(self) -> None:
@@ -400,35 +544,56 @@ class TestRealmAuditLog(ZulipTestCase):
 
         old_value = user.default_sending_stream_id
         do_change_default_sending_stream(user, stream, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(
-            realm=user.realm, event_type=RealmAuditLog.USER_DEFAULT_SENDING_STREAM_CHANGED,
-            event_time__gte=now, acting_user=user,
-            extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_value,
-                RealmAuditLog.NEW_VALUE: stream.id,
-            }).decode()).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=user.realm,
+                event_type=RealmAuditLog.USER_DEFAULT_SENDING_STREAM_CHANGED,
+                event_time__gte=now,
+                acting_user=user,
+                extra_data=orjson.dumps(
+                    {
+                        RealmAuditLog.OLD_VALUE: old_value,
+                        RealmAuditLog.NEW_VALUE: stream.id,
+                    }
+                ).decode(),
+            ).count(),
+            1,
+        )
         self.assertEqual(user.default_sending_stream, stream)
 
         old_value = user.default_events_register_stream_id
         do_change_default_events_register_stream(user, stream, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(
-            realm=user.realm, event_type=RealmAuditLog.USER_DEFAULT_REGISTER_STREAM_CHANGED,
-            event_time__gte=now, acting_user=user,
-            extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_value,
-                RealmAuditLog.NEW_VALUE: stream.id,
-            }).decode()).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=user.realm,
+                event_type=RealmAuditLog.USER_DEFAULT_REGISTER_STREAM_CHANGED,
+                event_time__gte=now,
+                acting_user=user,
+                extra_data=orjson.dumps(
+                    {
+                        RealmAuditLog.OLD_VALUE: old_value,
+                        RealmAuditLog.NEW_VALUE: stream.id,
+                    }
+                ).decode(),
+            ).count(),
+            1,
+        )
         self.assertEqual(user.default_events_register_stream, stream)
 
         old_value = user.default_all_public_streams
         do_change_default_all_public_streams(user, False, acting_user=user)
-        self.assertEqual(RealmAuditLog.objects.filter(
-            realm=user.realm, event_type=RealmAuditLog.USER_DEFAULT_ALL_PUBLIC_STREAMS_CHANGED,
-            event_time__gte=now, acting_user=user,
-            extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_value,
-                RealmAuditLog.NEW_VALUE: False
-            }).decode()).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=user.realm,
+                event_type=RealmAuditLog.USER_DEFAULT_ALL_PUBLIC_STREAMS_CHANGED,
+                event_time__gte=now,
+                acting_user=user,
+                extra_data=orjson.dumps(
+                    {RealmAuditLog.OLD_VALUE: old_value, RealmAuditLog.NEW_VALUE: False}
+                ).decode(),
+            ).count(),
+            1,
+        )
         self.assertEqual(user.default_all_public_streams, False)
 
     def test_rename_stream(self) -> None:
@@ -437,13 +602,19 @@ class TestRealmAuditLog(ZulipTestCase):
         stream = self.make_stream('test', user.realm)
         old_name = stream.name
         do_rename_stream(stream, 'updated name', user)
-        self.assertEqual(RealmAuditLog.objects.filter(
-            realm=user.realm, event_type=RealmAuditLog.STREAM_NAME_CHANGED,
-            event_time__gte=now, acting_user=user, modified_stream=stream,
-            extra_data=orjson.dumps({
-                RealmAuditLog.OLD_VALUE: old_name,
-                RealmAuditLog.NEW_VALUE: 'updated name'
-            }).decode()).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=user.realm,
+                event_type=RealmAuditLog.STREAM_NAME_CHANGED,
+                event_time__gte=now,
+                acting_user=user,
+                modified_stream=stream,
+                extra_data=orjson.dumps(
+                    {RealmAuditLog.OLD_VALUE: old_name, RealmAuditLog.NEW_VALUE: 'updated name'}
+                ).decode(),
+            ).count(),
+            1,
+        )
         self.assertEqual(stream.name, 'updated name')
 
     def test_change_notification_settings(self) -> None:
@@ -465,8 +636,15 @@ class TestRealmAuditLog(ZulipTestCase):
                 RealmAuditLog.NEW_VALUE: value,
                 'property': setting,
             }
-            self.assertEqual(RealmAuditLog.objects.filter(
-                realm=user.realm, event_type=RealmAuditLog.USER_NOTIFICATION_SETTINGS_CHANGED,
-                event_time__gte=now, acting_user=user, modified_user=user,
-                extra_data=orjson.dumps(expected_extra_data).decode()).count(), 1)
+            self.assertEqual(
+                RealmAuditLog.objects.filter(
+                    realm=user.realm,
+                    event_type=RealmAuditLog.USER_NOTIFICATION_SETTINGS_CHANGED,
+                    event_time__gte=now,
+                    acting_user=user,
+                    modified_user=user,
+                    extra_data=orjson.dumps(expected_extra_data).decode(),
+                ).count(),
+                1,
+            )
             self.assertEqual(getattr(user, setting), value)
diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py
index 529b4accd2..384c5391bf 100644
--- a/zerver/tests/test_auth_backends.py
+++ b/zerver/tests/test_auth_backends.py
@@ -136,14 +136,20 @@ from zproject.backends import (
 
 
 class AuthBackendTest(ZulipTestCase):
-    def get_username(self, email_to_username: Optional[Callable[[str], str]]=None) -> str:
+    def get_username(self, email_to_username: Optional[Callable[[str], str]] = None) -> str:
         username = self.example_email('hamlet')
         if email_to_username is not None:
             username = email_to_username(self.example_email('hamlet'))
 
         return username
 
-    def verify_backend(self, backend: Any, *, good_kwargs: Dict[str, Any], bad_kwargs: Optional[Dict[str, Any]]=None) -> None:
+    def verify_backend(
+        self,
+        backend: Any,
+        *,
+        good_kwargs: Dict[str, Any],
+        bad_kwargs: Optional[Dict[str, Any]] = None,
+    ) -> None:
         clear_supported_auth_backends_cache()
         user_profile = self.example_user('hamlet')
 
@@ -217,13 +223,11 @@ class AuthBackendTest(ZulipTestCase):
     def test_dummy_backend(self) -> None:
         realm = get_realm("zulip")
         username = self.get_username()
-        self.verify_backend(ZulipDummyBackend(),
-                            good_kwargs=dict(username=username,
-                                             realm=realm,
-                                             use_dummy_backend=True),
-                            bad_kwargs=dict(username=username,
-                                            realm=realm,
-                                            use_dummy_backend=False))
+        self.verify_backend(
+            ZulipDummyBackend(),
+            good_kwargs=dict(username=username, realm=realm, use_dummy_backend=True),
+            bad_kwargs=dict(username=username, realm=realm, use_dummy_backend=False),
+        )
 
     def setup_subdomain(self, user_profile: UserProfile) -> None:
         realm = user_profile.realm
@@ -237,41 +241,54 @@ class AuthBackendTest(ZulipTestCase):
         user_profile.set_password(password)
         user_profile.save()
 
-        with mock.patch('zproject.backends.email_auth_enabled',
-                        return_value=False), \
-                mock.patch('zproject.backends.password_auth_enabled',
-                           return_value=True):
+        with mock.patch('zproject.backends.email_auth_enabled', return_value=False), mock.patch(
+            'zproject.backends.password_auth_enabled', return_value=True
+        ):
             return_data: Dict[str, bool] = {}
-            user = EmailAuthBackend().authenticate(request=mock.MagicMock(),
-                                                   username=user_profile.delivery_email,
-                                                   realm=get_realm("zulip"),
-                                                   password=password,
-                                                   return_data=return_data)
+            user = EmailAuthBackend().authenticate(
+                request=mock.MagicMock(),
+                username=user_profile.delivery_email,
+                realm=get_realm("zulip"),
+                password=password,
+                return_data=return_data,
+            )
             self.assertEqual(user, None)
             self.assertTrue(return_data['email_auth_disabled'])
 
-        self.verify_backend(EmailAuthBackend(),
-                            good_kwargs=dict(request=mock.MagicMock(),
-                                             password=password,
-                                             username=username,
-                                             realm=get_realm('zulip'),
-                                             return_data={}),
-                            bad_kwargs=dict(request=mock.MagicMock(),
-                                            password=password,
-                                            username=username,
-                                            realm=get_realm('zephyr'),
-                                            return_data={}))
-        self.verify_backend(EmailAuthBackend(),
-                            good_kwargs=dict(request=mock.MagicMock(),
-                                             password=password,
-                                             username=username,
-                                             realm=get_realm('zulip'),
-                                             return_data={}),
-                            bad_kwargs=dict(request=mock.MagicMock(),
-                                            password=password,
-                                            username=username,
-                                            realm=get_realm('zephyr'),
-                                            return_data={}))
+        self.verify_backend(
+            EmailAuthBackend(),
+            good_kwargs=dict(
+                request=mock.MagicMock(),
+                password=password,
+                username=username,
+                realm=get_realm('zulip'),
+                return_data={},
+            ),
+            bad_kwargs=dict(
+                request=mock.MagicMock(),
+                password=password,
+                username=username,
+                realm=get_realm('zephyr'),
+                return_data={},
+            ),
+        )
+        self.verify_backend(
+            EmailAuthBackend(),
+            good_kwargs=dict(
+                request=mock.MagicMock(),
+                password=password,
+                username=username,
+                realm=get_realm('zulip'),
+                return_data={},
+            ),
+            bad_kwargs=dict(
+                request=mock.MagicMock(),
+                password=password,
+                username=username,
+                realm=get_realm('zephyr'),
+                return_data={},
+            ),
+        )
 
     def test_email_auth_backend_empty_password(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -281,10 +298,14 @@ class AuthBackendTest(ZulipTestCase):
 
         # First, verify authentication works with the a nonempty
         # password so we know we've set up the test correctly.
-        self.assertIsNotNone(EmailAuthBackend().authenticate(request=mock.MagicMock(),
-                                                             username=self.example_email('hamlet'),
-                                                             password=password,
-                                                             realm=get_realm("zulip")))
+        self.assertIsNotNone(
+            EmailAuthBackend().authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email('hamlet'),
+                password=password,
+                realm=get_realm("zulip"),
+            )
+        )
 
         # Now do the same test with the empty string as the password.
         password = ""
@@ -295,10 +316,14 @@ class AuthBackendTest(ZulipTestCase):
         # by using Django's version of this method.
         super(UserProfile, user_profile).set_password(password)
         user_profile.save()
-        self.assertIsNone(EmailAuthBackend().authenticate(request=mock.MagicMock(),
-                                                          username=self.example_email('hamlet'),
-                                                          password=password,
-                                                          realm=get_realm("zulip")))
+        self.assertIsNone(
+            EmailAuthBackend().authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email('hamlet'),
+                password=password,
+                realm=get_realm("zulip"),
+            )
+        )
 
     def test_email_auth_backend_disabled_password_auth(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -307,10 +332,14 @@ class AuthBackendTest(ZulipTestCase):
         user_profile.save()
         # Verify if a realm has password auth disabled, correct password is rejected
         with mock.patch('zproject.backends.password_auth_enabled', return_value=False):
-            self.assertIsNone(EmailAuthBackend().authenticate(request=mock.MagicMock(),
-                                                              username=self.example_email('hamlet'),
-                                                              password=password,
-                                                              realm=get_realm("zulip")))
+            self.assertIsNone(
+                EmailAuthBackend().authenticate(
+                    request=mock.MagicMock(),
+                    username=self.example_email('hamlet'),
+                    password=password,
+                    realm=get_realm("zulip"),
+                )
+            )
 
     def test_login_preview(self) -> None:
         # Test preview=true displays organization login page
@@ -324,8 +353,10 @@ class AuthBackendTest(ZulipTestCase):
         self.assert_in_response(realm.name, result)
         self.assert_in_response("Log in to Zulip", result)
 
-        data = dict(description=orjson.dumps("New realm description").decode(),
-                    name=orjson.dumps("New Zulip").decode())
+        data = dict(
+            description=orjson.dumps("New realm description").decode(),
+            name=orjson.dumps("New Zulip").decode(),
+        )
         result = self.client_patch('/json/realm', data)
         self.assert_json_success(result)
 
@@ -356,8 +387,9 @@ class AuthBackendTest(ZulipTestCase):
         result = self.client_get('/register/')
         self.assert_not_in_success_response(["No authentication backends are enabled"], result)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
-                       LDAP_EMAIL_ATTR="mail")
+    @override_settings(
+        AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',), LDAP_EMAIL_ATTR="mail"
+    )
     def test_ldap_backend(self) -> None:
         self.init_default_ldap_database()
         user_profile = self.example_user('hamlet')
@@ -369,65 +401,87 @@ class AuthBackendTest(ZulipTestCase):
         backend = ZulipLDAPAuthBackend()
 
         # Test LDAP auth fails when LDAP server rejects password
-        self.assertIsNone(backend.authenticate(request=mock.MagicMock(), username=email,
-                                               password="wrongpass", realm=get_realm("zulip")))
+        self.assertIsNone(
+            backend.authenticate(
+                request=mock.MagicMock(),
+                username=email,
+                password="wrongpass",
+                realm=get_realm("zulip"),
+            )
+        )
 
-        self.verify_backend(backend,
-                            bad_kwargs=dict(request=mock.MagicMock(),
-                                            username=username,
-                                            password=password,
-                                            realm=get_realm('zephyr')),
-                            good_kwargs=dict(request=mock.MagicMock(),
-                                             username=username,
-                                             password=password,
-                                             realm=get_realm('zulip')))
-        self.verify_backend(backend,
-                            bad_kwargs=dict(request=mock.MagicMock(),
-                                            username=username,
-                                            password=password,
-                                            realm=get_realm('zephyr')),
-                            good_kwargs=dict(request=mock.MagicMock(),
-                                             username=username,
-                                             password=password,
-                                             realm=get_realm('zulip')))
+        self.verify_backend(
+            backend,
+            bad_kwargs=dict(
+                request=mock.MagicMock(),
+                username=username,
+                password=password,
+                realm=get_realm('zephyr'),
+            ),
+            good_kwargs=dict(
+                request=mock.MagicMock(),
+                username=username,
+                password=password,
+                realm=get_realm('zulip'),
+            ),
+        )
+        self.verify_backend(
+            backend,
+            bad_kwargs=dict(
+                request=mock.MagicMock(),
+                username=username,
+                password=password,
+                realm=get_realm('zephyr'),
+            ),
+            good_kwargs=dict(
+                request=mock.MagicMock(),
+                username=username,
+                password=password,
+                realm=get_realm('zulip'),
+            ),
+        )
 
     def test_devauth_backend(self) -> None:
-        self.verify_backend(DevAuthBackend(),
-                            good_kwargs=dict(dev_auth_username=self.get_username(),
-                                             realm=get_realm("zulip")),
-                            bad_kwargs=dict(dev_auth_username=self.get_username(),
-                                            realm=get_realm("zephyr")))
+        self.verify_backend(
+            DevAuthBackend(),
+            good_kwargs=dict(dev_auth_username=self.get_username(), realm=get_realm("zulip")),
+            bad_kwargs=dict(dev_auth_username=self.get_username(), realm=get_realm("zephyr")),
+        )
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',))
     def test_remote_user_backend(self) -> None:
         username = self.get_username()
-        self.verify_backend(ZulipRemoteUserBackend(),
-                            good_kwargs=dict(remote_user=username,
-                                             realm=get_realm('zulip')),
-                            bad_kwargs=dict(remote_user=username,
-                                            realm=get_realm('zephyr')))
+        self.verify_backend(
+            ZulipRemoteUserBackend(),
+            good_kwargs=dict(remote_user=username, realm=get_realm('zulip')),
+            bad_kwargs=dict(remote_user=username, realm=get_realm('zephyr')),
+        )
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',))
     def test_remote_user_backend_invalid_realm(self) -> None:
         username = self.get_username()
-        self.verify_backend(ZulipRemoteUserBackend(),
-                            good_kwargs=dict(remote_user=username,
-                                             realm=get_realm('zulip')),
-                            bad_kwargs=dict(remote_user=username,
-                                            realm=get_realm('zephyr')))
+        self.verify_backend(
+            ZulipRemoteUserBackend(),
+            good_kwargs=dict(remote_user=username, realm=get_realm('zulip')),
+            bad_kwargs=dict(remote_user=username, realm=get_realm('zephyr')),
+        )
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',))
     @override_settings(SSO_APPEND_DOMAIN='zulip.com')
     def test_remote_user_backend_sso_append_domain(self) -> None:
         username = self.get_username(email_to_username)
-        self.verify_backend(ZulipRemoteUserBackend(),
-                            good_kwargs=dict(remote_user=username,
-                                             realm=get_realm("zulip")),
-                            bad_kwargs=dict(remote_user=username,
-                                            realm=get_realm('zephyr')))
+        self.verify_backend(
+            ZulipRemoteUserBackend(),
+            good_kwargs=dict(remote_user=username, realm=get_realm("zulip")),
+            bad_kwargs=dict(remote_user=username, realm=get_realm('zephyr')),
+        )
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.GitHubAuthBackend',
-                                                'zproject.backends.GoogleAuthBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.GitHubAuthBackend',
+            'zproject.backends.GoogleAuthBackend',
+        )
+    )
     def test_social_auth_backends(self) -> None:
         user = self.example_user('hamlet')
         token_data_dict = {
@@ -435,17 +489,13 @@ class AuthBackendTest(ZulipTestCase):
             'token_type': 'bearer',
         }
         github_email_data = [
-            dict(email=user.delivery_email,
-                 verified=True,
-                 primary=True),
-            dict(email="nonprimary@zulip.com",
-                 verified=True),
-            dict(email="ignored@example.com",
-                 verified=False),
+            dict(email=user.delivery_email, verified=True, primary=True),
+            dict(email="nonprimary@zulip.com", verified=True),
+            dict(email="ignored@example.com", verified=False),
         ]
-        google_email_data = dict(email=user.delivery_email,
-                                 name=user.full_name,
-                                 email_verified=True)
+        google_email_data = dict(
+            email=user.delivery_email, name=user.full_name, email_verified=True
+        )
         backends_to_test: Dict[str, Any] = {
             'google': {
                 'urls': [
@@ -484,6 +534,7 @@ class AuthBackendTest(ZulipTestCase):
             # authentication backend.  We do that here.
             def return_email() -> Dict[str, str]:
                 return {'email': user.delivery_email}
+
             backend.strategy.request_data = return_email
 
             result = orig_authenticate(backend, request, **kwargs)
@@ -500,7 +551,8 @@ class AuthBackendTest(ZulipTestCase):
                         details['method'],
                         details['url'],
                         status=details['status'],
-                        body=details['body'])
+                        body=details['body'],
+                    )
                 backend_class = backends_to_test[backend_name]['backend']
 
                 # We're creating a new class instance here, so the
@@ -514,38 +566,42 @@ class AuthBackendTest(ZulipTestCase):
                 if backend_name == "google":
                     backend.get_verified_emails = patched_get_verified_emails
 
-                good_kwargs = dict(backend=backend, strategy=backend.strategy,
-                                   storage=backend.strategy.storage,
-                                   response=token_data_dict,
-                                   subdomain='zulip')
+                good_kwargs = dict(
+                    backend=backend,
+                    strategy=backend.strategy,
+                    storage=backend.strategy.storage,
+                    response=token_data_dict,
+                    subdomain='zulip',
+                )
                 bad_kwargs = dict(subdomain='acme')
                 logger_name = f'zulip.auth.{backend.name}'
 
                 with mock.patch(
-                    'zerver.views.auth.redirect_and_log_into_subdomain',
-                    return_value=user
+                    'zerver.views.auth.redirect_and_log_into_subdomain', return_value=user
                 ), self.assertLogs(logger_name, level="INFO") as info_log:
-                    self.verify_backend(backend,
-                                        good_kwargs=good_kwargs,
-                                        bad_kwargs=bad_kwargs)
+                    self.verify_backend(backend, good_kwargs=good_kwargs, bad_kwargs=bad_kwargs)
                     bad_kwargs['subdomain'] = "zephyr"
-                    self.verify_backend(backend,
-                                        good_kwargs=good_kwargs,
-                                        bad_kwargs=bad_kwargs)
+                    self.verify_backend(backend, good_kwargs=good_kwargs, bad_kwargs=bad_kwargs)
                 # Verify logging for deactivated users
-                self.assertEqual(info_log.output, [
-                    f'INFO:{logger_name}:Failed login attempt for deactivated account: {user.id}@{user.realm.string_id}',
-                    f'INFO:{logger_name}:Failed login attempt for deactivated account: {user.id}@{user.realm.string_id}'
-                ])
+                self.assertEqual(
+                    info_log.output,
+                    [
+                        f'INFO:{logger_name}:Failed login attempt for deactivated account: {user.id}@{user.realm.string_id}',
+                        f'INFO:{logger_name}:Failed login attempt for deactivated account: {user.id}@{user.realm.string_id}',
+                    ],
+                )
 
 
 class RateLimitAuthenticationTests(ZulipTestCase):
     @override_settings(RATE_LIMITING_AUTHENTICATE=True)
-    def do_test_auth_rate_limiting(self,
-                                   attempt_authentication_func: Callable[[HttpRequest, str, str],
-                                                                         Optional[UserProfile]],
-                                   username: str, correct_password: str, wrong_password: str,
-                                   expected_user_profile: UserProfile) -> None:
+    def do_test_auth_rate_limiting(
+        self,
+        attempt_authentication_func: Callable[[HttpRequest, str, str], Optional[UserProfile]],
+        username: str,
+        correct_password: str,
+        wrong_password: str,
+        expected_user_profile: UserProfile,
+    ) -> None:
         # We have to mock RateLimitedAuthenticationByUsername.key to avoid key collisions
         # if tests run in parallel.
         original_key_method = RateLimitedAuthenticationByUsername.key
@@ -578,7 +634,9 @@ class RateLimitAuthenticationTests(ZulipTestCase):
                     self.assertIsNone(attempt_authentication(username, wrong_password))
 
                     # Correct password
-                    self.assertEqual(attempt_authentication(username, correct_password), expected_user_profile)
+                    self.assertEqual(
+                        attempt_authentication(username, correct_password), expected_user_profile
+                    )
                     # A correct login attempt should reset the rate limits for this user profile,
                     # so the next two attempts shouldn't get limited:
                     self.assertIsNone(attempt_authentication(username, wrong_password))
@@ -597,40 +655,59 @@ class RateLimitAuthenticationTests(ZulipTestCase):
         user_profile.set_password(password)
         user_profile.save()
 
-        def attempt_authentication(request: HttpRequest, username: str, password: str) -> Optional[UserProfile]:
-            return EmailAuthBackend().authenticate(request=request,
-                                                   username=username,
-                                                   realm=get_realm("zulip"),
-                                                   password=password,
-                                                   return_data={})
+        def attempt_authentication(
+            request: HttpRequest, username: str, password: str
+        ) -> Optional[UserProfile]:
+            return EmailAuthBackend().authenticate(
+                request=request,
+                username=username,
+                realm=get_realm("zulip"),
+                password=password,
+                return_data={},
+            )
 
-        self.do_test_auth_rate_limiting(attempt_authentication,
-                                        user_profile.delivery_email,
-                                        password, 'wrong_password',
-                                        user_profile)
+        self.do_test_auth_rate_limiting(
+            attempt_authentication,
+            user_profile.delivery_email,
+            password,
+            'wrong_password',
+            user_profile,
+        )
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
-                       LDAP_EMAIL_ATTR="mail")
+    @override_settings(
+        AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',), LDAP_EMAIL_ATTR="mail"
+    )
     def test_ldap_backend_user_based_rate_limiting(self) -> None:
         self.init_default_ldap_database()
         user_profile = self.example_user('hamlet')
         password = self.ldap_password('hamlet')
 
-        def attempt_authentication(request: HttpRequest, username: str, password: str) -> Optional[UserProfile]:
-            return ZulipLDAPAuthBackend().authenticate(request=request,
-                                                       username=username,
-                                                       realm=get_realm("zulip"),
-                                                       password=password,
-                                                       return_data={})
+        def attempt_authentication(
+            request: HttpRequest, username: str, password: str
+        ) -> Optional[UserProfile]:
+            return ZulipLDAPAuthBackend().authenticate(
+                request=request,
+                username=username,
+                realm=get_realm("zulip"),
+                password=password,
+                return_data={},
+            )
 
-        self.do_test_auth_rate_limiting(attempt_authentication,
-                                        user_profile.delivery_email,
-                                        password, 'wrong_password',
-                                        user_profile)
+        self.do_test_auth_rate_limiting(
+            attempt_authentication,
+            user_profile.delivery_email,
+            password,
+            'wrong_password',
+            user_profile,
+        )
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipLDAPAuthBackend'),
-                       LDAP_EMAIL_ATTR="mail")
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipLDAPAuthBackend',
+        ),
+        LDAP_EMAIL_ATTR="mail",
+    )
     def test_email_and_ldap_backends_user_based_rate_limiting(self) -> None:
         self.init_default_ldap_database()
         user_profile = self.example_user('hamlet')
@@ -640,21 +717,32 @@ class RateLimitAuthenticationTests(ZulipTestCase):
         user_profile.set_password(email_password)
         user_profile.save()
 
-        def attempt_authentication(request: HttpRequest, username: str, password: str) -> Optional[UserProfile]:
-            return authenticate(request=request,
-                                username=username,
-                                realm=get_realm("zulip"),
-                                password=password,
-                                return_data={})
+        def attempt_authentication(
+            request: HttpRequest, username: str, password: str
+        ) -> Optional[UserProfile]:
+            return authenticate(
+                request=request,
+                username=username,
+                realm=get_realm("zulip"),
+                password=password,
+                return_data={},
+            )
+
+        self.do_test_auth_rate_limiting(
+            attempt_authentication,
+            user_profile.delivery_email,
+            email_password,
+            'wrong_password',
+            user_profile,
+        )
+        self.do_test_auth_rate_limiting(
+            attempt_authentication,
+            user_profile.delivery_email,
+            ldap_password,
+            'wrong_password',
+            user_profile,
+        )
 
-        self.do_test_auth_rate_limiting(attempt_authentication,
-                                        user_profile.delivery_email,
-                                        email_password, 'wrong_password',
-                                        user_profile)
-        self.do_test_auth_rate_limiting(attempt_authentication,
-                                        user_profile.delivery_email,
-                                        ldap_password, 'wrong_password',
-                                        user_profile)
 
 class CheckPasswordStrengthTest(ZulipTestCase):
     def test_check_password_strength(self) -> None:
@@ -670,13 +758,15 @@ class CheckPasswordStrengthTest(ZulipTestCase):
             # Good password:
             self.assertTrue(check_password_strength('f657gdGGk9'))
 
+
 class DesktopFlowTestingLib(ZulipTestCase):
     def verify_desktop_flow_app_page(self, response: HttpResponse) -> None:
         self.assertEqual(response.status_code, 200)
         self.assertIn(b"<h1>Finish desktop login</h1>", response.content)
 
-    def verify_desktop_flow_end_page(self, response: HttpResponse, email: str,
-                                     desktop_flow_otp: str) -> None:
+    def verify_desktop_flow_end_page(
+        self, response: HttpResponse, email: str, desktop_flow_otp: str
+    ) -> None:
         self.assertEqual(response.status_code, 200)
 
         soup = BeautifulSoup(response.content, "html.parser")
@@ -686,7 +776,9 @@ class DesktopFlowTestingLib(ZulipTestCase):
         self.assertEqual(browser_url, '/login/')
         decrypted_key = self.verify_desktop_data_and_return_key(desktop_data, desktop_flow_otp)
 
-        result = self.client_get(f'http://zulip.testserver/accounts/login/subdomain/{decrypted_key}')
+        result = self.client_get(
+            f'http://zulip.testserver/accounts/login/subdomain/{decrypted_key}'
+        )
         self.assertEqual(result.status_code, 302)
         realm = get_realm("zulip")
         user_profile = get_user_by_delivery_email(email, realm)
@@ -699,6 +791,7 @@ class DesktopFlowTestingLib(ZulipTestCase):
         ciphertext = data[12:]
         return AESGCM(key).decrypt(iv, ciphertext, b"").decode()
 
+
 class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
     """This is a base class for testing social-auth backends. These
     methods are often overridden by subclasses:
@@ -709,6 +802,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         get_account_data_dict() - Return the data returned by the user info endpoint
                                   according to the respective backend.
     """
+
     # Don't run base class tests, make sure to set it to False
     # in subclass otherwise its tests will not run.
     __unittest_skip__ = True
@@ -729,27 +823,31 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         # https://github.com/python-social-auth/social-app-django/pull/162
         # for details.
         from social_core.backends.utils import load_backends
+
         load_backends(settings.AUTHENTICATION_BACKENDS, force_load=True)
 
     def logger_output(self, output_string: str, type: str) -> str:
         return f'{type.upper()}:zulip.auth.{self.backend.name}:{output_string}'
 
-    def register_extra_endpoints(self, requests_mock: responses.RequestsMock,
-                                 account_data_dict: Dict[str, str],
-                                 **extra_data: Any) -> None:
+    def register_extra_endpoints(
+        self,
+        requests_mock: responses.RequestsMock,
+        account_data_dict: Dict[str, str],
+        **extra_data: Any,
+    ) -> None:
         pass
 
     def prepare_login_url_and_headers(
         self,
         subdomain: str,
-        mobile_flow_otp: Optional[str]=None,
-        desktop_flow_otp: Optional[str]=None,
-        is_signup: bool=False,
-        next: str='',
-        multiuse_object_key: str='',
-        alternative_start_url: Optional[str]=None,
+        mobile_flow_otp: Optional[str] = None,
+        desktop_flow_otp: Optional[str] = None,
+        is_signup: bool = False,
+        next: str = '',
+        multiuse_object_key: str = '',
+        alternative_start_url: Optional[str] = None,
         *,
-        user_agent: Optional[str]=None,
+        user_agent: Optional[str] = None,
     ) -> Tuple[str, Dict[str, Any]]:
         url = self.LOGIN_URL
         if alternative_start_url is not None:
@@ -779,34 +877,42 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
 
         return url, headers
 
-    def social_auth_test_finish(self, result: HttpResponse,
-                                account_data_dict: Dict[str, str],
-                                expect_choose_email_screen: bool,
-                                headers: Any,
-                                **extra_data: Any) -> HttpResponse:
+    def social_auth_test_finish(
+        self,
+        result: HttpResponse,
+        account_data_dict: Dict[str, str],
+        expect_choose_email_screen: bool,
+        headers: Any,
+        **extra_data: Any,
+    ) -> HttpResponse:
         parsed_url = urllib.parse.urlparse(result.url)
         csrf_state = urllib.parse.parse_qs(parsed_url.query)['state']
-        result = self.client_get(self.AUTH_FINISH_URL,
-                                 dict(state=csrf_state), **headers)
+        result = self.client_get(self.AUTH_FINISH_URL, dict(state=csrf_state), **headers)
         return result
 
     def generate_access_url_payload(self, account_data_dict: Dict[str, str]) -> str:
-        return json.dumps({
-            'access_token': 'foobar',
-            'token_type': 'bearer',
-        })
+        return json.dumps(
+            {
+                'access_token': 'foobar',
+                'token_type': 'bearer',
+            }
+        )
 
-    def social_auth_test(self, account_data_dict: Dict[str, str],
-                         *, subdomain: str,
-                         mobile_flow_otp: Optional[str]=None,
-                         desktop_flow_otp: Optional[str]=None,
-                         is_signup: bool=False,
-                         next: str='',
-                         multiuse_object_key: str='',
-                         expect_choose_email_screen: bool=False,
-                         alternative_start_url: Optional[str]=None,
-                         user_agent: Optional[str]=None,
-                         **extra_data: Any) -> HttpResponse:
+    def social_auth_test(
+        self,
+        account_data_dict: Dict[str, str],
+        *,
+        subdomain: str,
+        mobile_flow_otp: Optional[str] = None,
+        desktop_flow_otp: Optional[str] = None,
+        is_signup: bool = False,
+        next: str = '',
+        multiuse_object_key: str = '',
+        expect_choose_email_screen: bool = False,
+        alternative_start_url: Optional[str] = None,
+        user_agent: Optional[str] = None,
+        **extra_data: Any,
+    ) -> HttpResponse:
         """Main entrypoint for all social authentication tests.
 
         * account_data_dict: Dictionary containing the name/email data
@@ -834,8 +940,13 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         """
 
         url, headers = self.prepare_login_url_and_headers(
-            subdomain, mobile_flow_otp, desktop_flow_otp, is_signup, next,
-            multiuse_object_key, alternative_start_url,
+            subdomain,
+            mobile_flow_otp,
+            desktop_flow_otp,
+            is_signup,
+            next,
+            multiuse_object_key,
+            alternative_start_url,
             user_agent=user_agent,
         )
 
@@ -843,7 +954,9 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
 
         expected_result_url_prefix = f'http://testserver/login/{self.backend.name}/'
         if settings.SOCIAL_AUTH_SUBDOMAIN is not None:
-            expected_result_url_prefix = f'http://{settings.SOCIAL_AUTH_SUBDOMAIN}.testserver/login/{self.backend.name}/'
+            expected_result_url_prefix = (
+                f'http://{settings.SOCIAL_AUTH_SUBDOMAIN}.testserver/login/{self.backend.name}/'
+            )
 
         if result.status_code != 302 or not result.url.startswith(expected_result_url_prefix):
             return result
@@ -865,7 +978,8 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
                 self.ACCESS_TOKEN_URL,
                 match_querystring=False,
                 status=200,
-                body=self.generate_access_url_payload(account_data_dict))
+                body=self.generate_access_url_payload(account_data_dict),
+            )
             requests_mock.add(
                 requests_mock.GET,
                 self.USER_INFO_URL,
@@ -874,17 +988,17 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
             )
             self.register_extra_endpoints(requests_mock, account_data_dict, **extra_data)
 
-            result = self.social_auth_test_finish(result, account_data_dict,
-                                                  expect_choose_email_screen,
-                                                  headers=headers,
-                                                  **extra_data)
+            result = self.social_auth_test_finish(
+                result, account_data_dict, expect_choose_email_screen, headers=headers, **extra_data
+            )
         return result
 
     def test_social_auth_no_key(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         with self.settings(**{self.CLIENT_KEY_SETTING: None}):
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip', next='/user_uploads/image')
+            result = self.social_auth_test(
+                account_data_dict, subdomain='zulip', next='/user_uploads/image'
+            )
             self.assert_in_success_response(["Configuration error"], result)
 
     def test_config_error_development(self) -> None:
@@ -916,9 +1030,12 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
 
     def test_social_auth_success(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=False,
-                                       subdomain='zulip', next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            expect_choose_email_screen=False,
+            subdomain='zulip',
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
         self.assertEqual(data['full_name'], self.name)
@@ -932,10 +1049,12 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
     @override_settings(SOCIAL_AUTH_SUBDOMAIN=None)
     def test_when_social_auth_subdomain_is_not_set(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip',
-                                       expect_choose_email_screen=False,
-                                       next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            expect_choose_email_screen=False,
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
         self.assertEqual(data['full_name'], self.name)
@@ -954,12 +1073,19 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         # because there won't be an existing user account we can
         # auto-select for the user.
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=True,
-                                           subdomain='zulip')
+            result = self.social_auth_test(
+                account_data_dict, expect_choose_email_screen=True, subdomain='zulip'
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/?is_deactivated=true")
-        self.assertEqual(m.output, [self.logger_output(f"Failed login attempt for deactivated account: {user_profile.id}@zulip", 'info')])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    f"Failed login attempt for deactivated account: {user_profile.id}@zulip", 'info'
+                )
+            ],
+        )
         # TODO: verify whether we provide a clear error message
 
     def test_social_auth_invalid_realm(self) -> None:
@@ -967,60 +1093,83 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         with mock.patch('zerver.middleware.get_realm', return_value=get_realm("zulip")):
             # This mock.patch case somewhat hackishly arranges it so
             # that we switch realms halfway through the test
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='invalid', next='/user_uploads/image')
+            result = self.social_auth_test(
+                account_data_dict, subdomain='invalid', next='/user_uploads/image'
+            )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, "/accounts/find/")
 
     def test_social_auth_invalid_email(self) -> None:
         account_data_dict = self.get_account_data_dict(email="invalid", name=self.name)
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=True,
-                                           subdomain='zulip', next='/user_uploads/image')
+            result = self.social_auth_test(
+                account_data_dict,
+                expect_choose_email_screen=True,
+                subdomain='zulip',
+                next='/user_uploads/image',
+            )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, "/login/?next=/user_uploads/image")
-        self.assertEqual(m.output, [self.logger_output("{} got invalid email argument.".format(self.backend.auth_backend_name), 'warning')])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "{} got invalid email argument.".format(self.backend.auth_backend_name),
+                    'warning',
+                )
+            ],
+        )
 
     def test_user_cannot_log_into_nonexisting_realm(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='nonexistent')
-        self.assert_in_response("There is no Zulip organization hosted at this subdomain.",
-                                result)
+        result = self.social_auth_test(account_data_dict, subdomain='nonexistent')
+        self.assert_in_response("There is no Zulip organization hosted at this subdomain.", result)
         self.assertEqual(result.status_code, 404)
 
     def test_user_cannot_log_into_wrong_subdomain(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain='zephyr')
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain='zephyr'
+        )
         self.assertTrue(result.url.startswith("http://zephyr.testserver/accounts/login/subdomain/"))
-        result = self.client_get(result.url.replace('http://zephyr.testserver', ''),
-                                 subdomain="zephyr")
-        self.assert_in_success_response(['Your email address, hamlet@zulip.com, is not in one of the domains ',
-                                         'that are allowed to register for accounts in this organization.'], result)
+        result = self.client_get(
+            result.url.replace('http://zephyr.testserver', ''), subdomain="zephyr"
+        )
+        self.assert_in_success_response(
+            [
+                'Your email address, hamlet@zulip.com, is not in one of the domains ',
+                'that are allowed to register for accounts in this organization.',
+            ],
+            result,
+        )
 
     def test_social_auth_mobile_success(self) -> None:
         mobile_flow_otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=self.email, name='Full Name')
         self.assertEqual(len(mail.outbox), 0)
-        self.user_profile.date_joined = timezone_now() - datetime.timedelta(seconds=JUST_CREATED_THRESHOLD + 1)
+        self.user_profile.date_joined = timezone_now() - datetime.timedelta(
+            seconds=JUST_CREATED_THRESHOLD + 1
+        )
         self.user_profile.save()
 
         with self.settings(SEND_LOGIN_EMAILS=True):
             # Verify that the right thing happens with an invalid-format OTP
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           mobile_flow_otp="1234")
+            result = self.social_auth_test(
+                account_data_dict, subdomain='zulip', mobile_flow_otp="1234"
+            )
             self.assert_json_error(result, "Invalid OTP")
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           mobile_flow_otp="invalido" * 8)
+            result = self.social_auth_test(
+                account_data_dict, subdomain='zulip', mobile_flow_otp="invalido" * 8
+            )
             self.assert_json_error(result, "Invalid OTP")
 
             # Now do it correctly
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           expect_choose_email_screen=False,
-                                           mobile_flow_otp=mobile_flow_otp)
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=False,
+                mobile_flow_otp=mobile_flow_otp,
+            )
         self.assertEqual(result.status_code, 302)
         redirect_url = result['Location']
         parsed_url = urllib.parse.urlparse(redirect_url)
@@ -1039,11 +1188,13 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         account_data_dict = self.get_account_data_dict(email=self.email, name='Full Name')
 
         # Verify that the right thing happens with an invalid-format OTP
-        result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                       desktop_flow_otp="1234")
+        result = self.social_auth_test(
+            account_data_dict, subdomain='zulip', desktop_flow_otp="1234"
+        )
         self.assert_json_error(result, "Invalid OTP")
-        result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                       desktop_flow_otp="invalido" * 8)
+        result = self.social_auth_test(
+            account_data_dict, subdomain='zulip', desktop_flow_otp="invalido" * 8
+        )
         self.assert_json_error(result, "Invalid OTP")
 
         # Now do it correctly
@@ -1055,17 +1206,21 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
             user_agent="ZulipElectron/5.0.0",
         )
         self.verify_desktop_flow_app_page(result)
-        result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                       expect_choose_email_screen=False,
-                                       desktop_flow_otp=desktop_flow_otp)
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            expect_choose_email_screen=False,
+            desktop_flow_otp=desktop_flow_otp,
+        )
         self.verify_desktop_flow_end_page(result, self.email, desktop_flow_otp)
 
     def test_social_auth_session_fields_cleared_correctly(self) -> None:
         mobile_flow_otp = '1234abcd' * 8
 
-        def initiate_auth(mobile_flow_otp: Optional[str]=None) -> None:
-            url, headers = self.prepare_login_url_and_headers(subdomain='zulip',
-                                                              mobile_flow_otp=mobile_flow_otp)
+        def initiate_auth(mobile_flow_otp: Optional[str] = None) -> None:
+            url, headers = self.prepare_login_url_and_headers(
+                subdomain='zulip', mobile_flow_otp=mobile_flow_otp
+            )
             result = self.client_get(url, **headers)
             self.assertEqual(result.status_code, 302)
 
@@ -1086,19 +1241,25 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=self.email, name='Full Name')
 
-        result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                       expect_choose_email_screen=False,
-                                       desktop_flow_otp=otp, mobile_flow_otp=otp)
-        self.assert_json_error(result, "Can't use both mobile_flow_otp and desktop_flow_otp together.")
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            expect_choose_email_screen=False,
+            desktop_flow_otp=otp,
+            mobile_flow_otp=otp,
+        )
+        self.assert_json_error(
+            result, "Can't use both mobile_flow_otp and desktop_flow_otp together."
+        )
 
     def test_social_auth_registration_existing_account(self) -> None:
         """If the user already exists, signup flow just logs them in"""
         email = "hamlet@zulip.com"
         name = 'Full Name'
         account_data_dict = self.get_account_data_dict(email=email, name=name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain='zulip', is_signup=True)
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain='zulip', is_signup=True
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
         # Verify data has the full_name consistent with the user we're logging in as.
@@ -1112,13 +1273,20 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         # Name wasn't changed at all
         self.assertEqual(hamlet.full_name, "King Hamlet")
 
-    def stage_two_of_registration(self, result: HttpResponse, realm: Realm, subdomain: str,
-                                  email: str, name: str, expected_final_name: str,
-                                  skip_registration_form: bool,
-                                  mobile_flow_otp: Optional[str]=None,
-                                  desktop_flow_otp: Optional[str]=None,
-                                  expect_confirm_registration_page: bool=False,
-                                  expect_full_name_prepopulated: bool=True) -> None:
+    def stage_two_of_registration(
+        self,
+        result: HttpResponse,
+        realm: Realm,
+        subdomain: str,
+        email: str,
+        name: str,
+        expected_final_name: str,
+        skip_registration_form: bool,
+        mobile_flow_otp: Optional[str] = None,
+        desktop_flow_otp: Optional[str] = None,
+        expect_confirm_registration_page: bool = False,
+        expect_full_name_prepopulated: bool = True,
+    ) -> None:
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], email)
         self.assertEqual(data['full_name'], name)
@@ -1142,10 +1310,9 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         else:
             self.assertIn('do_confirm/' + confirmation_key, result.url)
             do_confirm_url = result.url
-        result = self.client_get(do_confirm_url, name = name)
+        result = self.client_get(do_confirm_url, name=name)
         self.assert_in_response('action="/accounts/register/"', result)
-        confirmation_data = {"from_confirmation": "1",
-                             "key": confirmation_key}
+        confirmation_data = {"from_confirmation": "1", "key": confirmation_key}
         result = self.client_post('/accounts/register/', confirmation_data)
         if not skip_registration_form:
             self.assert_in_response("We just need you to do one last thing", result)
@@ -1160,9 +1327,8 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
             # Click confirm registration button.
             result = self.client_post(
                 '/accounts/register/',
-                {'full_name': expected_final_name,
-                 'key': confirmation_key,
-                 'terms': True})
+                {'full_name': expected_final_name, 'key': confirmation_key, 'terms': True},
+            )
 
         # Mobile and desktop flow have additional steps:
         if mobile_flow_otp:
@@ -1197,11 +1363,12 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         subdomain = 'zulip'
         realm = get_realm("zulip")
         account_data_dict = self.get_account_data_dict(email=email, name=name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain=subdomain, is_signup=True)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated)
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain=subdomain, is_signup=True
+        )
+        self.stage_two_of_registration(
+            result, realm, subdomain, email, name, name, self.BACKEND_CLASS.full_name_validated
+        )
 
     @override_settings(TERMS_OF_SERVICE=None)
     def test_social_auth_mobile_registration(self) -> None:
@@ -1212,13 +1379,23 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         mobile_flow_otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=email, name=name)
 
-        result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                       expect_choose_email_screen=True,
-                                       is_signup=True,
-                                       mobile_flow_otp=mobile_flow_otp)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated,
-                                       mobile_flow_otp=mobile_flow_otp)
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            expect_choose_email_screen=True,
+            is_signup=True,
+            mobile_flow_otp=mobile_flow_otp,
+        )
+        self.stage_two_of_registration(
+            result,
+            realm,
+            subdomain,
+            email,
+            name,
+            name,
+            self.BACKEND_CLASS.full_name_validated,
+            mobile_flow_otp=mobile_flow_otp,
+        )
 
     @override_settings(TERMS_OF_SERVICE=None)
     def test_social_auth_desktop_registration(self) -> None:
@@ -1229,13 +1406,23 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         desktop_flow_otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=email, name=name)
 
-        result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                       expect_choose_email_screen=True,
-                                       is_signup=True,
-                                       desktop_flow_otp=desktop_flow_otp)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated,
-                                       desktop_flow_otp=desktop_flow_otp)
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            expect_choose_email_screen=True,
+            is_signup=True,
+            desktop_flow_otp=desktop_flow_otp,
+        )
+        self.stage_two_of_registration(
+            result,
+            realm,
+            subdomain,
+            email,
+            name,
+            name,
+            self.BACKEND_CLASS.full_name_validated,
+            desktop_flow_otp=desktop_flow_otp,
+        )
 
     @override_settings(TERMS_OF_SERVICE=None)
     def test_social_auth_registration_invitation_exists(self) -> None:
@@ -1252,11 +1439,12 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         do_invite_users(iago, [email], [])
 
         account_data_dict = self.get_account_data_dict(email=email, name=name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain=subdomain, is_signup=True)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated)
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain=subdomain, is_signup=True
+        )
+        self.stage_two_of_registration(
+            result, realm, subdomain, email, name, name, self.BACKEND_CLASS.full_name_validated
+        )
 
     @override_settings(TERMS_OF_SERVICE=None)
     def test_social_auth_registration_using_multiuse_invite(self) -> None:
@@ -1283,28 +1471,33 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         account_data_dict = self.get_account_data_dict(email=email, name=name)
 
         # First, try to sign up for closed realm without using an invitation
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain=subdomain, is_signup=True)
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain=subdomain, is_signup=True
+        )
         result = self.client_get(result.url)
         # Verify that we're unable to sign up, since this is a closed realm
         self.assertEqual(result.status_code, 200)
         self.assert_in_success_response(["Sign up"], result)
 
-        result = self.social_auth_test(account_data_dict, subdomain=subdomain, is_signup=True,
-                                       expect_choose_email_screen=True,
-                                       multiuse_object_key=multiuse_object_key)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated)
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain=subdomain,
+            is_signup=True,
+            expect_choose_email_screen=True,
+            multiuse_object_key=multiuse_object_key,
+        )
+        self.stage_two_of_registration(
+            result, realm, subdomain, email, name, name, self.BACKEND_CLASS.full_name_validated
+        )
 
     def test_social_auth_registration_without_is_signup(self) -> None:
         """If `is_signup` is not set then a new account isn't created"""
         email = "newuser@zulip.com"
         name = 'Full Name'
         account_data_dict = self.get_account_data_dict(email=email, name=name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain='zulip')
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain='zulip'
+        )
         self.assertEqual(result.status_code, 302)
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], email)
@@ -1326,9 +1519,9 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         email = "nonexisting@phantom.com"
         name = 'Full Name'
         account_data_dict = self.get_account_data_dict(email=email, name=name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain='zulip')
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain='zulip'
+        )
         self.assertEqual(result.status_code, 302)
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], email)
@@ -1342,9 +1535,12 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         result = self.client_get(result.url)
         self.assertEqual(result.status_code, 200)
         self.assert_in_response('action="/register/"', result)
-        self.assert_in_response('Your email address, {}, is not '
-                                'in one of the domains that are allowed to register '
-                                'for accounts in this organization.'.format(email), result)
+        self.assert_in_response(
+            'Your email address, {}, is not '
+            'in one of the domains that are allowed to register '
+            'for accounts in this organization.'.format(email),
+            result,
+        )
 
     @override_settings(TERMS_OF_SERVICE=None)
     def test_social_auth_with_ldap_populate_registration_from_confirmation(self) -> None:
@@ -1358,32 +1554,56 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
 
         backend_path = f'zproject.backends.{self.BACKEND_CLASS.__name__}'
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
-                AUTHENTICATION_BACKENDS=(backend_path,
-                                         'zproject.backends.ZulipLDAPUserPopulator',
-                                         'zproject.backends.ZulipDummyBackend'),
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            AUTHENTICATION_BACKENDS=(
+                backend_path,
+                'zproject.backends.ZulipLDAPUserPopulator',
+                'zproject.backends.ZulipDummyBackend',
+            ),
         ), self.assertLogs(level='WARNING') as log_warn:
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=True,
-                                           subdomain=subdomain, is_signup=True)
+            result = self.social_auth_test(
+                account_data_dict,
+                expect_choose_email_screen=True,
+                subdomain=subdomain,
+                is_signup=True,
+            )
             # Full name should get populated from LDAP:
-            self.stage_two_of_registration(result, realm, subdomain, email, name, "New LDAP fullname",
-                                           skip_registration_form=True)
+            self.stage_two_of_registration(
+                result,
+                realm,
+                subdomain,
+                email,
+                name,
+                "New LDAP fullname",
+                skip_registration_form=True,
+            )
 
             # Now try a user that doesn't exist in LDAP:
             email = self.nonreg_email("alice")
             name = "Alice Social"
             account_data_dict = self.get_account_data_dict(email=email, name=name)
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=True,
-                                           subdomain=subdomain, is_signup=True)
+            result = self.social_auth_test(
+                account_data_dict,
+                expect_choose_email_screen=True,
+                subdomain=subdomain,
+                is_signup=True,
+            )
             # Full name should get populated as provided by the social backend, because
             # this user isn't in the LDAP dictionary:
-            self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                           skip_registration_form=self.BACKEND_CLASS.full_name_validated)
-        self.assertEqual(log_warn.output, [f'WARNING:root:New account email {email} could not be found in LDAP'])
+            self.stage_two_of_registration(
+                result,
+                realm,
+                subdomain,
+                email,
+                name,
+                name,
+                skip_registration_form=self.BACKEND_CLASS.full_name_validated,
+            )
+        self.assertEqual(
+            log_warn.output, [f'WARNING:root:New account email {email} could not be found in LDAP']
+        )
 
     @override_settings(TERMS_OF_SERVICE=None)
     def test_social_auth_with_ldap_auth_registration_from_confirmation(self) -> None:
@@ -1401,47 +1621,79 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
 
         backend_path = f'zproject.backends.{self.BACKEND_CLASS.__name__}'
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_EMAIL_ATTR='mail',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
-                AUTHENTICATION_BACKENDS=(backend_path,
-                                         'zproject.backends.ZulipLDAPAuthBackend',
-                                         'zproject.backends.ZulipDummyBackend'),
-        ), self.assertLogs('zulip.ldap', level='DEBUG') as log_debug, self.assertLogs(level='WARNING') as log_warn:
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_EMAIL_ATTR='mail',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            AUTHENTICATION_BACKENDS=(
+                backend_path,
+                'zproject.backends.ZulipLDAPAuthBackend',
+                'zproject.backends.ZulipDummyBackend',
+            ),
+        ), self.assertLogs('zulip.ldap', level='DEBUG') as log_debug, self.assertLogs(
+            level='WARNING'
+        ) as log_warn:
             account_data_dict = self.get_account_data_dict(email=email, name=name)
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=True,
-                                           subdomain=subdomain, is_signup=True)
+            result = self.social_auth_test(
+                account_data_dict,
+                expect_choose_email_screen=True,
+                subdomain=subdomain,
+                is_signup=True,
+            )
             # Full name should get populated as provided by the social backend, because
             # this user isn't in the LDAP dictionary:
-            self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                           skip_registration_form=self.BACKEND_CLASS.full_name_validated)
-        self.assertEqual(log_warn.output, [f'WARNING:root:New account email {email} could not be found in LDAP'])
-        self.assertEqual(log_debug.output, [f'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: {email}. Input username: {email}'])
+            self.stage_two_of_registration(
+                result,
+                realm,
+                subdomain,
+                email,
+                name,
+                name,
+                skip_registration_form=self.BACKEND_CLASS.full_name_validated,
+            )
+        self.assertEqual(
+            log_warn.output, [f'WARNING:root:New account email {email} could not be found in LDAP']
+        )
+        self.assertEqual(
+            log_debug.output,
+            [
+                f'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: {email}. Input username: {email}'
+            ],
+        )
 
     def test_social_auth_complete(self) -> None:
-        with mock.patch('social_core.backends.oauth.BaseOAuth2.process_error',
-                        side_effect=AuthFailed('Not found')), self.assertLogs(self.logger_string, level='INFO') as m:
+        with mock.patch(
+            'social_core.backends.oauth.BaseOAuth2.process_error',
+            side_effect=AuthFailed('Not found'),
+        ), self.assertLogs(self.logger_string, level='INFO') as m:
             result = self.client_get(reverse('social:complete', args=[self.backend.name]))
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
-        self.assertEqual(m.output, [
-            self.logger_output("AuthFailed: Authentication failed: ", 'info'),
-        ])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output("AuthFailed: Authentication failed: ", 'info'),
+            ],
+        )
 
-        with mock.patch('social_core.backends.oauth.BaseOAuth2.auth_complete',
-                        side_effect=requests.exceptions.HTTPError), self.assertLogs(self.logger_string, level='INFO') as m:
+        with mock.patch(
+            'social_core.backends.oauth.BaseOAuth2.auth_complete',
+            side_effect=requests.exceptions.HTTPError,
+        ), self.assertLogs(self.logger_string, level='INFO') as m:
             result = self.client_get(reverse('social:complete', args=[self.backend.name]))
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
-        self.assertEqual(m.output, [
-            self.logger_output("HTTPError: ", 'info'),
-        ])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output("HTTPError: ", 'info'),
+            ],
+        )
 
     def test_social_auth_complete_when_base_exc_is_raised(self) -> None:
-        with mock.patch('social_core.backends.oauth.BaseOAuth2.auth_complete',
-                        side_effect=AuthStateForbidden('State forbidden')), \
-                self.assertLogs(self.logger_string, level='WARNING'):
+        with mock.patch(
+            'social_core.backends.oauth.BaseOAuth2.auth_complete',
+            side_effect=AuthStateForbidden('State forbidden'),
+        ), self.assertLogs(self.logger_string, level='WARNING'):
             result = self.client_get(reverse('social:complete', args=[self.backend.name]))
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
@@ -1453,22 +1705,26 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
         name = 'Alice Jones'
 
         do_invite_users(iago, [email], [], invite_as=PreregistrationUser.INVITE_AS['REALM_ADMIN'])
-        expired_date = timezone_now() - datetime.timedelta(days=settings.INVITATION_LINK_VALIDITY_DAYS + 1)
+        expired_date = timezone_now() - datetime.timedelta(
+            days=settings.INVITATION_LINK_VALIDITY_DAYS + 1
+        )
         PreregistrationUser.objects.filter(email=email).update(invited_at=expired_date)
 
         subdomain = 'zulip'
         realm = get_realm("zulip")
         account_data_dict = self.get_account_data_dict(email=email, name=name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain=subdomain, is_signup=True)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated)
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain=subdomain, is_signup=True
+        )
+        self.stage_two_of_registration(
+            result, realm, subdomain, email, name, name, self.BACKEND_CLASS.full_name_validated
+        )
 
         # The invitation is expired, so the user should be created as normal member only.
         created_user = get_user_by_delivery_email(email, realm)
         self.assertEqual(created_user.role, UserProfile.ROLE_MEMBER)
 
+
 class SAMLAuthBackendTest(SocialAuthBase):
     __unittest_skip__ = False
 
@@ -1481,16 +1737,20 @@ class SAMLAuthBackendTest(SocialAuthBase):
 
     # We have to define our own social_auth_test as the flow of SAML authentication
     # is different from the other social backends.
-    def social_auth_test(self, account_data_dict: Dict[str, str],
-                         *, subdomain: str,
-                         mobile_flow_otp: Optional[str]=None,
-                         desktop_flow_otp: Optional[str]=None,
-                         is_signup: bool=False,
-                         next: str='',
-                         multiuse_object_key: str='',
-                         user_agent: Optional[str]=None,
-                         extra_attributes: Mapping[str, List[str]]={},
-                         **extra_data: Any) -> HttpResponse:
+    def social_auth_test(
+        self,
+        account_data_dict: Dict[str, str],
+        *,
+        subdomain: str,
+        mobile_flow_otp: Optional[str] = None,
+        desktop_flow_otp: Optional[str] = None,
+        is_signup: bool = False,
+        next: str = '',
+        multiuse_object_key: str = '',
+        user_agent: Optional[str] = None,
+        extra_attributes: Mapping[str, List[str]] = {},
+        **extra_data: Any,
+    ) -> HttpResponse:
         url, headers = self.prepare_login_url_and_headers(
             subdomain,
             mobile_flow_otp,
@@ -1529,9 +1789,11 @@ class SAMLAuthBackendTest(SocialAuthBase):
         if is_signup:
             self.assertEqual(data['is_signup'], '1')
 
-        saml_response = self.generate_saml_response(email=account_data_dict['email'],
-                                                    name=account_data_dict['name'],
-                                                    extra_attributes=extra_attributes)
+        saml_response = self.generate_saml_response(
+            email=account_data_dict['email'],
+            name=account_data_dict['name'],
+            extra_attributes=extra_attributes,
+        )
         post_params = {"SAMLResponse": saml_response, "RelayState": relay_state}
         # The mock below is necessary, so that python3-saml accepts our SAMLResponse,
         # and doesn't verify the cryptographic signatures etc., since generating
@@ -1546,7 +1808,9 @@ class SAMLAuthBackendTest(SocialAuthBase):
 
         return result
 
-    def generate_saml_response(self, email: str, name: str, extra_attributes: Mapping[str, List[str]]={}) -> str:
+    def generate_saml_response(
+        self, email: str, name: str, extra_attributes: Mapping[str, List[str]] = {}
+    ) -> str:
         """
         The samlresponse.txt fixture has a pre-generated SAMLResponse,
         with {email}, {first_name}, {last_name} placeholders, that can
@@ -1559,13 +1823,16 @@ class SAMLAuthBackendTest(SocialAuthBase):
         extra_attrs = ''
         for extra_attr_name, extra_attr_values in extra_attributes.items():
             values = ''.join(
-                '<saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" ' +
-                'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">' +
-                f'{value}</saml2:AttributeValue>' for value in extra_attr_values
+                '<saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" '
+                + 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">'
+                + f'{value}</saml2:AttributeValue>'
+                for value in extra_attr_values
+            )
+            extra_attrs += (
+                f'<saml2:Attribute Name="{extra_attr_name}" '
+                + 'NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified">'
+                + f'{values}</saml2:Attribute>'
             )
-            extra_attrs += f'<saml2:Attribute Name="{extra_attr_name}" ' + \
-                           'NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified">' + \
-                           f'{values}</saml2:Attribute>'
 
         unencoded_saml_response = self.fixture_data("samlresponse.txt", type="saml").format(
             email=email,
@@ -1589,21 +1856,24 @@ class SAMLAuthBackendTest(SocialAuthBase):
         """
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=None):
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip', next='/user_uploads/image')
+            result = self.social_auth_test(
+                account_data_dict, subdomain='zulip', next='/user_uploads/image'
+            )
             self.assert_in_success_response(["Configuration error", "SAML authentication"], result)
 
             # Test the signup path too:
-            result = self.social_auth_test(account_data_dict, is_signup=True,
-                                           subdomain='zulip', next='/user_uploads/image')
+            result = self.social_auth_test(
+                account_data_dict, is_signup=True, subdomain='zulip', next='/user_uploads/image'
+            )
             self.assert_in_success_response(["Configuration error", "SAML authentication"], result)
 
     def test_config_error_page(self) -> None:
         with self.assertLogs(level='INFO') as info_log:
             result = self.client_get("/accounts/login/social/saml")
-        self.assertEqual(info_log.output, [
-            'INFO:root:Attempted to initiate SAML authentication with wrong idp argument: None'
-        ])
+        self.assertEqual(
+            info_log.output,
+            ['INFO:root:Attempted to initiate SAML authentication with wrong idp argument: None'],
+        )
         self.assert_in_success_response(["Configuration error", "SAML authentication"], result)
 
     def test_saml_auth_works_without_private_public_keys(self) -> None:
@@ -1615,39 +1885,54 @@ class SAMLAuthBackendTest(SocialAuthBase):
             self.assertTrue(saml_auth_enabled())
             result = self.client_get("/saml/metadata.xml")
             self.assert_in_success_response(
-                [f'entityID="{settings.SOCIAL_AUTH_SAML_SP_ENTITY_ID}"'], result,
+                [f'entityID="{settings.SOCIAL_AUTH_SAML_SP_ENTITY_ID}"'],
+                result,
             )
 
     def test_social_auth_complete(self) -> None:
         with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
-            with mock.patch.object(OneLogin_Saml2_Auth, 'is_authenticated', return_value=False), \
-                    self.assertLogs(self.logger_string, level='INFO') as m:
+            with mock.patch.object(
+                OneLogin_Saml2_Auth, 'is_authenticated', return_value=False
+            ), self.assertLogs(self.logger_string, level='INFO') as m:
                 # This mock causes AuthFailed to be raised.
                 saml_response = self.generate_saml_response(self.email, self.name)
-                relay_state = orjson.dumps(dict(
-                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-                )).decode()
+                relay_state = orjson.dumps(
+                    dict(
+                        state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                    )
+                ).decode()
                 post_params = {"SAMLResponse": saml_response, "RelayState": relay_state}
-                result = self.client_post('/complete/saml/',  post_params)
+                result = self.client_post('/complete/saml/', post_params)
                 self.assertEqual(result.status_code, 302)
                 self.assertIn('login', result.url)
-            self.assertEqual(m.output, [self.logger_output("AuthFailed: Authentication failed: SAML login failed: [] (None)",
-                                                           'info')])
+            self.assertEqual(
+                m.output,
+                [
+                    self.logger_output(
+                        "AuthFailed: Authentication failed: SAML login failed: [] (None)", 'info'
+                    )
+                ],
+            )
 
     def test_social_auth_complete_when_base_exc_is_raised(self) -> None:
         with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
-            with mock.patch('social_core.backends.saml.SAMLAuth.auth_complete',
-                            side_effect=AuthStateForbidden('State forbidden')), \
-                    self.assertLogs(self.logger_string, level='WARNING') as m:
+            with mock.patch(
+                'social_core.backends.saml.SAMLAuth.auth_complete',
+                side_effect=AuthStateForbidden('State forbidden'),
+            ), self.assertLogs(self.logger_string, level='WARNING') as m:
                 saml_response = self.generate_saml_response(self.email, self.name)
-                relay_state = orjson.dumps(dict(
-                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-                )).decode()
+                relay_state = orjson.dumps(
+                    dict(
+                        state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                    )
+                ).decode()
                 post_params = {"SAMLResponse": saml_response, "RelayState": relay_state}
-                result = self.client_post('/complete/saml/',  post_params)
+                result = self.client_post('/complete/saml/', post_params)
                 self.assertEqual(result.status_code, 302)
                 self.assertIn('login', result.url)
-            self.assertEqual(m.output, [self.logger_output("Wrong state parameter given.", 'warning')])
+            self.assertEqual(
+                m.output, [self.logger_output("Wrong state parameter given.", 'warning')]
+            )
 
     def test_social_auth_complete_bad_params(self) -> None:
         # Simple GET for /complete/saml without the required parameters.
@@ -1657,71 +1942,99 @@ class SAMLAuthBackendTest(SocialAuthBase):
             result = self.client_get('/complete/saml/')
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
-        self.assertEqual(m.output, [self.logger_output("/complete/saml/: No SAMLResponse in request.", 'info')])
+        self.assertEqual(
+            m.output, [self.logger_output("/complete/saml/: No SAMLResponse in request.", 'info')]
+        )
 
         # Check that POSTing the RelayState, but with missing SAMLResponse,
         # doesn't cause errors either:
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            relay_state = orjson.dumps(dict(
-                state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-            )).decode()
+            relay_state = orjson.dumps(
+                dict(
+                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                )
+            ).decode()
             post_params = {"RelayState": relay_state}
-            result = self.client_post('/complete/saml/',  post_params)
+            result = self.client_post('/complete/saml/', post_params)
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
-        self.assertEqual(m.output, [self.logger_output("/complete/saml/: No SAMLResponse in request.", 'info')])
+        self.assertEqual(
+            m.output, [self.logger_output("/complete/saml/: No SAMLResponse in request.", 'info')]
+        )
 
         # Now test bad SAMLResponses.
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            relay_state = orjson.dumps(dict(
-                state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-            )).decode()
+            relay_state = orjson.dumps(
+                dict(
+                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                )
+            ).decode()
             post_params = {"RelayState": relay_state, 'SAMLResponse': ''}
-            result = self.client_post('/complete/saml/',  post_params)
+            result = self.client_post('/complete/saml/', post_params)
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
         self.assertTrue(m.output != '')
 
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            relay_state = orjson.dumps(dict(
-                state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-            )).decode()
+            relay_state = orjson.dumps(
+                dict(
+                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                )
+            ).decode()
             post_params = {"RelayState": relay_state, 'SAMLResponse': 'b'}
-            result = self.client_post('/complete/saml/',  post_params)
+            result = self.client_post('/complete/saml/', post_params)
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
         self.assertTrue(m.output != '')
 
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            relay_state = orjson.dumps(dict(
-                state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-            )).decode()
-            post_params = {"RelayState": relay_state, 'SAMLResponse': base64.b64encode(b"test").decode()}
-            result = self.client_post('/complete/saml/',  post_params)
+            relay_state = orjson.dumps(
+                dict(
+                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                )
+            ).decode()
+            post_params = {
+                "RelayState": relay_state,
+                'SAMLResponse': base64.b64encode(b"test").decode(),
+            }
+            result = self.client_post('/complete/saml/', post_params)
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
         self.assertTrue(m.output != '')
 
     def test_social_auth_complete_no_subdomain(self) -> None:
         with self.assertLogs(self.logger_string, level='INFO') as m:
-            post_params = {"RelayState": '',
-                           'SAMLResponse': self.generate_saml_response(email=self.example_email("hamlet"),
-                                                                       name="King Hamlet")}
+            post_params = {
+                "RelayState": '',
+                'SAMLResponse': self.generate_saml_response(
+                    email=self.example_email("hamlet"), name="King Hamlet"
+                ),
+            }
             with mock.patch.object(SAMLAuthBackend, 'choose_subdomain', return_value=None):
-                result = self.client_post('/complete/saml/',  post_params)
+                result = self.client_post('/complete/saml/', post_params)
             self.assertEqual(result.status_code, 302)
             self.assertEqual('/login/', result.url)
-        self.assertEqual(m.output, [self.logger_output(
-            "/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: {}".format("{}"),
-            'info',
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: {}".format(
+                        "{}"
+                    ),
+                    'info',
+                )
+            ],
+        )
 
     def test_social_auth_complete_wrong_issuing_idp(self) -> None:
-        relay_state = orjson.dumps(dict(
-            state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-        )).decode()
-        saml_response = self.generate_saml_response(email=self.example_email("hamlet"),
-                                                    name="King Hamlet")
+        relay_state = orjson.dumps(
+            dict(
+                state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+            )
+        ).decode()
+        saml_response = self.generate_saml_response(
+            email=self.example_email("hamlet"), name="King Hamlet"
+        )
 
         # We change the entity_id of the configured test IdP, which means it won't match
         # the Entity ID in the SAMLResponse generated above.
@@ -1729,12 +2042,18 @@ class SAMLAuthBackendTest(SocialAuthBase):
         idps_dict['test_idp']['entity_id'] = 'https://different.idp.example.com/'
         with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict):
             with self.assertLogs(self.logger_string, level='INFO') as m:
-                post_params = {"RelayState": relay_state,
-                               "SAMLResponse": saml_response}
-                result = self.client_post('/complete/saml/',  post_params)
+                post_params = {"RelayState": relay_state, "SAMLResponse": saml_response}
+                result = self.client_post('/complete/saml/', post_params)
                 self.assertEqual(result.status_code, 302)
                 self.assertEqual('/login/', result.url)
-            self.assertEqual(m.output, [self.logger_output("/complete/saml/: No valid IdP as issuer of the SAMLResponse.", "info")])
+            self.assertEqual(
+                m.output,
+                [
+                    self.logger_output(
+                        "/complete/saml/: No valid IdP as issuer of the SAMLResponse.", "info"
+                    )
+                ],
+            )
 
     def test_social_auth_complete_valid_get_idp_bad_samlresponse(self) -> None:
         """
@@ -1743,13 +2062,19 @@ class SAMLAuthBackendTest(SocialAuthBase):
         validation in the underlying libraries.
         """
 
-        with self.assertLogs(self.logger_string, level='INFO') as m, \
-                mock.patch.object(SAMLAuthBackend, 'get_issuing_idp', return_value='test_idp'):
-            relay_state = orjson.dumps(dict(
-                state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
-            )).decode()
-            post_params = {"RelayState": relay_state, 'SAMLResponse': base64.b64encode(b"test").decode()}
-            result = self.client_post('/complete/saml/',  post_params)
+        with self.assertLogs(self.logger_string, level='INFO') as m, mock.patch.object(
+            SAMLAuthBackend, 'get_issuing_idp', return_value='test_idp'
+        ):
+            relay_state = orjson.dumps(
+                dict(
+                    state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
+                )
+            ).decode()
+            post_params = {
+                "RelayState": relay_state,
+                'SAMLResponse': base64.b64encode(b"test").decode(),
+            }
+            result = self.client_post('/complete/saml/', post_params)
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
 
@@ -1760,13 +2085,27 @@ class SAMLAuthBackendTest(SocialAuthBase):
             result = self.client_get('/login/saml/')
             self.assertEqual(result.status_code, 302)
             self.assertEqual('/login/', result.url)
-        self.assertEqual(m.output, [self.logger_output("/login/saml/ : Bad idp param: KeyError: {}.".format("'idp'"), 'info')])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "/login/saml/ : Bad idp param: KeyError: {}.".format("'idp'"), 'info'
+                )
+            ],
+        )
 
         with self.assertLogs(self.logger_string, level='INFO') as m:
             result = self.client_get("/login/saml/", {"idp": "bad_idp"})
             self.assertEqual(result.status_code, 302)
             self.assertEqual('/login/', result.url)
-        self.assertEqual(m.output, [self.logger_output("/login/saml/ : Bad idp param: KeyError: {}.".format("'bad_idp'"), 'info')])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "/login/saml/ : Bad idp param: KeyError: {}.".format("'bad_idp'"), 'info'
+                )
+            ],
+        )
 
     def test_social_auth_invalid_email(self) -> None:
         """
@@ -1776,11 +2115,15 @@ class SAMLAuthBackendTest(SocialAuthBase):
         """
         account_data_dict = self.get_account_data_dict(email="invalid", name=self.name)
         with self.assertLogs(self.logger_string, "WARNING") as warn_log:
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=True,
-                                           subdomain='zulip', next='/user_uploads/image')
-        self.assertEqual(warn_log.output, [
-            self.logger_output('SAML got invalid email argument.', 'warning')])
+            result = self.social_auth_test(
+                account_data_dict,
+                expect_choose_email_screen=True,
+                subdomain='zulip',
+                next='/user_uploads/image',
+            )
+        self.assertEqual(
+            warn_log.output, [self.logger_output('SAML got invalid email argument.', 'warning')]
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, "/login/")
 
@@ -1843,10 +2186,16 @@ class SAMLAuthBackendTest(SocialAuthBase):
                 result = self.social_auth_test(account_data_dict, subdomain='zephyr')
         self.assertEqual(result.status_code, 302)
         self.assertEqual('/login/', result.url)
-        self.assertEqual(m.output, [self.logger_output(
-            '/complete/saml/: Authentication request with IdP test_idp but this provider is not enabled '
-            'for this subdomain zephyr.', 'info',
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    '/complete/saml/: Authentication request with IdP test_idp but this provider is not enabled '
+                    'for this subdomain zephyr.',
+                    'info',
+                )
+            ],
+        )
 
     def test_social_auth_saml_login_bad_idp_arg(self) -> None:
         for action in ['login', 'register']:
@@ -1854,16 +2203,22 @@ class SAMLAuthBackendTest(SocialAuthBase):
                 result = self.client_get(f'/accounts/{action}/social/saml')
             # Missing idp argument.
             self.assert_in_success_response(["Configuration error", "SAML authentication"], result)
-            self.assertEqual(info_log.output, [
-                'INFO:root:Attempted to initiate SAML authentication with wrong idp argument: None'
-            ])
+            self.assertEqual(
+                info_log.output,
+                [
+                    'INFO:root:Attempted to initiate SAML authentication with wrong idp argument: None'
+                ],
+            )
 
             with self.assertLogs(level='INFO') as info_log:
                 result = self.client_get(f'/accounts/{action}/social/saml/nonexistent_idp')
             # No such IdP is configured.
-            self.assertEqual(info_log.output, [
-                'INFO:root:Attempted to initiate SAML authentication with wrong idp argument: nonexistent_idp'
-            ])
+            self.assertEqual(
+                info_log.output,
+                [
+                    'INFO:root:Attempted to initiate SAML authentication with wrong idp argument: nonexistent_idp'
+                ],
+            )
             self.assert_in_success_response(["Configuration error", "SAML authentication"], result)
 
             result = self.client_get(f'/accounts/{action}/social/saml/')
@@ -1877,20 +2232,26 @@ class SAMLAuthBackendTest(SocialAuthBase):
         idps_dict['test_idp2']['display_name'] = 'Second Test IdP'
         idps_dict['test_idp2']['limit_to_subdomains'] = ['zulip']
 
-        with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict,
-                           SAML_REQUIRE_LIMIT_TO_SUBDOMAINS=True):
+        with self.settings(
+            SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict, SAML_REQUIRE_LIMIT_TO_SUBDOMAINS=True
+        ):
             with self.assertLogs(self.logger_string, level="ERROR") as m:
                 # Initialization of the backend should validate the configured IdPs
                 # with respect to the SAML_REQUIRE_LIMIT_TO_SUBDOMAINS setting and remove
                 # the non-compliant ones.
                 SAMLAuthBackend()
-            self.assertEqual(list(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.keys()),
-                             ['test_idp2'])
-        self.assertEqual(m.output, [self.logger_output(
-            "SAML_REQUIRE_LIMIT_TO_SUBDOMAINS is enabled and the following "
-            "IdPs don't have limit_to_subdomains specified and will be ignored: "
-            "['test_idp']", 'error',
-        )])
+            self.assertEqual(list(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.keys()), ['test_idp2'])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "SAML_REQUIRE_LIMIT_TO_SUBDOMAINS is enabled and the following "
+                    "IdPs don't have limit_to_subdomains specified and will be ignored: "
+                    "['test_idp']",
+                    'error',
+                )
+            ],
+        )
 
     def test_idp_initiated_signin_subdomain_specified(self) -> None:
         post_params = {
@@ -1900,7 +2261,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
 
         with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
             # We're not able to generate valid signatures in tests, so we need the mock.
-            result = self.client_post('/complete/saml/',  post_params)
+            result = self.client_post('/complete/saml/', post_params)
 
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
@@ -1922,7 +2283,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
 
         with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
             # We're not able to generate valid signatures in tests, so we need the mock.
-            result = self.client_post('/complete/saml/',  post_params)
+            result = self.client_post('/complete/saml/', post_params)
 
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, "/accounts/find/")
@@ -1935,7 +2296,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
 
         with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
             # We're not able to generate valid signatures in tests, so we need the mock.
-            result = self.client_post('http://zulip.testserver/complete/saml/',  post_params)
+            result = self.client_post('http://zulip.testserver/complete/saml/', post_params)
 
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
@@ -1956,7 +2317,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
 
         with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
             # We're not able to generate valid signatures in tests, so we need the mock.
-            result = self.client_post('http://zulip.testserver/complete/saml/',  post_params)
+            result = self.client_post('http://zulip.testserver/complete/saml/', post_params)
 
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
@@ -1980,24 +2341,31 @@ class SAMLAuthBackendTest(SocialAuthBase):
             with mock.patch('zproject.backends.get_subdomain', return_value='invalid'):
                 # Due to the quirks of our test setup, get_subdomain on all these `some_subdomain.testserver`
                 # requests returns 'zulip', so we need to mock it here.
-                result = self.client_post('http://invalid.testserver/complete/saml/',  post_params)
+                result = self.client_post('http://invalid.testserver/complete/saml/', post_params)
 
             self.assertEqual(result.status_code, 302)
             self.assertEqual('/login/', result.url)
-        self.assertEqual(m.output, [self.logger_output(
-            "/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: {}",
-            "info",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: {}",
+                    "info",
+                )
+            ],
+        )
 
     def test_social_auth_saml_idp_org_membership_success(self) -> None:
         idps_dict = copy.deepcopy(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS)
         idps_dict['test_idp']['attr_org_membership'] = 'member'
         with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict):
             account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip',
-                                           expect_choose_email_screen=False,
-                                           extra_attributes=dict(member=['zulip']))
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=False,
+                extra_attributes=dict(member=['zulip']),
+            )
             data = load_subdomain_token(result)
             self.assertEqual(data['email'], self.email)
             self.assertEqual(data['full_name'], self.name)
@@ -2015,10 +2383,12 @@ class SAMLAuthBackendTest(SocialAuthBase):
             # Having one of the settings.ROOT_SUBDOMAIN_ALIASES in the membership attributes
             # authorizes the user to access the root subdomain.
             account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='',
-                                           expect_choose_email_screen=False,
-                                           extra_attributes=dict(member=['www']))
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='',
+                expect_choose_email_screen=False,
+                extra_attributes=dict(member=['www']),
+            )
             data = load_subdomain_token(result)
             self.assertEqual(data['email'], self.email)
             self.assertEqual(data['full_name'], self.name)
@@ -2028,16 +2398,23 @@ class SAMLAuthBackendTest(SocialAuthBase):
             # Failure, the user doesn't have entitlements for the root subdomain.
             account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
             with self.assertLogs(self.logger_string, level='INFO') as m:
-                result = self.social_auth_test(account_data_dict,
-                                               subdomain='',
-                                               expect_choose_email_screen=False,
-                                               extra_attributes=dict(member=['zephyr']))
+                result = self.social_auth_test(
+                    account_data_dict,
+                    subdomain='',
+                    expect_choose_email_screen=False,
+                    extra_attributes=dict(member=['zephyr']),
+                )
             self.assertEqual(result.status_code, 302)
-            self.assertEqual(m.output, [self.logger_output(
-                "AuthFailed: Authentication failed: SAML user from IdP test_idp rejected due to " +
-                "missing entitlement for subdomain ''. User entitlements: ['zephyr'].",
-                "info",
-            )])
+            self.assertEqual(
+                m.output,
+                [
+                    self.logger_output(
+                        "AuthFailed: Authentication failed: SAML user from IdP test_idp rejected due to "
+                        + "missing entitlement for subdomain ''. User entitlements: ['zephyr'].",
+                        "info",
+                    )
+                ],
+            )
 
     def test_social_auth_saml_idp_org_membership_failed(self) -> None:
         idps_dict = copy.deepcopy(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS)
@@ -2045,15 +2422,24 @@ class SAMLAuthBackendTest(SocialAuthBase):
         with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict):
             account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
             with self.assertLogs(self.logger_string, level='INFO') as m:
-                result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                               extra_attributes=dict(member=['zephyr', 'othersubdomain']))
+                result = self.social_auth_test(
+                    account_data_dict,
+                    subdomain='zulip',
+                    extra_attributes=dict(member=['zephyr', 'othersubdomain']),
+                )
         self.assertEqual(result.status_code, 302)
         self.assertEqual('/login/', result.url)
-        self.assertEqual(m.output, [self.logger_output(
-            "AuthFailed: Authentication failed: SAML user from IdP test_idp rejected due to " +
-            "missing entitlement for subdomain 'zulip'. User entitlements: ['zephyr', 'othersubdomain'].",
-            "info",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "AuthFailed: Authentication failed: SAML user from IdP test_idp rejected due to "
+                    + "missing entitlement for subdomain 'zulip'. User entitlements: ['zephyr', 'othersubdomain'].",
+                    "info",
+                )
+            ],
+        )
+
 
 class AppleAuthMixin:
     BACKEND_CLASS = AppleAuthBackend
@@ -2063,7 +2449,9 @@ class AppleAuthMixin:
     AUTH_FINISH_URL = "/complete/apple/"
     CONFIG_ERROR_URL = "/config-error/apple"
 
-    def generate_id_token(self, account_data_dict: Dict[str, str], audience: Optional[str]=None) -> str:
+    def generate_id_token(
+        self, account_data_dict: Dict[str, str], audience: Optional[str] = None
+    ) -> str:
         payload = dict(email=account_data_dict['email'])
 
         # This setup is important because python-social-auth decodes `id_token`
@@ -2076,8 +2464,9 @@ class AppleAuthMixin:
         headers = {"kid": "SOMEKID"}
         private_key = settings.APPLE_ID_TOKEN_GENERATION_KEY
 
-        id_token = jwt.encode(payload, private_key, algorithm='RS256',
-                              headers=headers).decode('utf-8')
+        id_token = jwt.encode(payload, private_key, algorithm='RS256', headers=headers).decode(
+            'utf-8'
+        )
 
         return id_token
 
@@ -2085,11 +2474,12 @@ class AppleAuthMixin:
         name_parts = name.split(' ')
         first_name = name_parts[0]
         last_name = ''
-        if (len(name_parts) > 0):
+        if len(name_parts) > 0:
             last_name = name_parts[-1]
         name_dict = {'firstName': first_name, 'lastName': last_name}
         return dict(email=email, name=name_dict, email_verified=True)
 
+
 class AppleIdAuthBackendTest(AppleAuthMixin, SocialAuthBase):
     __unittest_skip__ = False
 
@@ -2100,22 +2490,29 @@ class AppleIdAuthBackendTest(AppleAuthMixin, SocialAuthBase):
     # dummy value to keep SocialAuthBase common code happy.
     USER_INFO_URL = '/invalid-unused-url'
 
-    def social_auth_test_finish(self, result: HttpResponse,
-                                account_data_dict: Dict[str, str],
-                                expect_choose_email_screen: bool,
-                                headers: Any,
-                                **extra_data: Any) -> HttpResponse:
+    def social_auth_test_finish(
+        self,
+        result: HttpResponse,
+        account_data_dict: Dict[str, str],
+        expect_choose_email_screen: bool,
+        headers: Any,
+        **extra_data: Any,
+    ) -> HttpResponse:
         parsed_url = urllib.parse.urlparse(result.url)
         state = urllib.parse.parse_qs(parsed_url.query)['state']
         user_param = json.dumps(account_data_dict)
         self.client.session.flush()
-        result = self.client_post(self.AUTH_FINISH_URL,
-                                  dict(state=state, user=user_param), **headers)
+        result = self.client_post(
+            self.AUTH_FINISH_URL, dict(state=state, user=user_param), **headers
+        )
         return result
 
-    def register_extra_endpoints(self, requests_mock: responses.RequestsMock,
-                                 account_data_dict: Dict[str, str],
-                                 **extra_data: Any) -> None:
+    def register_extra_endpoints(
+        self,
+        requests_mock: responses.RequestsMock,
+        account_data_dict: Dict[str, str],
+        **extra_data: Any,
+    ) -> None:
         # This is an URL of an endpoint on Apple servers that returns
         # the public keys to be used for verifying the signature
         # on the JWT id_token.
@@ -2129,12 +2526,14 @@ class AppleIdAuthBackendTest(AppleAuthMixin, SocialAuthBase):
     def generate_access_url_payload(self, account_data_dict: Dict[str, str]) -> str:
         # The ACCESS_TOKEN_URL endpoint works a bit different in standard Oauth2,
         # where the token_data_dict contains some essential data. we add that data here.
-        return json.dumps({
-            'access_token': 'foobar',
-            'expires_in': time.time() + 60*5,
-            'id_token': self.generate_id_token(account_data_dict),
-            'token_type': 'bearer',
-        })
+        return json.dumps(
+            {
+                'access_token': 'foobar',
+                'expires_in': time.time() + 60 * 5,
+                'id_token': self.generate_id_token(account_data_dict),
+                'token_type': 'bearer',
+            }
+        )
 
     def test_apple_auth_enabled(self) -> None:
         with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.AppleAuthBackend',)):
@@ -2150,25 +2549,40 @@ class AppleIdAuthBackendTest(AppleAuthMixin, SocialAuthBase):
         subdomain = "zulip"
         realm = get_realm("zulip")
         account_data_dict = self.get_account_data_dict(email=email, name='')
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=True,
-                                       subdomain=subdomain, is_signup=True)
-        self.stage_two_of_registration(result, realm, subdomain, email, '', 'Full Name',
-                                       skip_registration_form=False,
-                                       expect_full_name_prepopulated=False)
+        result = self.social_auth_test(
+            account_data_dict, expect_choose_email_screen=True, subdomain=subdomain, is_signup=True
+        )
+        self.stage_two_of_registration(
+            result,
+            realm,
+            subdomain,
+            email,
+            '',
+            'Full Name',
+            skip_registration_form=False,
+            expect_full_name_prepopulated=False,
+        )
 
     def test_id_token_verification_failure(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         with self.assertLogs(self.logger_string, level='INFO') as m:
             with mock.patch("jwt.decode", side_effect=PyJWTError):
-                result = self.social_auth_test(account_data_dict,
-                                               expect_choose_email_screen=True,
-                                               subdomain='zulip', is_signup=True)
+                result = self.social_auth_test(
+                    account_data_dict,
+                    expect_choose_email_screen=True,
+                    subdomain='zulip',
+                    is_signup=True,
+                )
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, "/login/")
-        self.assertEqual(m.output, [
-            self.logger_output("AuthFailed: Authentication failed: Token validation failed", "info"),
-        ])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "AuthFailed: Authentication failed: Token validation failed", "info"
+                ),
+            ],
+        )
 
     def test_validate_state(self) -> None:
         with self.assertLogs(self.logger_string, level='INFO') as m:
@@ -2183,12 +2597,18 @@ class AppleIdAuthBackendTest(AppleAuthMixin, SocialAuthBase):
             result = self.client_post('/complete/apple/', {'state': fake_state})
             self.assertEqual(result.status_code, 302)
             self.assertIn('login', result.url)
-        self.assertEqual(m.output, [
-            self.logger_output("Sign in with Apple failed: missing state parameter.", "info"),  # (1)
-            self.logger_output("Missing needed parameter state", "warning"),
-            self.logger_output("Sign in with Apple failed: bad state token.", "info"),  # (2)
-            self.logger_output("Wrong state parameter given.", "warning"),
-        ])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "Sign in with Apple failed: missing state parameter.", "info"
+                ),  # (1)
+                self.logger_output("Missing needed parameter state", "warning"),
+                self.logger_output("Sign in with Apple failed: bad state token.", "info"),  # (2)
+                self.logger_output("Wrong state parameter given.", "warning"),
+            ],
+        )
+
 
 class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
     __unittest_skip__ = False
@@ -2199,20 +2619,25 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
     def prepare_login_url_and_headers(
         self,
         subdomain: str,
-        mobile_flow_otp: Optional[str]=None,
-        desktop_flow_otp: Optional[str]=None,
-        is_signup: bool=False,
-        next: str='',
-        multiuse_object_key: str='',
-        alternative_start_url: Optional[str]=None,
-        id_token: Optional[str]=None,
-        account_data_dict: Dict[str, str]={},
+        mobile_flow_otp: Optional[str] = None,
+        desktop_flow_otp: Optional[str] = None,
+        is_signup: bool = False,
+        next: str = '',
+        multiuse_object_key: str = '',
+        alternative_start_url: Optional[str] = None,
+        id_token: Optional[str] = None,
+        account_data_dict: Dict[str, str] = {},
         *,
-        user_agent: Optional[str]=None,
+        user_agent: Optional[str] = None,
     ) -> Tuple[str, Dict[str, Any]]:
         url, headers = super().prepare_login_url_and_headers(
-            subdomain, mobile_flow_otp, desktop_flow_otp, is_signup, next,
-            multiuse_object_key, alternative_start_url=alternative_start_url,
+            subdomain,
+            mobile_flow_otp,
+            desktop_flow_otp,
+            is_signup,
+            next,
+            multiuse_object_key,
+            alternative_start_url=alternative_start_url,
             user_agent=user_agent,
         )
 
@@ -2232,17 +2657,21 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
         url += f"&{urllib.parse.urlencode(params)}"
         return url, headers
 
-    def social_auth_test(self, account_data_dict: Dict[str, str],
-                         *, subdomain: str,
-                         mobile_flow_otp: Optional[str]=None,
-                         desktop_flow_otp: Optional[str]=None,
-                         is_signup: bool=False,
-                         next: str='',
-                         multiuse_object_key: str='',
-                         alternative_start_url: Optional[str]=None,
-                         skip_id_token: bool=False,
-                         user_agent: Optional[str]=None,
-                         **extra_data: Any) -> HttpResponse:
+    def social_auth_test(
+        self,
+        account_data_dict: Dict[str, str],
+        *,
+        subdomain: str,
+        mobile_flow_otp: Optional[str] = None,
+        desktop_flow_otp: Optional[str] = None,
+        is_signup: bool = False,
+        next: str = '',
+        multiuse_object_key: str = '',
+        alternative_start_url: Optional[str] = None,
+        skip_id_token: bool = False,
+        user_agent: Optional[str] = None,
+        **extra_data: Any,
+    ) -> HttpResponse:
         """In Apple's native authentication flow, the client app authenticates
         with Apple and receives the JWT id_token, before contacting
         the Zulip server.  The app sends an appropriate request with
@@ -2256,14 +2685,23 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
         """
 
         if not skip_id_token:
-            id_token: Optional[str] = self.generate_id_token(account_data_dict, settings.SOCIAL_AUTH_APPLE_APP_ID)
+            id_token: Optional[str] = self.generate_id_token(
+                account_data_dict, settings.SOCIAL_AUTH_APPLE_APP_ID
+            )
         else:
             id_token = None
 
         url, headers = self.prepare_login_url_and_headers(
-            subdomain, mobile_flow_otp, desktop_flow_otp, is_signup, next,
-            multiuse_object_key, alternative_start_url=self.AUTH_FINISH_URL,
-            user_agent=user_agent, id_token=id_token, account_data_dict=account_data_dict,
+            subdomain,
+            mobile_flow_otp,
+            desktop_flow_otp,
+            is_signup,
+            next,
+            multiuse_object_key,
+            alternative_start_url=self.AUTH_FINISH_URL,
+            user_agent=user_agent,
+            id_token=id_token,
+            account_data_dict=account_data_dict,
         )
 
         with self.apple_jwk_url_mock():
@@ -2287,21 +2725,26 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
 
     def test_no_id_token_sent(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        result = self.social_auth_test(account_data_dict,
-                                       expect_choose_email_screen=False,
-                                       subdomain='zulip', next='/user_uploads/image',
-                                       skip_id_token=True)
+        result = self.social_auth_test(
+            account_data_dict,
+            expect_choose_email_screen=False,
+            subdomain='zulip',
+            next='/user_uploads/image',
+            skip_id_token=True,
+        )
         self.assert_json_error(result, "Missing id_token parameter")
 
     def test_social_auth_session_fields_cleared_correctly(self) -> None:
         mobile_flow_otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
 
-        def initiate_auth(mobile_flow_otp: Optional[str]=None) -> None:
-            url, headers = self.prepare_login_url_and_headers(subdomain='zulip',
-                                                              id_token='invalid',
-                                                              mobile_flow_otp=mobile_flow_otp,
-                                                              account_data_dict=account_data_dict)
+        def initiate_auth(mobile_flow_otp: Optional[str] = None) -> None:
+            url, headers = self.prepare_login_url_and_headers(
+                subdomain='zulip',
+                id_token='invalid',
+                mobile_flow_otp=mobile_flow_otp,
+                account_data_dict=account_data_dict,
+            )
             result = self.client_get(url, **headers)
             self.assertEqual(result.status_code, 302)
 
@@ -2311,9 +2754,14 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
             initiate_auth(mobile_flow_otp)
 
         self.assertEqual(self.client.session['mobile_flow_otp'], mobile_flow_otp)
-        self.assertEqual(info_log.output, [
-            self.logger_output("/complete/apple/: Authentication failed: Token validation failed", "info")
-        ])
+        self.assertEqual(
+            info_log.output,
+            [
+                self.logger_output(
+                    "/complete/apple/: Authentication failed: Token validation failed", "info"
+                )
+            ],
+        )
 
         with self.assertLogs(self.logger_string, level='INFO') as info_log:
             # Make a request without mobile_flow_otp param and verify the field doesn't persist
@@ -2321,24 +2769,35 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
             initiate_auth()
 
         self.assertEqual(self.client.session.get('mobile_flow_otp'), None)
-        self.assertEqual(info_log.output, [
-            self.logger_output("/complete/apple/: Authentication failed: Token validation failed", "info")
-        ])
+        self.assertEqual(
+            info_log.output,
+            [
+                self.logger_output(
+                    "/complete/apple/: Authentication failed: Token validation failed", "info"
+                )
+            ],
+        )
 
     def test_id_token_with_invalid_aud_sent(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         url, headers = self.prepare_login_url_and_headers(
-            subdomain='zulip', alternative_start_url=self.AUTH_FINISH_URL,
+            subdomain='zulip',
+            alternative_start_url=self.AUTH_FINISH_URL,
             id_token=self.generate_id_token(account_data_dict, audience='com.different.app'),
             account_data_dict=account_data_dict,
         )
 
-        with self.apple_jwk_url_mock(),  self.assertLogs(self.logger_string, level='INFO') as m:
+        with self.apple_jwk_url_mock(), self.assertLogs(self.logger_string, level='INFO') as m:
             result = self.client_get(url, **headers)
 
-        self.assertEqual(m.output, [
-            self.logger_output("/complete/apple/: Authentication failed: Token validation failed", "info")
-        ])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "/complete/apple/: Authentication failed: Token validation failed", "info"
+                )
+            ],
+        )
         return result
 
     def test_social_auth_desktop_success(self) -> None:
@@ -2355,6 +2814,7 @@ class AppleAuthBackendNativeFlowTest(AppleAuthMixin, SocialAuthBase):
         """
         pass
 
+
 class GitHubAuthBackendTest(SocialAuthBase):
     __unittest_skip__ = False
 
@@ -2370,16 +2830,18 @@ class GitHubAuthBackendTest(SocialAuthBase):
     CONFIG_ERROR_URL = "/config-error/github"
     email_data: List[Dict[str, Any]] = []
 
-    def social_auth_test_finish(self, result: HttpResponse,
-                                account_data_dict: Dict[str, str],
-                                expect_choose_email_screen: bool,
-                                headers: Any,
-                                expect_noreply_email_allowed: bool=False,
-                                **extra_data: Any) -> HttpResponse:
+    def social_auth_test_finish(
+        self,
+        result: HttpResponse,
+        account_data_dict: Dict[str, str],
+        expect_choose_email_screen: bool,
+        headers: Any,
+        expect_noreply_email_allowed: bool = False,
+        **extra_data: Any,
+    ) -> HttpResponse:
         parsed_url = urllib.parse.urlparse(result.url)
         csrf_state = urllib.parse.parse_qs(parsed_url.query)['state']
-        result = self.client_get(self.AUTH_FINISH_URL,
-                                 dict(state=csrf_state), **headers)
+        result = self.client_get(self.AUTH_FINISH_URL, dict(state=csrf_state), **headers)
 
         if expect_choose_email_screen:
             # As GitHub authenticates multiple email addresses,
@@ -2410,26 +2872,28 @@ class GitHubAuthBackendTest(SocialAuthBase):
                 self.assert_not_in_success_response(["also has unverified email"], result)
             else:
                 self.assert_in_success_response(["also has unverified email"], result)
-            result = self.client_get(self.AUTH_FINISH_URL,
-                                     dict(state=csrf_state, email=account_data_dict['email']), **headers)
+            result = self.client_get(
+                self.AUTH_FINISH_URL,
+                dict(state=csrf_state, email=account_data_dict['email']),
+                **headers,
+            )
 
         return result
 
-    def register_extra_endpoints(self, requests_mock: responses.RequestsMock,
-                                 account_data_dict: Dict[str, str],
-                                 **extra_data: Any) -> None:
+    def register_extra_endpoints(
+        self,
+        requests_mock: responses.RequestsMock,
+        account_data_dict: Dict[str, str],
+        **extra_data: Any,
+    ) -> None:
         # Keeping a verified email before the primary email makes sure
         # get_verified_emails puts the primary email at the start of the
         # email list returned as social_associate_user_helper assumes the
         # first email as the primary email.
         email_data = [
-            dict(email="notprimary@example.com",
-                 verified=True),
-            dict(email=account_data_dict["email"],
-                 verified=True,
-                 primary=True),
-            dict(email="ignored@example.com",
-                 verified=False),
+            dict(email="notprimary@example.com", verified=True),
+            dict(email=account_data_dict["email"], verified=True, primary=True),
+            dict(email="ignored@example.com", verified=False),
         ]
         email_data = extra_data.get("email_data", email_data)
 
@@ -2449,49 +2913,61 @@ class GitHubAuthBackendTest(SocialAuthBase):
 
         self.email_data = email_data
 
-    def get_account_data_dict(self, email: str, name: str, user_avatar_url: str='') -> Dict[str, Any]:
+    def get_account_data_dict(
+        self, email: str, name: str, user_avatar_url: str = ''
+    ) -> Dict[str, Any]:
         return dict(email=email, name=name, user_avatar_url=user_avatar_url)
 
     def test_social_auth_email_not_verified(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         email_data = [
-            dict(email=account_data_dict["email"],
-                 verified=False,
-                 primary=True),
+            dict(email=account_data_dict["email"], verified=False, primary=True),
         ]
         with self.assertLogs(self.logger_string, level='WARNING') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip',
-                                           email_data=email_data)
+            result = self.social_auth_test(
+                account_data_dict, subdomain='zulip', email_data=email_data
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(m.output, [self.logger_output(
-            "Social auth ({}) failed because user has no verified emails".format('GitHub'),
-            "warning",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "Social auth ({}) failed because user has no verified emails".format('GitHub'),
+                    "warning",
+                )
+            ],
+        )
 
     @override_settings(SOCIAL_AUTH_GITHUB_TEAM_ID='zulip-webapp')
     def test_social_auth_github_team_not_member_failed(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        with mock.patch('social_core.backends.github.GithubTeamOAuth2.user_data',
-                        side_effect=AuthFailed('Not found')), \
-                self.assertLogs(self.logger_string, level='INFO') as mock_info:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip')
+        with mock.patch(
+            'social_core.backends.github.GithubTeamOAuth2.user_data',
+            side_effect=AuthFailed('Not found'),
+        ), self.assertLogs(self.logger_string, level='INFO') as mock_info:
+            result = self.social_auth_test(account_data_dict, subdomain='zulip')
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(mock_info.output, [self.logger_output(
-            "GitHub user is not member of required team", 'info',
-        )])
+        self.assertEqual(
+            mock_info.output,
+            [
+                self.logger_output(
+                    "GitHub user is not member of required team",
+                    'info',
+                )
+            ],
+        )
 
     @override_settings(SOCIAL_AUTH_GITHUB_TEAM_ID='zulip-webapp')
     def test_social_auth_github_team_member_success(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        with mock.patch('social_core.backends.github.GithubTeamOAuth2.user_data',
-                        return_value=account_data_dict):
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=False,
-                                           subdomain='zulip')
+        with mock.patch(
+            'social_core.backends.github.GithubTeamOAuth2.user_data', return_value=account_data_dict
+        ):
+            result = self.social_auth_test(
+                account_data_dict, expect_choose_email_screen=False, subdomain='zulip'
+            )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
         self.assertEqual(data['full_name'], self.name)
@@ -2500,25 +2976,33 @@ class GitHubAuthBackendTest(SocialAuthBase):
     @override_settings(SOCIAL_AUTH_GITHUB_ORG_NAME='Zulip')
     def test_social_auth_github_organization_not_member_failed(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        with mock.patch('social_core.backends.github.GithubOrganizationOAuth2.user_data',
-                        side_effect=AuthFailed('Not found')), \
-                self.assertLogs(self.logger_string, level='INFO') as mock_info:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip')
+        with mock.patch(
+            'social_core.backends.github.GithubOrganizationOAuth2.user_data',
+            side_effect=AuthFailed('Not found'),
+        ), self.assertLogs(self.logger_string, level='INFO') as mock_info:
+            result = self.social_auth_test(account_data_dict, subdomain='zulip')
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(mock_info.output, [self.logger_output(
-            "GitHub user is not member of required organization", "info",
-        )])
+        self.assertEqual(
+            mock_info.output,
+            [
+                self.logger_output(
+                    "GitHub user is not member of required organization",
+                    "info",
+                )
+            ],
+        )
 
     @override_settings(SOCIAL_AUTH_GITHUB_ORG_NAME='Zulip')
     def test_social_auth_github_organization_member_success(self) -> None:
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
-        with mock.patch('social_core.backends.github.GithubOrganizationOAuth2.user_data',
-                        return_value=account_data_dict):
-            result = self.social_auth_test(account_data_dict,
-                                           expect_choose_email_screen=False,
-                                           subdomain='zulip')
+        with mock.patch(
+            'social_core.backends.github.GithubOrganizationOAuth2.user_data',
+            return_value=account_data_dict,
+        ):
+            result = self.social_auth_test(
+                account_data_dict, expect_choose_email_screen=False, subdomain='zulip'
+            )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
         self.assertEqual(data['full_name'], self.name)
@@ -2529,22 +3013,22 @@ class GitHubAuthBackendTest(SocialAuthBase):
             self.assertTrue(github_auth_enabled())
 
     def test_github_oauth2_success_non_primary(self) -> None:
-        account_data_dict = self.get_account_data_dict(email='nonprimary@zulip.com', name="Non Primary")
+        account_data_dict = self.get_account_data_dict(
+            email='nonprimary@zulip.com', name="Non Primary"
+        )
         email_data = [
-            dict(email=account_data_dict["email"],
-                 verified=True),
-            dict(email='hamlet@zulip.com',
-                 verified=True,
-                 primary=True),
-            dict(email="aaron@zulip.com",
-                 verified=True),
-            dict(email="ignored@example.com",
-                 verified=False),
+            dict(email=account_data_dict["email"], verified=True),
+            dict(email='hamlet@zulip.com', verified=True, primary=True),
+            dict(email="aaron@zulip.com", verified=True),
+            dict(email="ignored@example.com", verified=False),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip', email_data=email_data,
-                                       expect_choose_email_screen=True,
-                                       next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            email_data=email_data,
+            expect_choose_email_screen=True,
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], 'nonprimary@zulip.com')
         self.assertEqual(data['full_name'], 'Non Primary')
@@ -2561,15 +3045,15 @@ class GitHubAuthBackendTest(SocialAuthBase):
         # should be used for user's signup/login.
         account_data_dict = self.get_account_data_dict(email='not-hamlet@zulip.com', name=self.name)
         email_data = [
-            dict(email='hamlet@zulip.com',
-                 verified=True,
-                 primary=True),
+            dict(email='hamlet@zulip.com', verified=True, primary=True),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip',
-                                       email_data=email_data,
-                                       expect_choose_email_screen=False,
-                                       next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            email_data=email_data,
+            expect_choose_email_screen=False,
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], self.example_email("hamlet"))
         self.assertEqual(data['full_name'], self.name)
@@ -2588,18 +3072,17 @@ class GitHubAuthBackendTest(SocialAuthBase):
         # register a new account, which they're not.
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         email_data = [
-            dict(email=account_data_dict["email"],
-                 verified=True),
-            dict(email="notprimary@zulip.com",
-                 verified=True),
-            dict(email="verifiedemail@zulip.com",
-                 verified=True),
+            dict(email=account_data_dict["email"], verified=True),
+            dict(email="notprimary@zulip.com", verified=True),
+            dict(email="verifiedemail@zulip.com", verified=True),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip',
-                                       email_data=email_data,
-                                       expect_choose_email_screen=False,
-                                       next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            email_data=email_data,
+            expect_choose_email_screen=False,
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], account_data_dict["email"])
         self.assertEqual(data['full_name'], self.name)
@@ -2617,20 +3100,18 @@ class GitHubAuthBackendTest(SocialAuthBase):
         hamlet = self.example_user("hamlet")
         account_data_dict = self.get_account_data_dict(email='hamlet@zulip.com', name="Hamlet")
         email_data = [
-            dict(email=account_data_dict["email"],
-                 verified=True),
-            dict(email='hamlet@zulip.com',
-                 verified=True,
-                 primary=True),
-            dict(email="aaron@zulip.com",
-                 verified=True),
-            dict(email="ignored@example.com",
-                 verified=False),
+            dict(email=account_data_dict["email"], verified=True),
+            dict(email='hamlet@zulip.com', verified=True, primary=True),
+            dict(email="aaron@zulip.com", verified=True),
+            dict(email="ignored@example.com", verified=False),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip', email_data=email_data,
-                                       expect_choose_email_screen=True,
-                                       next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            email_data=email_data,
+            expect_choose_email_screen=True,
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], 'hamlet@zulip.com')
         self.assertEqual(data['full_name'], hamlet.full_name)
@@ -2646,45 +3127,52 @@ class GitHubAuthBackendTest(SocialAuthBase):
         # none of which are associated with an existing account, the
         # choose email screen should be shown (which will lead to a
         # "continue to registration" choice).
-        account_data_dict = self.get_account_data_dict(email="not-hamlet@zulip.com", name="Not Hamlet")
+        account_data_dict = self.get_account_data_dict(
+            email="not-hamlet@zulip.com", name="Not Hamlet"
+        )
         email_data = [
-            dict(email=account_data_dict["email"],
-                 verified=True),
-            dict(email="notprimary@zulip.com",
-                 verified=True),
-            dict(email="verifiedemail@zulip.com",
-                 verified=True),
+            dict(email=account_data_dict["email"], verified=True),
+            dict(email="notprimary@zulip.com", verified=True),
+            dict(email="verifiedemail@zulip.com", verified=True),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip',
-                                       email_data=email_data,
-                                       expect_choose_email_screen=True)
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            email_data=email_data,
+            expect_choose_email_screen=True,
+        )
         email = account_data_dict['email']
         name = account_data_dict['name']
         subdomain = 'zulip'
         realm = get_realm("zulip")
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       expect_confirm_registration_page=True,
-                                       skip_registration_form=False)
+        self.stage_two_of_registration(
+            result,
+            realm,
+            subdomain,
+            email,
+            name,
+            name,
+            expect_confirm_registration_page=True,
+            skip_registration_form=False,
+        )
 
     def test_github_oauth2_signup_choose_existing_account(self) -> None:
         # In the sign up flow, if the user has chosen an email of an
         # existing account, the user will be logged in.
         account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
         email_data = [
-            dict(email=account_data_dict["email"],
-                 verified=True),
-            dict(email="notprimary@zulip.com",
-                 verified=True),
-            dict(email="verifiedemail@zulip.com",
-                 verified=True),
+            dict(email=account_data_dict["email"], verified=True),
+            dict(email="notprimary@zulip.com", verified=True),
+            dict(email="verifiedemail@zulip.com", verified=True),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       email_data=email_data,
-                                       is_signup=True,
-                                       subdomain='zulip',
-                                       expect_choose_email_screen=True,
-                                       next='/user_uploads/image')
+        result = self.social_auth_test(
+            account_data_dict,
+            email_data=email_data,
+            is_signup=True,
+            subdomain='zulip',
+            expect_choose_email_screen=True,
+            next='/user_uploads/image',
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], account_data_dict["email"])
         self.assertEqual(data['full_name'], account_data_dict["name"])
@@ -2707,19 +3195,20 @@ class GitHubAuthBackendTest(SocialAuthBase):
         realm = get_realm("zulip")
         account_data_dict = self.get_account_data_dict(email=email, name=name)
         email_data = [
-            dict(email="hamlet@zulip.com",
-                 verified=True),
-            dict(email=email,
-                 verified=True),
-            dict(email="verifiedemail@zulip.com",
-                 verified=True),
+            dict(email="hamlet@zulip.com", verified=True),
+            dict(email=email, verified=True),
+            dict(email="verifiedemail@zulip.com", verified=True),
         ]
-        result = self.social_auth_test(account_data_dict,
-                                       email_data = email_data,
-                                       expect_choose_email_screen=True,
-                                       subdomain=subdomain, is_signup=True)
-        self.stage_two_of_registration(result, realm, subdomain, email, name, name,
-                                       self.BACKEND_CLASS.full_name_validated)
+        result = self.social_auth_test(
+            account_data_dict,
+            email_data=email_data,
+            expect_choose_email_screen=True,
+            subdomain=subdomain,
+            is_signup=True,
+        )
+        self.stage_two_of_registration(
+            result, realm, subdomain, email, name, name, self.BACKEND_CLASS.full_name_validated
+        )
 
     def test_github_oauth2_email_no_reply_dot_github_dot_com(self) -> None:
         # As emails ending with `noreply.github.com` are excluded from
@@ -2728,38 +3217,42 @@ class GitHubAuthBackendTest(SocialAuthBase):
         noreply_email = "hamlet@users.noreply.github.com"
         account_data_dict = self.get_account_data_dict(email=noreply_email, name=self.name)
         email_data = [
-            dict(email="notprimary@zulip.com",
-                 verified=True),
-            dict(email="hamlet@zulip.com",
-                 verified=True,
-                 primary=True),
-            dict(email="aaron@zulip.com",
-                 verified=True),
-            dict(email=account_data_dict["email"],
-                 verified=True),
+            dict(email="notprimary@zulip.com", verified=True),
+            dict(email="hamlet@zulip.com", verified=True, primary=True),
+            dict(email="aaron@zulip.com", verified=True),
+            dict(email=account_data_dict["email"], verified=True),
         ]
         with self.assertLogs(self.logger_string, level='WARNING') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip',
-                                           expect_choose_email_screen=True,
-                                           email_data=email_data)
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=True,
+                email_data=email_data,
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(m.output, [self.logger_output(
-            "Social auth (GitHub) failed because user has no verified"
-            " emails associated with the account",
-            "warning",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "Social auth (GitHub) failed because user has no verified"
+                    " emails associated with the account",
+                    "warning",
+                )
+            ],
+        )
 
         # Now we create the user account with the noreply email and verify that it's
         # possible to sign in to it.
         realm = get_realm("zulip")
         do_create_user(noreply_email, 'password', realm, account_data_dict["name"])
-        result = self.social_auth_test(account_data_dict,
-                                       subdomain='zulip',
-                                       expect_choose_email_screen=True,
-                                       expect_noreply_email_allowed=True,
-                                       email_data=email_data)
+        result = self.social_auth_test(
+            account_data_dict,
+            subdomain='zulip',
+            expect_choose_email_screen=True,
+            expect_noreply_email_allowed=True,
+            email_data=email_data,
+        )
         data = load_subdomain_token(result)
         self.assertEqual(data['email'], account_data_dict["email"])
         self.assertEqual(data['full_name'], account_data_dict["name"])
@@ -2770,28 +3263,33 @@ class GitHubAuthBackendTest(SocialAuthBase):
         self.assertTrue(uri.startswith('http://zulip.testserver/accounts/login/subdomain/'))
 
     def test_github_oauth2_email_not_associated(self) -> None:
-        account_data_dict = self.get_account_data_dict(email='not-associated@zulip.com', name=self.name)
+        account_data_dict = self.get_account_data_dict(
+            email='not-associated@zulip.com', name=self.name
+        )
         email_data = [
-            dict(email='nonprimary@zulip.com',
-                 verified=True),
-            dict(email='hamlet@zulip.com',
-                 verified=True,
-                 primary=True),
-            dict(email="aaron@zulip.com",
-                 verified=True),
+            dict(email='nonprimary@zulip.com', verified=True),
+            dict(email='hamlet@zulip.com', verified=True, primary=True),
+            dict(email="aaron@zulip.com", verified=True),
         ]
         with self.assertLogs(self.logger_string, level='WARNING') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip',
-                                           expect_choose_email_screen=True,
-                                           email_data=email_data)
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=True,
+                email_data=email_data,
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(m.output, [self.logger_output(
-            "Social auth (GitHub) failed because user has no verified"
-            " emails associated with the account",
-            "warning",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "Social auth (GitHub) failed because user has no verified"
+                    " emails associated with the account",
+                    "warning",
+                )
+            ],
+        )
 
     def test_github_unverified_email_with_existing_account(self) -> None:
         # check if a user is denied to log in if the user manages to
@@ -2799,25 +3297,31 @@ class GitHubAuthBackendTest(SocialAuthBase):
         # organisation through `email` GET parameter.
         account_data_dict = self.get_account_data_dict(email='hamlet@zulip.com', name=self.name)
         email_data = [
-            dict(email='iago@zulip.com',
-                 verified=True),
-            dict(email='hamlet@zulip.com',
-                 verified=False),
-            dict(email="aaron@zulip.com",
-                 verified=True,
-                 primary=True),
+            dict(email='iago@zulip.com', verified=True),
+            dict(email='hamlet@zulip.com', verified=False),
+            dict(email="aaron@zulip.com", verified=True, primary=True),
         ]
         with self.assertLogs(self.logger_string, level='WARNING') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip',
-                                           expect_choose_email_screen=True,
-                                           email_data=email_data)
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=True,
+                email_data=email_data,
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(m.output, [self.logger_output(
-            "Social auth ({}) failed because user has no verified emails associated with the account".format("GitHub"),
-            "warning",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "Social auth ({}) failed because user has no verified emails associated with the account".format(
+                        "GitHub"
+                    ),
+                    "warning",
+                )
+            ],
+        )
+
 
 class GitLabAuthBackendTest(SocialAuthBase):
     __unittest_skip__ = False
@@ -2840,6 +3344,7 @@ class GitLabAuthBackendTest(SocialAuthBase):
     def get_account_data_dict(self, email: str, name: str) -> Dict[str, Any]:
         return dict(email=email, name=name, email_verified=True)
 
+
 class GoogleAuthBackendTest(SocialAuthBase):
     __unittest_skip__ = False
 
@@ -2860,24 +3365,33 @@ class GoogleAuthBackendTest(SocialAuthBase):
     def test_social_auth_email_not_verified(self) -> None:
         account_data_dict = dict(email=self.email, name=self.name)
         with self.assertLogs(self.logger_string, level='WARNING') as m:
-            result = self.social_auth_test(account_data_dict,
-                                           subdomain='zulip')
+            result = self.social_auth_test(account_data_dict, subdomain='zulip')
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "/login/")
-        self.assertEqual(m.output, [self.logger_output(
-            "Social auth ({}) failed because user has no verified emails".format("Google"),
-            "warning",
-        )])
+        self.assertEqual(
+            m.output,
+            [
+                self.logger_output(
+                    "Social auth ({}) failed because user has no verified emails".format("Google"),
+                    "warning",
+                )
+            ],
+        )
 
     def test_social_auth_mobile_realm_uri(self) -> None:
         mobile_flow_otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=self.email, name='Full Name')
 
-        with self.settings(REALM_MOBILE_REMAP_URIS={'http://zulip.testserver': 'http://zulip-mobile.testserver'}):
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           expect_choose_email_screen=True,
-                                           alternative_start_url="/accounts/login/google/",
-                                           mobile_flow_otp=mobile_flow_otp)
+        with self.settings(
+            REALM_MOBILE_REMAP_URIS={'http://zulip.testserver': 'http://zulip-mobile.testserver'}
+        ):
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=True,
+                alternative_start_url="/accounts/login/google/",
+                mobile_flow_otp=mobile_flow_otp,
+            )
 
         self.assertEqual(result.status_code, 302)
         redirect_url = result['Location']
@@ -2894,25 +3408,36 @@ class GoogleAuthBackendTest(SocialAuthBase):
         mobile_flow_otp = '1234abcd' * 8
         account_data_dict = self.get_account_data_dict(email=self.email, name='Full Name')
         self.assertEqual(len(mail.outbox), 0)
-        self.user_profile.date_joined = timezone_now() - datetime.timedelta(seconds=JUST_CREATED_THRESHOLD + 1)
+        self.user_profile.date_joined = timezone_now() - datetime.timedelta(
+            seconds=JUST_CREATED_THRESHOLD + 1
+        )
         self.user_profile.save()
 
         with self.settings(SEND_LOGIN_EMAILS=True):
             # Verify that the right thing happens with an invalid-format OTP
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           alternative_start_url="/accounts/login/google/",
-                                           mobile_flow_otp="1234")
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                alternative_start_url="/accounts/login/google/",
+                mobile_flow_otp="1234",
+            )
             self.assert_json_error(result, "Invalid OTP")
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           alternative_start_url="/accounts/login/google/",
-                                           mobile_flow_otp="invalido" * 8)
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                alternative_start_url="/accounts/login/google/",
+                mobile_flow_otp="invalido" * 8,
+            )
             self.assert_json_error(result, "Invalid OTP")
 
             # Now do it correctly
-            result = self.social_auth_test(account_data_dict, subdomain='zulip',
-                                           expect_choose_email_screen=True,
-                                           alternative_start_url="/accounts/login/google/",
-                                           mobile_flow_otp=mobile_flow_otp)
+            result = self.social_auth_test(
+                account_data_dict,
+                subdomain='zulip',
+                expect_choose_email_screen=True,
+                alternative_start_url="/accounts/login/google/",
+                mobile_flow_otp=mobile_flow_otp,
+            )
         self.assertEqual(result.status_code, 302)
         redirect_url = result['Location']
         parsed_url = urllib.parse.urlparse(redirect_url)
@@ -2930,8 +3455,13 @@ class GoogleAuthBackendTest(SocialAuthBase):
         with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.GoogleAuthBackend',)):
             self.assertTrue(google_auth_enabled())
 
-    def get_log_into_subdomain(self, data: ExternalAuthDataDict, *, subdomain: str='zulip',
-                               force_token: Optional[str]=None) -> HttpResponse:
+    def get_log_into_subdomain(
+        self,
+        data: ExternalAuthDataDict,
+        *,
+        subdomain: str = 'zulip',
+        force_token: Optional[str] = None,
+    ) -> HttpResponse:
         if force_token is None:
             token = ExternalAuthResult(data_dict=data).store_data()
         else:
@@ -2940,7 +3470,7 @@ class GoogleAuthBackendTest(SocialAuthBase):
         return self.client_get(url_path, subdomain=subdomain)
 
     def test_redirect_to_next_url_for_log_into_subdomain(self) -> None:
-        def test_redirect_to_next_url(next: str='') -> HttpResponse:
+        def test_redirect_to_next_url(next: str = '') -> HttpResponse:
             data: ExternalAuthDataDict = {
                 'full_name': 'Hamlet',
                 'email': self.example_email("hamlet"),
@@ -2949,9 +3479,7 @@ class GoogleAuthBackendTest(SocialAuthBase):
                 'redirect_to': next,
             }
             user_profile = self.example_user('hamlet')
-            with mock.patch(
-                    'zerver.views.auth.authenticate',
-                    return_value=user_profile):
+            with mock.patch('zerver.views.auth.authenticate', return_value=user_profile):
                 with mock.patch('zerver.views.auth.do_login'):
                     result = self.get_log_into_subdomain(data)
             return result
@@ -2977,7 +3505,10 @@ class GoogleAuthBackendTest(SocialAuthBase):
         }
         with self.assertLogs(level='WARNING') as m:
             result = self.get_log_into_subdomain(data, force_token='nonsense')
-        self.assertEqual(m.output, ["WARNING:root:log_into_subdomain: Malformed token given: {}".format("nonsense")])
+        self.assertEqual(
+            m.output,
+            ["WARNING:root:log_into_subdomain: Malformed token given: {}".format("nonsense")],
+        )
         self.assertEqual(result.status_code, 400)
 
     def test_log_into_subdomain_when_token_not_found(self) -> None:
@@ -2993,7 +3524,9 @@ class GoogleAuthBackendTest(SocialAuthBase):
             result = self.get_log_into_subdomain(data, force_token=token)
         self.assertEqual(result.status_code, 400)
         self.assert_in_response("Invalid or expired login session.", result)
-        self.assertEqual(m.output, ["WARNING:root:log_into_subdomain: Invalid token given: {}".format(token)])
+        self.assertEqual(
+            m.output, ["WARNING:root:log_into_subdomain: Invalid token given: {}".format(token)]
+        )
 
     def test_prevent_duplicate_signups(self) -> None:
         existing_user = self.example_user('hamlet')
@@ -3029,9 +3562,11 @@ class GoogleAuthBackendTest(SocialAuthBase):
         self.assertIn('do_confirm/' + confirmation_key, result.url)
         result = self.client_get(result.url)
         self.assert_in_response('action="/accounts/register/"', result)
-        confirmation_data = {"from_confirmation": "1",
-                             "full_name": data['full_name'],
-                             "key": confirmation_key}
+        confirmation_data = {
+            "from_confirmation": "1",
+            "full_name": data['full_name'],
+            "key": confirmation_key,
+        }
         result = self.client_post('/accounts/register/', confirmation_data, subdomain="zulip")
         self.assert_in_response("We just need you to do one last thing", result)
 
@@ -3053,15 +3588,20 @@ class GoogleAuthBackendTest(SocialAuthBase):
         self.assert_in_response('new@zulip.com.', result)
         self.assert_in_response('action="http://zulip.testserver/accounts/do_confirm/', result)
 
-        url = re.findall('action="(http://zulip.testserver/accounts/do_confirm[^"]*)"', result.content.decode('utf-8'))[0]
+        url = re.findall(
+            'action="(http://zulip.testserver/accounts/do_confirm[^"]*)"',
+            result.content.decode('utf-8'),
+        )[0]
         confirmation = Confirmation.objects.all().first()
         confirmation_key = confirmation.confirmation_key
         self.assertIn('do_confirm/' + confirmation_key, url)
         result = self.client_get(url)
         self.assert_in_response('action="/accounts/register/"', result)
-        confirmation_data = {"from_confirmation": "1",
-                             "full_name": data['full_name'],
-                             "key": confirmation_key}
+        confirmation_data = {
+            "from_confirmation": "1",
+            "full_name": data['full_name'],
+            "key": confirmation_key,
+        }
         result = self.client_post('/accounts/register/', confirmation_data, subdomain="zulip")
         self.assert_in_response("We just need you to do one last thing", result)
 
@@ -3110,9 +3650,7 @@ class GoogleAuthBackendTest(SocialAuthBase):
         self.assertIn('do_confirm/' + confirmation_key, result.url)
         result = self.client_get(result.url)
         self.assert_in_response('action="/accounts/register/"', result)
-        data2 = {"from_confirmation": "1",
-                 "full_name": data['full_name'],
-                 "key": confirmation_key}
+        data2 = {"from_confirmation": "1", "full_name": data['full_name'], "key": confirmation_key}
         result = self.client_post('/accounts/register/', data2, subdomain="zulip")
         self.assert_in_response("We just need you to do one last thing", result)
 
@@ -3123,9 +3661,8 @@ class GoogleAuthBackendTest(SocialAuthBase):
         # Click confirm registration button.
         result = self.client_post(
             '/accounts/register/',
-            {'full_name': 'New User Name',
-             'key': confirmation_key,
-             'terms': True})
+            {'full_name': 'New User Name', 'key': confirmation_key, 'terms': True},
+        )
         self.assertEqual(result.status_code, 302)
         new_user = get_user_by_delivery_email('new@zulip.com', realm)
         new_streams = self.get_streams(new_user)
@@ -3142,7 +3679,9 @@ class GoogleAuthBackendTest(SocialAuthBase):
             token = secrets.token_hex(ExternalAuthResult.LOGIN_TOKEN_LENGTH // 2)
             result = self.get_log_into_subdomain(data, force_token=token)
             self.assertEqual(result.status_code, 400)
-        self.assertEqual(m.output, ["WARNING:root:log_into_subdomain: Invalid token given: {}".format(token)])
+        self.assertEqual(
+            m.output, ["WARNING:root:log_into_subdomain: Invalid token given: {}".format(token)]
+        )
 
     def test_user_cannot_log_into_wrong_subdomain(self) -> None:
         data: ExternalAuthDataDict = {
@@ -3153,26 +3692,29 @@ class GoogleAuthBackendTest(SocialAuthBase):
         result = self.get_log_into_subdomain(data)
         self.assert_json_error(result, "Invalid subdomain")
 
+
 class JSONFetchAPIKeyTest(ZulipTestCase):
     def test_success(self) -> None:
         user = self.example_user('hamlet')
         self.login_user(user)
-        result = self.client_post("/json/fetch_api_key",
-                                  dict(password=initial_password(user.delivery_email)))
+        result = self.client_post(
+            "/json/fetch_api_key", dict(password=initial_password(user.delivery_email))
+        )
         self.assert_json_success(result)
 
     def test_not_loggedin(self) -> None:
         user = self.example_user('hamlet')
-        result = self.client_post("/json/fetch_api_key",
-                                  dict(password=initial_password(user.delivery_email)))
-        self.assert_json_error(result,
-                               "Not logged in: API authentication or user session required", 401)
+        result = self.client_post(
+            "/json/fetch_api_key", dict(password=initial_password(user.delivery_email))
+        )
+        self.assert_json_error(
+            result, "Not logged in: API authentication or user session required", 401
+        )
 
     def test_wrong_password(self) -> None:
         user = self.example_user('hamlet')
         self.login_user(user)
-        result = self.client_post("/json/fetch_api_key",
-                                  dict(password="wrong"))
+        result = self.client_post("/json/fetch_api_key", dict(password="wrong"))
         self.assert_json_error(result, "Your username or password is incorrect.", 400)
 
     def test_invalid_subdomain(self) -> None:
@@ -3180,11 +3722,13 @@ class JSONFetchAPIKeyTest(ZulipTestCase):
         user = self.example_user(username)
         self.login_user(user)
         with mock.patch("zerver.views.auth.get_realm_from_request", return_value=None):
-            result = self.client_post("/json/fetch_api_key",
-                                      dict(username=username,
-                                           password=initial_password(user.delivery_email)))
+            result = self.client_post(
+                "/json/fetch_api_key",
+                dict(username=username, password=initial_password(user.delivery_email)),
+            )
         self.assert_json_error(result, "Invalid subdomain", 400)
 
+
 class FetchAPIKeyTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -3192,60 +3736,67 @@ class FetchAPIKeyTest(ZulipTestCase):
         self.email = self.user_profile.delivery_email
 
     def test_success(self) -> None:
-        result = self.client_post("/api/v1/fetch_api_key",
-                                  dict(username=self.email,
-                                       password=initial_password(self.email)))
+        result = self.client_post(
+            "/api/v1/fetch_api_key",
+            dict(username=self.email, password=initial_password(self.email)),
+        )
         self.assert_json_success(result)
 
     def test_invalid_email(self) -> None:
-        result = self.client_post("/api/v1/fetch_api_key",
-                                  dict(username='hamlet',
-                                       password=initial_password(self.email)))
+        result = self.client_post(
+            "/api/v1/fetch_api_key", dict(username='hamlet', password=initial_password(self.email))
+        )
         self.assert_json_error(result, "Enter a valid email address.", 400)
 
     def test_wrong_password(self) -> None:
-        result = self.client_post("/api/v1/fetch_api_key",
-                                  dict(username=self.email,
-                                       password="wrong"))
+        result = self.client_post(
+            "/api/v1/fetch_api_key", dict(username=self.email, password="wrong")
+        )
         self.assert_json_error(result, "Your username or password is incorrect.", 403)
 
     def test_invalid_subdomain(self) -> None:
         with mock.patch("zerver.views.auth.get_realm_from_request", return_value=None):
-            result = self.client_post("/api/v1/fetch_api_key",
-                                      dict(username='hamlet',
-                                           password=initial_password(self.email)))
+            result = self.client_post(
+                "/api/v1/fetch_api_key",
+                dict(username='hamlet', password=initial_password(self.email)),
+            )
         self.assert_json_error(result, "Invalid subdomain", 400)
 
     def test_password_auth_disabled(self) -> None:
         with mock.patch('zproject.backends.password_auth_enabled', return_value=False):
-            result = self.client_post("/api/v1/fetch_api_key",
-                                      dict(username=self.email,
-                                           password=initial_password(self.email)))
+            result = self.client_post(
+                "/api/v1/fetch_api_key",
+                dict(username=self.email, password=initial_password(self.email)),
+            )
             self.assert_json_error_contains(result, "Password auth is disabled", 403)
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_ldap_auth_email_auth_disabled_success(self) -> None:
         self.init_default_ldap_database()
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            result = self.client_post("/api/v1/fetch_api_key",
-                                      dict(username=self.example_email('hamlet'),
-                                           password=self.ldap_password('hamlet')))
+            result = self.client_post(
+                "/api/v1/fetch_api_key",
+                dict(username=self.example_email('hamlet'), password=self.ldap_password('hamlet')),
+            )
         self.assert_json_success(result)
 
     def test_inactive_user(self) -> None:
         do_deactivate_user(self.user_profile)
-        result = self.client_post("/api/v1/fetch_api_key",
-                                  dict(username=self.email,
-                                       password=initial_password(self.email)))
+        result = self.client_post(
+            "/api/v1/fetch_api_key",
+            dict(username=self.email, password=initial_password(self.email)),
+        )
         self.assert_json_error_contains(result, "Your account has been disabled", 403)
 
     def test_deactivated_realm(self) -> None:
         do_deactivate_realm(self.user_profile.realm)
-        result = self.client_post("/api/v1/fetch_api_key",
-                                  dict(username=self.email,
-                                       password=initial_password(self.email)))
+        result = self.client_post(
+            "/api/v1/fetch_api_key",
+            dict(username=self.email, password=initial_password(self.email)),
+        )
         self.assert_json_error_contains(result, "This organization has been deactivated", 403)
 
+
 class DevFetchAPIKeyTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -3253,8 +3804,7 @@ class DevFetchAPIKeyTest(ZulipTestCase):
         self.email = self.user_profile.delivery_email
 
     def test_success(self) -> None:
-        result = self.client_post("/api/v1/dev_fetch_api_key",
-                                  dict(username=self.email))
+        result = self.client_post("/api/v1/dev_fetch_api_key", dict(username=self.email))
         self.assert_json_success(result)
         data = result.json()
         self.assertEqual(data["email"], self.email)
@@ -3263,41 +3813,38 @@ class DevFetchAPIKeyTest(ZulipTestCase):
 
     def test_invalid_email(self) -> None:
         email = 'hamlet'
-        result = self.client_post("/api/v1/dev_fetch_api_key",
-                                  dict(username=email))
+        result = self.client_post("/api/v1/dev_fetch_api_key", dict(username=email))
         self.assert_json_error_contains(result, "Enter a valid email address.", 400)
 
     def test_unregistered_user(self) -> None:
         email = 'foo@zulip.com'
-        result = self.client_post("/api/v1/dev_fetch_api_key",
-                                  dict(username=email))
+        result = self.client_post("/api/v1/dev_fetch_api_key", dict(username=email))
         self.assert_json_error_contains(result, "This user is not registered.", 403)
 
     def test_inactive_user(self) -> None:
         do_deactivate_user(self.user_profile)
-        result = self.client_post("/api/v1/dev_fetch_api_key",
-                                  dict(username=self.email))
+        result = self.client_post("/api/v1/dev_fetch_api_key", dict(username=self.email))
         self.assert_json_error_contains(result, "Your account has been disabled", 403)
 
     def test_deactivated_realm(self) -> None:
         do_deactivate_realm(self.user_profile.realm)
-        result = self.client_post("/api/v1/dev_fetch_api_key",
-                                  dict(username=self.email))
+        result = self.client_post("/api/v1/dev_fetch_api_key", dict(username=self.email))
         self.assert_json_error_contains(result, "This organization has been deactivated", 403)
 
     def test_dev_auth_disabled(self) -> None:
         with mock.patch('zerver.views.auth.dev_auth_enabled', return_value=False):
-            result = self.client_post("/api/v1/dev_fetch_api_key",
-                                      dict(username=self.email))
+            result = self.client_post("/api/v1/dev_fetch_api_key", dict(username=self.email))
             self.assert_json_error_contains(result, "DevAuthBackend not enabled.", 400)
 
     def test_invalid_subdomain(self) -> None:
         with mock.patch("zerver.views.auth.get_realm_from_request", return_value=None):
-            result = self.client_post("/api/v1/dev_fetch_api_key",
-                                      dict(username=self.email,
-                                           password=initial_password(self.email)))
+            result = self.client_post(
+                "/api/v1/dev_fetch_api_key",
+                dict(username=self.email, password=initial_password(self.email)),
+            )
             self.assert_json_error_contains(result, "Invalid subdomain", 400)
 
+
 class DevGetEmailsTest(ZulipTestCase):
     def test_success(self) -> None:
         result = self.client_get("/api/v1/dev_list_users")
@@ -3314,37 +3861,50 @@ class DevGetEmailsTest(ZulipTestCase):
             result = self.client_get("/api/v1/dev_list_users")
             self.assert_json_error_contains(result, "Endpoint not available in production.", 400)
 
+
 class ExternalMethodDictsTests(ZulipTestCase):
     def get_configured_saml_backend_idp_names(self) -> List[str]:
         return settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.keys()
 
     def test_get_external_method_dicts_correctly_sorted(self) -> None:
         with self.settings(
-            AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                     'zproject.backends.GitHubAuthBackend',
-                                     'zproject.backends.GoogleAuthBackend',
-                                     'zproject.backends.ZulipRemoteUserBackend',
-                                     'zproject.backends.SAMLAuthBackend',
-                                     'zproject.backends.AzureADAuthBackend'),
+            AUTHENTICATION_BACKENDS=(
+                'zproject.backends.EmailAuthBackend',
+                'zproject.backends.GitHubAuthBackend',
+                'zproject.backends.GoogleAuthBackend',
+                'zproject.backends.ZulipRemoteUserBackend',
+                'zproject.backends.SAMLAuthBackend',
+                'zproject.backends.AzureADAuthBackend',
+            ),
         ):
             external_auth_methods = get_external_method_dicts()
             # First backends in the list should be SAML:
             self.assertIn('saml:', external_auth_methods[0]['name'])
             self.assertEqual(
                 [social_backend['name'] for social_backend in external_auth_methods[1:]],
-                [social_backend.name for social_backend in sorted(
-                    [ZulipRemoteUserBackend, GitHubAuthBackend, AzureADAuthBackend, GoogleAuthBackend],
-                    key=lambda x: x.sort_order,
-                    reverse=True,
-                )],
+                [
+                    social_backend.name
+                    for social_backend in sorted(
+                        [
+                            ZulipRemoteUserBackend,
+                            GitHubAuthBackend,
+                            AzureADAuthBackend,
+                            GoogleAuthBackend,
+                        ],
+                        key=lambda x: x.sort_order,
+                        reverse=True,
+                    )
+                ],
             )
 
     def test_get_external_method_buttons(self) -> None:
         with self.settings(
-            AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                     'zproject.backends.GitHubAuthBackend',
-                                     'zproject.backends.GoogleAuthBackend',
-                                     'zproject.backends.SAMLAuthBackend'),
+            AUTHENTICATION_BACKENDS=(
+                'zproject.backends.EmailAuthBackend',
+                'zproject.backends.GitHubAuthBackend',
+                'zproject.backends.GoogleAuthBackend',
+                'zproject.backends.SAMLAuthBackend',
+            ),
         ):
             saml_idp_names = self.get_configured_saml_backend_idp_names()
             expected_button_id_strings = [
@@ -3355,12 +3915,14 @@ class ExternalMethodDictsTests(ZulipTestCase):
                 expected_button_id_strings.append(f'id="{{}}_auth_button_saml:{name}"')
 
             result = self.client_get("/login/")
-            self.assert_in_success_response([string.format("login") for string in expected_button_id_strings],
-                                            result)
+            self.assert_in_success_response(
+                [string.format("login") for string in expected_button_id_strings], result
+            )
 
             result = self.client_get("/register/")
-            self.assert_in_success_response([string.format("register") for string in expected_button_id_strings],
-                                            result)
+            self.assert_in_success_response(
+                [string.format("register") for string in expected_button_id_strings], result
+            )
 
     def test_get_external_method_dicts_multiple_saml_idps(self) -> None:
         idps_dict = copy.deepcopy(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS)
@@ -3371,32 +3933,43 @@ class ExternalMethodDictsTests(ZulipTestCase):
         idps_dict['test_idp2']['limit_to_subdomains'] = ['zephyr']
         with self.settings(
             SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict,
-            AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                     'zproject.backends.GitHubAuthBackend',
-                                     'zproject.backends.SAMLAuthBackend'),
+            AUTHENTICATION_BACKENDS=(
+                'zproject.backends.EmailAuthBackend',
+                'zproject.backends.GitHubAuthBackend',
+                'zproject.backends.SAMLAuthBackend',
+            ),
         ):
             # Calling get_external_method_dicts without a realm returns all methods configured on the server:
             external_auth_methods = get_external_method_dicts()
             # 1 IdP enabled for all realms + a dict for GitHub auth
             self.assert_length(external_auth_methods, 2)
-            self.assertEqual([external_auth_methods[0]['name'], external_auth_methods[1]['name']],
-                             ['saml:test_idp', 'github'])
+            self.assertEqual(
+                [external_auth_methods[0]['name'], external_auth_methods[1]['name']],
+                ['saml:test_idp', 'github'],
+            )
 
             external_auth_methods = get_external_method_dicts(get_realm("zulip"))
             # Only test_idp enabled for the zulip realm, + GitHub auth.
             self.assert_length(external_auth_methods, 2)
-            self.assertEqual([external_auth_methods[0]['name'], external_auth_methods[1]['name']],
-                             ['saml:test_idp', 'github'])
+            self.assertEqual(
+                [external_auth_methods[0]['name'], external_auth_methods[1]['name']],
+                ['saml:test_idp', 'github'],
+            )
 
             external_auth_methods = get_external_method_dicts(get_realm("zephyr"))
             # Both idps enabled for the zephyr realm, + GitHub auth.
             self.assert_length(external_auth_methods, 3)
-            self.assertEqual({external_auth_methods[0]['name'], external_auth_methods[1]['name']},
-                             {'saml:test_idp', 'saml:test_idp2'})
+            self.assertEqual(
+                {external_auth_methods[0]['name'], external_auth_methods[1]['name']},
+                {'saml:test_idp', 'saml:test_idp2'},
+            )
+
 
 class FetchAuthBackends(ZulipTestCase):
     def test_get_server_settings(self) -> None:
-        def check_result(result: HttpResponse, extra_fields: Sequence[Tuple[str, Validator[object]]] = []) -> None:
+        def check_result(
+            result: HttpResponse, extra_fields: Sequence[Tuple[str, Validator[object]]] = []
+        ) -> None:
             authentication_methods_list = [
                 ('password', check_bool),
             ]
@@ -3405,36 +3978,47 @@ class FetchAuthBackends(ZulipTestCase):
             external_auth_methods = get_external_method_dicts()
 
             self.assert_json_success(result)
-            checker = check_dict_only([
-                ('authentication_methods', check_dict_only(authentication_methods_list)),
-                ('external_authentication_methods', check_list(
-                    check_dict_only([
-                        ('display_icon', check_none_or(check_string)),
-                        ('display_name', check_string),
-                        ('login_url', check_string),
-                        ('name', check_string),
-                        ('signup_url', check_string),
-                    ]),
-                    length=len(external_auth_methods)
-                )),
-                ('email_auth_enabled', check_bool),
-                ('is_incompatible', check_bool),
-                ('require_email_format_usernames', check_bool),
-                ('realm_uri', check_string),
-                ('zulip_version', check_string),
-                ('zulip_feature_level', check_int),
-                ('push_notifications_enabled', check_bool),
-                ('msg', check_string),
-                ('result', check_string),
-                *extra_fields,
-            ])
+            checker = check_dict_only(
+                [
+                    ('authentication_methods', check_dict_only(authentication_methods_list)),
+                    (
+                        'external_authentication_methods',
+                        check_list(
+                            check_dict_only(
+                                [
+                                    ('display_icon', check_none_or(check_string)),
+                                    ('display_name', check_string),
+                                    ('login_url', check_string),
+                                    ('name', check_string),
+                                    ('signup_url', check_string),
+                                ]
+                            ),
+                            length=len(external_auth_methods),
+                        ),
+                    ),
+                    ('email_auth_enabled', check_bool),
+                    ('is_incompatible', check_bool),
+                    ('require_email_format_usernames', check_bool),
+                    ('realm_uri', check_string),
+                    ('zulip_version', check_string),
+                    ('zulip_feature_level', check_int),
+                    ('push_notifications_enabled', check_bool),
+                    ('msg', check_string),
+                    ('result', check_string),
+                    *extra_fields,
+                ]
+            )
             checker("data", result.json())
 
         result = self.client_get("/api/v1/server_settings", subdomain="", HTTP_USER_AGENT="")
         check_result(result)
-        self.assertEqual(result.json()['external_authentication_methods'], get_external_method_dicts())
+        self.assertEqual(
+            result.json()['external_authentication_methods'], get_external_method_dicts()
+        )
 
-        result = self.client_get("/api/v1/server_settings", subdomain="", HTTP_USER_AGENT="ZulipInvalid")
+        result = self.client_get(
+            "/api/v1/server_settings", subdomain="", HTTP_USER_AGENT="ZulipInvalid"
+        )
         self.assertTrue(result.json()["is_incompatible"])
 
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=False):
@@ -3442,24 +4026,28 @@ class FetchAuthBackends(ZulipTestCase):
         check_result(result)
 
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=False):
-            result = self.client_get("/api/v1/server_settings", subdomain="zulip", HTTP_USER_AGENT="")
-        check_result(result, [
-            ('realm_name', check_string),
-            ('realm_description', check_string),
-            ('realm_icon', check_string),
-        ])
+            result = self.client_get(
+                "/api/v1/server_settings", subdomain="zulip", HTTP_USER_AGENT=""
+            )
+        check_result(
+            result,
+            [
+                ('realm_name', check_string),
+                ('realm_description', check_string),
+                ('realm_icon', check_string),
+            ],
+        )
 
         # Verify invalid subdomain
-        result = self.client_get("/api/v1/server_settings",
-                                 subdomain="invalid")
+        result = self.client_get("/api/v1/server_settings", subdomain="invalid")
         self.assert_json_error_contains(result, "Invalid subdomain", 400)
 
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
             # With ROOT_DOMAIN_LANDING_PAGE, homepage fails
-            result = self.client_get("/api/v1/server_settings",
-                                     subdomain="")
+            result = self.client_get("/api/v1/server_settings", subdomain="")
             self.assert_json_error_contains(result, "Subdomain required", 400)
 
+
 class TestTwoFactor(ZulipTestCase):
     def test_direct_dev_login_with_2fa(self) -> None:
         email = self.example_email('hamlet')
@@ -3501,26 +4089,31 @@ class TestTwoFactor(ZulipTestCase):
         self.init_default_ldap_database()
         ldap_user_attr_map = {'full_name': 'cn'}
         with self.settings(
-                AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
-                TWO_FACTOR_CALL_GATEWAY='two_factor.gateways.fake.Fake',
-                TWO_FACTOR_SMS_GATEWAY='two_factor.gateways.fake.Fake',
-                TWO_FACTOR_AUTHENTICATION_ENABLED=True,
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
+            TWO_FACTOR_CALL_GATEWAY='two_factor.gateways.fake.Fake',
+            TWO_FACTOR_SMS_GATEWAY='two_factor.gateways.fake.Fake',
+            TWO_FACTOR_AUTHENTICATION_ENABLED=True,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
-            first_step_data = {"username": email,
-                               "password": password,
-                               "two_factor_login_view-current_step": "auth"}
+            first_step_data = {
+                "username": email,
+                "password": password,
+                "two_factor_login_view-current_step": "auth",
+            }
             with self.assertLogs('two_factor.gateways.fake', 'INFO') as info_log:
                 result = self.client_post("/accounts/login/", first_step_data)
             self.assertEqual(result.status_code, 200)
-            self.assertEqual(info_log.output, [
-                'INFO:two_factor.gateways.fake:Fake SMS to +12125550100: "Your token is: 123456"'
-            ])
+            self.assertEqual(
+                info_log.output,
+                ['INFO:two_factor.gateways.fake:Fake SMS to +12125550100: "Your token is: 123456"'],
+            )
 
-            second_step_data = {"token-otp_token": str(token),
-                                "two_factor_login_view-current_step": "token"}
+            second_step_data = {
+                "token-otp_token": str(token),
+                "two_factor_login_view-current_step": "token",
+            }
             result = self.client_post("/accounts/login/", second_step_data)
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result['Location'], 'http://zulip.testserver')
@@ -3531,6 +4124,7 @@ class TestTwoFactor(ZulipTestCase):
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result['Location'], 'http://zulip.testserver')
 
+
 class TestDevAuthBackend(ZulipTestCase):
     def test_login_success(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -3595,8 +4189,7 @@ class TestDevAuthBackend(ZulipTestCase):
         self.assert_in_success_response(["iago@zulip.com", "hamlet@zulip.com"], result)
         self.assert_in_success_response(["starnine@mit.edu", "espuser@mit.edu"], result)
 
-        result = self.client_post('/devlogin/', {'new_realm': 'all_realms'},
-                                  subdomain="zephyr")
+        result = self.client_post('/devlogin/', {'new_realm': 'all_realms'}, subdomain="zephyr")
         self.assertEqual(result.status_code, 200)
         self.assert_in_success_response(["starnine@mit.edu", "espuser@mit.edu"], result)
         self.assert_in_success_response(["Click on a user to log in!"], result)
@@ -3615,14 +4208,20 @@ class TestDevAuthBackend(ZulipTestCase):
 
     def test_choose_realm_with_subdomains_enabled(self) -> None:
         with mock.patch('zerver.views.auth.is_subdomain_root_or_alias', return_value=False):
-            with mock.patch('zerver.views.auth.get_realm_from_request', return_value=get_realm('zulip')):
+            with mock.patch(
+                'zerver.views.auth.get_realm_from_request', return_value=get_realm('zulip')
+            ):
                 result = self.client_get("http://zulip.testserver/devlogin/")
                 self.assert_in_success_response(["iago@zulip.com", "hamlet@zulip.com"], result)
                 self.assert_not_in_success_response(["starnine@mit.edu", "espuser@mit.edu"], result)
                 self.assert_in_success_response(["Click on a user to log in to Zulip Dev!"], result)
 
-            with mock.patch('zerver.views.auth.get_realm_from_request', return_value=get_realm('zephyr')):
-                result = self.client_post("http://zulip.testserver/devlogin/", {'new_realm': 'zephyr'})
+            with mock.patch(
+                'zerver.views.auth.get_realm_from_request', return_value=get_realm('zephyr')
+            ):
+                result = self.client_post(
+                    "http://zulip.testserver/devlogin/", {'new_realm': 'zephyr'}
+                )
                 self.assertEqual(result["Location"], "http://zephyr.testserver")
 
                 result = self.client_get("http://zephyr.testserver/devlogin/")
@@ -3649,9 +4248,12 @@ class TestDevAuthBackend(ZulipTestCase):
         response = self.client_post('/accounts/login/local/', data)
         self.assert_in_success_response(["Configuration error", "DevAuthBackend"], response)
 
+
 class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
     def test_start_remote_user_sso(self) -> None:
-        result = self.client_get("/accounts/login/start/sso/", {"param1": "value1", "params": "value2"})
+        result = self.client_get(
+            "/accounts/login/start/sso/", {"param1": "value1", "params": "value2"}
+        )
         self.assertEqual(result.status_code, 302)
 
         url = result.url
@@ -3675,8 +4277,10 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
     def test_login_success_with_sso_append_domain(self) -> None:
         username = 'hamlet'
         user_profile = self.example_user('hamlet')
-        with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',),
-                           SSO_APPEND_DOMAIN='zulip.com'):
+        with self.settings(
+            AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',),
+            SSO_APPEND_DOMAIN='zulip.com',
+        ):
             result = self.client_get('/accounts/login/sso/', REMOTE_USER=username)
             self.assertEqual(result.status_code, 302)
             self.assert_logged_in_user_id(user_profile.id)
@@ -3692,8 +4296,9 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
     def test_login_failure(self) -> None:
         email = self.example_email("hamlet")
         result = self.client_get('/accounts/login/sso/', REMOTE_USER=email)
-        self.assert_in_success_response(["Configuration error", "Authentication via the REMOTE_USER header is"],
-                                        result)
+        self.assert_in_success_response(
+            ["Configuration error", "Authentication via the REMOTE_USER header is"], result
+        )
         self.assert_logged_in_user_id(None)
 
     def test_login_failure_due_to_nonexisting_user(self) -> None:
@@ -3713,15 +4318,17 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
     def test_login_failure_due_to_missing_field(self) -> None:
         with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)):
             result = self.client_get('/accounts/login/sso/')
-            self.assert_in_success_response(["Configuration error", "The REMOTE_USER header is not set."],
-                                            result)
+            self.assert_in_success_response(
+                ["Configuration error", "The REMOTE_USER header is not set."], result
+            )
 
     def test_login_failure_due_to_wrong_subdomain(self) -> None:
         email = self.example_email("hamlet")
         with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)):
             with mock.patch('zerver.views.auth.get_subdomain', return_value='acme'):
-                result = self.client_get('http://testserver:9080/accounts/login/sso/',
-                                         REMOTE_USER=email)
+                result = self.client_get(
+                    'http://testserver:9080/accounts/login/sso/', REMOTE_USER=email
+                )
                 self.assertEqual(result.status_code, 200)
                 self.assert_logged_in_user_id(None)
                 self.assert_in_response("You need an invitation to join this organization.", result)
@@ -3730,8 +4337,9 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         email = self.example_email("hamlet")
         with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)):
             with mock.patch('zerver.views.auth.get_subdomain', return_value=''):
-                result = self.client_get('http://testserver:9080/accounts/login/sso/',
-                                         REMOTE_USER=email)
+                result = self.client_get(
+                    'http://testserver:9080/accounts/login/sso/', REMOTE_USER=email
+                )
                 self.assertEqual(result.status_code, 200)
                 self.assert_logged_in_user_id(None)
                 self.assert_in_response("You need an invitation to join this organization.", result)
@@ -3741,7 +4349,8 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         email = user_profile.delivery_email
         with mock.patch('zerver.views.auth.get_subdomain', return_value='zulip'):
             with self.settings(
-                    AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)):
+                AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)
+            ):
                 result = self.client_get('/accounts/login/sso/', REMOTE_USER=email)
                 self.assertEqual(result.status_code, 302)
                 self.assert_logged_in_user_id(user_profile.id)
@@ -3756,24 +4365,30 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         mobile_flow_otp = '1234abcd' * 8
 
         # Verify that the right thing happens with an invalid-format OTP
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(mobile_flow_otp="1234"),
-                                 REMOTE_USER=email,
-                                 HTTP_USER_AGENT = "ZulipAndroid")
+        result = self.client_get(
+            '/accounts/login/sso/',
+            dict(mobile_flow_otp="1234"),
+            REMOTE_USER=email,
+            HTTP_USER_AGENT="ZulipAndroid",
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(mobile_flow_otp="invalido" * 8),
-                                 REMOTE_USER=email,
-                                 HTTP_USER_AGENT = "ZulipAndroid")
+        result = self.client_get(
+            '/accounts/login/sso/',
+            dict(mobile_flow_otp="invalido" * 8),
+            REMOTE_USER=email,
+            HTTP_USER_AGENT="ZulipAndroid",
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(mobile_flow_otp=mobile_flow_otp),
-                                 REMOTE_USER=email,
-                                 HTTP_USER_AGENT = "ZulipAndroid")
+        result = self.client_get(
+            '/accounts/login/sso/',
+            dict(mobile_flow_otp=mobile_flow_otp),
+            REMOTE_USER=email,
+            HTTP_USER_AGENT="ZulipAndroid",
+        )
         self.assertEqual(result.status_code, 302)
         redirect_url = result['Location']
         parsed_url = urllib.parse.urlparse(redirect_url)
@@ -3799,24 +4414,30 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         mobile_flow_otp = '1234abcd' * 8
 
         # Verify that the right thing happens with an invalid-format OTP
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(mobile_flow_otp="1234"),
-                                 REMOTE_USER=remote_user,
-                                 HTTP_USER_AGENT = "ZulipAndroid")
+        result = self.client_get(
+            '/accounts/login/sso/',
+            dict(mobile_flow_otp="1234"),
+            REMOTE_USER=remote_user,
+            HTTP_USER_AGENT="ZulipAndroid",
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(mobile_flow_otp="invalido" * 8),
-                                 REMOTE_USER=remote_user,
-                                 HTTP_USER_AGENT = "ZulipAndroid")
+        result = self.client_get(
+            '/accounts/login/sso/',
+            dict(mobile_flow_otp="invalido" * 8),
+            REMOTE_USER=remote_user,
+            HTTP_USER_AGENT="ZulipAndroid",
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(mobile_flow_otp=mobile_flow_otp),
-                                 REMOTE_USER=remote_user,
-                                 HTTP_USER_AGENT = "ZulipAndroid")
+        result = self.client_get(
+            '/accounts/login/sso/',
+            dict(mobile_flow_otp=mobile_flow_otp),
+            REMOTE_USER=remote_user,
+            HTTP_USER_AGENT="ZulipAndroid",
+        )
         self.assertEqual(result.status_code, 302)
         redirect_url = result['Location']
         parsed_url = urllib.parse.urlparse(redirect_url)
@@ -3831,8 +4452,12 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         self.assertIn('Zulip on Android', mail.outbox[0].body)
 
     @override_settings(SEND_LOGIN_EMAILS=True)
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipRemoteUserBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_login_desktop_flow_otp_success_email(self) -> None:
         user_profile = self.example_user('hamlet')
         email = user_profile.delivery_email
@@ -3841,27 +4466,31 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         desktop_flow_otp = '1234abcd' * 8
 
         # Verify that the right thing happens with an invalid-format OTP
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(desktop_flow_otp="1234"),
-                                 REMOTE_USER=email)
+        result = self.client_get(
+            '/accounts/login/sso/', dict(desktop_flow_otp="1234"), REMOTE_USER=email
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(desktop_flow_otp="invalido" * 8),
-                                 REMOTE_USER=email)
+        result = self.client_get(
+            '/accounts/login/sso/', dict(desktop_flow_otp="invalido" * 8), REMOTE_USER=email
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(desktop_flow_otp=desktop_flow_otp),
-                                 REMOTE_USER=email)
+        result = self.client_get(
+            '/accounts/login/sso/', dict(desktop_flow_otp=desktop_flow_otp), REMOTE_USER=email
+        )
         self.verify_desktop_flow_end_page(result, email, desktop_flow_otp)
 
     @override_settings(SEND_LOGIN_EMAILS=True)
     @override_settings(SSO_APPEND_DOMAIN="zulip.com")
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipRemoteUserBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_login_desktop_flow_otp_success_username(self) -> None:
         user_profile = self.example_user('hamlet')
         email = user_profile.delivery_email
@@ -3871,30 +4500,33 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         desktop_flow_otp = '1234abcd' * 8
 
         # Verify that the right thing happens with an invalid-format OTP
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(desktop_flow_otp="1234"),
-                                 REMOTE_USER=remote_user)
+        result = self.client_get(
+            '/accounts/login/sso/', dict(desktop_flow_otp="1234"), REMOTE_USER=remote_user
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(desktop_flow_otp="invalido" * 8),
-                                 REMOTE_USER=remote_user)
+        result = self.client_get(
+            '/accounts/login/sso/', dict(desktop_flow_otp="invalido" * 8), REMOTE_USER=remote_user
+        )
         self.assert_logged_in_user_id(None)
         self.assert_json_error_contains(result, "Invalid OTP", 400)
 
-        result = self.client_get('/accounts/login/sso/',
-                                 dict(desktop_flow_otp=desktop_flow_otp),
-                                 REMOTE_USER=remote_user)
+        result = self.client_get(
+            '/accounts/login/sso/', dict(desktop_flow_otp=desktop_flow_otp), REMOTE_USER=remote_user
+        )
         self.verify_desktop_flow_end_page(result, email, desktop_flow_otp)
 
     def test_redirect_to(self) -> None:
         """This test verifies the behavior of the redirect_to logic in
         login_or_register_remote_user."""
-        def test_with_redirect_to_param_set_as_next(next: str='') -> HttpResponse:
+
+        def test_with_redirect_to_param_set_as_next(next: str = '') -> HttpResponse:
             user_profile = self.example_user('hamlet')
             email = user_profile.delivery_email
-            with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)):
+            with self.settings(
+                AUTHENTICATION_BACKENDS=('zproject.backends.ZulipRemoteUserBackend',)
+            ):
                 result = self.client_get("/accounts/login/sso/", {"next": next}, REMOTE_USER=email)
             return result
 
@@ -3907,6 +4539,7 @@ class TestZulipRemoteUserBackend(DesktopFlowTestingLib, ZulipTestCase):
         res = test_with_redirect_to_param_set_as_next('https://rogue.zulip-like.server/login')
         self.assertEqual('http://zulip.testserver', res.url)
 
+
 class TestJWTLogin(ZulipTestCase):
     """
     JWT uses ZulipDummyBackend.
@@ -3935,7 +4568,9 @@ class TestJWTLogin(ZulipTestCase):
             web_token = jwt.encode(payload, key, algorithm).decode('utf8')
             data = {'json_web_token': web_token}
             result = self.client_post('/accounts/login/jwt/', data)
-            self.assert_json_error_contains(result, "No user specified in JSON web token claims", 400)
+            self.assert_json_error_contains(
+                result, "No user specified in JSON web token claims", 400
+            )
 
     def test_login_failure_when_realm_is_missing(self) -> None:
         payload = {'user': 'hamlet'}
@@ -3945,7 +4580,9 @@ class TestJWTLogin(ZulipTestCase):
             web_token = jwt.encode(payload, key, algorithm).decode('utf8')
             data = {'json_web_token': web_token}
             result = self.client_post('/accounts/login/jwt/', data)
-            self.assert_json_error_contains(result, "No organization specified in JSON web token claims", 400)
+            self.assert_json_error_contains(
+                result, "No organization specified in JSON web token claims", 400
+            )
 
     def test_login_failure_when_key_does_not_exist(self) -> None:
         data = {'json_web_token': 'not relevant'}
@@ -4016,6 +4653,7 @@ class TestJWTLogin(ZulipTestCase):
                 user_profile = self.example_user('hamlet')
                 self.assert_logged_in_user_id(user_profile.id)
 
+
 class DjangoToLDAPUsernameTests(ZulipTestCase):
     def setUp(self) -> None:
         self.init_default_ldap_database()
@@ -4025,8 +4663,10 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
         with self.settings(LDAP_APPEND_DOMAIN="zulip.com"):
             self.assertEqual(self.backend.django_to_ldap_username("hamlet"), "hamlet")
             self.assertEqual(self.backend.django_to_ldap_username("hamlet@zulip.com"), "hamlet")
-            with self.assertRaisesRegex(ZulipLDAPExceptionOutsideDomain,
-                                        'Email hamlet@example.com does not match LDAP domain zulip.com.'):
+            with self.assertRaisesRegex(
+                ZulipLDAPExceptionOutsideDomain,
+                'Email hamlet@example.com does not match LDAP domain zulip.com.',
+            ):
                 self.backend.django_to_ldap_username("hamlet@example.com")
 
             self.mock_ldap.directory['uid="hamlet@test",ou=users,dc=zulip,dc=com'] = {
@@ -4044,21 +4684,31 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
             self.assertEqual(username, '"hamlet@test"@zulip')
 
     def test_django_to_ldap_username_with_email_search(self) -> None:
-        self.assertEqual(self.backend.django_to_ldap_username("hamlet"),
-                         self.ldap_username("hamlet"))
-        self.assertEqual(self.backend.django_to_ldap_username("hamlet@zulip.com"),
-                         self.ldap_username("hamlet"))
+        self.assertEqual(
+            self.backend.django_to_ldap_username("hamlet"), self.ldap_username("hamlet")
+        )
+        self.assertEqual(
+            self.backend.django_to_ldap_username("hamlet@zulip.com"), self.ldap_username("hamlet")
+        )
         # If there are no matches through the email search, raise exception:
         with self.assertRaises(ZulipLDAPExceptionNoMatchingLDAPUser):
             self.backend.django_to_ldap_username("no_such_email@example.com")
 
-        self.assertEqual(self.backend.django_to_ldap_username("aaron@zulip.com"),
-                         self.ldap_username("aaron"))
+        self.assertEqual(
+            self.backend.django_to_ldap_username("aaron@zulip.com"), self.ldap_username("aaron")
+        )
 
         with self.assertLogs(level="WARNING") as m:
             with self.assertRaises(ZulipLDAPExceptionNoMatchingLDAPUser):
                 self.backend.django_to_ldap_username("shared_email@zulip.com")
-        self.assertEqual(m.output, ["WARNING:root:Multiple users with email {} found in LDAP.".format("shared_email@zulip.com")])
+        self.assertEqual(
+            m.output,
+            [
+                "WARNING:root:Multiple users with email {} found in LDAP.".format(
+                    "shared_email@zulip.com"
+                )
+            ],
+        )
 
         # Test on a weird case of a user whose uid is an email and his actual "mail"
         # attribute is a different email address:
@@ -4067,17 +4717,25 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
             "uid": ['some_user@organization_a.com'],
             "mail": ["some_user@contactaddress.com"],
         }
-        self.assertEqual(self.backend.django_to_ldap_username("some_user@contactaddress.com"),
-                         "some_user@organization_a.com")
-        self.assertEqual(self.backend.django_to_ldap_username("some_user@organization_a.com"),
-                         "some_user@organization_a.com")
+        self.assertEqual(
+            self.backend.django_to_ldap_username("some_user@contactaddress.com"),
+            "some_user@organization_a.com",
+        )
+        self.assertEqual(
+            self.backend.django_to_ldap_username("some_user@organization_a.com"),
+            "some_user@organization_a.com",
+        )
 
         # Configure email search for emails in the uid attribute:
-        with self.settings(AUTH_LDAP_REVERSE_EMAIL_SEARCH=LDAPSearch("ou=users,dc=zulip,dc=com",
-                                                                     ldap.SCOPE_ONELEVEL,
-                                                                     "(uid=%(email)s)")):
-            self.assertEqual(self.backend.django_to_ldap_username("newuser_email_as_uid@zulip.com"),
-                             "newuser_email_as_uid@zulip.com")
+        with self.settings(
+            AUTH_LDAP_REVERSE_EMAIL_SEARCH=LDAPSearch(
+                "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(uid=%(email)s)"
+            )
+        ):
+            self.assertEqual(
+                self.backend.django_to_ldap_username("newuser_email_as_uid@zulip.com"),
+                "newuser_email_as_uid@zulip.com",
+            )
 
             self.mock_ldap.directory['uid="hamlet@test"@zulip.com",ou=users,dc=zulip,dc=com'] = {
                 "cn": ["King Hamlet"],
@@ -4086,8 +4744,12 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
             username = self.backend.django_to_ldap_username('"hamlet@test"@zulip.com')
             self.assertEqual(username, '"hamlet@test"@zulip.com')
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipLDAPAuthBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipLDAPAuthBackend',
+        )
+    )
     def test_authenticate_to_ldap_via_email(self) -> None:
         """
         With AUTH_LDAP_REVERSE_EMAIL_SEARCH configured, django_to_ldap_username
@@ -4102,9 +4764,14 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
 
         with self.settings(LDAP_EMAIL_ATTR='mail'):
             self.assertEqual(
-                authenticate(request=mock.MagicMock(), username=user_profile.delivery_email,
-                             password=self.ldap_password('hamlet'), realm=realm),
-                user_profile)
+                authenticate(
+                    request=mock.MagicMock(),
+                    username=user_profile.delivery_email,
+                    password=self.ldap_password('hamlet'),
+                    realm=realm,
+                ),
+                user_profile,
+            )
 
     @override_settings(LDAP_EMAIL_ATTR='mail', LDAP_DEACTIVATE_NON_MATCHING_USERS=True)
     def test_sync_user_from_ldap_with_email_attr(self) -> None:
@@ -4125,6 +4792,7 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
             # Syncing didn't deactivate the user:
             self.assertTrue(user_profile.is_active)
 
+
 class ZulipLDAPTestCase(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -4146,15 +4814,20 @@ class ZulipLDAPTestCase(ZulipTestCase):
         realm.string_id = 'zulip'
         realm.save()
 
+
 class TestLDAP(ZulipLDAPTestCase):
     def test_generate_dev_ldap_dir(self) -> None:
         ldap_dir = generate_dev_ldap_dir('A', 10)
         self.assertEqual(len(ldap_dir), 10)
-        regex = re.compile(r'(uid\=)+[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+(\,ou\=users\,dc\=zulip\,dc\=com)')
+        regex = re.compile(
+            r'(uid\=)+[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+(\,ou\=users\,dc\=zulip\,dc\=com)'
+        )
         common_attrs = ['cn', 'userPassword', 'phoneNumber', 'birthDate']
         for key, value in ldap_dir.items():
             self.assertTrue(regex.match(key))
-            self.assertCountEqual(list(value.keys()), [*common_attrs, 'uid', 'thumbnailPhoto', 'userAccountControl'])
+            self.assertCountEqual(
+                list(value.keys()), [*common_attrs, 'uid', 'thumbnailPhoto', 'userAccountControl']
+            )
 
         ldap_dir = generate_dev_ldap_dir('b', 9)
         self.assertEqual(len(ldap_dir), 9)
@@ -4176,68 +4849,86 @@ class TestLDAP(ZulipLDAPTestCase):
         # dev LDAP environment that allowed login via password substrings.
         self.mock_ldap.directory = generate_dev_ldap_dir('B', 8)
         with self.settings(
-            AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                               ldap.SCOPE_ONELEVEL, "(uid=%(user)s)"),
-            AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                                        ldap.SCOPE_ONELEVEL, "(email=%(email)s)"),
+            AUTH_LDAP_USER_SEARCH=LDAPSearch(
+                "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(uid=%(user)s)"
+            ),
+            AUTH_LDAP_REVERSE_EMAIL_SEARCH=LDAPSearch(
+                "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(email=%(email)s)"
+            ),
             LDAP_APPEND_DOMAIN='zulip.com',
         ):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username='ldapuser1', password='dapu',
-                                                     realm=get_realm('zulip'))
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username='ldapuser1',
+                password='dapu',
+                realm=get_realm('zulip'),
+            )
 
-            assert(user_profile is None)
+            assert user_profile is None
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_success(self) -> None:
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username=self.example_email("hamlet"),
-                                                     password=self.ldap_password('hamlet'),
-                                                     realm=get_realm('zulip'))
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email("hamlet"),
+                password=self.ldap_password('hamlet'),
+                realm=get_realm('zulip'),
+            )
 
-            assert(user_profile is not None)
+            assert user_profile is not None
             self.assertEqual(user_profile.delivery_email, self.example_email("hamlet"))
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_success_with_username(self) -> None:
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username="hamlet", password=self.ldap_password('hamlet'),
-                                                     realm=get_realm('zulip'))
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username="hamlet",
+                password=self.ldap_password('hamlet'),
+                realm=get_realm('zulip'),
+            )
 
-            assert(user_profile is not None)
+            assert user_profile is not None
             self.assertEqual(user_profile, self.example_user("hamlet"))
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_success_with_email_attr(self) -> None:
         with self.settings(LDAP_EMAIL_ATTR='mail'):
             username = self.ldap_username("aaron")
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username=username,
-                                                     password=self.ldap_password(username),
-                                                     realm=get_realm('zulip'))
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=username,
+                password=self.ldap_password(username),
+                realm=get_realm('zulip'),
+            )
 
-            assert (user_profile is not None)
+            assert user_profile is not None
             self.assertEqual(user_profile, self.example_user("aaron"))
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipLDAPAuthBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipLDAPAuthBackend',
+        )
+    )
     def test_email_and_ldap_backends_together(self) -> None:
         with self.settings(
             LDAP_EMAIL_ATTR='mail',
-            AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                                        ldap.SCOPE_ONELEVEL,
-                                                        "(mail=%(email)s)"),
-            AUTH_LDAP_USERNAME_ATTR = "uid",
+            AUTH_LDAP_REVERSE_EMAIL_SEARCH=LDAPSearch(
+                "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(mail=%(email)s)"
+            ),
+            AUTH_LDAP_USERNAME_ATTR="uid",
         ):
             realm = get_realm('zulip')
             self.assertEqual(email_belongs_to_ldap(realm, self.example_email("aaron")), True)
             username = self.ldap_username("aaron")
-            user_profile = ZulipLDAPAuthBackend().authenticate(request=mock.MagicMock(),
-                                                               username=username,
-                                                               password=self.ldap_password(username),
-                                                               realm=realm)
+            user_profile = ZulipLDAPAuthBackend().authenticate(
+                request=mock.MagicMock(),
+                username=username,
+                password=self.ldap_password(username),
+                realm=realm,
+            )
             self.assertEqual(user_profile, self.example_user("aaron"))
 
             othello = self.example_user('othello')
@@ -4246,31 +4937,42 @@ class TestLDAP(ZulipLDAPTestCase):
             othello.save()
 
             self.assertEqual(email_belongs_to_ldap(realm, othello.delivery_email), False)
-            user_profile = EmailAuthBackend().authenticate(request=mock.MagicMock(),
-                                                           username=othello.delivery_email,
-                                                           password=password,
-                                                           realm=realm)
+            user_profile = EmailAuthBackend().authenticate(
+                request=mock.MagicMock(),
+                username=othello.delivery_email,
+                password=password,
+                realm=realm,
+            )
             self.assertEqual(user_profile, othello)
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_failure_due_to_wrong_password(self) -> None:
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            user = self.backend.authenticate(request=mock.MagicMock(),
-                                             username=self.example_email("hamlet"), password='wrong',
-                                             realm=get_realm('zulip'))
+            user = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email("hamlet"),
+                password='wrong',
+                realm=get_realm('zulip'),
+            )
             self.assertIs(user, None)
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_failure_due_to_nonexistent_user(self) -> None:
-        with self.settings(LDAP_APPEND_DOMAIN='zulip.com'), \
-                self.assertLogs('zulip.ldap', level='DEBUG') as log_debug:
-            user = self.backend.authenticate(request=mock.MagicMock(),
-                                             username='nonexistent@zulip.com',
-                                             password="doesnt_matter",
-                                             realm=get_realm('zulip'))
-            self.assertEqual(log_debug.output, [
-                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: nonexistent. Input username: nonexistent@zulip.com'
-            ])
+        with self.settings(LDAP_APPEND_DOMAIN='zulip.com'), self.assertLogs(
+            'zulip.ldap', level='DEBUG'
+        ) as log_debug:
+            user = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username='nonexistent@zulip.com',
+                password="doesnt_matter",
+                realm=get_realm('zulip'),
+            )
+            self.assertEqual(
+                log_debug.output,
+                [
+                    'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: nonexistent. Input username: nonexistent@zulip.com'
+                ],
+            )
             self.assertIs(user, None)
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
@@ -4285,8 +4987,9 @@ class TestLDAP(ZulipLDAPTestCase):
     def test_user_email_from_ldapuser_with_append_domain(self) -> None:
         backend = self.backend
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            username = backend.user_email_from_ldapuser('this_argument_is_ignored',
-                                                        _LDAPUser(self.backend, username='"hamlet@test"'))
+            username = backend.user_email_from_ldapuser(
+                'this_argument_is_ignored', _LDAPUser(self.backend, username='"hamlet@test"')
+            )
             self.assertEqual(username, '"hamlet@test"@zulip.com')
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
@@ -4351,7 +5054,9 @@ class TestLDAP(ZulipLDAPTestCase):
         with self.settings(LDAP_EMAIL_ATTR=nonexisting_attr):
             backend = self.backend
             email = 'nonexisting@zulip.com'
-            with self.assertRaisesRegex(Exception, 'LDAP user doesn\'t have the needed email attribute'):
+            with self.assertRaisesRegex(
+                Exception, 'LDAP user doesn\'t have the needed email attribute'
+            ):
                 backend.get_or_build_user(email, _LDAPUser())
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
@@ -4379,7 +5084,9 @@ class TestLDAP(ZulipLDAPTestCase):
                 self.backend.get_or_build_user(email, _LDAPUser())
 
             email = 'spam@acme.com'
-            with self.assertRaisesRegex(ZulipLDAPException, "This email domain isn't allowed in this organization."):
+            with self.assertRaisesRegex(
+                ZulipLDAPException, "This email domain isn't allowed in this organization."
+            ):
                 self.backend.get_or_build_user(email, _LDAPUser())
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
@@ -4395,15 +5102,22 @@ class TestLDAP(ZulipLDAPTestCase):
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_failure_when_domain_does_not_match(self) -> None:
-        with self.settings(LDAP_APPEND_DOMAIN='acme.com'), self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username=self.example_email("hamlet"),
-                                                     password=self.ldap_password('hamlet'),
-                                                     realm=get_realm('zulip'))
+        with self.settings(LDAP_APPEND_DOMAIN='acme.com'), self.assertLogs(
+            'zulip.ldap', 'DEBUG'
+        ) as debug_log:
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email("hamlet"),
+                password=self.ldap_password('hamlet'),
+                realm=get_realm('zulip'),
+            )
             self.assertIs(user_profile, None)
-        self.assertEqual(debug_log.output, [
-            'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: Email hamlet@zulip.com does not match LDAP domain acme.com.'
-        ])
+        self.assertEqual(
+            debug_log.output,
+            [
+                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: Email hamlet@zulip.com does not match LDAP domain acme.com.'
+            ],
+        )
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_success_with_different_subdomain(self) -> None:
@@ -4411,22 +5125,26 @@ class TestLDAP(ZulipLDAPTestCase):
 
         Realm.objects.create(string_id='acme')
         with self.settings(
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username=self.example_email('hamlet'),
-                                                     password=self.ldap_password('hamlet'),
-                                                     realm=get_realm('acme'))
+            LDAP_APPEND_DOMAIN='zulip.com', AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map
+        ):
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email('hamlet'),
+                password=self.ldap_password('hamlet'),
+                realm=get_realm('acme'),
+            )
             self.assertEqual(user_profile.delivery_email, self.example_email('hamlet'))
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_success_with_valid_subdomain(self) -> None:
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username=self.example_email("hamlet"),
-                                                     password=self.ldap_password('hamlet'),
-                                                     realm=get_realm('zulip'))
-            assert(user_profile is not None)
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email("hamlet"),
+                password=self.ldap_password('hamlet'),
+                realm=get_realm('zulip'),
+            )
+            assert user_profile is not None
             self.assertEqual(user_profile.delivery_email, self.example_email("hamlet"))
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
@@ -4434,25 +5152,31 @@ class TestLDAP(ZulipLDAPTestCase):
         user_profile = self.example_user("hamlet")
         do_deactivate_user(user_profile)
         with self.settings(LDAP_APPEND_DOMAIN='zulip.com'):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username=self.example_email("hamlet"),
-                                                     password=self.ldap_password('hamlet'),
-                                                     realm=get_realm('zulip'))
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username=self.example_email("hamlet"),
+                password=self.ldap_password('hamlet'),
+                realm=get_realm('zulip'),
+            )
             self.assertIs(user_profile, None)
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
-    @override_settings(AUTH_LDAP_USER_ATTR_MAP={
-        "full_name": "cn",
-        "avatar": "jpegPhoto",
-    })
+    @override_settings(
+        AUTH_LDAP_USER_ATTR_MAP={
+            "full_name": "cn",
+            "avatar": "jpegPhoto",
+        }
+    )
     def test_login_success_when_user_does_not_exist_with_valid_subdomain(self) -> None:
         RealmDomain.objects.create(realm=self.backend._realm, domain='acme.com')
         with self.settings(LDAP_APPEND_DOMAIN='acme.com'):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username='newuser@acme.com',
-                                                     password=self.ldap_password("newuser"),
-                                                     realm=get_realm('zulip'))
-            assert(user_profile is not None)
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username='newuser@acme.com',
+                password=self.ldap_password("newuser"),
+                realm=get_realm('zulip'),
+            )
+            assert user_profile is not None
             self.assertEqual(user_profile.delivery_email, 'newuser@acme.com')
             self.assertEqual(user_profile.full_name, 'New LDAP fullname')
             self.assertEqual(user_profile.realm.string_id, 'zulip')
@@ -4467,23 +5191,29 @@ class TestLDAP(ZulipLDAPTestCase):
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_login_success_when_user_does_not_exist_with_split_full_name_mapping(self) -> None:
         with self.settings(
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP={'first_name': 'sn', 'last_name': 'cn'}):
-            user_profile = self.backend.authenticate(request=mock.MagicMock(),
-                                                     username='newuser_splitname@zulip.com',
-                                                     password=self.ldap_password("newuser_splitname"),
-                                                     realm=get_realm('zulip'))
-            assert(user_profile is not None)
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP={'first_name': 'sn', 'last_name': 'cn'},
+        ):
+            user_profile = self.backend.authenticate(
+                request=mock.MagicMock(),
+                username='newuser_splitname@zulip.com',
+                password=self.ldap_password("newuser_splitname"),
+                realm=get_realm('zulip'),
+            )
+            assert user_profile is not None
             self.assertEqual(user_profile.delivery_email, 'newuser_splitname@zulip.com')
             self.assertEqual(user_profile.full_name, 'First Last')
             self.assertEqual(user_profile.realm.string_id, 'zulip')
 
+
 class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
     def test_authenticate(self) -> None:
         backend = ZulipLDAPUserPopulator()
-        result = backend.authenticate(username=self.example_email("hamlet"),
-                                      password=self.ldap_password("hamlet"),
-                                      realm=get_realm('zulip'))
+        result = backend.authenticate(
+            username=self.example_email("hamlet"),
+            password=self.ldap_password("hamlet"),
+            realm=get_realm('zulip'),
+        )
         self.assertIs(result, None)
 
     def perform_ldap_sync(self, user_profile: UserProfile) -> None:
@@ -4500,9 +5230,10 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
         Details: https://github.com/zulip/zulip/issues/13130
         """
         with self.settings(
-                LDAP_DEACTIVATE_NON_MATCHING_USERS=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_BIND_PASSWORD='wrongpass'):
+            LDAP_DEACTIVATE_NON_MATCHING_USERS=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_BIND_PASSWORD='wrongpass',
+        ):
             with self.assertRaises(ldap.INVALID_CREDENTIALS):
                 sync_user_from_ldap(self.example_user('hamlet'), mock.Mock())
             mock_deactivate.assert_not_called()
@@ -4529,7 +5260,9 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
     def test_update_with_hidden_emails(self) -> None:
         hamlet = self.example_user('hamlet')
         realm = get_realm("zulip")
-        do_set_realm_property(realm, 'email_address_visibility', Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            realm, 'email_address_visibility', Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
         hamlet.refresh_from_db()
 
         self.change_ldap_user_attr('hamlet', 'cn', 'New Name')
@@ -4542,8 +5275,7 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
         self.change_ldap_user_attr('hamlet', 'cn', 'Name')
         self.change_ldap_user_attr('hamlet', 'sn', 'Full')
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'first_name': 'sn',
-                                                    'last_name': 'cn'}):
+        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'first_name': 'sn', 'last_name': 'cn'}):
             self.perform_ldap_sync(self.example_user('hamlet'))
         hamlet = self.example_user('hamlet')
         self.assertEqual(hamlet.full_name, 'Full Name')
@@ -4556,49 +5288,62 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
     def test_too_short_name(self) -> None:
         self.change_ldap_user_attr('hamlet', 'cn', 'a')
 
-        with self.assertRaises(ZulipLDAPException), \
-                self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
+        with self.assertRaises(ZulipLDAPException), self.assertLogs(
+            'django_auth_ldap', 'WARNING'
+        ) as warn_log:
             self.perform_ldap_sync(self.example_user('hamlet'))
-        self.assertEqual(warn_log.output, ['WARNING:django_auth_ldap:Name too short! while authenticating hamlet'])
+        self.assertEqual(
+            warn_log.output,
+            ['WARNING:django_auth_ldap:Name too short! while authenticating hamlet'],
+        )
 
     def test_deactivate_user(self) -> None:
         self.change_ldap_user_attr('hamlet', 'userAccountControl', '2')
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'userAccountControl': 'userAccountControl'}), \
-                self.assertLogs('zulip.ldap') as info_logs:
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'userAccountControl': 'userAccountControl'}
+        ), self.assertLogs('zulip.ldap') as info_logs:
             self.perform_ldap_sync(self.example_user('hamlet'))
         hamlet = self.example_user('hamlet')
         self.assertFalse(hamlet.is_active)
-        self.assertEqual(info_logs.output, [
-            'INFO:zulip.ldap:Deactivating user hamlet@zulip.com because they are disabled in LDAP.'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                'INFO:zulip.ldap:Deactivating user hamlet@zulip.com because they are disabled in LDAP.'
+            ],
+        )
 
     @mock.patch("zproject.backends.ZulipLDAPAuthBackendBase.sync_full_name_from_ldap")
     def test_dont_sync_disabled_ldap_user(self, fake_sync: mock.MagicMock) -> None:
         self.change_ldap_user_attr('hamlet', 'userAccountControl', '2')
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'userAccountControl': 'userAccountControl'}), \
-                self.assertLogs('zulip.ldap') as info_logs:
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'userAccountControl': 'userAccountControl'}
+        ), self.assertLogs('zulip.ldap') as info_logs:
             self.perform_ldap_sync(self.example_user('hamlet'))
             fake_sync.assert_not_called()
-        self.assertEqual(info_logs.output, [
-            'INFO:zulip.ldap:Deactivating user hamlet@zulip.com because they are disabled in LDAP.'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                'INFO:zulip.ldap:Deactivating user hamlet@zulip.com because they are disabled in LDAP.'
+            ],
+        )
 
     def test_reactivate_user(self) -> None:
         do_deactivate_user(self.example_user('hamlet'))
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'userAccountControl': 'userAccountControl'}), \
-                self.assertLogs('zulip.ldap') as info_logs:
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'userAccountControl': 'userAccountControl'}
+        ), self.assertLogs('zulip.ldap') as info_logs:
             self.perform_ldap_sync(self.example_user('hamlet'))
         hamlet = self.example_user('hamlet')
         self.assertTrue(hamlet.is_active)
-        self.assertEqual(info_logs.output, [
-            'INFO:zulip.ldap:Reactivating user hamlet@zulip.com because they are not disabled in LDAP.'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                'INFO:zulip.ldap:Reactivating user hamlet@zulip.com because they are not disabled in LDAP.'
+            ],
+        )
 
     def test_user_in_multiple_realms(self) -> None:
         test_realm = do_create_realm('test', 'test', False)
@@ -4627,13 +5372,14 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
 
     def test_user_not_found_in_ldap(self) -> None:
         with self.settings(
-                LDAP_DEACTIVATE_NON_MATCHING_USERS=False,
-                LDAP_APPEND_DOMAIN='zulip.com'):
+            LDAP_DEACTIVATE_NON_MATCHING_USERS=False, LDAP_APPEND_DOMAIN='zulip.com'
+        ):
             othello = self.example_user("othello")  # othello isn't in our test directory
             mock_logger = mock.MagicMock()
             result = sync_user_from_ldap(othello, mock_logger)
             mock_logger.warning.assert_called_once_with(
-                "Did not find %s in LDAP.", othello.delivery_email)
+                "Did not find %s in LDAP.", othello.delivery_email
+            )
             self.assertFalse(result)
 
             do_deactivate_user(othello)
@@ -4645,9 +5391,9 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
 
     def test_update_user_avatar(self) -> None:
         # Hamlet has jpegPhoto set in our test directory by default.
-        with mock.patch('zerver.lib.upload.upload_avatar_image') as fn, \
-            self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                   'avatar': 'jpegPhoto'}):
+        with mock.patch('zerver.lib.upload.upload_avatar_image') as fn, self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'avatar': 'jpegPhoto'}
+        ):
             self.perform_ldap_sync(self.example_user('hamlet'))
             fn.assert_called_once()
             hamlet = self.example_user('hamlet')
@@ -4661,11 +5407,12 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
 
         # Now verify that if we do change the jpegPhoto image, we
         # will upload a new avatar.
-        self.change_ldap_user_attr('hamlet', 'jpegPhoto', static_path("images/logo/zulip-icon-512x512.png"),
-                                   binary=True)
-        with mock.patch('zerver.lib.upload.upload_avatar_image') as fn, \
-            self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                   'avatar': 'jpegPhoto'}):
+        self.change_ldap_user_attr(
+            'hamlet', 'jpegPhoto', static_path("images/logo/zulip-icon-512x512.png"), binary=True
+        )
+        with mock.patch('zerver.lib.upload.upload_avatar_image') as fn, self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'avatar': 'jpegPhoto'}
+        ):
             self.perform_ldap_sync(self.example_user('hamlet'))
             fn.assert_called_once()
             hamlet = self.example_user('hamlet')
@@ -4677,8 +5424,7 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
         with get_test_image_file('img.png') as f:
             test_image_data = f.read()
         self.change_ldap_user_attr('hamlet', 'jpegPhoto', test_image_data)
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'avatar': 'jpegPhoto'}):
+        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'avatar': 'jpegPhoto'}):
             self.perform_ldap_sync(self.example_user('hamlet'))
 
         hamlet = self.example_user('hamlet')
@@ -4698,15 +5444,20 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
 
         # Try to use invalid data as the image:
         self.change_ldap_user_attr('hamlet', 'jpegPhoto', b'00' + test_image_data)
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'avatar': 'jpegPhoto'}):
+        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn', 'avatar': 'jpegPhoto'}):
             with self.assertLogs(level="WARNING") as m:
                 self.perform_ldap_sync(self.example_user('hamlet'))
-            self.assertEqual(m.output, ["WARNING:root:Could not parse {} field for user {}".format("jpegPhoto", hamlet.id)])
+            self.assertEqual(
+                m.output,
+                [
+                    "WARNING:root:Could not parse {} field for user {}".format(
+                        "jpegPhoto", hamlet.id
+                    )
+                ],
+            )
 
     def test_deactivate_non_matching_users(self) -> None:
-        with self.settings(LDAP_APPEND_DOMAIN='zulip.com',
-                           LDAP_DEACTIVATE_NON_MATCHING_USERS=True):
+        with self.settings(LDAP_APPEND_DOMAIN='zulip.com', LDAP_DEACTIVATE_NON_MATCHING_USERS=True):
             # othello isn't in our test directory
             result = sync_user_from_ldap(self.example_user('othello'), mock.Mock())
 
@@ -4715,9 +5466,13 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
             self.assertFalse(othello.is_active)
 
     def test_update_custom_profile_field(self) -> None:
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'custom_profile_field__phone_number': 'homePhone',
-                                                    'custom_profile_field__birthday': 'birthDate'}):
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'custom_profile_field__phone_number': 'homePhone',
+                'custom_profile_field__birthday': 'birthDate',
+            }
+        ):
             self.perform_ldap_sync(self.example_user('hamlet'))
         hamlet = self.example_user('hamlet')
         test_data = [
@@ -4732,60 +5487,94 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
         ]
         for test_case in test_data:
             field = CustomProfileField.objects.get(realm=hamlet.realm, name=test_case['field_name'])
-            field_value = CustomProfileFieldValue.objects.get(user_profile=hamlet, field=field).value
+            field_value = CustomProfileFieldValue.objects.get(
+                user_profile=hamlet, field=field
+            ).value
             self.assertEqual(field_value, test_case['expected_value'])
 
     def test_update_non_existent_profile_field(self) -> None:
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'custom_profile_field__non_existent': 'homePhone'}):
-            with self.assertRaisesRegex(ZulipLDAPException, 'Custom profile field with name non_existent not found'), \
-                    self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'custom_profile_field__non_existent': 'homePhone',
+            }
+        ):
+            with self.assertRaisesRegex(
+                ZulipLDAPException, 'Custom profile field with name non_existent not found'
+            ), self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
                 self.perform_ldap_sync(self.example_user('hamlet'))
-            self.assertEqual(warn_log.output, [
-                'WARNING:django_auth_ldap:Custom profile field with name non_existent not found. while authenticating hamlet'
-            ])
+            self.assertEqual(
+                warn_log.output,
+                [
+                    'WARNING:django_auth_ldap:Custom profile field with name non_existent not found. while authenticating hamlet'
+                ],
+            )
 
     def test_update_custom_profile_field_invalid_data(self) -> None:
         self.change_ldap_user_attr('hamlet', 'birthDate', '9999')
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'custom_profile_field__birthday': 'birthDate'}):
-            with self.assertRaisesRegex(ZulipLDAPException, 'Invalid data for birthday field'), \
-                    self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'custom_profile_field__birthday': 'birthDate',
+            }
+        ):
+            with self.assertRaisesRegex(
+                ZulipLDAPException, 'Invalid data for birthday field'
+            ), self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
                 self.perform_ldap_sync(self.example_user('hamlet'))
-            self.assertEqual(warn_log.output, [
-                'WARNING:django_auth_ldap:Invalid data for birthday field: Birthday is not a date while authenticating hamlet'
-            ])
+            self.assertEqual(
+                warn_log.output,
+                [
+                    'WARNING:django_auth_ldap:Invalid data for birthday field: Birthday is not a date while authenticating hamlet'
+                ],
+            )
 
     def test_update_custom_profile_field_no_mapping(self) -> None:
         hamlet = self.example_user('hamlet')
         no_op_field = CustomProfileField.objects.get(realm=hamlet.realm, name='Phone number')
-        expected_value = CustomProfileFieldValue.objects.get(user_profile=hamlet, field=no_op_field).value
+        expected_value = CustomProfileFieldValue.objects.get(
+            user_profile=hamlet, field=no_op_field
+        ).value
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'custom_profile_field__birthday': 'birthDate'}):
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'custom_profile_field__birthday': 'birthDate',
+            }
+        ):
             self.perform_ldap_sync(self.example_user('hamlet'))
 
-        actual_value = CustomProfileFieldValue.objects.get(user_profile=hamlet, field=no_op_field).value
+        actual_value = CustomProfileFieldValue.objects.get(
+            user_profile=hamlet, field=no_op_field
+        ).value
         self.assertEqual(actual_value, expected_value)
 
     def test_update_custom_profile_field_no_update(self) -> None:
         hamlet = self.example_user('hamlet')
         phone_number_field = CustomProfileField.objects.get(realm=hamlet.realm, name='Phone number')
         birthday_field = CustomProfileField.objects.get(realm=hamlet.realm, name='Birthday')
-        phone_number_field_value = CustomProfileFieldValue.objects.get(user_profile=hamlet,
-                                                                       field=phone_number_field)
+        phone_number_field_value = CustomProfileFieldValue.objects.get(
+            user_profile=hamlet, field=phone_number_field
+        )
         phone_number_field_value.value = '123456789'
         phone_number_field_value.save(update_fields=['value'])
-        expected_call_args = [hamlet, [
-            {
-                'id': birthday_field.id,
-                'value': '1900-09-08',
-            },
-        ]]
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'custom_profile_field__birthday': 'birthDate',
-                                                    'custom_profile_field__phone_number': 'homePhone'}):
+        expected_call_args = [
+            hamlet,
+            [
+                {
+                    'id': birthday_field.id,
+                    'value': '1900-09-08',
+                },
+            ],
+        ]
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'custom_profile_field__birthday': 'birthDate',
+                'custom_profile_field__phone_number': 'homePhone',
+            }
+        ):
             with mock.patch('zproject.backends.do_update_user_custom_profile_data_if_changed') as f:
                 self.perform_ldap_sync(self.example_user('hamlet'))
                 f.assert_called_once_with(*expected_call_args)
@@ -4793,20 +5582,31 @@ class TestZulipLDAPUserPopulator(ZulipLDAPTestCase):
     def test_update_custom_profile_field_not_present_in_ldap(self) -> None:
         hamlet = self.example_user('hamlet')
         no_op_field = CustomProfileField.objects.get(realm=hamlet.realm, name='Birthday')
-        expected_value = CustomProfileFieldValue.objects.get(user_profile=hamlet, field=no_op_field).value
+        expected_value = CustomProfileFieldValue.objects.get(
+            user_profile=hamlet, field=no_op_field
+        ).value
 
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'custom_profile_field__birthday': 'nonExistantAttr'}), self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'custom_profile_field__birthday': 'nonExistantAttr',
+            }
+        ), self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
             self.perform_ldap_sync(self.example_user('hamlet'))
 
-        actual_value = CustomProfileFieldValue.objects.get(user_profile=hamlet, field=no_op_field).value
+        actual_value = CustomProfileFieldValue.objects.get(
+            user_profile=hamlet, field=no_op_field
+        ).value
         self.assertEqual(actual_value, expected_value)
-        self.assertEqual(warn_log.output, [
-            'WARNING:django_auth_ldap:uid=hamlet,ou=users,dc=zulip,dc=com does not have a value for the attribute nonExistantAttr'
-        ])
+        self.assertEqual(
+            warn_log.output,
+            [
+                'WARNING:django_auth_ldap:uid=hamlet,ou=users,dc=zulip,dc=com does not have a value for the attribute nonExistantAttr'
+            ],
+        )
+
 
 class TestQueryLDAP(ZulipLDAPTestCase):
-
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',))
     def test_ldap_not_configured(self) -> None:
         values = query_ldap(self.example_email('hamlet'))
@@ -4821,11 +5621,14 @@ class TestQueryLDAP(ZulipLDAPTestCase):
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_normal_query(self) -> None:
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn',
-                                                    'avatar': 'jpegPhoto',
-                                                    'custom_profile_field__birthday': 'birthDate',
-                                                    'custom_profile_field__phone_number': 'nonExistentAttr',
-                                                    }):
+        with self.settings(
+            AUTH_LDAP_USER_ATTR_MAP={
+                'full_name': 'cn',
+                'avatar': 'jpegPhoto',
+                'custom_profile_field__birthday': 'birthDate',
+                'custom_profile_field__phone_number': 'nonExistentAttr',
+            }
+        ):
             values = query_ldap(self.example_email('hamlet'))
         self.assertEqual(len(values), 4)
         self.assertIn('full_name: King Hamlet', values)
@@ -4835,8 +5638,7 @@ class TestQueryLDAP(ZulipLDAPTestCase):
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_query_email_attr(self) -> None:
-        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn'},
-                           LDAP_EMAIL_ATTR='mail'):
+        with self.settings(AUTH_LDAP_USER_ATTR_MAP={'full_name': 'cn'}, LDAP_EMAIL_ATTR='mail'):
             # This will look up the user by email in our test dictionary,
             # should successfully find hamlet's LDAP entry.
             values = query_ldap(self.example_email('hamlet'))
@@ -4844,30 +5646,35 @@ class TestQueryLDAP(ZulipLDAPTestCase):
         self.assertIn('full_name: King Hamlet', values)
         self.assertIn('email: hamlet@zulip.com', values)
 
+
 class TestZulipAuthMixin(ZulipTestCase):
     def test_get_user(self) -> None:
         backend = ZulipAuthMixin()
         result = backend.get_user(11111)
         self.assertIs(result, None)
 
+
 class TestPasswordAuthEnabled(ZulipTestCase):
     def test_password_auth_enabled_for_ldap(self) -> None:
         with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',)):
             realm = Realm.objects.get(string_id='zulip')
             self.assertTrue(password_auth_enabled(realm))
 
+
 class TestRequireEmailFormatUsernames(ZulipTestCase):
-    def test_require_email_format_usernames_for_ldap_with_append_domain(
-            self) -> None:
-        with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
-                           LDAP_APPEND_DOMAIN="zulip.com"):
+    def test_require_email_format_usernames_for_ldap_with_append_domain(self) -> None:
+        with self.settings(
+            AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
+            LDAP_APPEND_DOMAIN="zulip.com",
+        ):
             realm = Realm.objects.get(string_id='zulip')
             self.assertFalse(require_email_format_usernames(realm))
 
-    def test_require_email_format_usernames_for_ldap_with_email_attr(
-            self) -> None:
-        with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
-                           LDAP_EMAIL_ATTR="email"):
+    def test_require_email_format_usernames_for_ldap_with_email_attr(self) -> None:
+        with self.settings(
+            AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',),
+            LDAP_EMAIL_ATTR="email",
+        ):
             realm = Realm.objects.get(string_id='zulip')
             self.assertFalse(require_email_format_usernames(realm))
 
@@ -4876,22 +5683,29 @@ class TestRequireEmailFormatUsernames(ZulipTestCase):
             realm = Realm.objects.get(string_id='zulip')
             self.assertTrue(require_email_format_usernames(realm))
 
-    def test_require_email_format_usernames_for_email_and_ldap_with_email_attr(
-            self) -> None:
-        with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                                    'zproject.backends.ZulipLDAPAuthBackend'),
-                           LDAP_EMAIL_ATTR="email"):
+    def test_require_email_format_usernames_for_email_and_ldap_with_email_attr(self) -> None:
+        with self.settings(
+            AUTHENTICATION_BACKENDS=(
+                'zproject.backends.EmailAuthBackend',
+                'zproject.backends.ZulipLDAPAuthBackend',
+            ),
+            LDAP_EMAIL_ATTR="email",
+        ):
             realm = Realm.objects.get(string_id='zulip')
             self.assertFalse(require_email_format_usernames(realm))
 
-    def test_require_email_format_usernames_for_email_and_ldap_with_append_email(
-            self) -> None:
-        with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                                    'zproject.backends.ZulipLDAPAuthBackend'),
-                           LDAP_APPEND_DOMAIN="zulip.com"):
+    def test_require_email_format_usernames_for_email_and_ldap_with_append_email(self) -> None:
+        with self.settings(
+            AUTHENTICATION_BACKENDS=(
+                'zproject.backends.EmailAuthBackend',
+                'zproject.backends.ZulipLDAPAuthBackend',
+            ),
+            LDAP_APPEND_DOMAIN="zulip.com",
+        ):
             realm = Realm.objects.get(string_id='zulip')
             self.assertFalse(require_email_format_usernames(realm))
 
+
 class TestMaybeSendToRegistration(ZulipTestCase):
     def test_sso_only_when_preregistration_user_does_not_exist(self) -> None:
         rf = RequestFactory()
@@ -4909,7 +5723,9 @@ class TestMaybeSendToRegistration(ZulipTestCase):
 
         with mock.patch('zerver.views.auth.HomepageForm', return_value=Form()):
             self.assertEqual(PreregistrationUser.objects.all().count(), 0)
-            result = maybe_send_to_registration(request, self.example_email("hamlet"), is_signup=True)
+            result = maybe_send_to_registration(
+                request, self.example_email("hamlet"), is_signup=True
+            )
             self.assertEqual(result.status_code, 302)
             confirmation = Confirmation.objects.all().first()
             confirmation_key = confirmation.confirmation_key
@@ -4947,18 +5763,22 @@ class TestMaybeSendToRegistration(ZulipTestCase):
             self.assertIn('do_confirm/' + confirmation_key, result.url)
             self.assertEqual(PreregistrationUser.objects.all().count(), 1)
 
-class TestAdminSetBackends(ZulipTestCase):
 
+class TestAdminSetBackends(ZulipTestCase):
     def test_change_enabled_backends(self) -> None:
         # Log in as admin
         self.login('iago')
-        result = self.client_patch("/json/realm", {
-            'authentication_methods': orjson.dumps({'Email': False, 'Dev': True}).decode()})
+        result = self.client_patch(
+            "/json/realm",
+            {'authentication_methods': orjson.dumps({'Email': False, 'Dev': True}).decode()},
+        )
         self.assert_json_error(result, 'Must be an organization owner')
 
         self.login('desdemona')
-        result = self.client_patch("/json/realm", {
-            'authentication_methods': orjson.dumps({'Email': False, 'Dev': True}).decode()})
+        result = self.client_patch(
+            "/json/realm",
+            {'authentication_methods': orjson.dumps({'Email': False, 'Dev': True}).decode()},
+        )
         self.assert_json_success(result)
         realm = get_realm('zulip')
         self.assertFalse(password_auth_enabled(realm))
@@ -4967,8 +5787,10 @@ class TestAdminSetBackends(ZulipTestCase):
     def test_disable_all_backends(self) -> None:
         # Log in as admin
         self.login('desdemona')
-        result = self.client_patch("/json/realm", {
-            'authentication_methods': orjson.dumps({'Email': False, 'Dev': False}).decode()})
+        result = self.client_patch(
+            "/json/realm",
+            {'authentication_methods': orjson.dumps({'Email': False, 'Dev': False}).decode()},
+        )
         self.assert_json_error(result, 'At least one authentication method must be enabled.')
         realm = get_realm('zulip')
         self.assertTrue(password_auth_enabled(realm))
@@ -4978,8 +5800,14 @@ class TestAdminSetBackends(ZulipTestCase):
         # Log in as admin
         self.login('desdemona')
         # Set some supported and unsupported backends
-        result = self.client_patch("/json/realm", {
-            'authentication_methods': orjson.dumps({'Email': False, 'Dev': True, 'GitHub': False}).decode()})
+        result = self.client_patch(
+            "/json/realm",
+            {
+                'authentication_methods': orjson.dumps(
+                    {'Email': False, 'Dev': True, 'GitHub': False}
+                ).decode()
+            },
+        )
         self.assert_json_success(result)
         realm = get_realm('zulip')
         # Check that unsupported backend is not enabled
@@ -4987,6 +5815,7 @@ class TestAdminSetBackends(ZulipTestCase):
         self.assertTrue(dev_auth_enabled(realm))
         self.assertFalse(password_auth_enabled(realm))
 
+
 class EmailValidatorTestCase(ZulipTestCase):
     def test_valid_email(self) -> None:
         validate_login_email(self.example_email("hamlet"))
@@ -5025,6 +5854,7 @@ class EmailValidatorTestCase(ZulipTestCase):
         errors = get_existing_user_errors(realm, {'fred-is-fine@zulip.com'})
         self.assertEqual(errors, {})
 
+
 class LDAPBackendTest(ZulipTestCase):
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
     def test_non_existing_realm(self) -> None:
@@ -5037,14 +5867,17 @@ class LDAPBackendTest(ZulipTestCase):
         )
         error_type = ZulipLDAPAuthBackend.REALM_IS_NONE_ERROR
         error = ZulipLDAPConfigurationError('Realm is None', error_type)
-        with mock.patch('zproject.backends.ZulipLDAPAuthBackend.get_or_build_user',
-                        side_effect=error), \
-                mock.patch('django_auth_ldap.backend._LDAPUser._authenticate_user_dn'), \
-                self.assertLogs('django_auth_ldap', 'WARNING') as warn_log:
+        with mock.patch(
+            'zproject.backends.ZulipLDAPAuthBackend.get_or_build_user', side_effect=error
+        ), mock.patch('django_auth_ldap.backend._LDAPUser._authenticate_user_dn'), self.assertLogs(
+            'django_auth_ldap', 'WARNING'
+        ) as warn_log:
             response = self.client_post('/login/', data)
-            self.assert_in_success_response(["Configuration error",
-                                             "You are trying to log in using LDAP without creating an"],
-                                            response)
-        self.assertEqual(warn_log.output, [
-            "WARNING:django_auth_ldap:('Realm is None', 1) while authenticating hamlet"
-        ])
+            self.assert_in_success_response(
+                ["Configuration error", "You are trying to log in using LDAP without creating an"],
+                response,
+            )
+        self.assertEqual(
+            warn_log.output,
+            ["WARNING:django_auth_ldap:('Realm is None', 1) while authenticating hamlet"],
+        )
diff --git a/zerver/tests/test_bots.py b/zerver/tests/test_bots.py
index 15540892fa..c40da6425c 100644
--- a/zerver/tests/test_bots.py
+++ b/zerver/tests/test_bots.py
@@ -41,11 +41,17 @@ def _check_string(var_name: str, val: object) -> Optional[str]:
         return f'{var_name} starts with a "_" and is hence invalid.'
     return None
 
+
 stripe_sample_config_options = [
-    WebhookIntegration('stripe', ['financial'], display_name='Stripe',
-                       config_options=[("Stripe API Key", "stripe_api_key", _check_string)]),
+    WebhookIntegration(
+        'stripe',
+        ['financial'],
+        display_name='Stripe',
+        config_options=[("Stripe API Key", "stripe_api_key", _check_string)],
+    ),
 ]
 
+
 class BotTest(ZulipTestCase, UploadSerializeMixin):
     def get_bot_user(self, email: str) -> UserProfile:
         realm = get_realm("zulip")
@@ -116,8 +122,10 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         }
         result = self.client_post("/json/bots", bot_info)
 
-        error_message = ("Can't create bots until FAKE_EMAIL_DOMAIN is correctly configured.\n" +
-                         "Please contact your server administrator.")
+        error_message = (
+            "Can't create bots until FAKE_EMAIL_DOMAIN is correctly configured.\n"
+            + "Please contact your server administrator."
+        )
         self.assert_json_error(result, error_message)
         self.assert_num_bots_equal(0)
 
@@ -170,10 +178,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         email = 'hambot-bot@zulip.testserver'
         bot = self.get_bot_user(email)
 
-        (event,) = [
-            e for e in events
-            if e['event']['type'] == 'realm_bot'
-        ]
+        (event,) = [e for e in events if e['event']['type'] == 'realm_bot']
 
         self.assertEqual(result["user_id"], bot.id)
         self.assertEqual(
@@ -224,7 +229,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         email = 'hambot-bot@zulip.example.com'
         self.get_bot_user(email)
 
-    @override_settings(FAKE_EMAIL_DOMAIN="fakedomain.com", REALM_HOSTS={"zulip": "zulip.example.com"})
+    @override_settings(
+        FAKE_EMAIL_DOMAIN="fakedomain.com", REALM_HOSTS={"zulip": "zulip.example.com"}
+    )
     def test_add_bot_host_used_as_domain_if_valid(self) -> None:
         self.login('hamlet')
         self.assert_num_bots_equal(0)
@@ -267,9 +274,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
             self.create_bot(file=fp)
             profile = get_user(email, realm)
             # Make sure that avatar image that we've uploaded is same with avatar image in the server
-            self.assertTrue(filecmp.cmp(fp.name,
-                                        os.path.splitext(avatar_disk_path(profile))[0] +
-                                        ".original"))
+            self.assertTrue(
+                filecmp.cmp(fp.name, os.path.splitext(avatar_disk_path(profile))[0] + ".original")
+            )
         self.assert_num_bots_equal(1)
 
         self.assertEqual(profile.avatar_source, UserProfile.AVATAR_FROM_USER)
@@ -278,8 +285,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
     def test_add_bot_with_too_many_files(self) -> None:
         self.login('hamlet')
         self.assert_num_bots_equal(0)
-        with get_test_image_file('img.png') as fp1, \
-                get_test_image_file('img.gif') as fp2:
+        with get_test_image_file('img.png') as fp1, get_test_image_file('img.gif') as fp2:
             bot_info = dict(
                 full_name='whatever',
                 short_name='whatever',
@@ -300,7 +306,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         self.assertEqual(result['default_sending_stream'], 'Denmark')
 
         profile = get_user(email, realm)
-        assert(profile.default_sending_stream is not None)
+        assert profile.default_sending_stream is not None
         self.assertEqual(profile.default_sending_stream.name, 'Denmark')
 
     def test_add_bot_with_default_sending_stream_not_subscribed(self) -> None:
@@ -313,15 +319,16 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         self.assertEqual(result['default_sending_stream'], 'Rome')
 
         profile = get_user(email, realm)
-        assert(profile.default_sending_stream is not None)
+        assert profile.default_sending_stream is not None
         self.assertEqual(profile.default_sending_stream.name, 'Rome')
 
     def test_add_bot_email_address_visibility(self) -> None:
         # Test that we don't mangle the email field with
         # email_address_visiblity limited to admins
         user = self.example_user("hamlet")
-        do_set_realm_property(user.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            user.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
         user.refresh_from_db()
 
         self.login_user(user)
@@ -334,26 +341,25 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         email = 'hambot-bot@zulip.testserver'
         bot = self.get_bot_user(email)
 
-        (event,) = [
-            e for e in events
-            if e['event']['type'] == 'realm_bot'
-        ]
+        (event,) = [e for e in events if e['event']['type'] == 'realm_bot']
         self.assertEqual(
             dict(
                 type='realm_bot',
                 op='add',
-                bot=dict(email='hambot-bot@zulip.testserver',
-                         user_id=bot.id,
-                         bot_type=bot.bot_type,
-                         full_name='The Bot of Hamlet',
-                         is_active=True,
-                         api_key=result['api_key'],
-                         avatar_url=result['avatar_url'],
-                         default_sending_stream=None,
-                         default_events_register_stream=None,
-                         default_all_public_streams=False,
-                         services=[],
-                         owner_id=user.id),
+                bot=dict(
+                    email='hambot-bot@zulip.testserver',
+                    user_id=bot.id,
+                    bot_type=bot.bot_type,
+                    full_name='The Bot of Hamlet',
+                    is_active=True,
+                    api_key=result['api_key'],
+                    avatar_url=result['avatar_url'],
+                    default_sending_stream=None,
+                    default_events_register_stream=None,
+                    default_all_public_streams=False,
+                    services=[],
+                    owner_id=user.id,
+                ),
             ),
             event['event'],
         )
@@ -428,13 +434,10 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         email = 'hambot-bot@zulip.testserver'
         realm = get_realm('zulip')
         profile = get_user(email, realm)
-        assert(profile.default_sending_stream is not None)
+        assert profile.default_sending_stream is not None
         self.assertEqual(profile.default_sending_stream.name, 'Denmark')
 
-        (event,) = [
-            e for e in events
-            if e['event']['type'] == 'realm_bot'
-        ]
+        (event,) = [e for e in events if e['event']['type'] == 'realm_bot']
         self.assertEqual(
             dict(
                 type='realm_bot',
@@ -484,7 +487,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         self.assertEqual(result['default_events_register_stream'], 'Denmark')
 
         profile = get_user(bot_email, bot_realm)
-        assert(profile.default_events_register_stream is not None)
+        assert profile.default_events_register_stream is not None
         self.assertEqual(profile.default_events_register_stream.name, 'Denmark')
 
     def test_add_bot_with_default_events_register_stream_private_allowed(self) -> None:
@@ -503,13 +506,10 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         bot_email = 'hambot-bot@zulip.testserver'
         bot_realm = get_realm('zulip')
         bot_profile = get_user(bot_email, bot_realm)
-        assert(bot_profile.default_events_register_stream is not None)
+        assert bot_profile.default_events_register_stream is not None
         self.assertEqual(bot_profile.default_events_register_stream.name, 'Denmark')
 
-        (event,) = [
-            e for e in events
-            if e['event']['type'] == 'realm_bot'
-        ]
+        (event,) = [e for e in events if e['event']['type'] == 'realm_bot']
         self.assertEqual(
             dict(
                 type='realm_bot',
@@ -600,7 +600,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         result = self.client_post("/json/bots", bot_info)
         self.assert_json_success(result)
 
-        self.assertEqual(UserProfile.objects.filter(is_bot=True, bot_owner=user, is_active=True).count(), 2)
+        self.assertEqual(
+            UserProfile.objects.filter(is_bot=True, bot_owner=user, is_active=True).count(), 2
+        )
 
         result = self.client_delete('/json/users/me')
         self.assert_json_success(result)
@@ -608,7 +610,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         self.assertFalse(user.is_active)
 
         self.login('iago')
-        self.assertFalse(UserProfile.objects.filter(is_bot=True, bot_owner=user, is_active=True).exists())
+        self.assertFalse(
+            UserProfile.objects.filter(is_bot=True, bot_owner=user, is_active=True).exists()
+        )
 
     def test_cannot_deactivate_other_realm_bot(self) -> None:
         user = self.mit_user('starnine')
@@ -1038,11 +1042,10 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
 
         email = 'hambot-bot@zulip.testserver'
         # Try error case first (too many files):
-        with get_test_image_file('img.png') as fp1, \
-                get_test_image_file('img.gif') as fp2:
+        with get_test_image_file('img.png') as fp1, get_test_image_file('img.gif') as fp2:
             result = self.client_patch_multipart(
-                f'/json/bots/{self.get_bot_user(email).id}',
-                dict(file1=fp1, file2=fp2))
+                f'/json/bots/{self.get_bot_user(email).id}', dict(file1=fp1, file2=fp2)
+            )
         self.assert_json_error(result, 'You may only upload one file at a time')
 
         profile = get_user(bot_email, bot_realm)
@@ -1051,14 +1054,14 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         # HAPPY PATH
         with get_test_image_file('img.png') as fp:
             result = self.client_patch_multipart(
-                f'/json/bots/{self.get_bot_user(email).id}',
-                dict(file=fp))
+                f'/json/bots/{self.get_bot_user(email).id}', dict(file=fp)
+            )
             profile = get_user(bot_email, bot_realm)
             self.assertEqual(profile.avatar_version, 2)
             # Make sure that avatar image that we've uploaded is same with avatar image in the server
-            self.assertTrue(filecmp.cmp(fp.name,
-                                        os.path.splitext(avatar_disk_path(profile))[0] +
-                                        ".original"))
+            self.assertTrue(
+                filecmp.cmp(fp.name, os.path.splitext(avatar_disk_path(profile))[0] + ".original")
+            )
         self.assert_json_success(result)
 
         self.assertEqual(profile.avatar_source, UserProfile.AVATAR_FROM_USER)
@@ -1295,7 +1298,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
 
         bot_email = "hambot-bot@zulip.testserver"
         bot_realm = get_realm('zulip')
-        default_events_register_stream = get_user(bot_email, bot_realm).default_events_register_stream
+        default_events_register_stream = get_user(
+            bot_email, bot_realm
+        ).default_events_register_stream
         self.assertEqual(None, default_events_register_stream)
 
         bot = self.get_bot()
@@ -1370,8 +1375,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         }
         email = 'hambot-bot@zulip.testserver'
         # Important: We intentionally use the wrong method, post, here.
-        result = self.client_post(f"/json/bots/{self.get_bot_user(email).id}",
-                                  bot_info)
+        result = self.client_post(f"/json/bots/{self.get_bot_user(email).id}", bot_info)
         self.assert_json_success(result)
 
         self.assertEqual('Fred', result.json()['full_name'])
@@ -1418,11 +1422,14 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
 
     @patch('zulip_bots.bots.giphy.giphy.GiphyHandler.validate_config')
     def test_patch_bot_config_data(self, mock_validate_config: MagicMock) -> None:
-        self.create_test_bot('test', self.example_user("hamlet"),
-                             full_name='Bot with config data',
-                             bot_type=UserProfile.EMBEDDED_BOT,
-                             service_name='giphy',
-                             config_data=orjson.dumps({'key': '12345678'}).decode())
+        self.create_test_bot(
+            'test',
+            self.example_user("hamlet"),
+            full_name='Bot with config data',
+            bot_type=UserProfile.EMBEDDED_BOT,
+            service_name='giphy',
+            config_data=orjson.dumps({'key': '12345678'}).decode(),
+        )
         bot_info = {'config_data': orjson.dumps({'key': '87654321'}).decode()}
         email = 'test-bot@zulip.testserver'
         result = self.client_patch(f"/json/bots/{self.get_bot_user(email).id}", bot_info)
@@ -1476,7 +1483,10 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         # Test for valid service.
         test_service_name = 'converter'
         test_bot_handler = get_bot_handler(test_service_name)
-        self.assertEqual(str(type(test_bot_handler)), "<class 'zulip_bots.bots.converter.converter.ConverterHandler'>")
+        self.assertEqual(
+            str(type(test_bot_handler)),
+            "<class 'zulip_bots.bots.converter.converter.ConverterHandler'>",
+        )
 
         # Test for invalid service.
         test_service_name = "incorrect_bot_service_foo"
@@ -1517,12 +1527,14 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
 
     def test_create_embedded_bot(self, **extras: Any) -> None:
         bot_config_info = {'key': 'value'}
-        self.create_test_bot(short_name='embeddedservicebot',
-                             user_profile=self.example_user("hamlet"),
-                             bot_type=UserProfile.EMBEDDED_BOT,
-                             service_name='followup',
-                             config_data=orjson.dumps(bot_config_info).decode(),
-                             **extras)
+        self.create_test_bot(
+            short_name='embeddedservicebot',
+            user_profile=self.example_user("hamlet"),
+            bot_type=UserProfile.EMBEDDED_BOT,
+            service_name='followup',
+            config_data=orjson.dumps(bot_config_info).decode(),
+            **extras,
+        )
         bot_email = "embeddedservicebot-bot@zulip.testserver"
         bot_realm = get_realm('zulip')
         bot = get_user(bot_email, bot_realm)
@@ -1562,7 +1574,10 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
             'config_data': orjson.dumps(incorrect_bot_config_info).decode(),
         }
         bot_info.update(extras)
-        with patch('zulip_bots.bots.giphy.giphy.GiphyHandler.validate_config', side_effect=ConfigValidationError):
+        with patch(
+            'zulip_bots.bots.giphy.giphy.GiphyHandler.validate_config',
+            side_effect=ConfigValidationError,
+        ):
             result = self.client_post("/json/bots", bot_info)
         self.assert_json_error(result, 'Invalid configuration data!')
 
@@ -1588,8 +1603,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
         self.create_bot(**bot_metadata)
         new_bot = UserProfile.objects.get(full_name="My Stripe Bot")
         config_data = get_bot_config(new_bot)
-        self.assertEqual(config_data, {"integration_id": "stripe",
-                                       "stripe_api_key": "sample-api-key"})
+        self.assertEqual(
+            config_data, {"integration_id": "stripe", "stripe_api_key": "sample-api-key"}
+        )
 
     @patch("zerver.lib.integrations.WEBHOOK_INTEGRATIONS", stripe_sample_config_options)
     def test_create_incoming_webhook_bot_with_service_name_incorrect_keys(self) -> None:
diff --git a/zerver/tests/test_cache.py b/zerver/tests/test_cache.py
index 5501979aa7..39ba8207f2 100644
--- a/zerver/tests/test_cache.py
+++ b/zerver/tests/test_cache.py
@@ -37,6 +37,7 @@ class AppsTest(ZulipTestCase):
             self.assertEqual(m.output, ['INFO:root:Clearing memcached cache after migrations'])
             self.assertEqual(len(m.output), 1)
 
+
 class CacheKeyValidationTest(ZulipTestCase):
     def test_validate_cache_key(self) -> None:
         validate_cache_key('nice_Ascii:string!~')
@@ -49,7 +50,7 @@ class CacheKeyValidationTest(ZulipTestCase):
         with self.assertRaises(InvalidCacheKeyException):
             validate_cache_key('whitespace_character: ')
         with self.assertRaises(InvalidCacheKeyException):
-            validate_cache_key('too_long:' + 'X'*MEMCACHED_MAX_KEY_LENGTH)
+            validate_cache_key('too_long:' + 'X' * MEMCACHED_MAX_KEY_LENGTH)
 
         with self.assertRaises(InvalidCacheKeyException):
             # validate_cache_key does validation on a key with the
@@ -75,6 +76,7 @@ class CacheKeyValidationTest(ZulipTestCase):
         with self.assertRaises(InvalidCacheKeyException):
             cache_delete_many([good_key, invalid_key])
 
+
 class CacheWithKeyDecoratorTest(ZulipTestCase):
     def test_cache_with_key_invalid_character(self) -> None:
         def invalid_characters_cache_key_function(user_id: int) -> str:
@@ -85,8 +87,7 @@ class CacheWithKeyDecoratorTest(ZulipTestCase):
             return UserProfile.objects.get(id=user_id)
 
         hamlet = self.example_user('hamlet')
-        with patch('zerver.lib.cache.cache_set') as mock_set, \
-                self.assertLogs(level="WARNING") as m:
+        with patch('zerver.lib.cache.cache_set') as mock_set, self.assertLogs(level="WARNING") as m:
             with queries_captured() as queries:
                 result = get_user_function_with_bad_cache_keys(hamlet.id)
 
@@ -97,7 +98,7 @@ class CacheWithKeyDecoratorTest(ZulipTestCase):
 
     def test_cache_with_key_key_too_long(self) -> None:
         def too_long_cache_key_function(user_id: int) -> str:
-            return 'CacheWithKeyDecoratorTest:very_long_key:{}:{}'.format('a'*250, user_id)
+            return 'CacheWithKeyDecoratorTest:very_long_key:{}:{}'.format('a' * 250, user_id)
 
         @cache_with_key(too_long_cache_key_function, timeout=1000)
         def get_user_function_with_bad_cache_keys(user_id: int) -> UserProfile:
@@ -105,8 +106,7 @@ class CacheWithKeyDecoratorTest(ZulipTestCase):
 
         hamlet = self.example_user('hamlet')
 
-        with patch('zerver.lib.cache.cache_set') as mock_set, \
-                self.assertLogs(level="WARNING") as m:
+        with patch('zerver.lib.cache.cache_set') as mock_set, self.assertLogs(level="WARNING") as m:
             with queries_captured() as queries:
                 result = get_user_function_with_bad_cache_keys(hamlet.id)
 
@@ -163,6 +163,7 @@ class CacheWithKeyDecoratorTest(ZulipTestCase):
         self.assertEqual(result_two, None)
         self.assert_length(queries, 0)
 
+
 class GetCacheWithKeyDecoratorTest(ZulipTestCase):
     def test_get_cache_with_good_key(self) -> None:
         # Test with a good cache key function, but a get_user function
@@ -199,9 +200,14 @@ class GetCacheWithKeyDecoratorTest(ZulipTestCase):
                 get_user_function_with_bad_cache_keys(hamlet.id)
             self.assertEqual(len(m.output), 1)
 
+
 class SafeCacheFunctionsTest(ZulipTestCase):
     def test_safe_cache_functions_with_all_good_keys(self) -> None:
-        items = {"SafeFunctionsTest:key1": 1, "SafeFunctionsTest:key2": 2, "SafeFunctionsTest:key3": 3}
+        items = {
+            "SafeFunctionsTest:key1": 1,
+            "SafeFunctionsTest:key2": 2,
+            "SafeFunctionsTest:key3": 3,
+        }
         safe_cache_set_many(items)
 
         result = safe_cache_get_many(list(items.keys()))
@@ -212,13 +218,19 @@ class SafeCacheFunctionsTest(ZulipTestCase):
         items = {"SafeFunctionsTest:\nbadkey1": 1, "SafeFunctionsTest:\nbadkey2": 2}
         with self.assertLogs(level="WARNING") as m:
             safe_cache_set_many(items)
-            self.assertIn('WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']', m.output[0])
+            self.assertIn(
+                'WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']',
+                m.output[0],
+            )
             self.assertEqual(len(m.output), 1)
 
         with self.assertLogs(level="WARNING") as m:
             result = safe_cache_get_many(list(items.keys()))
             self.assertEqual(result, {})
-            self.assertIn('WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']', m.output[0])
+            self.assertIn(
+                'WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']',
+                m.output[0],
+            )
             self.assertEqual(len(m.output), 1)
 
     def test_safe_cache_functions_with_good_and_bad_keys(self) -> None:
@@ -228,15 +240,22 @@ class SafeCacheFunctionsTest(ZulipTestCase):
 
         with self.assertLogs(level="WARNING") as m:
             safe_cache_set_many(items)
-            self.assertIn('WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']', m.output[0])
+            self.assertIn(
+                'WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']',
+                m.output[0],
+            )
             self.assertEqual(len(m.output), 1)
 
         with self.assertLogs(level="WARNING") as m:
             result = safe_cache_get_many(list(items.keys()))
             self.assertEqual(result, good_items)
-            self.assertIn('WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']', m.output[0])
+            self.assertIn(
+                'WARNING:root:Invalid cache key used: [\'SafeFunctionsTest:\\nbadkey1\', \'SafeFunctionsTest:\\nbadkey2\']',
+                m.output[0],
+            )
             self.assertEqual(len(m.output), 1)
 
+
 class BotCacheKeyTest(ZulipTestCase):
     def test_bot_profile_key_deleted_on_save(self) -> None:
         # Get the profile cached on both cache keys:
@@ -257,9 +276,11 @@ class BotCacheKeyTest(ZulipTestCase):
         user_profile2 = get_user_profile_by_email(settings.EMAIL_GATEWAY_BOT)
         self.assertEqual(user_profile2.can_forge_sender, flipped_setting)
 
+
 def get_user_email(user: UserProfile) -> str:
     return user.email  # nocoverage
 
+
 class GenericBulkCachedFetchTest(ZulipTestCase):
     def test_query_function_called_only_if_needed(self) -> None:
         # Get the user cached:
@@ -282,9 +303,7 @@ class GenericBulkCachedFetchTest(ZulipTestCase):
         self.assertEqual(result, {hamlet.delivery_email: hamlet})
         with self.assertLogs(level='INFO') as info_log:
             flush_cache(Mock())
-        self.assertEqual(info_log.output, [
-            'INFO:root:Clearing memcached cache after migrations'
-        ])
+        self.assertEqual(info_log.output, ['INFO:root:Clearing memcached cache after migrations'])
 
         # With the cache flushed, the query_function should get called:
         with self.assertRaises(CustomException):
@@ -299,10 +318,14 @@ class GenericBulkCachedFetchTest(ZulipTestCase):
         class CustomException(Exception):
             pass
 
-        def cache_key_function(email: str) -> str:  # nocoverage -- this is just here to make sure it's not called
+        def cache_key_function(
+            email: str,
+        ) -> str:  # nocoverage -- this is just here to make sure it's not called
             raise CustomException("The cache key function was called")
 
-        def query_function(emails: List[str]) -> List[UserProfile]:  # nocoverage -- this is just here to make sure it's not called
+        def query_function(
+            emails: List[str],
+        ) -> List[UserProfile]:  # nocoverage -- this is just here to make sure it's not called
             raise CustomException("The query function was called")
 
         # query_function and cache_key_function shouldn't be called, because
diff --git a/zerver/tests/test_camo.py b/zerver/tests/test_camo.py
index 441e1c9adb..fb5c51a78f 100644
--- a/zerver/tests/test_camo.py
+++ b/zerver/tests/test_camo.py
@@ -4,16 +4,25 @@ from zerver.lib.test_classes import ZulipTestCase
 class CamoURLTest(ZulipTestCase):
     def test_legacy_camo_url(self) -> None:
         # Test with valid hex and URL pair
-        result = self.client_get("/external_content/0f50f0bda30b6e65e9442c83ddb4076c74e75f96/687474703a2f2f7777772e72616e646f6d2e736974652f696d616765732f666f6f6261722e6a706567")
+        result = self.client_get(
+            "/external_content/0f50f0bda30b6e65e9442c83ddb4076c74e75f96/687474703a2f2f7777772e72616e646f6d2e736974652f696d616765732f666f6f6261722e6a706567"
+        )
         self.assertEqual(result.status_code, 302, result)
-        self.assertIn('/filters:no_upscale():quality(100)/aHR0cDovL3d3dy5yYW5kb20uc2l0ZS9pbWFnZXMvZm9vYmFyLmpwZWc=/source_type/external', result.url)
+        self.assertIn(
+            '/filters:no_upscale():quality(100)/aHR0cDovL3d3dy5yYW5kb20uc2l0ZS9pbWFnZXMvZm9vYmFyLmpwZWc=/source_type/external',
+            result.url,
+        )
 
         # Test with invalid hex and URL pair
-        result = self.client_get("/external_content/074c5e6c9c6d4ce97db1c740d79dc561cf7eb379/687474703a2f2f7777772e72616e646f6d2e736974652f696d616765732f666f6f6261722e6a706567")
+        result = self.client_get(
+            "/external_content/074c5e6c9c6d4ce97db1c740d79dc561cf7eb379/687474703a2f2f7777772e72616e646f6d2e736974652f696d616765732f666f6f6261722e6a706567"
+        )
         self.assertEqual(result.status_code, 403, result)
         self.assert_in_response("Not a valid URL.", result)
 
     def test_with_thumbor_disabled(self) -> None:
         with self.settings(THUMBOR_SERVES_CAMO=False):
-            result = self.client_get("/external_content/074c5e6c9c6d4ce97db1c740d79dc561cf7eb379/687474703a2f2f7777772e72616e646f6d2e736974652f696d616765732f666f6f6261722e6a706567")
+            result = self.client_get(
+                "/external_content/074c5e6c9c6d4ce97db1c740d79dc561cf7eb379/687474703a2f2f7777772e72616e646f6d2e736974652f696d616765732f666f6f6261722e6a706567"
+            )
             self.assertEqual(result.status_code, 404, result)
diff --git a/zerver/tests/test_compatibility.py b/zerver/tests/test_compatibility.py
index 0b8101d308..92bc82e7d2 100644
--- a/zerver/tests/test_compatibility.py
+++ b/zerver/tests/test_compatibility.py
@@ -5,7 +5,9 @@ from zerver.views.compatibility import find_mobile_os, is_outdated_desktop_app,
 
 
 class VersionTest(ZulipTestCase):
-    data = [case.split() for case in '''
+    data = [
+        case.split()
+        for case in '''
         1.2.3    <  1.2.4
         1.2.3    =  1.2.3
         1.4.1    >  1.2.3
@@ -22,7 +24,10 @@ class VersionTest(ZulipTestCase):
         15.1.95  <  16.2.96
         16.2.96  =  16.2.96
         20.0.103 >  16.2.96
-    '''.strip().split('\n')] + [
+    '''.strip().split(
+            '\n'
+        )
+    ] + [
         ['', '?', '1'],
         ['', '?', 'a'],
     ]
@@ -45,22 +50,28 @@ class VersionTest(ZulipTestCase):
             else:
                 assert False  # nocoverage
 
-    mobile_os_data = [case.split(None, 1) for case in '''
+    mobile_os_data = [
+        case.split(None, 1)
+        for case in '''
       android ZulipMobile/1.2.3 (Android 4.5)
       ios     ZulipMobile/1.2.3 (iPhone OS 2.1)
       ios     ZulipMobile/1.2.3 (iOS 6)
       None    ZulipMobile/1.2.3 (Windows 8)
-    '''.strip().split('\n')]
+    '''.strip().split(
+            '\n'
+        )
+    ]
 
     def test_find_mobile_os(self) -> None:
         for expected_, user_agent in self.mobile_os_data:
             expected = None if expected_ == 'None' else expected_
-            self.assertEqual(find_mobile_os(user_agent), expected,
-                             msg=user_agent)
+            self.assertEqual(find_mobile_os(user_agent), expected, msg=user_agent)
 
 
 class CompatibilityTest(ZulipTestCase):
-    data = [case.split(None, 1) for case in '''
+    data = [
+        case.split(None, 1)
+        for case in '''
       old ZulipInvalid/5.0
       ok  ZulipMobile/5.0
       ok  ZulipMobile/5.0 (iOS 11)
@@ -78,7 +89,11 @@ class CompatibilityTest(ZulipTestCase):
       ok  ZulipMobile/1 CFNetwork/974.2.1 Darwin/18.0.0
       ok  ZulipMobile/20.0.103 (Android 6.0.1)
       ok  ZulipMobile/20.0.103 (iOS 12.1)
-    '''.strip().split('\n') if case]
+    '''.strip().split(
+            '\n'
+        )
+        if case
+    ]
 
     def test_compatibility_without_user_agent(self) -> None:
         result = self.client_get("/compatibility", skip_user_agent=True)
@@ -86,8 +101,7 @@ class CompatibilityTest(ZulipTestCase):
 
     def test_compatibility(self) -> None:
         for expected, user_agent in self.data:
-            result = self.client_get("/compatibility",
-                                     HTTP_USER_AGENT=user_agent)
+            result = self.client_get("/compatibility", HTTP_USER_AGENT=user_agent)
             if expected == 'ok':
                 self.assert_json_success(result)
             elif expected == 'old':
@@ -97,17 +111,47 @@ class CompatibilityTest(ZulipTestCase):
 
     def test_insecure_desktop_app(self) -> None:
         self.assertEqual(is_outdated_desktop_app('ZulipDesktop/0.5.2 (Mac)'), (True, True, True))
-        self.assertEqual(is_outdated_desktop_app('ZulipElectron/2.3.82 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/2.3.82 Chrome/61.0.3163.100 Electron/2.0.9 Safari/537.36'), (True, True, True))
-        self.assertEqual(is_outdated_desktop_app('ZulipElectron/4.0.0 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'), (True, True, False))
+        self.assertEqual(
+            is_outdated_desktop_app(
+                'ZulipElectron/2.3.82 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/2.3.82 Chrome/61.0.3163.100 Electron/2.0.9 Safari/537.36'
+            ),
+            (True, True, True),
+        )
+        self.assertEqual(
+            is_outdated_desktop_app(
+                'ZulipElectron/4.0.0 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'
+            ),
+            (True, True, False),
+        )
 
-        self.assertEqual(is_outdated_desktop_app('ZulipElectron/4.0.3 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'), (True, True, False))
+        self.assertEqual(
+            is_outdated_desktop_app(
+                'ZulipElectron/4.0.3 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'
+            ),
+            (True, True, False),
+        )
 
         # Verify what happens if DESKTOP_MINIMUM_VERSION < v < DESKTOP_WARNING_VERSION
         with mock.patch('zerver.views.compatibility.DESKTOP_MINIMUM_VERSION', '4.0.3'):
-            self.assertEqual(is_outdated_desktop_app('ZulipElectron/4.0.3 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'), (True, False, False))
+            self.assertEqual(
+                is_outdated_desktop_app(
+                    'ZulipElectron/4.0.3 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'
+                ),
+                (True, False, False),
+            )
 
-        self.assertEqual(is_outdated_desktop_app('ZulipElectron/5.2.0 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/5.2.0 Chrome/80.0.3987.165 Electron/8.2.5 Safari/537.36'), (False, False, False))
+        self.assertEqual(
+            is_outdated_desktop_app(
+                'ZulipElectron/5.2.0 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/5.2.0 Chrome/80.0.3987.165 Electron/8.2.5 Safari/537.36'
+            ),
+            (False, False, False),
+        )
 
-        self.assertEqual(is_outdated_desktop_app('Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36'), (False, False, False))
+        self.assertEqual(
+            is_outdated_desktop_app(
+                'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36'
+            ),
+            (False, False, False),
+        )
 
         self.assertEqual(is_outdated_desktop_app(''), (False, False, False))
diff --git a/zerver/tests/test_create_video_call.py b/zerver/tests/test_create_video_call.py
index fcc270d0b3..919322463a 100644
--- a/zerver/tests/test_create_video_call.py
+++ b/zerver/tests/test_create_video_call.py
@@ -16,7 +16,8 @@ class TestVideoCall(ZulipTestCase):
         with self.settings(VIDEO_ZOOM_CLIENT_ID=None):
             response = self.client_get("/calls/zoom/register")
             self.assert_json_error(
-                response, "Zoom credentials have not been configured",
+                response,
+                "Zoom credentials have not been configured",
             )
 
     def test_register_video_request(self) -> None:
@@ -51,10 +52,12 @@ class TestVideoCall(ZulipTestCase):
 
         response = self.client_post("/json/calls/zoom/create")
         self.assertEqual(
-            responses.calls[-1].request.url, "https://api.zoom.us/v2/users/me/meetings",
+            responses.calls[-1].request.url,
+            "https://api.zoom.us/v2/users/me/meetings",
         )
         self.assertEqual(
-            responses.calls[-1].request.headers["Authorization"], "Bearer newtoken",
+            responses.calls[-1].request.headers["Authorization"],
+            "Bearer newtoken",
         )
         json = self.assert_json_success(response)
         self.assertEqual(json["url"], "example.com")
@@ -119,7 +122,9 @@ class TestVideoCall(ZulipTestCase):
         )
 
         responses.add(
-            responses.POST, "https://api.zoom.us/v2/users/me/meetings", status=400,
+            responses.POST,
+            "https://api.zoom.us/v2/users/me/meetings",
+            status=400,
         )
 
         response = self.client_get(
@@ -132,7 +137,9 @@ class TestVideoCall(ZulipTestCase):
         self.assert_json_error(response, "Failed to create Zoom call")
 
         responses.replace(
-            responses.POST, "https://api.zoom.us/v2/users/me/meetings", status=401,
+            responses.POST,
+            "https://api.zoom.us/v2/users/me/meetings",
+            status=401,
         )
 
         response = self.client_post("/json/calls/zoom/create")
@@ -163,54 +170,82 @@ class TestVideoCall(ZulipTestCase):
 
     def test_create_bigbluebutton_link(self) -> None:
         with mock.patch('zerver.views.video_calls.random.randint', return_value="1"), mock.patch(
-             'secrets.token_bytes', return_value=b"\x00" * 7):
+            'secrets.token_bytes', return_value=b"\x00" * 7
+        ):
             response = self.client_get("/json/calls/bigbluebutton/create")
             self.assert_json_success(response)
-            self.assertEqual(response.json()['url'],
-                             "/calls/bigbluebutton/join?meeting_id=%22zulip-1%22&password=%22AAAAAAAAAA%22"
-                             "&checksum=%22697939301a52d3a2f0b3c3338895c1a5ab528933%22")
+            self.assertEqual(
+                response.json()['url'],
+                "/calls/bigbluebutton/join?meeting_id=%22zulip-1%22&password=%22AAAAAAAAAA%22"
+                "&checksum=%22697939301a52d3a2f0b3c3338895c1a5ab528933%22",
+            )
 
     @responses.activate
     def test_join_bigbluebutton_redirect(self) -> None:
-        responses.add(responses.GET, "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
-                      "<response><returncode>SUCCESS</returncode><messageKey/></response>")
-        response = self.client_get("/calls/bigbluebutton/join", {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'})
+        responses.add(
+            responses.GET,
+            "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
+            "<response><returncode>SUCCESS</returncode><messageKey/></response>",
+        )
+        response = self.client_get(
+            "/calls/bigbluebutton/join",
+            {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'},
+        )
         self.assertEqual(response.status_code, 302)
         self.assertEqual(isinstance(response, HttpResponseRedirect), True)
-        self.assertEqual(response.url, "https://bbb.example.com/bigbluebutton/api/join?meetingID=zulip-1&password=a"
-                                       "&fullName=King%20Hamlet&checksum=7ddbb4e7e5aa57cb8c58db12003f3b5b040ff530")
+        self.assertEqual(
+            response.url,
+            "https://bbb.example.com/bigbluebutton/api/join?meetingID=zulip-1&password=a"
+            "&fullName=King%20Hamlet&checksum=7ddbb4e7e5aa57cb8c58db12003f3b5b040ff530",
+        )
 
     @responses.activate
     def test_join_bigbluebutton_redirect_wrong_check(self) -> None:
-        responses.add(responses.GET,
-                      "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
-                      "<response><returncode>FAILED</returncode><messageKey>checksumError</messageKey>"
-                      "<message>You did not pass the checksum security check</message></response>")
-        response = self.client_get("/calls/bigbluebutton/join", {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'})
+        responses.add(
+            responses.GET,
+            "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
+            "<response><returncode>FAILED</returncode><messageKey>checksumError</messageKey>"
+            "<message>You did not pass the checksum security check</message></response>",
+        )
+        response = self.client_get(
+            "/calls/bigbluebutton/join",
+            {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'},
+        )
         self.assert_json_error(response, "Error authenticating to the Big Blue Button server.")
 
     @responses.activate
     def test_join_bigbluebutton_redirect_server_error(self) -> None:
         # Simulate bbb server error
-        responses.add(responses.GET,
-                      "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check", "", status=500)
+        responses.add(
+            responses.GET,
+            "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
+            "",
+            status=500,
+        )
         response = self.client_get(
-            "/calls/bigbluebutton/join", {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'})
+            "/calls/bigbluebutton/join",
+            {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'},
+        )
         self.assert_json_error(response, "Error connecting to the Big Blue Button server.")
 
     @responses.activate
     def test_join_bigbluebutton_redirect_error_by_server(self) -> None:
         # Simulate bbb server error
-        responses.add(responses.GET,
-                      "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
-                      "<response><returncode>FAILURE</returncode><messageKey>otherFailure</messageKey></response>")
+        responses.add(
+            responses.GET,
+            "https://bbb.example.com/bigbluebutton/api/create?meetingID=zulip-1&moderatorPW=a&attendeePW=aa&checksum=check",
+            "<response><returncode>FAILURE</returncode><messageKey>otherFailure</messageKey></response>",
+        )
         response = self.client_get(
-            "/calls/bigbluebutton/join", {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'})
+            "/calls/bigbluebutton/join",
+            {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'},
+        )
         self.assert_json_error(response, "Big Blue Button server returned an unexpected error.")
 
     def test_join_bigbluebutton_redirect_not_configured(self) -> None:
-        with self.settings(BIG_BLUE_BUTTON_SECRET=None,
-                           BIG_BLUE_BUTTON_URL=None):
+        with self.settings(BIG_BLUE_BUTTON_SECRET=None, BIG_BLUE_BUTTON_URL=None):
             response = self.client_get(
-                "/calls/bigbluebutton/join", {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'})
+                "/calls/bigbluebutton/join",
+                {"meeting_id": '"zulip-1"', "password": '"a"', "checksum": '"check"'},
+            )
             self.assert_json_error(response, "Big Blue Button is not configured.")
diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py
index b890655d7c..d7d61acf13 100644
--- a/zerver/tests/test_custom_profile_data.py
+++ b/zerver/tests/test_custom_profile_data.py
@@ -30,7 +30,8 @@ class CustomProfileFieldTestCase(ZulipTestCase):
     def custom_field_exists_in_realm(self, field_id: int) -> bool:
         fields = custom_profile_fields_for_realm(self.realm.id)
         field_ids = [field.id for field in fields]
-        return (field_id in field_ids)
+        return field_id in field_ids
+
 
 class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
     def test_create(self) -> None:
@@ -80,8 +81,7 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         self.assertEqual(field.id, field.order)
 
         result = self.client_post("/json/realm/profile_fields", info=data)
-        self.assert_json_error(result,
-                               'A field with that label already exists.')
+        self.assert_json_error(result, 'A field with that label already exists.')
 
     def test_create_choice_field(self) -> None:
         self.login('iago')
@@ -94,38 +94,48 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         error_msg = "Bad value for 'field_data': invalid"
         self.assert_json_error(result, error_msg)
 
-        data["field_data"] = orjson.dumps({
-            'python': ['1'],
-            'java': ['2'],
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'python': ['1'],
+                'java': ['2'],
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'field_data is not a dict')
 
-        data["field_data"] = orjson.dumps({
-            'python': {'text': 'Python'},
-            'java': {'text': 'Java'},
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'python': {'text': 'Python'},
+                'java': {'text': 'Java'},
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, "order key is missing from field_data")
 
-        data["field_data"] = orjson.dumps({
-            'python': {'text': 'Python', 'order': ''},
-            'java': {'text': 'Java', 'order': '2'},
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'python': {'text': 'Python', 'order': ''},
+                'java': {'text': 'Java', 'order': '2'},
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'field_data["order"] cannot be blank.')
 
-        data["field_data"] = orjson.dumps({
-            '': {'text': 'Python', 'order': '1'},
-            'java': {'text': 'Java', 'order': '2'},
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                '': {'text': 'Python', 'order': '1'},
+                'java': {'text': 'Java', 'order': '2'},
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, "'value' cannot be blank.")
 
-        data["field_data"] = orjson.dumps({
-            'python': {'text': 'Python', 'order': 1},
-            'java': {'text': 'Java', 'order': '2'},
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'python': {'text': 'Python', 'order': 1},
+                'java': {'text': 'Java', 'order': '2'},
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'field_data["order"] is not a string')
 
@@ -133,10 +143,12 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'Field must have at least one choice.')
 
-        data["field_data"] = orjson.dumps({
-            'python': {'text': 'Python', 'order': '1'},
-            'java': {'text': 'Java', 'order': '2'},
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'python': {'text': 'Python', 'order': '1'},
+                'java': {'text': 'Java', 'order': '2'},
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_success(result)
 
@@ -144,19 +156,23 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         self.login('iago')
         realm = get_realm("zulip")
         field_type: int = CustomProfileField.EXTERNAL_ACCOUNT
-        field_data: str = orjson.dumps({
-            'subtype': 'twitter',
-        }).decode()
+        field_data: str = orjson.dumps(
+            {
+                'subtype': 'twitter',
+            }
+        ).decode()
         invalid_field_name: str = "Not required field name"
         invalid_field_hint: str = "Not required field hint"
 
-        result = self.client_post("/json/realm/profile_fields",
-                                  info=dict(
-                                      field_type=field_type,
-                                      field_data=field_data,
-                                      hint=invalid_field_hint,
-                                      name=invalid_field_name,
-                                  ))
+        result = self.client_post(
+            "/json/realm/profile_fields",
+            info=dict(
+                field_type=field_type,
+                field_data=field_data,
+                hint=invalid_field_hint,
+                name=invalid_field_name,
+            ),
+        )
         self.assert_json_success(result)
         # Silently overwrite name and hint with values set in default fields dict
         # for default custom external account fields.
@@ -171,16 +187,16 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         self.assert_json_success(result)
 
         # Should also work without name or hint and only external field type and subtype data
-        result = self.client_post("/json/realm/profile_fields",
-                                  info=dict(field_type=field_type, field_data=field_data))
+        result = self.client_post(
+            "/json/realm/profile_fields", info=dict(field_type=field_type, field_data=field_data)
+        )
         self.assert_json_success(result)
 
         # Default external account field data cannot be updated
         field = CustomProfileField.objects.get(name="Twitter", realm=realm)
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'Twitter username',
-                  'field_type': CustomProfileField.EXTERNAL_ACCOUNT},
+            info={'name': 'Twitter username', 'field_type': CustomProfileField.EXTERNAL_ACCOUNT},
         )
         self.assert_json_error(result, 'Default custom field cannot be updated.')
 
@@ -202,28 +218,36 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, "subtype key is missing from field_data")
 
-        data["field_data"] = orjson.dumps({
-            'subtype': '',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': '',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'field_data["subtype"] cannot be blank.')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': '123',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': '123',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'Invalid external account type')
 
         non_default_external_account = 'linkedin'
-        data["field_data"] = orjson.dumps({
-            'subtype': non_default_external_account,
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': non_default_external_account,
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'Invalid external account type')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': 'twitter',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'twitter',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_success(result)
 
@@ -233,44 +257,56 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         self.assertEqual(orjson.loads(twitter_field.field_data)['subtype'], 'twitter')
 
         data['name'] = 'Reddit'
-        data["field_data"] = orjson.dumps({
-            'subtype': 'custom',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'custom',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'Custom external account must define URL pattern')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': 'custom',
-            'url_pattern': 123,
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'custom',
+                'url_pattern': 123,
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'field_data["url_pattern"] is not a string')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': 'custom',
-            'url_pattern': 'invalid',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'custom',
+                'url_pattern': 'invalid',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'Malformed URL pattern.')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': 'custom',
-            'url_pattern': 'https://www.reddit.com/%(username)s/user/%(username)s',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'custom',
+                'url_pattern': 'https://www.reddit.com/%(username)s/user/%(username)s',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'Malformed URL pattern.')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': 'custom',
-            'url_pattern': 'reddit.com/%(username)s',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'custom',
+                'url_pattern': 'reddit.com/%(username)s',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_error(result, 'field_data["url_pattern"] is not a URL')
 
-        data["field_data"] = orjson.dumps({
-            'subtype': 'custom',
-            'url_pattern': 'https://www.reddit.com/user/%(username)s',
-        }).decode()
+        data["field_data"] = orjson.dumps(
+            {
+                'subtype': 'custom',
+                'url_pattern': 'https://www.reddit.com/user/%(username)s',
+            }
+        ).decode()
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_success(result)
 
@@ -286,9 +322,10 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
 
     def test_create_field_of_type_user(self) -> None:
         self.login('iago')
-        data = {"name": "Your mentor",
-                "field_type": CustomProfileField.USER,
-                }
+        data = {
+            "name": "Your mentor",
+            "field_type": CustomProfileField.USER,
+        }
         result = self.client_post("/json/realm/profile_fields", info=data)
         self.assert_json_success(result)
 
@@ -299,6 +336,7 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
         result = self.client_delete("/json/realm/profile_fields/1")
         self.assert_json_error(result, 'Must be an organization administrator')
 
+
 class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
     def test_delete(self) -> None:
         self.login('iago')
@@ -308,8 +346,7 @@ class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
         self.assert_json_error(result, 'Field id 100 not found.')
 
         self.assertTrue(self.custom_field_exists_in_realm(field.id))
-        result = self.client_delete(
-            f"/json/realm/profile_fields/{field.id}")
+        result = self.client_delete(f"/json/realm/profile_fields/{field.id}")
         self.assert_json_success(result)
         self.assertFalse(self.custom_field_exists_in_realm(field.id))
 
@@ -319,11 +356,13 @@ class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
         realm = get_realm("zulip")
 
         invalid_field_id = 1234
-        result = self.client_delete("/json/users/me/profile_data", {
-            'data': orjson.dumps([invalid_field_id]).decode(),
-        })
-        self.assert_json_error(result,
-                               f'Field id {invalid_field_id} not found.')
+        result = self.client_delete(
+            "/json/users/me/profile_data",
+            {
+                'data': orjson.dumps([invalid_field_id]).decode(),
+            },
+        )
+        self.assert_json_error(result, f'Field id {invalid_field_id} not found.')
 
         field = CustomProfileField.objects.get(name="Mentor", realm=realm)
         data: List[Dict[str, Union[int, str, List[int]]]] = [
@@ -335,15 +374,21 @@ class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
         converter = field.FIELD_CONVERTERS[field.field_type]
         self.assertEqual([self.example_user("aaron").id], converter(iago_value.value))
 
-        result = self.client_delete("/json/users/me/profile_data", {
-            'data': orjson.dumps([field.id]).decode(),
-        })
+        result = self.client_delete(
+            "/json/users/me/profile_data",
+            {
+                'data': orjson.dumps([field.id]).decode(),
+            },
+        )
         self.assert_json_success(result)
 
         # Don't throw an exception here
-        result = self.client_delete("/json/users/me/profile_data", {
-            'data': orjson.dumps([field.id]).decode(),
-        })
+        result = self.client_delete(
+            "/json/users/me/profile_data",
+            {
+                'data': orjson.dumps([field.id]).decode(),
+            },
+        )
         self.assert_json_success(result)
 
     def test_delete_internals(self) -> None:
@@ -363,30 +408,29 @@ class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
         self.assertFalse(self.custom_field_exists_in_realm(field.id))
         self.assertEqual(user_profile.customprofilefieldvalue_set.count(), self.original_count - 1)
 
+
 class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
     def test_update(self) -> None:
         self.login('iago')
         realm = get_realm('zulip')
         result = self.client_patch(
             "/json/realm/profile_fields/100",
-            info={'name': 'Phone Number',
-                  'field_type': CustomProfileField.SHORT_TEXT},
+            info={'name': 'Phone Number', 'field_type': CustomProfileField.SHORT_TEXT},
         )
         self.assert_json_error(result, 'Field id 100 not found.')
 
         field = CustomProfileField.objects.get(name="Phone number", realm=realm)
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': '',
-                  'field_type': CustomProfileField.SHORT_TEXT},
+            info={'name': '', 'field_type': CustomProfileField.SHORT_TEXT},
         )
         self.assert_json_error(result, 'Label cannot be blank.')
 
         self.assertEqual(CustomProfileField.objects.count(), self.original_count)
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'New phone number',
-                  'field_type': CustomProfileField.SHORT_TEXT})
+            info={'name': 'New phone number', 'field_type': CustomProfileField.SHORT_TEXT},
+        )
         self.assert_json_success(result)
         field = CustomProfileField.objects.get(id=field.id, realm=realm)
         self.assertEqual(CustomProfileField.objects.count(), self.original_count)
@@ -396,24 +440,30 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
 
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': '*' * 41,
-                  'field_type': CustomProfileField.SHORT_TEXT})
+            info={'name': '*' * 41, 'field_type': CustomProfileField.SHORT_TEXT},
+        )
         msg = "name is too long (limit: 40 characters)"
         self.assert_json_error(result, msg)
 
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'New phone number',
-                  'hint': '*' * 81,
-                  'field_type': CustomProfileField.SHORT_TEXT})
+            info={
+                'name': 'New phone number',
+                'hint': '*' * 81,
+                'field_type': CustomProfileField.SHORT_TEXT,
+            },
+        )
         msg = "hint is too long (limit: 80 characters)"
         self.assert_json_error(result, msg)
 
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'New phone number',
-                  'hint': 'New contact number',
-                  'field_type': CustomProfileField.SHORT_TEXT})
+            info={
+                'name': 'New phone number',
+                'hint': 'New contact number',
+                'field_type': CustomProfileField.SHORT_TEXT,
+            },
+        )
         self.assert_json_success(result)
 
         field = CustomProfileField.objects.get(id=field.id, realm=realm)
@@ -424,8 +474,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
 
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'Name ',
-                  'field_type': CustomProfileField.SHORT_TEXT},
+            info={'name': 'Name ', 'field_type': CustomProfileField.SHORT_TEXT},
         )
         self.assert_json_success(result)
         field.refresh_from_db()
@@ -434,91 +483,101 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
         field = CustomProfileField.objects.get(name="Favorite editor", realm=realm)
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'Favorite editor',
-                  'field_data': 'invalid'})
+            info={'name': 'Favorite editor', 'field_data': 'invalid'},
+        )
         self.assert_json_error(result, "Bad value for 'field_data': invalid")
 
-        field_data = orjson.dumps({
-            'vim': 'Vim',
-            'emacs': {'order': '2', 'text': 'Emacs'},
-        }).decode()
+        field_data = orjson.dumps(
+            {
+                'vim': 'Vim',
+                'emacs': {'order': '2', 'text': 'Emacs'},
+            }
+        ).decode()
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'Favorite editor',
-                  'field_data': field_data})
+            info={'name': 'Favorite editor', 'field_data': field_data},
+        )
         self.assert_json_error(result, "field_data is not a dict")
 
-        field_data = orjson.dumps({
-            'vim': {'order': '1', 'text': 'Vim'},
-            'emacs': {'order': '2', 'text': 'Emacs'},
-            'notepad': {'order': '3', 'text': 'Notepad'},
-        }).decode()
+        field_data = orjson.dumps(
+            {
+                'vim': {'order': '1', 'text': 'Vim'},
+                'emacs': {'order': '2', 'text': 'Emacs'},
+                'notepad': {'order': '3', 'text': 'Notepad'},
+            }
+        ).decode()
         result = self.client_patch(
             f"/json/realm/profile_fields/{field.id}",
-            info={'name': 'Favorite editor',
-                  'field_data': field_data})
+            info={'name': 'Favorite editor', 'field_data': field_data},
+        )
         self.assert_json_success(result)
 
     def test_update_is_aware_of_uniqueness(self) -> None:
         self.login('iago')
         realm = get_realm('zulip')
-        field_1 = try_add_realm_custom_profile_field(realm, "Phone",
-                                                     CustomProfileField.SHORT_TEXT)
+        field_1 = try_add_realm_custom_profile_field(realm, "Phone", CustomProfileField.SHORT_TEXT)
 
-        field_2 = try_add_realm_custom_profile_field(realm, "Phone 1",
-                                                     CustomProfileField.SHORT_TEXT)
+        field_2 = try_add_realm_custom_profile_field(
+            realm, "Phone 1", CustomProfileField.SHORT_TEXT
+        )
 
         self.assertTrue(self.custom_field_exists_in_realm(field_1.id))
         self.assertTrue(self.custom_field_exists_in_realm(field_2.id))
         result = self.client_patch(
             f"/json/realm/profile_fields/{field_2.id}",
-            info={'name': 'Phone', 'field_type': CustomProfileField.SHORT_TEXT})
-        self.assert_json_error(
-            result, 'A field with that label already exists.')
+            info={'name': 'Phone', 'field_type': CustomProfileField.SHORT_TEXT},
+        )
+        self.assert_json_error(result, 'A field with that label already exists.')
 
-    def assert_error_update_invalid_value(self, field_name: str, new_value: object, error_msg: str) -> None:
+    def assert_error_update_invalid_value(
+        self, field_name: str, new_value: object, error_msg: str
+    ) -> None:
         self.login('iago')
         realm = get_realm('zulip')
         field = CustomProfileField.objects.get(name=field_name, realm=realm)
 
         # Update value of field
-        result = self.client_patch("/json/users/me/profile_data",
-                                   {'data': orjson.dumps([{"id": field.id, "value": new_value}]).decode()})
+        result = self.client_patch(
+            "/json/users/me/profile_data",
+            {'data': orjson.dumps([{"id": field.id, "value": new_value}]).decode()},
+        )
         self.assert_json_error(result, error_msg)
 
     def test_update_invalid_field(self) -> None:
         self.login('iago')
         data = [{'id': 1234, 'value': '12'}]
-        result = self.client_patch("/json/users/me/profile_data", {
-            'data': orjson.dumps(data).decode(),
-        })
-        self.assert_json_error(result,
-                               "Field id 1234 not found.")
+        result = self.client_patch(
+            "/json/users/me/profile_data",
+            {
+                'data': orjson.dumps(data).decode(),
+            },
+        )
+        self.assert_json_error(result, "Field id 1234 not found.")
 
     def test_update_invalid_short_text(self) -> None:
         field_name = "Phone number"
-        self.assert_error_update_invalid_value(field_name, 't' * 201,
-                                               f"{field_name} is too long (limit: 50 characters)")
+        self.assert_error_update_invalid_value(
+            field_name, 't' * 201, f"{field_name} is too long (limit: 50 characters)"
+        )
 
     def test_update_invalid_date(self) -> None:
         field_name = "Birthday"
-        self.assert_error_update_invalid_value(field_name, "a-b-c",
-                                               f"{field_name} is not a date")
-        self.assert_error_update_invalid_value(field_name, "1909-3-5",
-                                               f"{field_name} is not a date")
-        self.assert_error_update_invalid_value(field_name, 123,
-                                               f"{field_name} is not a string")
+        self.assert_error_update_invalid_value(field_name, "a-b-c", f"{field_name} is not a date")
+        self.assert_error_update_invalid_value(
+            field_name, "1909-3-5", f"{field_name} is not a date"
+        )
+        self.assert_error_update_invalid_value(field_name, 123, f"{field_name} is not a string")
 
     def test_update_invalid_url(self) -> None:
         field_name = "Favorite website"
-        self.assert_error_update_invalid_value(field_name, "not URL",
-                                               f"{field_name} is not a URL")
+        self.assert_error_update_invalid_value(field_name, "not URL", f"{field_name} is not a URL")
 
     def test_update_invalid_user_field(self) -> None:
         field_name = "Mentor"
         invalid_user_id = 1000
-        self.assert_error_update_invalid_value(field_name, [invalid_user_id],
-                                               f"Invalid user ID: {invalid_user_id}")
+        self.assert_error_update_invalid_value(
+            field_name, [invalid_user_id], f"Invalid user ID: {invalid_user_id}"
+        )
 
     def test_update_profile_data_successfully(self) -> None:
         self.login('iago')
@@ -538,11 +597,13 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
         for i, field_value in enumerate(fields):
             name, value = field_value
             field = CustomProfileField.objects.get(name=name, realm=realm)
-            data.append({
-                'id': field.id,
-                'value': value,
-                'field': field,
-            })
+            data.append(
+                {
+                    'id': field.id,
+                    'value': value,
+                    'field': field,
+                }
+            )
 
         # Update value of field
         result = self.client_patch(
@@ -562,19 +623,24 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
 
         for field_dict in iago.profile_data:
             self.assertEqual(field_dict['value'], expected_value[field_dict['id']])
-            self.assertEqual(field_dict['rendered_value'], expected_rendered_value[field_dict['id']])
+            self.assertEqual(
+                field_dict['rendered_value'], expected_rendered_value[field_dict['id']]
+            )
             for k in ['id', 'type', 'name', 'field_data']:
                 self.assertIn(k, field_dict)
 
         # Update value of one field.
         field = CustomProfileField.objects.get(name='Biography', realm=realm)
-        data = [{
-            'id': field.id,
-            'value': 'foobar',
-        }]
+        data = [
+            {
+                'id': field.id,
+                'value': 'foobar',
+            }
+        ]
 
-        result = self.client_patch("/json/users/me/profile_data",
-                                   {'data': orjson.dumps(data).decode()})
+        result = self.client_patch(
+            "/json/users/me/profile_data", {'data': orjson.dumps(data).decode()}
+        )
         self.assert_json_success(result)
         for field_dict in iago.profile_data:
             if field_dict['id'] == field.id:
@@ -582,20 +648,24 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
 
     def test_update_invalid_choice_field(self) -> None:
         field_name = "Favorite editor"
-        self.assert_error_update_invalid_value(field_name, "foobar",
-                                               f"'foobar' is not a valid choice for '{field_name}'.")
+        self.assert_error_update_invalid_value(
+            field_name, "foobar", f"'foobar' is not a valid choice for '{field_name}'."
+        )
 
     def test_update_choice_field_successfully(self) -> None:
         self.login('iago')
         realm = get_realm('zulip')
         field = CustomProfileField.objects.get(name='Favorite editor', realm=realm)
-        data = [{
-            'id': field.id,
-            'value': 'emacs',
-        }]
+        data = [
+            {
+                'id': field.id,
+                'value': 'emacs',
+            }
+        ]
 
-        result = self.client_patch("/json/users/me/profile_data",
-                                   {'data': orjson.dumps(data).decode()})
+        result = self.client_patch(
+            "/json/users/me/profile_data", {'data': orjson.dumps(data).decode()}
+        )
         self.assert_json_success(result)
 
     def test_null_value_and_rendered_value(self) -> None:
@@ -647,6 +717,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
             do_update_user_custom_profile_data_if_changed(iago, data)
             mock_notify.assert_not_called()
 
+
 class ListCustomProfileFieldTest(CustomProfileFieldTestCase):
     def test_list(self) -> None:
         self.login('iago')
@@ -667,17 +738,20 @@ class ListCustomProfileFieldTest(CustomProfileFieldTestCase):
         try_reorder_realm_custom_profile_fields(realm, order)
         result = self.client_get("/json/realm/profile_fields")
         content = result.json()
-        self.assertListEqual(content["custom_fields"],
-                             sorted(content["custom_fields"], key=lambda x: -x["id"]))
+        self.assertListEqual(
+            content["custom_fields"], sorted(content["custom_fields"], key=lambda x: -x["id"])
+        )
 
     def test_get_custom_profile_fields_from_api(self) -> None:
         iago = self.example_user("iago")
         test_bot = self.create_test_bot("foo-bot", iago)
         self.login_user(iago)
-        assert(test_bot)
+        assert test_bot
 
         with queries_captured() as queries:
-            response = self.client_get("/json/users", {"client_gravatar": "false", "include_custom_profile_fields": "true"})
+            response = self.client_get(
+                "/json/users", {"client_gravatar": "false", "include_custom_profile_fields": "true"}
+            )
 
         self.assertEqual(len(queries), 4)
 
@@ -700,15 +774,40 @@ class ListCustomProfileFieldTest(CustomProfileFieldTestCase):
 
         expected_keys_for_iago = {
             "delivery_email",
-            "email", "user_id", "avatar_url", "avatar_version", "is_admin", "is_guest", "is_bot", "is_owner",
-            "full_name", "timezone", "is_active", "date_joined", "profile_data"}
+            "email",
+            "user_id",
+            "avatar_url",
+            "avatar_version",
+            "is_admin",
+            "is_guest",
+            "is_bot",
+            "is_owner",
+            "full_name",
+            "timezone",
+            "is_active",
+            "date_joined",
+            "profile_data",
+        }
         self.assertEqual(set(iago_raw_data.keys()), expected_keys_for_iago)
         self.assertNotEqual(iago_raw_data["profile_data"], {})
 
         expected_keys_for_test_bot = {
             "delivery_email",
-            "email", "user_id", "avatar_url", "avatar_version", "is_admin", "is_guest", "is_bot", "is_owner",
-            "full_name", "timezone", "is_active", "date_joined", "bot_type", "bot_owner_id"}
+            "email",
+            "user_id",
+            "avatar_url",
+            "avatar_version",
+            "is_admin",
+            "is_guest",
+            "is_bot",
+            "is_owner",
+            "full_name",
+            "timezone",
+            "is_active",
+            "date_joined",
+            "bot_type",
+            "bot_owner_id",
+        }
         self.assertEqual(set(test_bot_raw_data.keys()), expected_keys_for_test_bot)
         self.assertEqual(test_bot_raw_data["bot_type"], 1)
         self.assertEqual(test_bot_raw_data["bot_owner_id"], iago_raw_data["user_id"])
@@ -723,10 +822,24 @@ class ListCustomProfileFieldTest(CustomProfileFieldTestCase):
     def test_get_custom_profile_fields_from_api_for_single_user(self) -> None:
         self.login('iago')
         expected_keys = {
-            "result", "msg", "max_message_id", "user_id", "avatar_url",
-            "full_name", "email", "is_bot", "is_admin", "is_owner", "profile_data",
-            "avatar_version", "timezone", "delivery_email", "is_active", "is_guest",
-            "date_joined"}
+            "result",
+            "msg",
+            "max_message_id",
+            "user_id",
+            "avatar_url",
+            "full_name",
+            "email",
+            "is_bot",
+            "is_admin",
+            "is_owner",
+            "profile_data",
+            "avatar_version",
+            "timezone",
+            "delivery_email",
+            "is_active",
+            "is_guest",
+            "date_joined",
+        }
 
         url = "/json/users/me"
         response = self.client_get(url)
@@ -744,8 +857,9 @@ class ReorderCustomProfileFieldTest(CustomProfileFieldTestCase):
             .order_by('-order')
             .values_list('order', flat=True)
         )
-        result = self.client_patch("/json/realm/profile_fields",
-                                   info={'order': orjson.dumps(order).decode()})
+        result = self.client_patch(
+            "/json/realm/profile_fields", info={'order': orjson.dumps(order).decode()}
+        )
         self.assert_json_success(result)
         fields = CustomProfileField.objects.filter(realm=realm).order_by('order')
         for field in fields:
@@ -760,8 +874,9 @@ class ReorderCustomProfileFieldTest(CustomProfileFieldTestCase):
             .values_list('order', flat=True)
         )
         order.append(4)
-        result = self.client_patch("/json/realm/profile_fields",
-                                   info={'order': orjson.dumps(order).decode()})
+        result = self.client_patch(
+            "/json/realm/profile_fields", info={'order': orjson.dumps(order).decode()}
+        )
         self.assert_json_success(result)
         fields = CustomProfileField.objects.filter(realm=realm).order_by('order')
         for field in fields:
@@ -775,19 +890,20 @@ class ReorderCustomProfileFieldTest(CustomProfileFieldTestCase):
             .order_by('-order')
             .values_list('order', flat=True)
         )
-        result = self.client_patch("/json/realm/profile_fields",
-                                   info={'order': orjson.dumps(order).decode()})
+        result = self.client_patch(
+            "/json/realm/profile_fields", info={'order': orjson.dumps(order).decode()}
+        )
         self.assert_json_error(result, "Must be an organization administrator")
 
     def test_reorder_invalid(self) -> None:
         self.login('iago')
         order = [100, 200, 300]
-        result = self.client_patch("/json/realm/profile_fields",
-                                   info={'order': orjson.dumps(order).decode()})
-        self.assert_json_error(
-            result, 'Invalid order mapping.')
+        result = self.client_patch(
+            "/json/realm/profile_fields", info={'order': orjson.dumps(order).decode()}
+        )
+        self.assert_json_error(result, 'Invalid order mapping.')
         order = [1, 2]
-        result = self.client_patch("/json/realm/profile_fields",
-                                   info={'order': orjson.dumps(order).decode()})
-        self.assert_json_error(
-            result, 'Invalid order mapping.')
+        result = self.client_patch(
+            "/json/realm/profile_fields", info={'order': orjson.dumps(order).decode()}
+        )
+        self.assert_json_error(result, 'Invalid order mapping.')
diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py
index 2500f8fc0a..06f257675e 100644
--- a/zerver/tests/test_decorators.py
+++ b/zerver/tests/test_decorators.py
@@ -92,7 +92,9 @@ class DecoratorTestCase(ZulipTestCase):
         req = HostRequestMock()
         self.assertEqual(get_client_name(req), 'Unspecified')
 
-        req.META['HTTP_USER_AGENT'] = 'ZulipElectron/4.0.3 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'
+        req.META[
+            'HTTP_USER_AGENT'
+        ] = 'ZulipElectron/4.0.3 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Zulip/4.0.3 Chrome/66.0.3359.181 Electron/3.1.10 Safari/537.36'
         self.assertEqual(get_client_name(req), 'ZulipElectron')
 
         req.META['HTTP_USER_AGENT'] = 'ZulipDesktop/0.4.4 (Mac)'
@@ -105,22 +107,28 @@ class DecoratorTestCase(ZulipTestCase):
         self.assertEqual(get_client_name(req), 'ZulipMobile')
 
         # TODO: This should ideally be Firefox.
-        req.META['HTTP_USER_AGENT'] = 'Mozilla/5.0 (X11; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0'
+        req.META[
+            'HTTP_USER_AGENT'
+        ] = 'Mozilla/5.0 (X11; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0'
         self.assertEqual(get_client_name(req), 'Mozilla')
 
         # TODO: This should ideally be Chrome.
-        req.META['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.43 Safari/537.36'
+        req.META[
+            'HTTP_USER_AGENT'
+        ] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.43 Safari/537.36'
         self.assertEqual(get_client_name(req), 'Mozilla')
 
         # TODO: This should ideally be Mobile Safari if we had better user-agent parsing.
-        req.META['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Linux; Android 8.0.0; SM-G930F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36'
+        req.META[
+            'HTTP_USER_AGENT'
+        ] = 'Mozilla/5.0 (Linux; Android 8.0.0; SM-G930F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Mobile Safari/537.36'
         self.assertEqual(get_client_name(req), 'Mozilla')
 
     def test_REQ_aliases(self) -> None:
-
         @has_request_variables
-        def double(request: HttpRequest,
-                   x: int=REQ(whence='number', aliases=['x', 'n'], converter=int)) -> int:
+        def double(
+            request: HttpRequest, x: int = REQ(whence='number', aliases=['x', 'n'], converter=int)
+        ) -> int:
             return x + x
 
         class Request:
@@ -148,7 +156,6 @@ class DecoratorTestCase(ZulipTestCase):
         self.assertEqual(str(cm.exception), "Can't decide between 'number' and 'x' arguments")
 
     def test_REQ_converter(self) -> None:
-
         def my_converter(data: str) -> List[int]:
             lst = orjson.loads(data)
             if not isinstance(lst, list):
@@ -158,7 +165,9 @@ class DecoratorTestCase(ZulipTestCase):
             return [int(elem) for elem in lst]
 
         @has_request_variables
-        def get_total(request: HttpRequest, numbers: Iterable[int]=REQ(converter=my_converter)) -> int:
+        def get_total(
+            request: HttpRequest, numbers: Iterable[int] = REQ(converter=my_converter)
+        ) -> int:
             return sum(numbers)
 
         class Request:
@@ -190,10 +199,10 @@ class DecoratorTestCase(ZulipTestCase):
         self.assertEqual(result, 21)
 
     def test_REQ_validator(self) -> None:
-
         @has_request_variables
-        def get_total(request: HttpRequest,
-                      numbers: Iterable[int]=REQ(validator=check_list(check_int))) -> int:
+        def get_total(
+            request: HttpRequest, numbers: Iterable[int] = REQ(validator=check_list(check_int))
+        ) -> int:
             return sum(numbers)
 
         class Request:
@@ -220,10 +229,10 @@ class DecoratorTestCase(ZulipTestCase):
         self.assertEqual(result, 21)
 
     def test_REQ_str_validator(self) -> None:
-
         @has_request_variables
-        def get_middle_characters(request: HttpRequest,
-                                  value: str=REQ(str_validator=check_string_fixed_length(5))) -> str:
+        def get_middle_characters(
+            request: HttpRequest, value: str = REQ(str_validator=check_string_fixed_length(5))
+        ) -> str:
             return value[1:-1]
 
         class Request:
@@ -246,8 +255,9 @@ class DecoratorTestCase(ZulipTestCase):
 
     def test_REQ_argument_type(self) -> None:
         @has_request_variables
-        def get_payload(request: HttpRequest,
-                        payload: Dict[str, Any]=REQ(argument_type='body')) -> Dict[str, Any]:
+        def get_payload(
+            request: HttpRequest, payload: Dict[str, Any] = REQ(argument_type='body')
+        ) -> Dict[str, Any]:
             return payload
 
         request = HostRequestMock()
@@ -273,7 +283,8 @@ class DecoratorTestCase(ZulipTestCase):
 
         @webhook_view('ClientName')
         def my_webhook_raises_exception_unsupported_event(
-                request: HttpRequest, user_profile: UserProfile) -> None:
+            request: HttpRequest, user_profile: UserProfile
+        ) -> None:
             raise UnsupportedWebhookEventType("test_event")
 
         webhook_bot_email = 'webhook-bot@zulip.com'
@@ -282,7 +293,7 @@ class DecoratorTestCase(ZulipTestCase):
         webhook_bot_api_key = get_api_key(webhook_bot)
 
         request = HostRequestMock()
-        request.POST['api_key'] = 'X'*32
+        request.POST['api_key'] = 'X' * 32
 
         with self.assertRaisesRegex(JsonableError, "Invalid API key"):
             my_webhook(request)
@@ -291,22 +302,32 @@ class DecoratorTestCase(ZulipTestCase):
         request.POST['api_key'] = webhook_bot_api_key
 
         with self.assertLogs(level="WARNING") as m:
-            with self.assertRaisesRegex(JsonableError,
-                                        "Account is not associated with this subdomain"):
+            with self.assertRaisesRegex(
+                JsonableError, "Account is not associated with this subdomain"
+            ):
                 api_result = my_webhook(request)
         self.assertEqual(
             m.output,
-            ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(webhook_bot_email, "zulip", "")]
+            [
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    webhook_bot_email, "zulip", ""
+                )
+            ],
         )
 
         with self.assertLogs(level="WARNING") as m:
-            with self.assertRaisesRegex(JsonableError,
-                                        "Account is not associated with this subdomain"):
+            with self.assertRaisesRegex(
+                JsonableError, "Account is not associated with this subdomain"
+            ):
                 request.host = "acme." + settings.EXTERNAL_HOST
                 api_result = my_webhook(request)
         self.assertEqual(
             m.output,
-            ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(webhook_bot_email, "zulip", "acme")]
+            [
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    webhook_bot_email, "zulip", "acme"
+                )
+            ],
         )
 
         request.host = "zulip.testserver"
@@ -339,7 +360,9 @@ class DecoratorTestCase(ZulipTestCase):
                 request.META['HTTP_X_CUSTOM_HEADER'] = 'custom_value'
                 my_webhook_raises_exception(request)
 
-        self.assertIn(self.logger_output("raised by webhook function\n", 'error', 'webhooks'), log.output[0])
+        self.assertIn(
+            self.logger_output("raised by webhook function\n", 'error', 'webhooks'), log.output[0]
+        )
 
         # Test when an unsupported webhook event occurs
         exception_msg = "The 'test_event' event isn't currently supported by the ClientName webhook"
@@ -350,7 +373,9 @@ class DecoratorTestCase(ZulipTestCase):
                 request.META['HTTP_X_CUSTOM_HEADER'] = 'custom_value'
                 my_webhook_raises_exception_unsupported_event(request)
 
-        self.assertIn(self.logger_output(exception_msg, 'error', 'webhooks.unsupported'), log.output[0])
+        self.assertIn(
+            self.logger_output(exception_msg, 'error', 'webhooks.unsupported'), log.output[0]
+        )
 
         with self.settings(RATE_LIMITING=True):
             with mock.patch('zerver.decorator.rate_limit_user') as rate_limit_mock:
@@ -378,6 +403,7 @@ class DecoratorTestCase(ZulipTestCase):
         with self.assertRaisesRegex(JsonableError, "This organization has been deactivated"):
             my_webhook(request)
 
+
 class SkipRateLimitingTest(ZulipTestCase):
     def test_authenticated_rest_api_view(self) -> None:
         @authenticated_rest_api_view(skip_rate_limiting=False)
@@ -446,6 +472,7 @@ class SkipRateLimitingTest(ZulipTestCase):
         # Don't assert json_success, since it'll be the rate_limit mock object
         self.assertTrue(rate_limit_mock.called)
 
+
 class DecoratorLoggingTestCase(ZulipTestCase):
     def test_authenticated_rest_api_view_logging(self) -> None:
         @authenticated_rest_api_view(webhook_client_name="ClientName")
@@ -483,8 +510,12 @@ class DecoratorLoggingTestCase(ZulipTestCase):
         request.body = '{}'
         request.content_type = 'text/plain'
 
-        with mock.patch('zerver.decorator.webhook_unsupported_events_logger.exception') as mock_exception:
-            exception_msg = "The 'test_event' event isn't currently supported by the ClientName webhook"
+        with mock.patch(
+            'zerver.decorator.webhook_unsupported_events_logger.exception'
+        ) as mock_exception:
+            exception_msg = (
+                "The 'test_event' event isn't currently supported by the ClientName webhook"
+            )
             with self.assertRaisesRegex(UnsupportedWebhookEventType, exception_msg):
                 my_webhook_raises_exception(request)
 
@@ -492,7 +523,9 @@ class DecoratorLoggingTestCase(ZulipTestCase):
 
     def test_authenticated_rest_api_view_with_non_webhook_view(self) -> None:
         @authenticated_rest_api_view()
-        def non_webhook_view_raises_exception(request: HttpRequest, user_profile: UserProfile) -> None:
+        def non_webhook_view_raises_exception(
+            request: HttpRequest, user_profile: UserProfile
+        ) -> None:
             raise Exception("raised by a non-webhook view")
 
         request = HostRequestMock()
@@ -514,19 +547,20 @@ class DecoratorLoggingTestCase(ZulipTestCase):
         api_key = get_api_key(user_profile)
         credentials = f"{user_profile.email}:{api_key}"
         api_auth = 'Digest ' + base64.b64encode(credentials.encode('utf-8')).decode('utf-8')
-        result = self.client_post('/api/v1/external/zendesk', {},
-                                  HTTP_AUTHORIZATION=api_auth)
+        result = self.client_post('/api/v1/external/zendesk', {}, HTTP_AUTHORIZATION=api_auth)
         self.assert_json_error(result, "This endpoint requires HTTP basic authentication.")
 
         api_auth = 'Basic ' + base64.b64encode(b"foo").decode('utf-8')
-        result = self.client_post('/api/v1/external/zendesk', {},
-                                  HTTP_AUTHORIZATION=api_auth)
-        self.assert_json_error(result, "Invalid authorization header for basic auth",
-                               status_code=401)
+        result = self.client_post('/api/v1/external/zendesk', {}, HTTP_AUTHORIZATION=api_auth)
+        self.assert_json_error(
+            result, "Invalid authorization header for basic auth", status_code=401
+        )
 
         result = self.client_post('/api/v1/external/zendesk', {})
-        self.assert_json_error(result, "Missing authorization header for basic auth",
-                               status_code=401)
+        self.assert_json_error(
+            result, "Missing authorization header for basic auth", status_code=401
+        )
+
 
 class RateLimitTestCase(ZulipTestCase):
     def errors_disallowed(self) -> Any:
@@ -537,6 +571,7 @@ class RateLimitTestCase(ZulipTestCase):
         # make logging errors fail than what I'm doing here.
         class TestLoggingErrorException(Exception):
             pass
+
         return mock.patch('logging.error', side_effect=TestLoggingErrorException)
 
     def test_internal_local_clients_skip_rate_limiting(self) -> None:
@@ -631,10 +666,12 @@ class RateLimitTestCase(ZulipTestCase):
     @skipUnless(settings.ZILENCER_ENABLED, "requires zilencer")
     def test_rate_limiting_skipped_if_remote_server(self) -> None:
         server_uuid = "1234-abcd"
-        server = RemoteZulipServer(uuid=server_uuid,
-                                   api_key="magic_secret_api_key",
-                                   hostname="demo.example.com",
-                                   last_updated=timezone_now())
+        server = RemoteZulipServer(
+            uuid=server_uuid,
+            api_key="magic_secret_api_key",
+            hostname="demo.example.com",
+            last_updated=timezone_now(),
+        )
 
         class Client:
             name = 'external'
@@ -657,6 +694,7 @@ class RateLimitTestCase(ZulipTestCase):
 
         self.assertFalse(rate_limit_mock.called)
 
+
 class ValidatorTestCase(ZulipTestCase):
     def test_check_string(self) -> None:
         x: Any = "hello"
@@ -747,7 +785,7 @@ class ValidatorTestCase(ZulipTestCase):
         with self.assertRaisesRegex(ValueError, re.escape('5 is too large (max 4)')):
             self.assertEqual(to_non_negative_int('5', max_int_size=4))
         with self.assertRaisesRegex(ValueError, re.escape(f'{2**32} is too large (max {2**32-1})')):
-            self.assertEqual(to_non_negative_int(str(2**32)))
+            self.assertEqual(to_non_negative_int(str(2 ** 32)))
 
     def test_to_positive_or_allowed_int(self) -> None:
         self.assertEqual(to_positive_or_allowed_int(-1)('5'), 5)
@@ -909,10 +947,12 @@ class ValidatorTestCase(ZulipTestCase):
         # This is an example.
         def check_person(val: object) -> Dict[str, object]:
             try:
-                return check_dict([
-                    ('name', check_string),
-                    ('age', check_int),
-                ])('_', val)
+                return check_dict(
+                    [
+                        ('name', check_string),
+                        ('age', check_int),
+                    ]
+                )('_', val)
             except ValidationError:
                 raise ValidationError('This is not a valid person')
 
@@ -1000,10 +1040,15 @@ class DeactivatedRealmTest(ZulipTestCase):
         realm = get_realm("zulip")
         do_deactivate_realm(get_realm("zulip"))
 
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": self.example_email("othello")})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": self.example_email("othello"),
+            },
+        )
         self.assert_json_error_contains(result, "Not logged in", status_code=401)
 
         # Even if a logged-in session was leaked, it still wouldn't work
@@ -1013,17 +1058,27 @@ class DeactivatedRealmTest(ZulipTestCase):
         realm.deactivated = True
         realm.save()
 
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": self.example_email("othello")})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": self.example_email("othello"),
+            },
+        )
         self.assert_json_error_contains(result, "has been deactivated", status_code=400)
 
-        result = self.api_post(self.example_user("hamlet"),
-                               "/api/v1/messages", {"type": "private",
-                                                    "content": "Test message",
-                                                    "client": "test suite",
-                                                    "to": self.example_email("othello")})
+        result = self.api_post(
+            self.example_user("hamlet"),
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": self.example_email("othello"),
+            },
+        )
         self.assert_json_error_contains(result, "has been deactivated", status_code=401)
 
     def test_fetch_api_key_deactivated_realm(self) -> None:
@@ -1052,10 +1107,10 @@ class DeactivatedRealmTest(ZulipTestCase):
         api_key = get_api_key(user_profile)
         url = f"/api/v1/external/jira?api_key={api_key}&stream=jira_custom"
         data = self.webhook_fixture_data('jira', 'created_v2')
-        result = self.client_post(url, data,
-                                  content_type="application/json")
+        result = self.client_post(url, data, content_type="application/json")
         self.assert_json_error_contains(result, "has been deactivated", status_code=400)
 
+
 class LoginRequiredTest(ZulipTestCase):
     def test_login_required(self) -> None:
         """
@@ -1090,30 +1145,34 @@ class LoginRequiredTest(ZulipTestCase):
         result = self.client_get('/accounts/accept_terms/')
         self.assertEqual(result.status_code, 302)
 
+
 class FetchAPIKeyTest(ZulipTestCase):
     def test_fetch_api_key_success(self) -> None:
         user = self.example_user("cordelia")
         self.login_user(user)
-        result = self.client_post("/json/fetch_api_key",
-                                  dict(password=initial_password(user.delivery_email)))
+        result = self.client_post(
+            "/json/fetch_api_key", dict(password=initial_password(user.delivery_email))
+        )
         self.assert_json_success(result)
 
     def test_fetch_api_key_email_address_visibility(self) -> None:
         user = self.example_user("cordelia")
-        do_set_realm_property(user.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            user.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
 
         self.login_user(user)
-        result = self.client_post("/json/fetch_api_key",
-                                  dict(password=initial_password(user.delivery_email)))
+        result = self.client_post(
+            "/json/fetch_api_key", dict(password=initial_password(user.delivery_email))
+        )
         self.assert_json_success(result)
 
     def test_fetch_api_key_wrong_password(self) -> None:
         self.login('cordelia')
-        result = self.client_post("/json/fetch_api_key",
-                                  dict(password='wrong_password'))
+        result = self.client_post("/json/fetch_api_key", dict(password='wrong_password'))
         self.assert_json_error_contains(result, "password is incorrect")
 
+
 class InactiveUserTest(ZulipTestCase):
     def test_send_deactivated_user(self) -> None:
         """
@@ -1124,10 +1183,15 @@ class InactiveUserTest(ZulipTestCase):
         self.login_user(user_profile)
         do_deactivate_user(user_profile)
 
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": self.example_email("othello")})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": self.example_email("othello"),
+            },
+        )
         self.assert_json_error_contains(result, "Not logged in", status_code=401)
 
         # Even if a logged-in session was leaked, it still wouldn't work
@@ -1136,17 +1200,27 @@ class InactiveUserTest(ZulipTestCase):
         user_profile.is_active = False
         user_profile.save()
 
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": self.example_email("othello")})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": self.example_email("othello"),
+            },
+        )
         self.assert_json_error_contains(result, "Account is deactivated", status_code=400)
 
-        result = self.api_post(self.example_user("hamlet"),
-                               "/api/v1/messages", {"type": "private",
-                                                    "content": "Test message",
-                                                    "client": "test suite",
-                                                    "to": self.example_email("othello")})
+        result = self.api_post(
+            self.example_user("hamlet"),
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": self.example_email("othello"),
+            },
+        )
         self.assert_json_error_contains(result, "Account is deactivated", status_code=401)
 
     def test_fetch_api_key_deactivated_user(self) -> None:
@@ -1175,9 +1249,7 @@ class InactiveUserTest(ZulipTestCase):
         do_deactivate_user(user_profile)
 
         result = self.login_with_return(self.example_email("hamlet"))
-        self.assert_in_response(
-            "Your account is no longer active.",
-            result)
+        self.assert_in_response("Your account is no longer active.", result)
 
     def test_login_deactivated_mirror_dummy(self) -> None:
         """
@@ -1231,8 +1303,7 @@ class InactiveUserTest(ZulipTestCase):
         api_key = get_api_key(user_profile)
         url = f"/api/v1/external/jira?api_key={api_key}&stream=jira_custom"
         data = self.webhook_fixture_data('jira', 'created_v2')
-        result = self.client_post(url, data,
-                                  content_type="application/json")
+        result = self.client_post(url, data, content_type="application/json")
         self.assert_json_error_contains(result, "Account is deactivated", status_code=400)
 
 
@@ -1251,8 +1322,10 @@ class TestIncomingWebhookBot(ZulipTestCase):
         self.assert_json_success(result)
         post_params = {"anchor": 1, "num_before": 1, "num_after": 1}
         result = self.api_get(webhook_bot, "/api/v1/messages", dict(post_params))
-        self.assert_json_error(result, 'This API is not available to incoming webhook bots.',
-                               status_code=401)
+        self.assert_json_error(
+            result, 'This API is not available to incoming webhook bots.', status_code=401
+        )
+
 
 class TestValidateApiKey(ZulipTestCase):
     def setUp(self) -> None:
@@ -1274,7 +1347,9 @@ class TestValidateApiKey(ZulipTestCase):
 
     def test_validate_api_key_if_profile_does_not_exist(self) -> None:
         with self.assertRaises(JsonableError):
-            validate_api_key(HostRequestMock(), 'email@doesnotexist.com', 'VIzRVw2CspUOnEm9Yu5vQiQtJNkvETkp')
+            validate_api_key(
+                HostRequestMock(), 'email@doesnotexist.com', 'VIzRVw2CspUOnEm9Yu5vQiQtJNkvETkp'
+            )
 
     def test_validate_api_key_if_api_key_does_not_match_profile_api_key(self) -> None:
         with self.assertRaises(InvalidAPIKeyFormatError):
@@ -1298,49 +1373,74 @@ class TestValidateApiKey(ZulipTestCase):
         with self.assertRaises(JsonableError), self.assertLogs(level="WARNING") as root_warn_log:
             api_key = get_api_key(self.webhook_bot)
             validate_api_key(HostRequestMock(), self.webhook_bot.email, api_key)
-        self.assertEqual(root_warn_log.output, [
-            'WARNING:root:User webhook-bot@zulip.com (zulip) attempted to access API on wrong subdomain ()'
-        ])
+        self.assertEqual(
+            root_warn_log.output,
+            [
+                'WARNING:root:User webhook-bot@zulip.com (zulip) attempted to access API on wrong subdomain ()'
+            ],
+        )
 
     def test_validate_api_key_if_profile_is_incoming_webhook_and_is_webhook_is_set(self) -> None:
         api_key = get_api_key(self.webhook_bot)
-        profile = validate_api_key(HostRequestMock(host="zulip.testserver"),
-                                   self.webhook_bot.email, api_key,
-                                   allow_webhook_access=True)
+        profile = validate_api_key(
+            HostRequestMock(host="zulip.testserver"),
+            self.webhook_bot.email,
+            api_key,
+            allow_webhook_access=True,
+        )
         self.assertEqual(profile.id, self.webhook_bot.id)
 
     def test_validate_api_key_if_email_is_case_insensitive(self) -> None:
         api_key = get_api_key(self.default_bot)
-        profile = validate_api_key(HostRequestMock(host="zulip.testserver"), self.default_bot.email.upper(), api_key)
+        profile = validate_api_key(
+            HostRequestMock(host="zulip.testserver"), self.default_bot.email.upper(), api_key
+        )
         self.assertEqual(profile.id, self.default_bot.id)
 
     def test_valid_api_key_if_user_is_on_wrong_subdomain(self) -> None:
         with self.settings(RUNNING_INSIDE_TORNADO=False):
             api_key = get_api_key(self.default_bot)
             with self.assertLogs(level="WARNING") as m:
-                with self.assertRaisesRegex(JsonableError,
-                                            "Account is not associated with this subdomain"):
-                    validate_api_key(HostRequestMock(host=settings.EXTERNAL_HOST),
-                                     self.default_bot.email, api_key)
+                with self.assertRaisesRegex(
+                    JsonableError, "Account is not associated with this subdomain"
+                ):
+                    validate_api_key(
+                        HostRequestMock(host=settings.EXTERNAL_HOST),
+                        self.default_bot.email,
+                        api_key,
+                    )
             self.assertEqual(
                 m.output,
-                ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(self.default_bot.email, "zulip", "")]
+                [
+                    "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                        self.default_bot.email, "zulip", ""
+                    )
+                ],
             )
 
             with self.assertLogs(level="WARNING") as m:
-                with self.assertRaisesRegex(JsonableError,
-                                            "Account is not associated with this subdomain"):
-                    validate_api_key(HostRequestMock(host='acme.' + settings.EXTERNAL_HOST),
-                                     self.default_bot.email, api_key)
+                with self.assertRaisesRegex(
+                    JsonableError, "Account is not associated with this subdomain"
+                ):
+                    validate_api_key(
+                        HostRequestMock(host='acme.' + settings.EXTERNAL_HOST),
+                        self.default_bot.email,
+                        api_key,
+                    )
             self.assertEqual(
                 m.output,
-                ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(self.default_bot.email, "zulip", "acme")]
+                [
+                    "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                        self.default_bot.email, "zulip", "acme"
+                    )
+                ],
             )
 
     def _change_is_active_field(self, profile: UserProfile, value: bool) -> None:
         profile.is_active = value
         profile.save()
 
+
 class TestInternalNotifyView(ZulipTestCase):
     BORING_RESULT = 'boring'
 
@@ -1405,6 +1505,7 @@ class TestInternalNotifyView(ZulipTestCase):
         self.assertTrue(is_local_addr('::1'))
         self.assertFalse(is_local_addr('42.43.44.45'))
 
+
 class TestHumanUsersOnlyDecorator(ZulipTestCase):
     def test_human_only_endpoints(self) -> None:
         default_bot = self.example_user('default_bot')
@@ -1440,30 +1541,42 @@ class TestHumanUsersOnlyDecorator(ZulipTestCase):
             result = self.api_delete(default_bot, endpoint)
             self.assert_json_error(result, "This endpoint does not accept bot requests.")
 
+
 class TestAuthenticatedRequirePostDecorator(ZulipTestCase):
     def test_authenticated_html_post_view_with_get_request(self) -> None:
         self.login('hamlet')
         with self.assertLogs(level="WARNING") as mock_warning:
             result = self.client_get(r'/accounts/register/', {'stream': 'Verona'})
             self.assertEqual(result.status_code, 405)
-            self.assertEqual(mock_warning.output, ["WARNING:root:Method Not Allowed (GET): /accounts/register/"])
+            self.assertEqual(
+                mock_warning.output, ["WARNING:root:Method Not Allowed (GET): /accounts/register/"]
+            )
 
         with self.assertLogs(level="WARNING") as mock_warning:
             result = self.client_get(r'/accounts/logout/', {'stream': 'Verona'})
             self.assertEqual(result.status_code, 405)
-            self.assertEqual(mock_warning.output, ["WARNING:root:Method Not Allowed (GET): /accounts/logout/"])
+            self.assertEqual(
+                mock_warning.output, ["WARNING:root:Method Not Allowed (GET): /accounts/logout/"]
+            )
 
     def test_authenticated_json_post_view_with_get_request(self) -> None:
         self.login('hamlet')
         with self.assertLogs(level="WARNING") as mock_warning:
             result = self.client_get(r'/api/v1/dev_fetch_api_key', {'stream': 'Verona'})
             self.assertEqual(result.status_code, 405)
-            self.assertEqual(mock_warning.output, ["WARNING:root:Method Not Allowed (GET): /api/v1/dev_fetch_api_key"])
+            self.assertEqual(
+                mock_warning.output,
+                ["WARNING:root:Method Not Allowed (GET): /api/v1/dev_fetch_api_key"],
+            )
 
         with self.assertLogs(level="WARNING") as mock_warning:
             result = self.client_get(r'/json/remotes/server/register', {'stream': 'Verona'})
             self.assertEqual(result.status_code, 405)
-            self.assertEqual(mock_warning.output, ["WARNING:root:Method Not Allowed (GET): /json/remotes/server/register"])
+            self.assertEqual(
+                mock_warning.output,
+                ["WARNING:root:Method Not Allowed (GET): /json/remotes/server/register"],
+            )
+
 
 class TestAuthenticatedJsonPostViewDecorator(ZulipTestCase):
     def test_authenticated_json_post_view_if_everything_is_correct(self) -> None:
@@ -1477,30 +1590,53 @@ class TestAuthenticatedJsonPostViewDecorator(ZulipTestCase):
         with self.assertLogs(level="WARNING") as m:
             result = self.client_get(r'/json/subscriptions/exists', {'stream': 'Verona'})
             self.assertEqual(result.status_code, 405)
-        self.assertEqual(m.output, ["WARNING:root:Method Not Allowed ({}): {}".format("GET", "/json/subscriptions/exists")])
+        self.assertEqual(
+            m.output,
+            [
+                "WARNING:root:Method Not Allowed ({}): {}".format(
+                    "GET", "/json/subscriptions/exists"
+                )
+            ],
+        )
 
     def test_authenticated_json_post_view_if_subdomain_is_invalid(self) -> None:
         user = self.example_user('hamlet')
         email = user.delivery_email
         self.login_user(user)
-        with self.assertLogs(level="WARNING") as m, \
-                mock.patch('zerver.decorator.get_subdomain', return_value=''):
-            self.assert_json_error_contains(self._do_test(user),
-                                            "Account is not associated with this subdomain")
+        with self.assertLogs(level="WARNING") as m, mock.patch(
+            'zerver.decorator.get_subdomain', return_value=''
+        ):
+            self.assert_json_error_contains(
+                self._do_test(user), "Account is not associated with this subdomain"
+            )
         self.assertEqual(
             m.output,
-            ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(email, 'zulip', ''),
-                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(email, 'zulip', '')]
+            [
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    email, 'zulip', ''
+                ),
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    email, 'zulip', ''
+                ),
+            ],
         )
 
-        with self.assertLogs(level="WARNING") as m, \
-                mock.patch('zerver.decorator.get_subdomain', return_value='acme'):
-            self.assert_json_error_contains(self._do_test(user),
-                                            "Account is not associated with this subdomain")
+        with self.assertLogs(level="WARNING") as m, mock.patch(
+            'zerver.decorator.get_subdomain', return_value='acme'
+        ):
+            self.assert_json_error_contains(
+                self._do_test(user), "Account is not associated with this subdomain"
+            )
         self.assertEqual(
             m.output,
-            ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(email, 'zulip', 'acme'),
-                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(email, 'zulip', 'acme')]
+            [
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    email, 'zulip', 'acme'
+                ),
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    email, 'zulip', 'acme'
+                ),
+            ],
         )
 
     def test_authenticated_json_post_view_if_user_is_incoming_webhook(self) -> None:
@@ -1525,7 +1661,9 @@ class TestAuthenticatedJsonPostViewDecorator(ZulipTestCase):
         # we deactivate user's realm manually because do_deactivate_user removes user session
         user_profile.realm.deactivated = True
         user_profile.realm.save()
-        self.assert_json_error_contains(self._do_test(user_profile), "This organization has been deactivated")
+        self.assert_json_error_contains(
+            self._do_test(user_profile), "This organization has been deactivated"
+        )
         do_reactivate_realm(user_profile.realm)
 
     def _do_test(self, user: UserProfile) -> HttpResponse:
@@ -1534,34 +1672,48 @@ class TestAuthenticatedJsonPostViewDecorator(ZulipTestCase):
         data = {"password": initial_password(user.email), "stream": stream_name}
         return self.client_post('/json/subscriptions/exists', data)
 
+
 class TestAuthenticatedJsonViewDecorator(ZulipTestCase):
     def test_authenticated_json_view_if_subdomain_is_invalid(self) -> None:
         user = self.example_user('hamlet')
         email = user.delivery_email
         self.login_user(user)
 
-        with self.assertLogs(level="WARNING") as m, \
-                mock.patch('zerver.decorator.get_subdomain', return_value=''):
-            self.assert_json_error_contains(self._do_test(email),
-                                            "Account is not associated with this subdomain")
+        with self.assertLogs(level="WARNING") as m, mock.patch(
+            'zerver.decorator.get_subdomain', return_value=''
+        ):
+            self.assert_json_error_contains(
+                self._do_test(email), "Account is not associated with this subdomain"
+            )
         self.assertEqual(
             m.output,
-            ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(email, "zulip", "")]
+            [
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    email, "zulip", ""
+                )
+            ],
         )
 
-        with self.assertLogs(level="WARNING") as m, \
-                mock.patch('zerver.decorator.get_subdomain', return_value='acme'):
-            self.assert_json_error_contains(self._do_test(email),
-                                            "Account is not associated with this subdomain")
+        with self.assertLogs(level="WARNING") as m, mock.patch(
+            'zerver.decorator.get_subdomain', return_value='acme'
+        ):
+            self.assert_json_error_contains(
+                self._do_test(email), "Account is not associated with this subdomain"
+            )
         self.assertEqual(
             m.output,
-            ["WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(email, "zulip", "acme")]
+            [
+                "WARNING:root:User {} ({}) attempted to access API on wrong subdomain ({})".format(
+                    email, "zulip", "acme"
+                )
+            ],
         )
 
     def _do_test(self, user_email: str) -> HttpResponse:
         data = {"password": initial_password(user_email)}
         return self.client_post(r'/accounts/webathena_kerberos_login/', data)
 
+
 class TestZulipLoginRequiredDecorator(ZulipTestCase):
     def test_zulip_login_required_if_subdomain_is_invalid(self) -> None:
         self.login('hamlet')
@@ -1639,6 +1791,7 @@ class TestZulipLoginRequiredDecorator(ZulipTestCase):
             content = getattr(response, 'content')
             self.assertEqual(content.decode(), 'Success')
 
+
 class TestRequireDecorators(ZulipTestCase):
     def test_require_server_admin_decorator(self) -> None:
         user = self.example_user('hamlet')
@@ -1697,6 +1850,7 @@ class ReturnSuccessOnHeadRequestDecorator(ZulipTestCase):
         response = test_function(request)
         self.assertEqual(orjson.loads(response.content).get('msg'), 'from_test_function')
 
+
 class RestAPITest(ZulipTestCase):
     def test_method_not_allowed(self) -> None:
         self.login('hamlet')
@@ -1715,14 +1869,13 @@ class RestAPITest(ZulipTestCase):
         self.assertEqual(str(result['Allow']), 'DELETE, PATCH')
 
     def test_http_accept_redirect(self) -> None:
-        result = self.client_get('/json/users',
-                                 HTTP_ACCEPT='text/html')
+        result = self.client_get('/json/users', HTTP_ACCEPT='text/html')
         self.assertEqual(result.status_code, 302)
         self.assertTrue(result["Location"].endswith("/login/?next=/json/users"))
 
+
 class CacheTestCase(ZulipTestCase):
     def test_cachify_basics(self) -> None:
-
         @cachify
         def add(w: Any, x: Any, y: Any, z: Any) -> Any:
             return w + x + y + z
@@ -1732,7 +1885,6 @@ class CacheTestCase(ZulipTestCase):
             self.assertEqual(add('a', 'b', 'c', 'd'), 'abcd')
 
     def test_cachify_is_per_call(self) -> None:
-
         def test_greetings(greeting: str) -> Tuple[List[str], List[str]]:
 
             result_log: List[str] = []
@@ -1752,38 +1904,53 @@ class CacheTestCase(ZulipTestCase):
             return (work_log, result_log)
 
         work_log, result_log = test_greetings('hello')
-        self.assertEqual(work_log, [
-            'hello alice smith',
-            'hello bob barker',
-            'hello cal johnson',
-        ])
+        self.assertEqual(
+            work_log,
+            [
+                'hello alice smith',
+                'hello bob barker',
+                'hello cal johnson',
+            ],
+        )
 
-        self.assertEqual(result_log, [
-            'hello alice smith',
-            'hello bob barker',
-            'hello alice smith',
-            'hello cal johnson',
-        ])
+        self.assertEqual(
+            result_log,
+            [
+                'hello alice smith',
+                'hello bob barker',
+                'hello alice smith',
+                'hello cal johnson',
+            ],
+        )
 
         work_log, result_log = test_greetings('goodbye')
-        self.assertEqual(work_log, [
-            'goodbye alice smith',
-            'goodbye bob barker',
-            'goodbye cal johnson',
-        ])
+        self.assertEqual(
+            work_log,
+            [
+                'goodbye alice smith',
+                'goodbye bob barker',
+                'goodbye cal johnson',
+            ],
+        )
+
+        self.assertEqual(
+            result_log,
+            [
+                'goodbye alice smith',
+                'goodbye bob barker',
+                'goodbye alice smith',
+                'goodbye cal johnson',
+            ],
+        )
 
-        self.assertEqual(result_log, [
-            'goodbye alice smith',
-            'goodbye bob barker',
-            'goodbye alice smith',
-            'goodbye cal johnson',
-        ])
 
 class TestUserAgentParsing(ZulipTestCase):
     def test_user_agent_parsing(self) -> None:
         """Test for our user agent parsing logic, using a large data set."""
         user_agents_parsed: Dict[str, int] = defaultdict(int)
-        user_agents_path = os.path.join(settings.DEPLOY_ROOT, "zerver/tests/fixtures/user_agents_unique")
+        user_agents_path = os.path.join(
+            settings.DEPLOY_ROOT, "zerver/tests/fixtures/user_agents_unique"
+        )
         with open(user_agents_path) as f:
             for line in f:
                 line = line.strip()
diff --git a/zerver/tests/test_digest.py b/zerver/tests/test_digest.py
index f305a663e6..4290d63e8c 100644
--- a/zerver/tests/test_digest.py
+++ b/zerver/tests/test_digest.py
@@ -39,12 +39,11 @@ from zerver.models import (
 
 
 class TestDigestEmailMessages(ZulipTestCase):
-
     @mock.patch('zerver.lib.digest.enough_traffic')
     @mock.patch('zerver.lib.digest.send_future_email')
-    def test_multiple_stream_senders(self,
-                                     mock_send_future_email: mock.MagicMock,
-                                     mock_enough_traffic: mock.MagicMock) -> None:
+    def test_multiple_stream_senders(
+        self, mock_send_future_email: mock.MagicMock, mock_enough_traffic: mock.MagicMock
+    ) -> None:
 
         othello = self.example_user('othello')
         self.subscribe(othello, 'Verona')
@@ -55,7 +54,7 @@ class TestDigestEmailMessages(ZulipTestCase):
 
         cutoff = time.mktime(one_hour_ago.timetuple())
 
-        senders = ['hamlet', 'cordelia',  'iago', 'prospero', 'ZOE']
+        senders = ['hamlet', 'cordelia', 'iago', 'prospero', 'ZOE']
         self.simulate_stream_conversation('Verona', senders)
 
         # Remove RealmAuditoLog rows, so we don't exclude polonius.
@@ -79,10 +78,7 @@ class TestDigestEmailMessages(ZulipTestCase):
 
         hot_convo = kwargs['context']['hot_conversations'][0]
 
-        expected_participants = {
-            self.example_user(sender).full_name
-            for sender in senders
-        }
+        expected_participants = {self.example_user(sender).full_name for sender in senders}
 
         self.assertEqual(set(hot_convo['participants']), expected_participants)
         self.assertEqual(hot_convo['count'], 5 - 2)  # 5 messages, but 2 shown
@@ -92,9 +88,9 @@ class TestDigestEmailMessages(ZulipTestCase):
 
     @mock.patch('zerver.lib.digest.enough_traffic')
     @mock.patch('zerver.lib.digest.send_future_email')
-    def test_guest_user_multiple_stream_sender(self,
-                                               mock_send_future_email: mock.MagicMock,
-                                               mock_enough_traffic: mock.MagicMock) -> None:
+    def test_guest_user_multiple_stream_sender(
+        self, mock_send_future_email: mock.MagicMock, mock_enough_traffic: mock.MagicMock
+    ) -> None:
         othello = self.example_user('othello')
         hamlet = self.example_user('hamlet')
         cordelia = self.example_user('cordelia')
@@ -111,7 +107,7 @@ class TestDigestEmailMessages(ZulipTestCase):
 
         cutoff = time.mktime(one_hour_ago.timetuple())
 
-        senders = ['hamlet', 'cordelia',  'othello', 'desdemona']
+        senders = ['hamlet', 'cordelia', 'othello', 'desdemona']
         self.simulate_stream_conversation('web_public_stream', senders)
 
         # Remove RealmAuditoLog rows, so we don't exclude polonius.
@@ -146,7 +142,7 @@ class TestDigestEmailMessages(ZulipTestCase):
             self.example_user('desdemona'),
             self.example_user('polonius'),
         ]
-        digest_users.sort(key = lambda user: user.id)
+        digest_users.sort(key=lambda user: user.id)
 
         for digest_user in digest_users:
             for stream in ['Verona', 'Scotland', 'Denmark']:
@@ -155,7 +151,7 @@ class TestDigestEmailMessages(ZulipTestCase):
         RealmAuditLog.objects.all().delete()
 
         # Send messages to a stream and unsubscribe - subscribe from that stream
-        senders = ['hamlet', 'cordelia',  'iago', 'prospero', 'ZOE']
+        senders = ['hamlet', 'cordelia', 'iago', 'prospero', 'ZOE']
         self.simulate_stream_conversation('Verona', senders)
 
         for digest_user in digest_users:
@@ -198,10 +194,7 @@ class TestDigestEmailMessages(ZulipTestCase):
             self.assertEqual(2, len(hot_conversations), [digest_user.id])
 
             hot_convo = hot_conversations[0]
-            expected_participants = {
-                self.example_user(sender).full_name
-                for sender in senders
-            }
+            expected_participants = {self.example_user(sender).full_name for sender in senders}
 
             self.assertEqual(set(hot_convo['participants']), expected_participants)
             self.assertEqual(hot_convo['count'], 5 - 2)  # 5 messages, but 2 shown
@@ -267,12 +260,14 @@ class TestDigestEmailMessages(ZulipTestCase):
         self.assertEqual(recent_streams[cordelia.id], {denmark.id})
 
     def active_human_users(self, realm: Realm) -> List[UserProfile]:
-        users = list(UserProfile.objects.filter(
-            realm=realm,
-            is_active=True,
-            is_bot=False,
-            enable_digest_emails=True,
-        ))
+        users = list(
+            UserProfile.objects.filter(
+                realm=realm,
+                is_active=True,
+                is_bot=False,
+                enable_digest_emails=True,
+            )
+        )
 
         assert len(users) >= 5
 
@@ -415,13 +410,17 @@ class TestDigestEmailMessages(ZulipTestCase):
         realm = cordelia.realm
 
         recent_streams = get_recent_streams(realm, cutoff)
-        stream_count, stream_info = gather_new_streams(realm, recent_streams, can_access_public=True)
+        stream_count, stream_info = gather_new_streams(
+            realm, recent_streams, can_access_public=True
+        )
         self.assertEqual(stream_count, 1)
         expected_html = f"<a href='http://zulip.testserver/#narrow/stream/{stream.id}-New-stream'>New stream</a>"
         self.assertEqual(stream_info['html'][0], expected_html)
 
         # guests don't see our stream
-        stream_count, stream_info = gather_new_streams(realm, recent_streams, can_access_public=False)
+        stream_count, stream_info = gather_new_streams(
+            realm, recent_streams, can_access_public=False
+        )
         self.assertEqual(stream_count, 0)
         self.assertEqual(stream_info['html'], [])
 
@@ -430,7 +429,9 @@ class TestDigestEmailMessages(ZulipTestCase):
         stream.save()
 
         recent_streams = get_recent_streams(realm, cutoff)
-        stream_count, stream_info = gather_new_streams(realm, recent_streams, can_access_public=True)
+        stream_count, stream_info = gather_new_streams(
+            realm, recent_streams, can_access_public=True
+        )
         self.assertEqual(stream_count, 1)
 
         # Make the stream appear to be older.
@@ -438,7 +439,9 @@ class TestDigestEmailMessages(ZulipTestCase):
         stream.save()
 
         recent_streams = get_recent_streams(realm, cutoff)
-        stream_count, stream_info = gather_new_streams(realm, recent_streams, can_access_public=True)
+        stream_count, stream_info = gather_new_streams(
+            realm, recent_streams, can_access_public=True
+        )
         self.assertEqual(stream_count, 0)
         self.assertEqual(stream_info['html'], [])
 
@@ -454,19 +457,25 @@ class TestDigestEmailMessages(ZulipTestCase):
         Message.objects.filter(id__in=message_ids).update(sending_client=sending_client)
         return message_ids
 
+
 class TestDigestContentInBrowser(ZulipTestCase):
     def test_get_digest_content_in_browser(self) -> None:
         self.login('hamlet')
         result = self.client_get("/digest/")
         self.assert_in_success_response(["Click here to log in to Zulip and catch up."], result)
 
+
 class TestDigestTopics(ZulipTestCase):
-    def populate_topic(self, topic: DigestTopic, humans: int, human_messages: int, bots: int, bot_messages: int) -> None:
+    def populate_topic(
+        self, topic: DigestTopic, humans: int, human_messages: int, bots: int, bot_messages: int
+    ) -> None:
         def send_messages(client: Client, users: int, messages: int) -> None:
             messages_sent = 0
             while messages_sent < messages:
                 for index, username in enumerate(self.example_user_map, start=1):
-                    topic.add_message(Message(sender=self.example_user(username), sending_client=client))
+                    topic.add_message(
+                        Message(sender=self.example_user(username), sending_client=client)
+                    )
                     messages_sent += 1
                     if messages_sent == messages:
                         break
@@ -505,10 +514,23 @@ class TestDigestTopics(ZulipTestCase):
         self.populate_topic(lengthy_topic_d, humans=2, human_messages=35, bots=0, bot_messages=0)
 
         topics = [
-            diverse_topic_a, diverse_topic_b, diverse_topic_c, diverse_topic_d, diverse_topic_e,
-            lengthy_topic_a, lengthy_topic_b, lengthy_topic_c, lengthy_topic_d
+            diverse_topic_a,
+            diverse_topic_b,
+            diverse_topic_c,
+            diverse_topic_d,
+            diverse_topic_e,
+            lengthy_topic_a,
+            lengthy_topic_b,
+            lengthy_topic_c,
+            lengthy_topic_d,
         ]
-        self.assertEqual(get_hot_topics(topics, set([1, 0])), [diverse_topic_a, diverse_topic_b, lengthy_topic_a, lengthy_topic_b])
-        self.assertEqual(get_hot_topics(topics, set([1, 2])), [diverse_topic_a, diverse_topic_c, lengthy_topic_a, lengthy_topic_d])
+        self.assertEqual(
+            get_hot_topics(topics, set([1, 0])),
+            [diverse_topic_a, diverse_topic_b, lengthy_topic_a, lengthy_topic_b],
+        )
+        self.assertEqual(
+            get_hot_topics(topics, set([1, 2])),
+            [diverse_topic_a, diverse_topic_c, lengthy_topic_a, lengthy_topic_d],
+        )
         self.assertEqual(get_hot_topics(topics, set([2])), [diverse_topic_c, lengthy_topic_d])
         self.assertEqual(get_hot_topics(topics, set()), [])
diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py
index fead18c1c1..66cfd89f7a 100644
--- a/zerver/tests/test_docs.py
+++ b/zerver/tests/test_docs.py
@@ -34,9 +34,15 @@ class DocPageTest(ZulipTestCase):
             print("ERROR: {}".format(content.get('msg')))
             print()
 
-    def _test(self, url: str, expected_content: str, extra_strings: Sequence[str]=[],
-              landing_missing_strings: Sequence[str]=[], landing_page: bool=True,
-              doc_html_str: bool=False) -> None:
+    def _test(
+        self,
+        url: str,
+        expected_content: str,
+        extra_strings: Sequence[str] = [],
+        landing_missing_strings: Sequence[str] = [],
+        landing_page: bool = True,
+        doc_html_str: bool = False,
+    ) -> None:
 
         # Test the URL on the "zephyr" subdomain
         result = self.get_doc(url, subdomain="zephyr")
@@ -47,7 +53,9 @@ class DocPageTest(ZulipTestCase):
         for s in extra_strings:
             self.assertIn(s, str(result.content))
         if not doc_html_str:
-            self.assert_in_success_response(['<meta name="robots" content="noindex,nofollow">'], result)
+            self.assert_in_success_response(
+                ['<meta name="robots" content="noindex,nofollow">'], result
+            )
 
         # Test the URL on the root subdomain
         result = self.get_doc(url, subdomain="")
@@ -56,7 +64,9 @@ class DocPageTest(ZulipTestCase):
         self.assertEqual(result.status_code, 200)
         self.assertIn(expected_content, str(result.content))
         if not doc_html_str:
-            self.assert_in_success_response(['<meta name="robots" content="noindex,nofollow">'], result)
+            self.assert_in_success_response(
+                ['<meta name="robots" content="noindex,nofollow">'], result
+            )
 
         for s in extra_strings:
             self.assertIn(s, str(result.content))
@@ -77,7 +87,9 @@ class DocPageTest(ZulipTestCase):
             if not doc_html_str:
                 # Every page has a meta-description
                 self.assert_in_success_response(['<meta name="description" content="'], result)
-            self.assert_not_in_success_response(['<meta name="robots" content="noindex,nofollow">'], result)
+            self.assert_not_in_success_response(
+                ['<meta name="robots" content="noindex,nofollow">'], result
+            )
 
             # Test the URL on the "zephyr" subdomain with the landing page setting
             result = self.get_doc(url, subdomain="zephyr")
@@ -88,7 +100,9 @@ class DocPageTest(ZulipTestCase):
             for s in extra_strings:
                 self.assertIn(s, str(result.content))
             if not doc_html_str:
-                self.assert_in_success_response(['<meta name="robots" content="noindex,nofollow">'], result)
+                self.assert_in_success_response(
+                    ['<meta name="robots" content="noindex,nofollow">'], result
+                )
 
     def test_api_doc_endpoints(self) -> None:
         current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -144,8 +158,11 @@ class DocPageTest(ZulipTestCase):
         self._test('/errors/5xx/', 'Internal server error')
         self._test('/emails/', 'manually generate most of the emails by clicking')
 
-        result = self.client_get('/integrations/doc-html/nonexistent_integration', follow=True,
-                                 HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        result = self.client_get(
+            '/integrations/doc-html/nonexistent_integration',
+            follow=True,
+            HTTP_X_REQUESTED_WITH='XMLHttpRequest',
+        )
         self.assertEqual(result.status_code, 404)
 
         result = self.client_get('/new-user/')
@@ -168,14 +185,16 @@ class DocPageTest(ZulipTestCase):
         self._test(url, description, doc_html_str=True)
 
     def test_integration_doc_endpoints(self) -> None:
-        self._test('/integrations/',
-                   'native integrations.',
-                   extra_strings=[
-                       'And hundreds more through',
-                       'Hubot',
-                       'Zapier',
-                       'IFTTT',
-                   ])
+        self._test(
+            '/integrations/',
+            'native integrations.',
+            extra_strings=[
+                'And hundreds more through',
+                'Hubot',
+                'Zapier',
+                'IFTTT',
+            ],
+        )
 
         for integration in INTEGRATIONS.keys():
             url = f'/integrations/doc-html/{integration}'
@@ -226,15 +245,17 @@ class DocPageTest(ZulipTestCase):
         # TODO: Ideally, this Mozilla would be the specific browser.
         self.assertTrue('data-platform="Mozilla"' in result.content.decode("utf-8"))
 
-        result = self.client_get("/accounts/password/reset/",
-                                 HTTP_USER_AGENT="ZulipElectron/1.0.0")
+        result = self.client_get("/accounts/password/reset/", HTTP_USER_AGENT="ZulipElectron/1.0.0")
         self.assertTrue('data-platform="ZulipElectron"' in result.content.decode("utf-8"))
 
+
 class HelpTest(ZulipTestCase):
     def test_help_settings_links(self) -> None:
         result = self.client_get('/help/change-the-time-format')
         self.assertEqual(result.status_code, 200)
-        self.assertIn('Go to <a href="/#settings/display-settings">Display settings</a>', str(result.content))
+        self.assertIn(
+            'Go to <a href="/#settings/display-settings">Display settings</a>', str(result.content)
+        )
         # Check that the sidebar was rendered properly.
         self.assertIn('Getting started with Zulip', str(result.content))
 
@@ -266,6 +287,7 @@ class HelpTest(ZulipTestCase):
         self.assertIn('<strong>Manage streams</strong>', str(result.content))
         self.assertNotIn('/#streams', str(result.content))
 
+
 class IntegrationTest(ZulipTestCase):
     def test_check_if_every_integration_has_logo_that_exists(self) -> None:
         for integration in INTEGRATIONS.values():
@@ -299,31 +321,24 @@ class IntegrationTest(ZulipTestCase):
         context: Dict[str, Any] = {}
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
             add_api_uri_context(context, HostRequestMock())
-        self.assertEqual(
-            context['settings_html'],
-            'Zulip settings page')
-        self.assertEqual(
-            context['subscriptions_html'],
-            'streams page')
+        self.assertEqual(context['settings_html'], 'Zulip settings page')
+        self.assertEqual(context['subscriptions_html'], 'streams page')
 
         context = {}
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
             add_api_uri_context(context, HostRequestMock(host="mysubdomain.testserver"))
+        self.assertEqual(context['settings_html'], '<a href="/#settings">Zulip settings page</a>')
         self.assertEqual(
-            context['settings_html'],
-            '<a href="/#settings">Zulip settings page</a>')
-        self.assertEqual(
-            context['subscriptions_html'],
-            '<a target="_blank" href="/#streams">streams page</a>')
+            context['subscriptions_html'], '<a target="_blank" href="/#streams">streams page</a>'
+        )
 
         context = {}
         add_api_uri_context(context, HostRequestMock())
+        self.assertEqual(context['settings_html'], '<a href="/#settings">Zulip settings page</a>')
         self.assertEqual(
-            context['settings_html'],
-            '<a href="/#settings">Zulip settings page</a>')
-        self.assertEqual(
-            context['subscriptions_html'],
-            '<a target="_blank" href="/#streams">streams page</a>')
+            context['subscriptions_html'], '<a target="_blank" href="/#streams">streams page</a>'
+        )
+
 
 class AboutPageTest(ZulipTestCase):
     @skipUnless(settings.ZILENCER_ENABLED, "requires zilencer")
@@ -351,12 +366,14 @@ class AboutPageTest(ZulipTestCase):
         expected_result = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
         self.assertEqual(split_by(flat_list, 3, None), expected_result)
 
+
 class SmtpConfigErrorTest(ZulipTestCase):
     def test_smtp_error(self) -> None:
         result = self.client_get("/config-error/smtp")
         self.assertEqual(result.status_code, 200)
         self.assert_in_success_response(["email configuration"], result)
 
+
 class PlansPageTest(ZulipTestCase):
     def test_plans_auth(self) -> None:
         root_domain = ""
@@ -432,22 +449,29 @@ class PlansPageTest(ZulipTestCase):
         realm.save(update_fields=["plan_type"])
         result = self.client_get("/plans/", subdomain="zulip")
         self.assert_in_success_response([current_plan], result)
-        self.assert_not_in_success_response([sign_up_now, buy_standard, sponsorship_pending], result)
+        self.assert_not_in_success_response(
+            [sign_up_now, buy_standard, sponsorship_pending], result
+        )
 
         realm.plan_type = Realm.STANDARD
         realm.save(update_fields=["plan_type"])
         result = self.client_get("/plans/", subdomain="zulip")
         self.assert_in_success_response([current_plan], result)
-        self.assert_not_in_success_response([sign_up_now, buy_standard, sponsorship_pending], result)
+        self.assert_not_in_success_response(
+            [sign_up_now, buy_standard, sponsorship_pending], result
+        )
 
         realm.plan_type = Realm.LIMITED
         realm.save()
-        Customer.objects.create(realm=get_realm("zulip"), stripe_customer_id="cus_id", sponsorship_pending=True)
+        Customer.objects.create(
+            realm=get_realm("zulip"), stripe_customer_id="cus_id", sponsorship_pending=True
+        )
         result = self.client_get("/plans/", subdomain="zulip")
         self.assert_in_success_response([current_plan], result)
         self.assert_in_success_response([current_plan, sponsorship_pending], result)
         self.assert_not_in_success_response([sign_up_now, buy_standard], result)
 
+
 class AppsPageTest(ZulipTestCase):
     def test_apps_view(self) -> None:
         result = self.client_get('/apps')
@@ -472,7 +496,10 @@ class AppsPageTest(ZulipTestCase):
 
     def test_app_download_link_view(self) -> None:
         return_value = "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-Web-Setup-5.4.3.exe"
-        with mock.patch("zerver.views.portico.get_latest_github_release_download_link_for_platform", return_value=return_value) as m:
+        with mock.patch(
+            "zerver.views.portico.get_latest_github_release_download_link_for_platform",
+            return_value=return_value,
+        ) as m:
             result = self.client_get("/apps/download/windows")
             m.assert_called_once_with("windows")
             self.assertEqual(result.status_code, 302)
@@ -481,16 +508,23 @@ class AppsPageTest(ZulipTestCase):
         result = self.client_get("/apps/download/plan9")
         self.assertEqual(result.status_code, 404)
 
+
 class PrivacyTermsTest(ZulipTestCase):
     def test_custom_tos_template(self) -> None:
         response = self.client_get("/terms/")
 
-        self.assert_in_success_response(["Thanks for using our products and services (\"Services\"). ",
-                                         "By using our Services, you are agreeing to these terms"],
-                                        response)
+        self.assert_in_success_response(
+            [
+                "Thanks for using our products and services (\"Services\"). ",
+                "By using our Services, you are agreeing to these terms",
+            ],
+            response,
+        )
 
     def test_custom_terms_of_service_template(self) -> None:
-        not_configured_message = 'This installation of Zulip does not have a configured terms of service'
+        not_configured_message = (
+            'This installation of Zulip does not have a configured terms of service'
+        )
         with self.settings(TERMS_OF_SERVICE=None):
             response = self.client_get('/terms/')
         self.assert_in_success_response([not_configured_message], response)
@@ -500,7 +534,9 @@ class PrivacyTermsTest(ZulipTestCase):
         self.assert_not_in_success_response([not_configured_message], response)
 
     def test_custom_privacy_policy_template(self) -> None:
-        not_configured_message = 'This installation of Zulip does not have a configured privacy policy'
+        not_configured_message = (
+            'This installation of Zulip does not have a configured privacy policy'
+        )
         with self.settings(PRIVACY_POLICY=None):
             response = self.client_get('/privacy/')
         self.assert_in_success_response([not_configured_message], response)
@@ -511,8 +547,9 @@ class PrivacyTermsTest(ZulipTestCase):
 
     def test_custom_privacy_policy_template_with_absolute_url(self) -> None:
         current_dir = os.path.dirname(os.path.abspath(__file__))
-        abs_path = os.path.join(current_dir, '..', '..',
-                                'templates/zerver/tests/markdown/test_markdown.md')
+        abs_path = os.path.join(
+            current_dir, '..', '..', 'templates/zerver/tests/markdown/test_markdown.md'
+        )
         with self.settings(PRIVACY_POLICY=abs_path):
             response = self.client_get('/privacy/')
         self.assert_in_success_response(['This is some <em>bold text</em>.'], response)
diff --git a/zerver/tests/test_drafts.py b/zerver/tests/test_drafts.py
index e6b4fdf65d..bd671ab51e 100644
--- a/zerver/tests/test_drafts.py
+++ b/zerver/tests/test_drafts.py
@@ -9,8 +9,11 @@ from zerver.models import Draft
 
 
 class DraftCreationTests(ZulipTestCase):
-    def create_and_check_drafts_for_success(self, draft_dicts: List[Dict[str, Any]],
-                                            expected_draft_dicts: Optional[List[Dict[str, Any]]]=None) -> None:
+    def create_and_check_drafts_for_success(
+        self,
+        draft_dicts: List[Dict[str, Any]],
+        expected_draft_dicts: Optional[List[Dict[str, Any]]] = None,
+    ) -> None:
         hamlet = self.example_user("hamlet")
 
         # Make sure that there are no drafts in the database before
@@ -32,8 +35,9 @@ class DraftCreationTests(ZulipTestCase):
             expected_draft_dicts = draft_dicts
         self.assertEqual(new_draft_dicts, expected_draft_dicts)
 
-    def create_and_check_drafts_for_error(self, draft_dicts: List[Dict[str, Any]],
-                                          expected_message: str) -> None:
+    def create_and_check_drafts_for_error(
+        self, draft_dicts: List[Dict[str, Any]], expected_message: str
+    ) -> None:
         hamlet = self.example_user("hamlet")
 
         # Make sure that there are no drafts in the database before
@@ -54,50 +58,60 @@ class DraftCreationTests(ZulipTestCase):
         hamlet = self.example_user("hamlet")
         visible_stream_name = self.get_streams(hamlet)[0]
         visible_stream_id = self.get_stream_id(visible_stream_name)
-        draft_dicts = [{
-            "type": "stream",
-            "to": [visible_stream_id],
-            "topic": "sync drafts",
-            "content": "Let's add backend support for syncing drafts.",
-            "timestamp": 1595479019,
-        }]
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [visible_stream_id],
+                "topic": "sync drafts",
+                "content": "Let's add backend support for syncing drafts.",
+                "timestamp": 1595479019,
+            }
+        ]
         self.create_and_check_drafts_for_success(draft_dicts)
 
     def test_create_one_personal_message_draft_properly(self) -> None:
         zoe = self.example_user("ZOE")
-        draft_dicts = [{
-            "type": "private",
-            "to": [zoe.id],
-            "topic": "This topic should be ignored.",
-            "content": "What if we made it possible to sync drafts in Zulip?",
-            "timestamp": 1595479019,
-        }]
-        expected_draft_dicts = [{
-            "type": "private",
-            "to": [zoe.id],
-            "topic": "",  # For private messages the topic should be ignored.
-            "content": "What if we made it possible to sync drafts in Zulip?",
-            "timestamp": 1595479019,
-        }]
+        draft_dicts = [
+            {
+                "type": "private",
+                "to": [zoe.id],
+                "topic": "This topic should be ignored.",
+                "content": "What if we made it possible to sync drafts in Zulip?",
+                "timestamp": 1595479019,
+            }
+        ]
+        expected_draft_dicts = [
+            {
+                "type": "private",
+                "to": [zoe.id],
+                "topic": "",  # For private messages the topic should be ignored.
+                "content": "What if we made it possible to sync drafts in Zulip?",
+                "timestamp": 1595479019,
+            }
+        ]
         self.create_and_check_drafts_for_success(draft_dicts, expected_draft_dicts)
 
     def test_create_one_group_personal_message_draft_properly(self) -> None:
         zoe = self.example_user("ZOE")
         othello = self.example_user("othello")
-        draft_dicts = [{
-            "type": "private",
-            "to": [zoe.id, othello.id],
-            "topic": "This topic should be ignored.",
-            "content": "What if we made it possible to sync drafts in Zulip?",
-            "timestamp": 1595479019,
-        }]
-        expected_draft_dicts = [{
-            "type": "private",
-            "to": [zoe.id, othello.id],
-            "topic": "",  # For private messages the topic should be ignored.
-            "content": "What if we made it possible to sync drafts in Zulip?",
-            "timestamp": 1595479019,
-        }]
+        draft_dicts = [
+            {
+                "type": "private",
+                "to": [zoe.id, othello.id],
+                "topic": "This topic should be ignored.",
+                "content": "What if we made it possible to sync drafts in Zulip?",
+                "timestamp": 1595479019,
+            }
+        ]
+        expected_draft_dicts = [
+            {
+                "type": "private",
+                "to": [zoe.id, othello.id],
+                "topic": "",  # For private messages the topic should be ignored.
+                "content": "What if we made it possible to sync drafts in Zulip?",
+                "timestamp": 1595479019,
+            }
+        ]
         self.create_and_check_drafts_for_success(draft_dicts, expected_draft_dicts)
 
     def test_create_batch_of_drafts_properly(self) -> None:
@@ -132,18 +146,20 @@ class DraftCreationTests(ZulipTestCase):
         self.create_and_check_drafts_for_success(draft_dicts)
 
     def test_missing_timestamps(self) -> None:
-        """ If a timestamp is not provided for a draft dict then it should be automatically
-        filled in. """
+        """If a timestamp is not provided for a draft dict then it should be automatically
+        filled in."""
         hamlet = self.example_user("hamlet")
         visible_stream_name = self.get_streams(hamlet)[0]
         visible_stream_id = self.get_stream_id(visible_stream_name)
 
-        draft_dicts = [{
-            "type": "stream",
-            "to": [visible_stream_id],
-            "topic": "sync drafts",
-            "content": "Let's add backend support for syncing drafts.",
-        }]
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [visible_stream_id],
+                "topic": "sync drafts",
+                "content": "Let's add backend support for syncing drafts.",
+            }
+        ]
 
         self.assertEqual(Draft.objects.count(), 0)
 
@@ -161,17 +177,16 @@ class DraftCreationTests(ZulipTestCase):
         self.assertTrue(new_draft["timestamp"] >= current_time)
 
     def test_invalid_timestamp(self) -> None:
-        draft_dicts = [{
-            "type": "stream",
-            "to": [],
-            "topic": "sync drafts",
-            "content": "Let's add backend support for syncing drafts.",
-            "timestamp": -10.10,
-        }]
-        self.create_and_check_drafts_for_error(
-            draft_dicts,
-            "Timestamp must not be negative."
-        )
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [],
+                "topic": "sync drafts",
+                "content": "Let's add backend support for syncing drafts.",
+                "timestamp": -10.10,
+            }
+        ]
+        self.create_and_check_drafts_for_error(draft_dicts, "Timestamp must not be negative.")
 
     def test_create_non_stream_draft_with_no_recipient(self) -> None:
         """ When "to" is an empty list, the type should become "" as well. """
@@ -210,74 +225,80 @@ class DraftCreationTests(ZulipTestCase):
         self.create_and_check_drafts_for_success(draft_dicts, expected_draft_dicts)
 
     def test_create_stream_draft_with_no_recipient(self) -> None:
-        draft_dicts = [{
-            "type": "stream",
-            "to": [],
-            "topic": "sync drafts",
-            "content": "Let's add backend support for syncing drafts.",
-            "timestamp": 15954790199,
-        }]
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [],
+                "topic": "sync drafts",
+                "content": "Let's add backend support for syncing drafts.",
+                "timestamp": 15954790199,
+            }
+        ]
         self.create_and_check_drafts_for_error(
-            draft_dicts,
-            "Must specify exactly 1 stream ID for stream messages"
+            draft_dicts, "Must specify exactly 1 stream ID for stream messages"
         )
 
     def test_create_stream_draft_for_inaccessible_stream(self) -> None:
         # When the user does not have permission to access the stream:
         stream = self.make_stream("Secret Society", invite_only=True)
-        draft_dicts = [{
-            "type": "stream",
-            "to": [stream.id],  # This can't be accessed by hamlet.
-            "topic": "sync drafts",
-            "content": "Let's add backend support for syncing drafts.",
-            "timestamp": 1595479019,
-        }]
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [stream.id],  # This can't be accessed by hamlet.
+                "topic": "sync drafts",
+                "content": "Let's add backend support for syncing drafts.",
+                "timestamp": 1595479019,
+            }
+        ]
         self.create_and_check_drafts_for_error(draft_dicts, "Invalid stream id")
 
         # When the stream itself does not exist:
-        draft_dicts = [{
-            "type": "stream",
-            "to": [99999999999999],  # Hopefully, this doesn't exist.
-            "topic": "sync drafts",
-            "content": "Let's add backend support for syncing drafts.",
-            "timestamp": 1595479019,
-        }]
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [99999999999999],  # Hopefully, this doesn't exist.
+                "topic": "sync drafts",
+                "content": "Let's add backend support for syncing drafts.",
+                "timestamp": 1595479019,
+            }
+        ]
         self.create_and_check_drafts_for_error(draft_dicts, "Invalid stream id")
 
     def test_create_personal_message_draft_for_non_existing_user(self) -> None:
-        draft_dicts = [{
-            "type": "private",
-            "to": [99999999999999],  # Hopefully, this doesn't exist either.
-            "topic": "This topic should be ignored.",
-            "content": "What if we made it possible to sync drafts in Zulip?",
-            "timestamp": 1595479019,
-        }]
+        draft_dicts = [
+            {
+                "type": "private",
+                "to": [99999999999999],  # Hopefully, this doesn't exist either.
+                "topic": "This topic should be ignored.",
+                "content": "What if we made it possible to sync drafts in Zulip?",
+                "timestamp": 1595479019,
+            }
+        ]
         self.create_and_check_drafts_for_error(draft_dicts, "Invalid user ID 99999999999999")
 
     def test_create_draft_with_null_bytes(self) -> None:
-        draft_dicts = [{
-            "type": "",
-            "to": [],
-            "topic": "sync drafts.",
-            "content": "Some regular \x00 content here",
-            "timestamp": 15954790199,
-        }]
-        self.create_and_check_drafts_for_error(
-            draft_dicts,
-            "Message must not contain null bytes"
-        )
+        draft_dicts = [
+            {
+                "type": "",
+                "to": [],
+                "topic": "sync drafts.",
+                "content": "Some regular \x00 content here",
+                "timestamp": 15954790199,
+            }
+        ]
+        self.create_and_check_drafts_for_error(draft_dicts, "Message must not contain null bytes")
+
+        draft_dicts = [
+            {
+                "type": "stream",
+                "to": [10],
+                "topic": "thinking about \x00",
+                "content": "Let's add backend support for syncing drafts.",
+                "timestamp": 15954790199,
+            }
+        ]
+        self.create_and_check_drafts_for_error(draft_dicts, "Topic must not contain null bytes")
 
-        draft_dicts = [{
-            "type": "stream",
-            "to": [10],
-            "topic": "thinking about \x00",
-            "content": "Let's add backend support for syncing drafts.",
-            "timestamp": 15954790199,
-        }]
-        self.create_and_check_drafts_for_error(
-            draft_dicts,
-            "Topic must not contain null bytes"
-        )
 
 class DraftEditTests(ZulipTestCase):
     def test_edit_draft_successfully(self) -> None:
@@ -295,9 +316,11 @@ class DraftEditTests(ZulipTestCase):
             "to": [stream_a],
             "topic": "drafts",
             "content": "The API should be good",
-            "timestamp": 1595505700
+            "timestamp": 1595505700,
         }
-        resp = self.api_post(hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()})
+        resp = self.api_post(
+            hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()}
+        )
         self.assert_json_success(resp)
         new_draft_id = orjson.loads(resp.content)["ids"][0]
 
@@ -308,8 +331,9 @@ class DraftEditTests(ZulipTestCase):
         draft_dict["timestamp"] = 1595505800
 
         # Update this change in the backend.
-        resp = self.api_patch(hamlet, f"/api/v1/drafts/{new_draft_id}",
-                              {"draft": orjson.dumps(draft_dict).decode()})
+        resp = self.api_patch(
+            hamlet, f"/api/v1/drafts/{new_draft_id}", {"draft": orjson.dumps(draft_dict).decode()}
+        )
         self.assert_json_success(resp)
 
         # Now make sure that the change was made successfully.
@@ -330,10 +354,11 @@ class DraftEditTests(ZulipTestCase):
             "to": [10],
             "topic": "drafts",
             "content": "The API should be good",
-            "timestamp": 1595505700
+            "timestamp": 1595505700,
         }
-        resp = self.api_patch(hamlet, "/api/v1/drafts/999999999",
-                              {"draft": orjson.dumps(draft_dict).decode()})
+        resp = self.api_patch(
+            hamlet, "/api/v1/drafts/999999999", {"draft": orjson.dumps(draft_dict).decode()}
+        )
         self.assert_json_error(resp, "Draft does not exist", status_code=404)
 
         # Now make sure that no changes were made.
@@ -353,9 +378,11 @@ class DraftEditTests(ZulipTestCase):
             "to": [stream_id],
             "topic": "drafts",
             "content": "The API should be good",
-            "timestamp": 1595505700
+            "timestamp": 1595505700,
         }
-        resp = self.api_post(hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()})
+        resp = self.api_post(
+            hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()}
+        )
         self.assert_json_success(resp)
         new_draft_id = orjson.loads(resp.content)["ids"][0]
 
@@ -365,8 +392,9 @@ class DraftEditTests(ZulipTestCase):
 
         # Update this change in the backend as a different user.
         zoe = self.example_user("ZOE")
-        resp = self.api_patch(zoe, f"/api/v1/drafts/{new_draft_id}",
-                              {"draft": orjson.dumps(draft_dict).decode()})
+        resp = self.api_patch(
+            zoe, f"/api/v1/drafts/{new_draft_id}", {"draft": orjson.dumps(draft_dict).decode()}
+        )
         self.assert_json_error(resp, "Draft does not exist", status_code=404)
 
         # Now make sure that no changes were made.
@@ -375,6 +403,7 @@ class DraftEditTests(ZulipTestCase):
         existing_draft_dict.pop("id")
         self.assertEqual(existing_draft_dict, draft_dict)
 
+
 class DraftDeleteTests(ZulipTestCase):
     def test_delete_draft_successfully(self) -> None:
         hamlet = self.example_user("hamlet")
@@ -390,9 +419,11 @@ class DraftDeleteTests(ZulipTestCase):
             "to": [stream_id],
             "topic": "drafts",
             "content": "The API should be good",
-            "timestamp": 1595505700
+            "timestamp": 1595505700,
         }
-        resp = self.api_post(hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()})
+        resp = self.api_post(
+            hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()}
+        )
         self.assert_json_success(resp)
         new_draft_id = orjson.loads(resp.content)["ids"][0]
 
@@ -433,9 +464,11 @@ class DraftDeleteTests(ZulipTestCase):
             "to": [stream_id],
             "topic": "drafts",
             "content": "The API should be good",
-            "timestamp": 1595505700
+            "timestamp": 1595505700,
         }
-        resp = self.api_post(hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()})
+        resp = self.api_post(
+            hamlet, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()}
+        )
         self.assert_json_success(resp)
         new_draft_id = orjson.loads(resp.content)["ids"][0]
 
@@ -453,6 +486,7 @@ class DraftDeleteTests(ZulipTestCase):
         existing_draft_dict.pop("id")
         self.assertEqual(existing_draft_dict, draft_dict)
 
+
 class DraftFetchTest(ZulipTestCase):
     def test_fetch_drafts(self) -> None:
         self.assertEqual(Draft.objects.count(), 0)
@@ -514,10 +548,7 @@ class DraftFetchTest(ZulipTestCase):
 
         first_draft_id = Draft.objects.order_by("id")[0].id
         expected_draft_contents = [
-            {
-                "id": first_draft_id + i,
-                **draft_dicts[i]
-            } for i in range(0, 3)
+            {"id": first_draft_id + i, **draft_dicts[i]} for i in range(0, 3)
         ]
 
         self.assertEqual(data["drafts"], expected_draft_contents)
diff --git a/zerver/tests/test_email_change.py b/zerver/tests/test_email_change.py
index ddc0fc0c7b..0499821e53 100644
--- a/zerver/tests/test_email_change.py
+++ b/zerver/tests/test_email_change.py
@@ -23,7 +23,9 @@ class EmailChangeTestCase(ZulipTestCase):
         key = generate_key()
         url = confirmation_url(key, None, Confirmation.EMAIL_CHANGE)
         response = self.client_get(url)
-        self.assert_in_success_response(["Whoops. We couldn't find your confirmation link in the system."], response)
+        self.assert_in_success_response(
+            ["Whoops. We couldn't find your confirmation link in the system."], response
+        )
 
     def test_confirm_email_change_with_invalid_key(self) -> None:
         self.login('hamlet')
@@ -37,19 +39,25 @@ class EmailChangeTestCase(ZulipTestCase):
         old_email = user_profile.email
         new_email = 'hamlet-new@zulip.com'
         self.login('hamlet')
-        obj = EmailChangeStatus.objects.create(new_email=new_email,
-                                               old_email=old_email,
-                                               user_profile=user_profile,
-                                               realm=user_profile.realm)
+        obj = EmailChangeStatus.objects.create(
+            new_email=new_email,
+            old_email=old_email,
+            user_profile=user_profile,
+            realm=user_profile.realm,
+        )
         key = generate_key()
         date_sent = now() - datetime.timedelta(days=2)
-        Confirmation.objects.create(content_object=obj,
-                                    date_sent=date_sent,
-                                    confirmation_key=key,
-                                    type=Confirmation.EMAIL_CHANGE)
+        Confirmation.objects.create(
+            content_object=obj,
+            date_sent=date_sent,
+            confirmation_key=key,
+            type=Confirmation.EMAIL_CHANGE,
+        )
         url = confirmation_url(key, user_profile.realm, Confirmation.EMAIL_CHANGE)
         response = self.client_get(url)
-        self.assert_in_success_response(["The confirmation link has expired or been deactivated."], response)
+        self.assert_in_success_response(
+            ["The confirmation link has expired or been deactivated."], response
+        )
 
     def test_confirm_email_change(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -63,21 +71,26 @@ class EmailChangeTestCase(ZulipTestCase):
         new_email = 'hamlet-new@zulip.com'
         new_realm = get_realm('zulip')
         self.login('hamlet')
-        obj = EmailChangeStatus.objects.create(new_email=new_email,
-                                               old_email=old_email,
-                                               user_profile=user_profile,
-                                               realm=user_profile.realm)
+        obj = EmailChangeStatus.objects.create(
+            new_email=new_email,
+            old_email=old_email,
+            user_profile=user_profile,
+            realm=user_profile.realm,
+        )
         key = generate_key()
-        Confirmation.objects.create(content_object=obj,
-                                    date_sent=now(),
-                                    confirmation_key=key,
-                                    type=Confirmation.EMAIL_CHANGE)
+        Confirmation.objects.create(
+            content_object=obj,
+            date_sent=now(),
+            confirmation_key=key,
+            type=Confirmation.EMAIL_CHANGE,
+        )
         url = confirmation_url(key, user_profile.realm, Confirmation.EMAIL_CHANGE)
         response = self.client_get(url)
 
         self.assertEqual(response.status_code, 200)
-        self.assert_in_success_response(["This confirms that the email address for your Zulip"],
-                                        response)
+        self.assert_in_success_response(
+            ["This confirms that the email address for your Zulip"], response
+        )
         user_profile = get_user_by_delivery_email(new_email, new_realm)
         self.assertTrue(bool(user_profile))
         obj.refresh_from_db()
@@ -113,8 +126,7 @@ class EmailChangeTestCase(ZulipTestCase):
         activation_url = [s for s in body.split('\n') if s][2]
         response = self.client_get(activation_url)
 
-        self.assert_in_success_response(["This confirms that the email address"],
-                                        response)
+        self.assert_in_success_response(["This confirms that the email address"], response)
 
         # Now confirm trying to change your email back doesn't throw an immediate error
         result = self.client_patch(url, {"email": "hamlet@zulip.com"})
@@ -129,8 +141,7 @@ class EmailChangeTestCase(ZulipTestCase):
         result = self.client_patch(url, data)
         self.assertEqual(len(mail.outbox), 0)
         self.assertEqual(result.status_code, 400)
-        self.assert_in_response("Email address changes are disabled in this organization.",
-                                result)
+        self.assert_in_response("Email address changes are disabled in this organization.", result)
         # Realm admins can change their email address even setting is disabled.
         data = {'email': 'iago-new@zulip.com'}
         self.login('iago')
@@ -147,8 +158,7 @@ class EmailChangeTestCase(ZulipTestCase):
         result = self.client_patch(url, data)
         self.assertEqual(len(mail.outbox), 0)
         self.assertEqual(result.status_code, 400)
-        self.assert_in_response("Already has an account",
-                                result)
+        self.assert_in_response("Already has an account", result)
 
     def test_unauthorized_email_change_from_email_confirmation_link(self) -> None:
         data = {'email': 'hamlet-new@zulip.com'}
@@ -173,8 +183,9 @@ class EmailChangeTestCase(ZulipTestCase):
         response = self.client_get(activation_url)
 
         self.assertEqual(response.status_code, 400)
-        self.assert_in_response("Email address changes are disabled in this organization.",
-                                response)
+        self.assert_in_response(
+            "Email address changes are disabled in this organization.", response
+        )
 
     def test_post_invalid_email(self) -> None:
         data = {'email': 'hamlet-new'}
@@ -193,27 +204,33 @@ class EmailChangeTestCase(ZulipTestCase):
 
     def test_change_delivery_email_end_to_end_with_admins_visibility(self) -> None:
         user_profile = self.example_user('hamlet')
-        do_set_realm_property(user_profile.realm, 'email_address_visibility',
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            user_profile.realm, 'email_address_visibility', Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
 
         self.login_user(user_profile)
         old_email = user_profile.delivery_email
         new_email = 'hamlet-new@zulip.com'
-        obj = EmailChangeStatus.objects.create(new_email=new_email,
-                                               old_email=old_email,
-                                               user_profile=user_profile,
-                                               realm=user_profile.realm)
+        obj = EmailChangeStatus.objects.create(
+            new_email=new_email,
+            old_email=old_email,
+            user_profile=user_profile,
+            realm=user_profile.realm,
+        )
         key = generate_key()
-        Confirmation.objects.create(content_object=obj,
-                                    date_sent=now(),
-                                    confirmation_key=key,
-                                    type=Confirmation.EMAIL_CHANGE)
+        Confirmation.objects.create(
+            content_object=obj,
+            date_sent=now(),
+            confirmation_key=key,
+            type=Confirmation.EMAIL_CHANGE,
+        )
         url = confirmation_url(key, user_profile.realm, Confirmation.EMAIL_CHANGE)
         response = self.client_get(url)
 
         self.assertEqual(response.status_code, 200)
-        self.assert_in_success_response(["This confirms that the email address for your Zulip"],
-                                        response)
+        self.assert_in_success_response(
+            ["This confirms that the email address for your Zulip"], response
+        )
         user_profile = get_user_profile_by_id(user_profile.id)
         self.assertEqual(user_profile.delivery_email, new_email)
         self.assertEqual(user_profile.email, f"user{user_profile.id}@zulip.testserver")
diff --git a/zerver/tests/test_email_log.py b/zerver/tests/test_email_log.py
index 1269906134..6ea871b962 100644
--- a/zerver/tests/test_email_log.py
+++ b/zerver/tests/test_email_log.py
@@ -9,10 +9,9 @@ from zproject.email_backends import get_forward_address
 
 class EmailLogTest(ZulipTestCase):
     def test_generate_and_clear_email_log(self) -> None:
-        with self.settings(EMAIL_BACKEND='zproject.email_backends.EmailLogBackEnd'), \
-                mock.patch('zproject.email_backends.EmailBackend.send_messages'), \
-                self.assertLogs(level="INFO") as m, \
-                self.settings(DEVELOPMENT_LOG_EMAILS=True):
+        with self.settings(EMAIL_BACKEND='zproject.email_backends.EmailLogBackEnd'), mock.patch(
+            'zproject.email_backends.EmailBackend.send_messages'
+        ), self.assertLogs(level="INFO") as m, self.settings(DEVELOPMENT_LOG_EMAILS=True):
             result = self.client_get('/emails/generate/')
             self.assertEqual(result.status_code, 302)
             self.assertIn('emails', result['Location'])
@@ -24,7 +23,9 @@ class EmailLogTest(ZulipTestCase):
             self.assertEqual(result.status_code, 302)
             result = self.client_get(result['Location'])
             self.assertIn('manually generate most of the emails by clicking', str(result.content))
-            output_log = "INFO:root:Emails sent in development are available at http://testserver/emails"
+            output_log = (
+                "INFO:root:Emails sent in development are available at http://testserver/emails"
+            )
             self.assertEqual(m.output, [output_log for i in range(15)])
 
     def test_forward_address_details(self) -> None:
diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py
index ae36367402..b8fcafa8ad 100644
--- a/zerver/tests/test_email_mirror.py
+++ b/zerver/tests/test_email_mirror.py
@@ -47,13 +47,23 @@ from zerver.worker.queue_processors import MirrorWorker
 
 logger_name = "zerver.lib.email_mirror"
 
+
 class TestEncodeDecode(ZulipTestCase):
-    def _assert_options(self, options: Dict[str, bool], show_sender: bool=False,
-                        include_footer: bool=False, include_quotes: bool=False,
-                        prefer_text: bool=True) -> None:
+    def _assert_options(
+        self,
+        options: Dict[str, bool],
+        show_sender: bool = False,
+        include_footer: bool = False,
+        include_quotes: bool = False,
+        prefer_text: bool = True,
+    ) -> None:
         self.assertEqual(show_sender, ('show_sender' in options) and options['show_sender'])
-        self.assertEqual(include_footer, ('include_footer' in options) and options['include_footer'])
-        self.assertEqual(include_quotes, ('include_quotes' in options) and options['include_quotes'])
+        self.assertEqual(
+            include_footer, ('include_footer' in options) and options['include_footer']
+        )
+        self.assertEqual(
+            include_quotes, ('include_quotes' in options) and options['include_quotes']
+        )
         self.assertEqual(prefer_text, options.get('prefer_text', True))
 
     def test_encode_decode(self) -> None:
@@ -83,7 +93,9 @@ class TestEncodeDecode(ZulipTestCase):
         self.assertEqual(token, stream.email_token)
 
         # We also handle mixing + and . but it shouldn't be recommended to users.
-        email_address_all_options = "dev-help.{}+include-footer.show-sender+include-quotes@testserver"
+        email_address_all_options = (
+            "dev-help.{}+include-footer.show-sender+include-quotes@testserver"
+        )
         email_address_all_options = email_address_all_options.format(stream.email_token)
         token, options = decode_email_address(email_address_all_options)
         self._assert_options(options, show_sender=True, include_footer=True, include_quotes=True)
@@ -103,7 +115,9 @@ class TestEncodeDecode(ZulipTestCase):
             self.assertEqual(token, stream.email_token)
 
             token, options = decode_email_address(email_address_all_options)
-            self._assert_options(options, show_sender=True, include_footer=True, include_quotes=True)
+            self._assert_options(
+                options, show_sender=True, include_footer=True, include_quotes=True
+            )
             self.assertEqual(token, stream.email_token)
 
         with self.assertRaises(ZulipEmailForwardError):
@@ -161,6 +175,7 @@ class TestEncodeDecode(ZulipTestCase):
         token, options = decode_email_address(address_prefer_html)
         self._assert_options(options, prefer_text=False)
 
+
 class TestGetMissedMessageToken(ZulipTestCase):
     def test_get_missed_message_token(self) -> None:
         with self.settings(EMAIL_GATEWAY_PATTERN="%s@example.com"):
@@ -186,6 +201,7 @@ class TestGetMissedMessageToken(ZulipTestCase):
             with self.assertRaises(ZulipEmailForwardError):
                 get_missed_message_token_from_address(address)
 
+
 class TestFilterFooter(ZulipTestCase):
     def test_filter_footer(self) -> None:
         text = """Test message
@@ -204,6 +220,7 @@ class TestFilterFooter(ZulipTestCase):
         # Multiple possible footers, don't strip
         self.assertEqual(result, text)
 
+
 class TestStreamEmailMessagesSuccess(ZulipTestCase):
     def test_receive_stream_email_messages_success(self) -> None:
 
@@ -321,8 +338,10 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase):
         stream = get_stream("Denmark", user_profile.realm)
 
         # stream address is angle-addr within multiple addresses
-        stream_to_addresses = ["A.N. Other <another@example.org>",
-                               f"Denmark <{encode_email_address(stream)}>"]
+        stream_to_addresses = [
+            "A.N. Other <another@example.org>",
+            f"Denmark <{encode_email_address(stream)}>",
+        ]
 
         incoming_valid_message = EmailMessage()
         incoming_valid_message.set_content('TestStreamEmailMessages Body')
@@ -362,8 +381,10 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase):
         process_message(incoming_valid_message)
         message = most_recent_message(user_profile)
 
-        self.assertEqual(message.content, "From: {}\n{}".format(self.example_email('hamlet'),
-                                                                "TestStreamEmailMessages Body"))
+        self.assertEqual(
+            message.content,
+            "From: {}\n{}".format(self.example_email('hamlet'), "TestStreamEmailMessages Body"),
+        )
         self.assertEqual(get_display_recipient(message.recipient), stream.name)
         self.assertEqual(message.topic_name(), incoming_valid_message['Subject'])
 
@@ -381,15 +402,21 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase):
         incoming_valid_message = EmailMessage()
         incoming_valid_message.set_content('TestStreamEmailMessages Body')
         incoming_valid_message['Subject'] = 'TestStreamEmailMessages Subject'
-        incoming_valid_message['From'] = 'Test =?utf-8?b?VXNlcsOzxIXEmQ==?= <=?utf-8?q?hamlet=5F=C4=99?=@zulip.com>'
+        incoming_valid_message[
+            'From'
+        ] = 'Test =?utf-8?b?VXNlcsOzxIXEmQ==?= <=?utf-8?q?hamlet=5F=C4=99?=@zulip.com>'
         incoming_valid_message['To'] = stream_to_address
         incoming_valid_message['Reply-to'] = self.example_email('othello')
 
         process_message(incoming_valid_message)
         message = most_recent_message(user_profile)
 
-        self.assertEqual(message.content, "From: {}\n{}".format('Test Useróąę <hamlet_ę@zulip.com>',
-                                                                "TestStreamEmailMessages Body"))
+        self.assertEqual(
+            message.content,
+            "From: {}\n{}".format(
+                'Test Useróąę <hamlet_ę@zulip.com>', "TestStreamEmailMessages Body"
+            ),
+        )
         self.assertEqual(get_display_recipient(message.recipient), stream.name)
         self.assertEqual(message.topic_name(), incoming_valid_message['Subject'])
 
@@ -453,6 +480,7 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase):
         self.assertEqual(get_display_recipient(message.recipient), stream.name)
         self.assertEqual(message.topic_name(), incoming_valid_message['Subject'])
 
+
 class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
     def test_message_with_valid_attachment(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -463,7 +491,9 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
 
         incoming_valid_message = EmailMessage()
         incoming_valid_message.set_content("Test body")
-        with open(os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb') as f:
+        with open(
+            os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb'
+        ) as f:
             image_bytes = f.read()
 
         incoming_valid_message.add_attachment(
@@ -478,13 +508,18 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
         incoming_valid_message['To'] = stream_to_address
         incoming_valid_message['Reply-to'] = self.example_email('othello')
 
-        with mock.patch('zerver.lib.email_mirror.upload_message_file',
-                        return_value='https://test_url') as upload_message_file:
+        with mock.patch(
+            'zerver.lib.email_mirror.upload_message_file', return_value='https://test_url'
+        ) as upload_message_file:
             process_message(incoming_valid_message)
-            upload_message_file.assert_called_with('image.png', len(image_bytes),
-                                                   'image/png', image_bytes,
-                                                   get_system_bot(settings.EMAIL_GATEWAY_BOT),
-                                                   target_realm=user_profile.realm)
+            upload_message_file.assert_called_with(
+                'image.png',
+                len(image_bytes),
+                'image/png',
+                image_bytes,
+                get_system_bot(settings.EMAIL_GATEWAY_BOT),
+                target_realm=user_profile.realm,
+            )
 
         message = most_recent_message(user_profile)
         self.assertEqual(message.content, "Test body\n[image.png](https://test_url)")
@@ -498,7 +533,9 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
 
         incoming_valid_message = EmailMessage()
         incoming_valid_message.set_content("Test body")
-        with open(os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb') as f:
+        with open(
+            os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb'
+        ) as f:
             image_bytes = f.read()
 
         utf8_filename = "image_ąęó.png"
@@ -514,13 +551,18 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
         incoming_valid_message['To'] = stream_to_address
         incoming_valid_message['Reply-to'] = self.example_email('othello')
 
-        with mock.patch('zerver.lib.email_mirror.upload_message_file',
-                        return_value='https://test_url') as upload_message_file:
+        with mock.patch(
+            'zerver.lib.email_mirror.upload_message_file', return_value='https://test_url'
+        ) as upload_message_file:
             process_message(incoming_valid_message)
-            upload_message_file.assert_called_with(utf8_filename, len(image_bytes),
-                                                   'image/png', image_bytes,
-                                                   get_system_bot(settings.EMAIL_GATEWAY_BOT),
-                                                   target_realm=user_profile.realm)
+            upload_message_file.assert_called_with(
+                utf8_filename,
+                len(image_bytes),
+                'image/png',
+                image_bytes,
+                get_system_bot(settings.EMAIL_GATEWAY_BOT),
+                target_realm=user_profile.realm,
+            )
 
         message = most_recent_message(user_profile)
         self.assertEqual(message.content, f"Test body\n[{utf8_filename}](https://test_url)")
@@ -537,7 +579,9 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
 
         nested_multipart = EmailMessage()
         nested_multipart.set_content("Nested text that should get skipped.")
-        with open(os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb') as f:
+        with open(
+            os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb'
+        ) as f:
             image_bytes = f.read()
 
         nested_multipart.add_attachment(
@@ -553,13 +597,18 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
         incoming_valid_message['To'] = stream_to_address
         incoming_valid_message['Reply-to'] = self.example_email('othello')
 
-        with mock.patch('zerver.lib.email_mirror.upload_message_file',
-                        return_value='https://test_url') as upload_message_file:
+        with mock.patch(
+            'zerver.lib.email_mirror.upload_message_file', return_value='https://test_url'
+        ) as upload_message_file:
             process_message(incoming_valid_message)
-            upload_message_file.assert_called_with('image.png', len(image_bytes),
-                                                   'image/png', image_bytes,
-                                                   get_system_bot(settings.EMAIL_GATEWAY_BOT),
-                                                   target_realm=user_profile.realm)
+            upload_message_file.assert_called_with(
+                'image.png',
+                len(image_bytes),
+                'image/png',
+                image_bytes,
+                get_system_bot(settings.EMAIL_GATEWAY_BOT),
+                target_realm=user_profile.realm,
+            )
 
         message = most_recent_message(user_profile)
         self.assertEqual(message.content, "Test body\n[image.png](https://test_url)")
@@ -587,7 +636,11 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
             process_message(incoming_valid_message)
         self.assertEqual(
             m.output,
-            ["WARNING:{}:Payload is not bytes (invalid attachment {} in message from {}).".format(logger_name, "some_attachment", self.example_email('hamlet'))]
+            [
+                "WARNING:{}:Payload is not bytes (invalid attachment {} in message from {}).".format(
+                    logger_name, "some_attachment", self.example_email('hamlet')
+                )
+            ],
         )
 
     def test_receive_plaintext_and_html_prefer_text_html_options(self) -> None:
@@ -649,6 +702,7 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
         # HTML body is empty, so the plaintext content should be picked, despite prefer-html option.
         self.assertEqual(message.content, "Test message")
 
+
 class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
     def test_receive_stream_email_messages_empty_body(self) -> None:
         # build dummy messages for stream
@@ -670,7 +724,9 @@ class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
 
         with self.assertLogs(logger_name, level="WARNING") as m:
             process_message(incoming_valid_message)
-        self.assertEqual(m.output, [f"WARNING:{logger_name}:Email has no nonempty body sections; ignoring."])
+        self.assertEqual(
+            m.output, [f"WARNING:{logger_name}:Email has no nonempty body sections; ignoring."]
+        )
 
     def test_receive_stream_email_messages_no_textual_body(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -680,7 +736,9 @@ class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
         stream_to_address = encode_email_address(stream)
         # No textual body
         incoming_valid_message = EmailMessage()
-        with open(os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb') as f:
+        with open(
+            os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), 'rb'
+        ) as f:
             incoming_valid_message.add_attachment(
                 f.read(),
                 maintype="image",
@@ -696,8 +754,10 @@ class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
             process_message(incoming_valid_message)
         self.assertEqual(
             m.output,
-            [f"WARNING:{logger_name}:Content types: ['multipart/mixed', 'image/png']",
-             f"WARNING:{logger_name}:Unable to find plaintext or HTML message body"]
+            [
+                f"WARNING:{logger_name}:Content types: ['multipart/mixed', 'image/png']",
+                f"WARNING:{logger_name}:Unable to find plaintext or HTML message body",
+            ],
         )
 
     def test_receive_stream_email_messages_empty_body_after_stripping(self) -> None:
@@ -724,6 +784,7 @@ class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
 
         self.assertEqual(message.content, "(No email body)")
 
+
 class TestMissedMessageEmailMessages(ZulipTestCase):
     def test_receive_missed_personal_message_email_messages(self) -> None:
 
@@ -732,10 +793,15 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         # Hamlet will receive the message.
         self.login('hamlet')
         othello = self.example_user('othello')
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "test_receive_missed_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": orjson.dumps([othello.id]).decode()})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "test_receive_missed_message_email_messages",
+                "client": "test suite",
+                "to": orjson.dumps([othello.id]).decode(),
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('othello')
@@ -772,10 +838,15 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         self.login('othello')
         cordelia = self.example_user('cordelia')
         iago = self.example_user('iago')
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "test_receive_missed_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": orjson.dumps([cordelia.id, iago.id]).decode()})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "test_receive_missed_message_email_messages",
+                "client": "test suite",
+                "to": orjson.dumps([cordelia.id, iago.id]).decode(),
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('cordelia')
@@ -820,11 +891,16 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         self.subscribe(self.example_user("hamlet"), "Denmark")
         self.subscribe(self.example_user("othello"), "Denmark")
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "topic": "test topic",
-                                                     "content": "test_receive_missed_stream_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": "Denmark"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "topic": "test topic",
+                "content": "test_receive_missed_stream_message_email_messages",
+                "client": "test suite",
+                "to": "Denmark",
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('othello')
@@ -855,11 +931,16 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         self.subscribe(self.example_user("hamlet"), "Denmark")
         self.subscribe(self.example_user("othello"), "Denmark")
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "topic": "test topic",
-                                                     "content": "test_receive_missed_stream_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": "Denmark"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "topic": "test topic",
+                "content": "test_receive_missed_stream_message_email_messages",
+                "client": "test suite",
+                "to": "Denmark",
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('othello')
@@ -896,11 +977,16 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         self.subscribe(self.example_user("hamlet"), "Denmark")
         self.subscribe(self.example_user("othello"), "Denmark")
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "topic": "test topic",
-                                                     "content": "test_receive_missed_stream_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": "Denmark"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "topic": "test topic",
+                "content": "test_receive_missed_stream_message_email_messages",
+                "client": "test suite",
+                "to": "Denmark",
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('othello')
@@ -928,11 +1014,16 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         self.subscribe(self.example_user("hamlet"), "Denmark")
         self.subscribe(self.example_user("othello"), "Denmark")
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "topic": "test topic",
-                                                     "content": "test_receive_missed_stream_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": "Denmark"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "topic": "test topic",
+                "content": "test_receive_missed_stream_message_email_messages",
+                "client": "test suite",
+                "to": "Denmark",
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('othello')
@@ -961,11 +1052,16 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         self.subscribe(self.example_user("othello"), "Denmark")
         self.login('hamlet')
 
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "topic": "test topic",
-                                                     "content": "test_receive_missed_stream_message_email_messages",
-                                                     "client": "test suite",
-                                                     "to": "Denmark"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "topic": "test topic",
+                "content": "test_receive_missed_stream_message_email_messages",
+                "client": "test suite",
+                "to": "Denmark",
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('othello')
@@ -986,6 +1082,7 @@ class TestMissedMessageEmailMessages(ZulipTestCase):
         with self.assertRaises(ZulipEmailForwardError):
             process_missed_message(mm_address, incoming_valid_message)
 
+
 class TestEmptyGatewaySetting(ZulipTestCase):
     def test_missed_message(self) -> None:
         self.login('othello')
@@ -1013,6 +1110,7 @@ class TestEmptyGatewaySetting(ZulipTestCase):
             test_address = encode_email_address(stream)
             self.assertEqual(test_address, '')
 
+
 class TestReplyExtraction(ZulipTestCase):
     def test_is_forwarded(self) -> None:
         self.assertTrue(is_forwarded("FWD: hey"))
@@ -1114,11 +1212,10 @@ class TestReplyExtraction(ZulipTestCase):
         message = most_recent_message(user_profile)
         self.assertEqual(message.content, convert_html_to_markdown(html))
 
-class TestScriptMTA(ZulipTestCase):
 
+class TestScriptMTA(ZulipTestCase):
     def test_success(self) -> None:
-        script = os.path.join(os.path.dirname(__file__),
-                              '../../scripts/lib/email-mirror-postfix')
+        script = os.path.join(os.path.dirname(__file__), '../../scripts/lib/email-mirror-postfix')
 
         sender = self.example_email('hamlet')
         stream = get_stream("Denmark", get_realm("zulip"))
@@ -1134,8 +1231,7 @@ class TestScriptMTA(ZulipTestCase):
         )
 
     def test_error_no_recipient(self) -> None:
-        script = os.path.join(os.path.dirname(__file__),
-                              '../../scripts/lib/email-mirror-postfix')
+        script = os.path.join(os.path.dirname(__file__), '../../scripts/lib/email-mirror-postfix')
 
         sender = self.example_email('hamlet')
         stream = get_stream("Denmark", get_realm("zulip"))
@@ -1156,7 +1252,6 @@ class TestScriptMTA(ZulipTestCase):
 
 
 class TestEmailMirrorTornadoView(ZulipTestCase):
-
     def send_private_message(self) -> str:
         self.login('othello')
         cordelia = self.example_user('cordelia')
@@ -1168,7 +1263,8 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
                 "content": "test_receive_missed_message_email_messages",
                 "client": "test suite",
                 "to": orjson.dumps([cordelia.id, iago.id]).decode(),
-            })
+            },
+        )
         self.assert_json_success(result)
 
         user_profile = self.example_user('cordelia')
@@ -1180,15 +1276,18 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
         mail = mail_template.format(stream_to_address=to_address, sender=sender.delivery_email)
         msg_base64 = base64.b64encode(mail.encode()).decode()
 
-        def check_queue_json_publish(queue_name: str,
-                                     event: Mapping[str, Any],
-                                     processor: Optional[Callable[[Any], None]]=None) -> None:
+        def check_queue_json_publish(
+            queue_name: str,
+            event: Mapping[str, Any],
+            processor: Optional[Callable[[Any], None]] = None,
+        ) -> None:
             self.assertEqual(queue_name, "email_mirror")
             self.assertEqual(event, {"rcpt_to": to_address, "msg_base64": msg_base64})
             MirrorWorker().consume(event)
 
-            self.assertEqual(self.get_last_message().content,
-                             "This is a plain-text message for testing Zulip.")
+            self.assertEqual(
+                self.get_last_message().content, "This is a plain-text message for testing Zulip."
+            )
 
         post_data = {
             "rcpt_to": to_address,
@@ -1217,7 +1316,8 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
         self.assert_json_error(
             result,
             "5.1.1 Bad destination mailbox address: "
-            "Bad stream token from email recipient " + stream_to_address)
+            "Bad stream token from email recipient " + stream_to_address,
+        )
 
     def test_success_to_stream_with_good_token_wrong_stream_name(self) -> None:
         stream = get_stream("Denmark", get_realm("zulip"))
@@ -1240,8 +1340,8 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
 
         result = self.send_offline_message(mm_address, self.example_user('cordelia'))
         self.assert_json_error(
-            result,
-            "5.1.1 Bad destination mailbox address: Missed message address out of uses.")
+            result, "5.1.1 Bad destination mailbox address: Missed message address out of uses."
+        )
 
     def test_wrong_missed_email_private_message(self) -> None:
         self.send_private_message()
@@ -1249,7 +1349,8 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
         result = self.send_offline_message(mm_address, self.example_user('cordelia'))
         self.assert_json_error(
             result,
-            "5.1.1 Bad destination mailbox address: Missed message address expired or doesn't exist.")
+            "5.1.1 Bad destination mailbox address: Missed message address expired or doesn't exist.",
+        )
 
 
 class TestStreamEmailMessagesSubjectStripping(ZulipTestCase):
@@ -1283,13 +1384,15 @@ class TestStreamEmailMessagesSubjectStripping(ZulipTestCase):
             stripped = strip_from_subject(subject['original_subject'])
             self.assertEqual(stripped, subject['stripped_subject'])
 
+
 # If the Content-Type header didn't specify a charset, the text content
 # of the email used to not be properly found. Test that this is fixed:
 class TestContentTypeUnspecifiedCharset(ZulipTestCase):
     def test_charset_not_specified(self) -> None:
         message_as_string = self.fixture_data('1.txt', type='email')
-        message_as_string = message_as_string.replace("Content-Type: text/plain; charset=\"us-ascii\"",
-                                                      "Content-Type: text/plain")
+        message_as_string = message_as_string.replace(
+            "Content-Type: text/plain; charset=\"us-ascii\"", "Content-Type: text/plain"
+        )
         incoming_message = message_from_string(message_as_string, policy=email.policy.default)
         # https://github.com/python/typeshed/issues/2417
         assert isinstance(incoming_message, EmailMessage)
@@ -1307,6 +1410,7 @@ class TestContentTypeUnspecifiedCharset(ZulipTestCase):
 
         self.assertEqual(message.content, "Email fixture 1.txt body")
 
+
 class TestEmailMirrorProcessMessageNoValidRecipient(ZulipTestCase):
     def test_process_message_no_valid_recipient(self) -> None:
         incoming_valid_message = EmailMessage()
@@ -1318,8 +1422,10 @@ class TestEmailMirrorProcessMessageNoValidRecipient(ZulipTestCase):
 
         with mock.patch("zerver.lib.email_mirror.log_and_report") as mock_log_and_report:
             process_message(incoming_valid_message)
-            mock_log_and_report.assert_called_with(incoming_valid_message,
-                                                   "Missing recipient in mirror email", None)
+            mock_log_and_report.assert_called_with(
+                incoming_valid_message, "Missing recipient in mirror email", None
+            )
+
 
 class TestEmailMirrorLogAndReport(ZulipTestCase):
     def test_log_and_report(self) -> None:
@@ -1330,7 +1436,7 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
         stream_to_address = encode_email_address(stream)
 
         address_parts = stream_to_address.split('@')
-        scrubbed_address = 'X'*len(address_parts[0]) + '@' + address_parts[1]
+        scrubbed_address = 'X' * len(address_parts[0]) + '@' + address_parts[1]
 
         incoming_valid_message = EmailMessage()
         incoming_valid_message.set_content('Test Body')
@@ -1339,24 +1445,31 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
         incoming_valid_message['To'] = stream_to_address
         with self.assertLogs('zerver.lib.email_mirror', 'ERROR') as error_log:
             log_and_report(incoming_valid_message, "test error message", stream_to_address)
-        self.assertEqual(error_log.output, [
-            'ERROR:zerver.lib.email_mirror:Sender: hamlet@zulip.com\nTo: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX@testserver <Address to stream id: 1>\ntest error message'
-        ])
+        self.assertEqual(
+            error_log.output,
+            [
+                'ERROR:zerver.lib.email_mirror:Sender: hamlet@zulip.com\nTo: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX@testserver <Address to stream id: 1>\ntest error message'
+            ],
+        )
         message = most_recent_message(user_profile)
 
         self.assertEqual("email mirror error", message.topic_name())
 
         msg_content = message.content.strip('~').strip()
         expected_content = "Sender: {}\nTo: {} <Address to stream id: {}>\ntest error message"
-        expected_content = expected_content.format(self.example_email('hamlet'), scrubbed_address,
-                                                   stream.id)
+        expected_content = expected_content.format(
+            self.example_email('hamlet'), scrubbed_address, stream.id
+        )
         self.assertEqual(msg_content, expected_content)
 
         with self.assertLogs('zerver.lib.email_mirror', 'ERROR') as error_log:
             log_and_report(incoming_valid_message, "test error message", None)
-        self.assertEqual(error_log.output, [
-            'ERROR:zerver.lib.email_mirror:Sender: hamlet@zulip.com\nTo: No recipient found\ntest error message'
-        ])
+        self.assertEqual(
+            error_log.output,
+            [
+                'ERROR:zerver.lib.email_mirror:Sender: hamlet@zulip.com\nTo: No recipient found\ntest error message'
+            ],
+        )
 
         message = most_recent_message(user_profile)
         self.assertEqual("email mirror error", message.topic_name())
@@ -1375,10 +1488,7 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
                 log_and_report(incoming_valid_message, "test error message", None)
                 expected_content = "Sender: {}\nTo: No recipient found\ntest error message"
                 expected_content = expected_content.format(self.example_email('hamlet'))
-            self.assertEqual(
-                m.output,
-                [f"ERROR:{logger_name}:{expected_content}"]
-            )
+            self.assertEqual(m.output, [f"ERROR:{logger_name}:{expected_content}"])
 
     def test_redact_email_address(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -1389,7 +1499,7 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
         # Test for a stream address:
         stream_to_address = encode_email_address(stream)
         stream_address_parts = stream_to_address.split('@')
-        scrubbed_stream_address = 'X'*len(stream_address_parts[0]) + '@' + stream_address_parts[1]
+        scrubbed_stream_address = 'X' * len(stream_address_parts[0]) + '@' + stream_address_parts[1]
 
         error_message = "test message {}"
         error_message = error_message.format(stream_to_address)
@@ -1419,7 +1529,8 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
                 "content": "test_redact_email_message",
                 "client": "test suite",
                 "to": orjson.dumps([cordelia.email, iago.email]).decode(),
-            })
+            },
+        )
         self.assert_json_success(result)
 
         cordelia_profile = self.example_user('cordelia')
@@ -1429,7 +1540,7 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
         error_message = "test message {}"
         error_message = error_message.format(mm_address)
         expected_message = "test message {} <Missed message address>"
-        expected_message = expected_message.format('X'*34 + '@testserver')
+        expected_message = expected_message.format('X' * 34 + '@testserver')
 
         redacted_message = redact_email_address(error_message)
         self.assertEqual(redacted_message, expected_message)
@@ -1439,8 +1550,9 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
         error_message = error_message.format(stream_to_address, stream_to_address)
         expected_message = "test message first occurrence: {} <Address to stream id: {}>"
         expected_message += " second occurrence: {} <Address to stream id: {}>"
-        expected_message = expected_message.format(scrubbed_stream_address, stream.id,
-                                                   scrubbed_stream_address, stream.id)
+        expected_message = expected_message.format(
+            scrubbed_stream_address, stream.id, scrubbed_stream_address, stream.id
+        )
 
         redacted_message = redact_email_address(error_message)
         self.assertEqual(redacted_message, expected_message)
diff --git a/zerver/tests/test_email_notifications.py b/zerver/tests/test_email_notifications.py
index cc9653077f..7dfcc3aeb3 100644
--- a/zerver/tests/test_email_notifications.py
+++ b/zerver/tests/test_email_notifications.py
@@ -31,12 +31,15 @@ class TestCustomEmails(ZulipTestCase):
         reply_to = 'reply_to_test'
         from_name = "from_name_test"
         markdown_template_path = "templates/zerver/emails/email_base_default.source.html"
-        send_custom_email([hamlet], {
-            "markdown_template_path": markdown_template_path,
-            "reply_to": reply_to,
-            "subject": email_subject,
-            "from_name": from_name,
-        })
+        send_custom_email(
+            [hamlet],
+            {
+                "markdown_template_path": markdown_template_path,
+                "reply_to": reply_to,
+                "subject": email_subject,
+                "from_name": from_name,
+            },
+        )
         self.assertEqual(len(mail.outbox), 1)
         msg = mail.outbox[0]
         self.assertEqual(msg.subject, email_subject)
@@ -46,10 +49,15 @@ class TestCustomEmails(ZulipTestCase):
 
     def test_send_custom_email_headers(self) -> None:
         hamlet = self.example_user('hamlet')
-        markdown_template_path = "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
-        send_custom_email([hamlet], {
-            "markdown_template_path": markdown_template_path,
-        })
+        markdown_template_path = (
+            "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
+        )
+        send_custom_email(
+            [hamlet],
+            {
+                "markdown_template_path": markdown_template_path,
+            },
+        )
         self.assertEqual(len(mail.outbox), 1)
         msg = mail.outbox[0]
         self.assertEqual(msg.subject, "Test Subject")
@@ -63,32 +71,56 @@ class TestCustomEmails(ZulipTestCase):
         markdown_template_path = "zerver/tests/fixtures/email/custom_emails/email_base_headers_no_headers_test.source.html"
 
         from zerver.lib.send_email import NoEmailArgumentException
-        self.assertRaises(NoEmailArgumentException, send_custom_email, [hamlet], {
-            "markdown_template_path": markdown_template_path,
-            "from_name": from_name,
-        })
 
-        self.assertRaises(NoEmailArgumentException, send_custom_email, [hamlet], {
-            "markdown_template_path": markdown_template_path,
-            "subject": email_subject,
-        })
+        self.assertRaises(
+            NoEmailArgumentException,
+            send_custom_email,
+            [hamlet],
+            {
+                "markdown_template_path": markdown_template_path,
+                "from_name": from_name,
+            },
+        )
+
+        self.assertRaises(
+            NoEmailArgumentException,
+            send_custom_email,
+            [hamlet],
+            {
+                "markdown_template_path": markdown_template_path,
+                "subject": email_subject,
+            },
+        )
 
     def test_send_custom_email_doubled_arguments(self) -> None:
         hamlet = self.example_user('hamlet')
         from_name = "from_name_test"
         email_subject = 'subject_test'
-        markdown_template_path = "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
+        markdown_template_path = (
+            "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
+        )
 
         from zerver.lib.send_email import DoubledEmailArgumentException
-        self.assertRaises(DoubledEmailArgumentException, send_custom_email, [hamlet], {
-            "markdown_template_path": markdown_template_path,
-            "subject": email_subject,
-        })
 
-        self.assertRaises(DoubledEmailArgumentException, send_custom_email, [hamlet], {
-            "markdown_template_path": markdown_template_path,
-            "from_name": from_name,
-        })
+        self.assertRaises(
+            DoubledEmailArgumentException,
+            send_custom_email,
+            [hamlet],
+            {
+                "markdown_template_path": markdown_template_path,
+                "subject": email_subject,
+            },
+        )
+
+        self.assertRaises(
+            DoubledEmailArgumentException,
+            send_custom_email,
+            [hamlet],
+            {
+                "markdown_template_path": markdown_template_path,
+                "from_name": from_name,
+            },
+        )
 
     def test_send_custom_email_admins_only(self) -> None:
         admin_user = self.example_user('hamlet')
@@ -96,11 +128,16 @@ class TestCustomEmails(ZulipTestCase):
 
         non_admin_user = self.example_user('cordelia')
 
-        markdown_template_path = "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
-        send_custom_email([admin_user, non_admin_user], {
-            "markdown_template_path": markdown_template_path,
-            "admins_only": True,
-        })
+        markdown_template_path = (
+            "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
+        )
+        send_custom_email(
+            [admin_user, non_admin_user],
+            {
+                "markdown_template_path": markdown_template_path,
+                "admins_only": True,
+            },
+        )
         self.assertEqual(len(mail.outbox), 1)
         self.assertIn(admin_user.delivery_email, mail.outbox[0].to[0])
 
@@ -124,42 +161,56 @@ class TestFollowupEmails(ZulipTestCase):
         email_data = orjson.loads(scheduled_emails[0].data)
         self.assertEqual(email_data["context"]["email"], self.example_email("iago"))
         self.assertEqual(email_data["context"]["is_realm_admin"], True)
-        self.assertEqual(email_data["context"]["getting_started_link"],
-                         "http://zulip.testserver/help/getting-your-organization-started-with-zulip")
+        self.assertEqual(
+            email_data["context"]["getting_started_link"],
+            "http://zulip.testserver/help/getting-your-organization-started-with-zulip",
+        )
         self.assertNotIn("ldap_username", email_data["context"])
 
     # See https://zulip.readthedocs.io/en/latest/production/authentication-methods.html#ldap-including-active-directory
     # for case details.
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'),
-                       # configure email search for email address in the uid attribute:
-                       AUTH_LDAP_REVERSE_EMAIL_SEARCH=LDAPSearch("ou=users,dc=zulip,dc=com",
-                                                                 ldap.SCOPE_ONELEVEL,
-                                                                 "(uid=%(email)s)"))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        ),
+        # configure email search for email address in the uid attribute:
+        AUTH_LDAP_REVERSE_EMAIL_SEARCH=LDAPSearch(
+            "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(uid=%(email)s)"
+        ),
+    )
     def test_day1_email_ldap_case_a_login_credentials(self) -> None:
         self.init_default_ldap_database()
         ldap_user_attr_map = {'full_name': 'cn'}
 
         with self.settings(AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map):
-            self.login_with_return("newuser_email_as_uid@zulip.com",
-                                   self.ldap_password("newuser_email_as_uid@zulip.com"))
+            self.login_with_return(
+                "newuser_email_as_uid@zulip.com",
+                self.ldap_password("newuser_email_as_uid@zulip.com"),
+            )
             user = UserProfile.objects.get(delivery_email="newuser_email_as_uid@zulip.com")
             scheduled_emails = ScheduledEmail.objects.filter(users=user)
 
             self.assertEqual(len(scheduled_emails), 2)
             email_data = orjson.loads(scheduled_emails[0].data)
             self.assertEqual(email_data["context"]["ldap"], True)
-            self.assertEqual(email_data["context"]["ldap_username"], "newuser_email_as_uid@zulip.com")
+            self.assertEqual(
+                email_data["context"]["ldap_username"], "newuser_email_as_uid@zulip.com"
+            )
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_day1_email_ldap_case_b_login_credentials(self) -> None:
         self.init_default_ldap_database()
         ldap_user_attr_map = {'full_name': 'cn'}
 
         with self.settings(
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             self.login_with_return("newuser@zulip.com", self.ldap_password("newuser"))
 
@@ -171,15 +222,19 @@ class TestFollowupEmails(ZulipTestCase):
             self.assertEqual(email_data["context"]["ldap"], True)
             self.assertEqual(email_data["context"]["ldap_username"], "newuser")
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_day1_email_ldap_case_c_login_credentials(self) -> None:
         self.init_default_ldap_database()
         ldap_user_attr_map = {'full_name': 'cn'}
 
         with self.settings(
-                LDAP_EMAIL_ATTR='mail',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            LDAP_EMAIL_ATTR='mail',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             self.login_with_return("newuser_with_email", self.ldap_password("newuser_with_email"))
             user = UserProfile.objects.get(delivery_email="newuser_email@zulip.com")
@@ -197,10 +252,15 @@ class TestFollowupEmails(ZulipTestCase):
         enqueue_welcome_emails(self.example_user("hamlet"))
         # Hamlet has account only in Zulip realm so both day1 and day2 emails should be sent
         scheduled_emails = ScheduledEmail.objects.filter(users=hamlet).order_by(
-            "scheduled_timestamp")
+            "scheduled_timestamp"
+        )
         self.assertEqual(2, len(scheduled_emails))
-        self.assertEqual(orjson.loads(scheduled_emails[1].data)["template_prefix"], 'zerver/emails/followup_day2')
-        self.assertEqual(orjson.loads(scheduled_emails[0].data)["template_prefix"], 'zerver/emails/followup_day1')
+        self.assertEqual(
+            orjson.loads(scheduled_emails[1].data)["template_prefix"], 'zerver/emails/followup_day2'
+        )
+        self.assertEqual(
+            orjson.loads(scheduled_emails[0].data)["template_prefix"], 'zerver/emails/followup_day1'
+        )
 
         ScheduledEmail.objects.all().delete()
 
@@ -211,6 +271,7 @@ class TestFollowupEmails(ZulipTestCase):
         email_data = orjson.loads(scheduled_emails[0].data)
         self.assertEqual(email_data["template_prefix"], 'zerver/emails/followup_day1')
 
+
 class TestMissedMessages(ZulipTestCase):
     def normalize_string(self, s: str) -> str:
         s = s.strip()
@@ -219,11 +280,17 @@ class TestMissedMessages(ZulipTestCase):
     def _get_tokens(self) -> List[str]:
         return ['mm' + str(random.getrandbits(32)) for _ in range(30)]
 
-    def _test_cases(self, msg_id: int, verify_body_include: List[str], email_subject: str,
-                    send_as_user: bool, verify_html_body: bool=False,
-                    show_message_content: bool=True,
-                    verify_body_does_not_include: Sequence[str]=[],
-                    trigger: str='') -> None:
+    def _test_cases(
+        self,
+        msg_id: int,
+        verify_body_include: List[str],
+        email_subject: str,
+        send_as_user: bool,
+        verify_html_body: bool = False,
+        show_message_content: bool = True,
+        verify_body_does_not_include: Sequence[str] = [],
+        trigger: str = '',
+    ) -> None:
         othello = self.example_user('othello')
         hamlet = self.example_user('hamlet')
         tokens = self._get_tokens()
@@ -231,11 +298,16 @@ class TestMissedMessages(ZulipTestCase):
             handle_missedmessage_emails(hamlet.id, [{'message_id': msg_id, 'trigger': trigger}])
         if settings.EMAIL_GATEWAY_PATTERN != "":
             reply_to_addresses = [settings.EMAIL_GATEWAY_PATTERN % (t,) for t in tokens]
-            reply_to_emails = [str(Address(display_name="Zulip", addr_spec=address)) for address in reply_to_addresses]
+            reply_to_emails = [
+                str(Address(display_name="Zulip", addr_spec=address))
+                for address in reply_to_addresses
+            ]
         else:
             reply_to_emails = ["noreply@testserver"]
         msg = mail.outbox[0]
-        from_email = str(Address(display_name="Zulip missed messages", addr_spec=FromAddress.NOREPLY))
+        from_email = str(
+            Address(display_name="Zulip missed messages", addr_spec=FromAddress.NOREPLY)
+        )
         self.assertEqual(len(mail.outbox), 1)
         if send_as_user:
             from_email = f'"{othello.full_name}" <{othello.email}>'
@@ -254,7 +326,9 @@ class TestMissedMessages(ZulipTestCase):
 
         self.assertEqual(msg.extra_headers["List-Id"], "Zulip Dev <zulip.testserver>")
 
-    def _realm_name_in_missed_message_email_subject(self, realm_name_in_notifications: bool) -> None:
+    def _realm_name_in_missed_message_email_subject(
+        self, realm_name_in_notifications: bool
+    ) -> None:
         msg_id = self.send_personal_message(
             self.example_user('othello'),
             self.example_user('hamlet'),
@@ -267,16 +341,15 @@ class TestMissedMessages(ZulipTestCase):
             email_subject = 'PMs with Othello, the Moor of Venice [Zulip Dev]'
         self._test_cases(msg_id, verify_body_include, email_subject, False)
 
-    def _extra_context_in_missed_stream_messages_mention(self, send_as_user: bool,
-                                                         show_message_content: bool=True) -> None:
+    def _extra_context_in_missed_stream_messages_mention(
+        self, send_as_user: bool, show_message_content: bool = True
+    ) -> None:
         for i in range(0, 11):
             self.send_stream_message(self.example_user('othello'), "Denmark", content=str(i))
-        self.send_stream_message(
-            self.example_user('othello'), "Denmark",
-            '11', topic_name='test2')
+        self.send_stream_message(self.example_user('othello'), "Denmark", '11', topic_name='test2')
         msg_id = self.send_stream_message(
-            self.example_user('othello'), "denmark",
-            '@**King Hamlet**')
+            self.example_user('othello'), "denmark", '@**King Hamlet**'
+        )
 
         if show_message_content:
             verify_body_include = [
@@ -295,24 +368,31 @@ class TestMissedMessages(ZulipTestCase):
             ]
 
             email_subject = 'New missed messages'
-            verify_body_does_not_include = ['Denmark > test', 'Othello, the Moor of Venice',
-                                            '1 2 3 4 5 6 7 8 9 10 @**King Hamlet**', 'private', 'group',
-                                            'Reply to this email directly, or view it in Zulip']
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user,
-                         show_message_content=show_message_content,
-                         verify_body_does_not_include=verify_body_does_not_include,
-                         trigger='mentioned')
+            verify_body_does_not_include = [
+                'Denmark > test',
+                'Othello, the Moor of Venice',
+                '1 2 3 4 5 6 7 8 9 10 @**King Hamlet**',
+                'private',
+                'group',
+                'Reply to this email directly, or view it in Zulip',
+            ]
+        self._test_cases(
+            msg_id,
+            verify_body_include,
+            email_subject,
+            send_as_user,
+            show_message_content=show_message_content,
+            verify_body_does_not_include=verify_body_does_not_include,
+            trigger='mentioned',
+        )
 
-    def _extra_context_in_missed_stream_messages_wildcard_mention(self, send_as_user: bool,
-                                                                  show_message_content: bool=True) -> None:
+    def _extra_context_in_missed_stream_messages_wildcard_mention(
+        self, send_as_user: bool, show_message_content: bool = True
+    ) -> None:
         for i in range(1, 6):
             self.send_stream_message(self.example_user('othello'), "Denmark", content=str(i))
-        self.send_stream_message(
-            self.example_user('othello'), "Denmark",
-            '11', topic_name='test2')
-        msg_id = self.send_stream_message(
-            self.example_user('othello'), "denmark",
-            '@**all**')
+        self.send_stream_message(self.example_user('othello'), "Denmark", '11', topic_name='test2')
+        msg_id = self.send_stream_message(self.example_user('othello'), "denmark", '@**all**')
 
         if show_message_content:
             verify_body_include = [
@@ -330,47 +410,62 @@ class TestMissedMessages(ZulipTestCase):
                 " Manage email preferences: http://zulip.testserver/#settings/notifications",
             ]
             email_subject = 'New missed messages'
-            verify_body_does_not_include = ['Denmark > test', 'Othello, the Moor of Venice',
-                                            '1 2 3 4 5 @**all**', 'private', 'group',
-                                            'Reply to this email directly, or view it in Zulip']
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user,
-                         show_message_content=show_message_content,
-                         verify_body_does_not_include=verify_body_does_not_include,
-                         trigger='wildcard_mentioned')
+            verify_body_does_not_include = [
+                'Denmark > test',
+                'Othello, the Moor of Venice',
+                '1 2 3 4 5 @**all**',
+                'private',
+                'group',
+                'Reply to this email directly, or view it in Zulip',
+            ]
+        self._test_cases(
+            msg_id,
+            verify_body_include,
+            email_subject,
+            send_as_user,
+            show_message_content=show_message_content,
+            verify_body_does_not_include=verify_body_does_not_include,
+            trigger='wildcard_mentioned',
+        )
 
     def _extra_context_in_missed_stream_messages_email_notify(self, send_as_user: bool) -> None:
         for i in range(0, 11):
             self.send_stream_message(self.example_user('othello'), "Denmark", content=str(i))
-        self.send_stream_message(
-            self.example_user('othello'), "Denmark",
-            '11', topic_name='test2')
-        msg_id = self.send_stream_message(
-            self.example_user('othello'), "denmark",
-            '12')
+        self.send_stream_message(self.example_user('othello'), "Denmark", '11', topic_name='test2')
+        msg_id = self.send_stream_message(self.example_user('othello'), "denmark", '12')
         verify_body_include = [
             "Othello, the Moor of Venice: 1 2 3 4 5 6 7 8 9 10 12 -- ",
             "You are receiving this because you have email notifications enabled for this stream.",
         ]
         email_subject = '#Denmark > test'
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user, trigger='stream_email_notify')
+        self._test_cases(
+            msg_id, verify_body_include, email_subject, send_as_user, trigger='stream_email_notify'
+        )
 
-    def _extra_context_in_missed_stream_messages_mention_two_senders(self, send_as_user: bool) -> None:
+    def _extra_context_in_missed_stream_messages_mention_two_senders(
+        self, send_as_user: bool
+    ) -> None:
         for i in range(0, 3):
             self.send_stream_message(self.example_user('cordelia'), "Denmark", str(i))
         msg_id = self.send_stream_message(
-            self.example_user('othello'), "Denmark",
-            '@**King Hamlet**')
+            self.example_user('othello'), "Denmark", '@**King Hamlet**'
+        )
         verify_body_include = [
             "Cordelia Lear: 0 1 2 Othello, the Moor of Venice: @**King Hamlet** -- ",
             "You are receiving this because you were mentioned in Zulip Dev.",
         ]
         email_subject = '#Denmark > test'
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user, trigger='mentioned')
+        self._test_cases(
+            msg_id, verify_body_include, email_subject, send_as_user, trigger='mentioned'
+        )
 
-    def _extra_context_in_personal_missed_stream_messages(self, send_as_user: bool,
-                                                          show_message_content: bool=True,
-                                                          message_content_disabled_by_user: bool=False,
-                                                          message_content_disabled_by_realm: bool=False) -> None:
+    def _extra_context_in_personal_missed_stream_messages(
+        self,
+        send_as_user: bool,
+        show_message_content: bool = True,
+        message_content_disabled_by_user: bool = False,
+        message_content_disabled_by_realm: bool = False,
+    ) -> None:
         msg_id = self.send_personal_message(
             self.example_user('othello'),
             self.example_user('hamlet'),
@@ -397,11 +492,21 @@ class TestMissedMessages(ZulipTestCase):
                     " Manage email preferences: http://zulip.testserver/#settings/notifications",
                 ]
             email_subject = 'New missed messages'
-            verify_body_does_not_include = ['Othello, the Moor of Venice', 'Extremely personal message!',
-                                            'mentioned', 'group', 'Reply to this email directly, or view it in Zulip']
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user,
-                         show_message_content=show_message_content,
-                         verify_body_does_not_include=verify_body_does_not_include)
+            verify_body_does_not_include = [
+                'Othello, the Moor of Venice',
+                'Extremely personal message!',
+                'mentioned',
+                'group',
+                'Reply to this email directly, or view it in Zulip',
+            ]
+        self._test_cases(
+            msg_id,
+            verify_body_include,
+            email_subject,
+            send_as_user,
+            show_message_content=show_message_content,
+            verify_body_does_not_include=verify_body_does_not_include,
+        )
 
     def _reply_to_email_in_personal_missed_stream_messages(self, send_as_user: bool) -> None:
         msg_id = self.send_personal_message(
@@ -423,8 +528,9 @@ class TestMissedMessages(ZulipTestCase):
         email_subject = 'PMs with Othello, the Moor of Venice'
         self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)
 
-    def _extra_context_in_huddle_missed_stream_messages_two_others(self, send_as_user: bool,
-                                                                   show_message_content: bool=True) -> None:
+    def _extra_context_in_huddle_missed_stream_messages_two_others(
+        self, send_as_user: bool, show_message_content: bool = True
+    ) -> None:
         msg_id = self.send_huddle_message(
             self.example_user('othello'),
             [
@@ -446,14 +552,25 @@ class TestMissedMessages(ZulipTestCase):
                 " Manage email preferences: http://zulip.testserver/#settings/notifications",
             ]
             email_subject = 'New missed messages'
-            verify_body_does_not_include = ['Iago', 'Othello, the Moor of Venice Othello, the Moor of Venice',
-                                            'Group personal message!', 'mentioned',
-                                            'Reply to this email directly, or view it in Zulip']
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user,
-                         show_message_content=show_message_content,
-                         verify_body_does_not_include=verify_body_does_not_include)
+            verify_body_does_not_include = [
+                'Iago',
+                'Othello, the Moor of Venice Othello, the Moor of Venice',
+                'Group personal message!',
+                'mentioned',
+                'Reply to this email directly, or view it in Zulip',
+            ]
+        self._test_cases(
+            msg_id,
+            verify_body_include,
+            email_subject,
+            send_as_user,
+            show_message_content=show_message_content,
+            verify_body_does_not_include=verify_body_does_not_include,
+        )
 
-    def _extra_context_in_huddle_missed_stream_messages_three_others(self, send_as_user: bool) -> None:
+    def _extra_context_in_huddle_missed_stream_messages_three_others(
+        self, send_as_user: bool
+    ) -> None:
         msg_id = self.send_huddle_message(
             self.example_user('othello'),
             [
@@ -468,13 +585,19 @@ class TestMissedMessages(ZulipTestCase):
         email_subject = 'Group PMs with Cordelia Lear, Iago, and Othello, the Moor of Venice'
         self._test_cases(msg_id, verify_body_include, email_subject, send_as_user)
 
-    def _extra_context_in_huddle_missed_stream_messages_many_others(self, send_as_user: bool) -> None:
-        msg_id = self.send_huddle_message(self.example_user('othello'),
-                                          [self.example_user('hamlet'),
-                                           self.example_user('iago'),
-                                           self.example_user('cordelia'),
-                                           self.example_user('prospero')],
-                                          'Group personal message!')
+    def _extra_context_in_huddle_missed_stream_messages_many_others(
+        self, send_as_user: bool
+    ) -> None:
+        msg_id = self.send_huddle_message(
+            self.example_user('othello'),
+            [
+                self.example_user('hamlet'),
+                self.example_user('iago'),
+                self.example_user('cordelia'),
+                self.example_user('prospero'),
+            ],
+            'Group personal message!',
+        )
 
         verify_body_include = ['Othello, the Moor of Venice: Group personal message! -- Reply']
         email_subject = 'Group PMs with Cordelia Lear, Iago, and 2 others'
@@ -482,26 +605,30 @@ class TestMissedMessages(ZulipTestCase):
 
     def _deleted_message_in_missed_stream_messages(self, send_as_user: bool) -> None:
         msg_id = self.send_stream_message(
-            self.example_user('othello'), "denmark",
-            '@**King Hamlet** to be deleted')
+            self.example_user('othello'), "denmark", '@**King Hamlet** to be deleted'
+        )
 
         hamlet = self.example_user('hamlet')
         self.login('othello')
-        result = self.client_patch('/json/messages/' + str(msg_id),
-                                   {'message_id': msg_id, 'content': ' '})
+        result = self.client_patch(
+            '/json/messages/' + str(msg_id), {'message_id': msg_id, 'content': ' '}
+        )
         self.assert_json_success(result)
         handle_missedmessage_emails(hamlet.id, [{'message_id': msg_id}])
         self.assertEqual(len(mail.outbox), 0)
 
     def _deleted_message_in_personal_missed_stream_messages(self, send_as_user: bool) -> None:
-        msg_id = self.send_personal_message(self.example_user('othello'),
-                                            self.example_user('hamlet'),
-                                            'Extremely personal message! to be deleted!')
+        msg_id = self.send_personal_message(
+            self.example_user('othello'),
+            self.example_user('hamlet'),
+            'Extremely personal message! to be deleted!',
+        )
 
         hamlet = self.example_user('hamlet')
         self.login('othello')
-        result = self.client_patch('/json/messages/' + str(msg_id),
-                                   {'message_id': msg_id, 'content': ' '})
+        result = self.client_patch(
+            '/json/messages/' + str(msg_id), {'message_id': msg_id, 'content': ' '}
+        )
         self.assert_json_success(result)
         handle_missedmessage_emails(hamlet.id, [{'message_id': msg_id}])
         self.assertEqual(len(mail.outbox), 0)
@@ -519,8 +646,9 @@ class TestMissedMessages(ZulipTestCase):
         hamlet = self.example_user('hamlet')
         iago = self.example_user('iago')
         self.login('othello')
-        result = self.client_patch('/json/messages/' + str(msg_id),
-                                   {'message_id': msg_id, 'content': ' '})
+        result = self.client_patch(
+            '/json/messages/' + str(msg_id), {'message_id': msg_id, 'content': ' '}
+        )
         self.assert_json_success(result)
         handle_missedmessage_emails(hamlet.id, [{'message_id': msg_id}])
         self.assertEqual(len(mail.outbox), 0)
@@ -542,16 +670,22 @@ class TestMissedMessages(ZulipTestCase):
 
     def test_message_content_disabled_in_missed_message_notifications(self) -> None:
         # Test when user disabled message content in email notifications.
-        do_change_notification_settings(self.example_user("hamlet"),
-                                        "message_content_in_email_notifications", False)
+        do_change_notification_settings(
+            self.example_user("hamlet"), "message_content_in_email_notifications", False
+        )
         self._extra_context_in_missed_stream_messages_mention(False, show_message_content=False)
         mail.outbox = []
-        self._extra_context_in_missed_stream_messages_wildcard_mention(False, show_message_content=False)
+        self._extra_context_in_missed_stream_messages_wildcard_mention(
+            False, show_message_content=False
+        )
         mail.outbox = []
-        self._extra_context_in_personal_missed_stream_messages(False, show_message_content=False,
-                                                               message_content_disabled_by_user=True)
+        self._extra_context_in_personal_missed_stream_messages(
+            False, show_message_content=False, message_content_disabled_by_user=True
+        )
         mail.outbox = []
-        self._extra_context_in_huddle_missed_stream_messages_two_others(False, show_message_content=False)
+        self._extra_context_in_huddle_missed_stream_messages_two_others(
+            False, show_message_content=False
+        )
 
     @override_settings(SEND_MISSED_MESSAGE_EMAILS_AS_USER=True)
     def test_extra_context_in_missed_stream_messages_as_user(self) -> None:
@@ -653,8 +787,9 @@ class TestMissedMessages(ZulipTestCase):
         # Emails don't have missed message content when message content is disabled by the user
         do_change_notification_settings(user, "message_content_in_email_notifications", False)
         mail.outbox = []
-        self._extra_context_in_personal_missed_stream_messages(False, show_message_content=False,
-                                                               message_content_disabled_by_user=True)
+        self._extra_context_in_personal_missed_stream_messages(
+            False, show_message_content=False, message_content_disabled_by_user=True
+        )
 
         # When message content is not allowed at realm level
         # Emails don't have missed message irrespective of message content setting of the user
@@ -664,93 +799,125 @@ class TestMissedMessages(ZulipTestCase):
 
         do_change_notification_settings(user, "message_content_in_email_notifications", True)
         mail.outbox = []
-        self._extra_context_in_personal_missed_stream_messages(False, show_message_content=False,
-                                                               message_content_disabled_by_realm=True)
+        self._extra_context_in_personal_missed_stream_messages(
+            False, show_message_content=False, message_content_disabled_by_realm=True
+        )
 
         do_change_notification_settings(user, "message_content_in_email_notifications", False)
         mail.outbox = []
-        self._extra_context_in_personal_missed_stream_messages(False, show_message_content=False,
-                                                               message_content_disabled_by_user=True,
-                                                               message_content_disabled_by_realm=True)
+        self._extra_context_in_personal_missed_stream_messages(
+            False,
+            show_message_content=False,
+            message_content_disabled_by_user=True,
+            message_content_disabled_by_realm=True,
+        )
 
     def test_realm_emoji_in_missed_message(self) -> None:
         realm = get_realm("zulip")
 
         msg_id = self.send_personal_message(
-            self.example_user('othello'), self.example_user('hamlet'),
-            'Extremely personal message with a realm emoji :green_tick:!')
+            self.example_user('othello'),
+            self.example_user('hamlet'),
+            'Extremely personal message with a realm emoji :green_tick:!',
+        )
         realm_emoji_id = realm.get_active_emoji()['green_tick']['id']
-        realm_emoji_url = f"http://zulip.testserver/user_avatars/{realm.id}/emoji/images/{realm_emoji_id}.png"
-        verify_body_include = [f'<img alt=":green_tick:" src="{realm_emoji_url}" title="green tick" style="height: 20px;">']
+        realm_emoji_url = (
+            f"http://zulip.testserver/user_avatars/{realm.id}/emoji/images/{realm_emoji_id}.png"
+        )
+        verify_body_include = [
+            f'<img alt=":green_tick:" src="{realm_emoji_url}" title="green tick" style="height: 20px;">'
+        ]
         email_subject = 'PMs with Othello, the Moor of Venice'
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True)
+        self._test_cases(
+            msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
+        )
 
     def test_emojiset_in_missed_message(self) -> None:
         hamlet = self.example_user('hamlet')
         hamlet.emojiset = 'twitter'
         hamlet.save(update_fields=['emojiset'])
         msg_id = self.send_personal_message(
-            self.example_user('othello'), self.example_user('hamlet'),
-            'Extremely personal message with a hamburger :hamburger:!')
-        verify_body_include = ['<img alt=":hamburger:" src="http://zulip.testserver/static/generated/emoji/images-twitter-64/1f354.png" title="hamburger" style="height: 20px;">']
+            self.example_user('othello'),
+            self.example_user('hamlet'),
+            'Extremely personal message with a hamburger :hamburger:!',
+        )
+        verify_body_include = [
+            '<img alt=":hamburger:" src="http://zulip.testserver/static/generated/emoji/images-twitter-64/1f354.png" title="hamburger" style="height: 20px;">'
+        ]
         email_subject = 'PMs with Othello, the Moor of Venice'
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True)
+        self._test_cases(
+            msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
+        )
 
     def test_stream_link_in_missed_message(self) -> None:
         msg_id = self.send_personal_message(
-            self.example_user('othello'), self.example_user('hamlet'),
-            'Come and join us in #**Verona**.')
+            self.example_user('othello'),
+            self.example_user('hamlet'),
+            'Come and join us in #**Verona**.',
+        )
         stream_id = get_stream('Verona', get_realm('zulip')).id
         href = f"http://zulip.testserver/#narrow/stream/{stream_id}-Verona"
-        verify_body_include = [f'<a class="stream" data-stream-id="{stream_id}" href="{href}">#Verona</a']
+        verify_body_include = [
+            f'<a class="stream" data-stream-id="{stream_id}" href="{href}">#Verona</a'
+        ]
         email_subject = 'PMs with Othello, the Moor of Venice'
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True)
+        self._test_cases(
+            msg_id, verify_body_include, email_subject, send_as_user=False, verify_html_body=True
+        )
 
     def test_sender_name_in_missed_message(self) -> None:
         hamlet = self.example_user('hamlet')
-        msg_id_1 = self.send_stream_message(self.example_user('iago'),
-                                            "Denmark",
-                                            '@**King Hamlet**')
-        msg_id_2 = self.send_stream_message(self.example_user('iago'),
-                                            "Verona",
-                                            '* 1\n *2')
-        msg_id_3 = self.send_personal_message(self.example_user('iago'),
-                                              hamlet,
-                                              'Hello')
+        msg_id_1 = self.send_stream_message(
+            self.example_user('iago'), "Denmark", '@**King Hamlet**'
+        )
+        msg_id_2 = self.send_stream_message(self.example_user('iago'), "Verona", '* 1\n *2')
+        msg_id_3 = self.send_personal_message(self.example_user('iago'), hamlet, 'Hello')
 
-        handle_missedmessage_emails(hamlet.id, [
-            {'message_id': msg_id_1, "trigger": "mentioned"},
-            {'message_id': msg_id_2, "trigger": "stream_email_notify"},
-            {'message_id': msg_id_3},
-        ])
+        handle_missedmessage_emails(
+            hamlet.id,
+            [
+                {'message_id': msg_id_1, "trigger": "mentioned"},
+                {'message_id': msg_id_2, "trigger": "stream_email_notify"},
+                {'message_id': msg_id_3},
+            ],
+        )
 
         self.assertIn('Iago: @**King Hamlet**\n\n--\nYou are', mail.outbox[0].body)
         # If message content starts with <p> tag the sender name is appended inside the <p> tag.
-        self.assertIn('<p><b>Iago</b>: <span class="user-mention"', mail.outbox[0].alternatives[0][0])
+        self.assertIn(
+            '<p><b>Iago</b>: <span class="user-mention"', mail.outbox[0].alternatives[0][0]
+        )
 
         self.assertIn('Iago: * 1\n *2\n\n--\nYou are receiving', mail.outbox[1].body)
         # If message content does not starts with <p> tag sender name is appended before the <p> tag
-        self.assertIn('       <b>Iago</b>: <ul>\n<li>1<br/>\n *2</li>\n</ul>\n',
-                      mail.outbox[1].alternatives[0][0])
+        self.assertIn(
+            '       <b>Iago</b>: <ul>\n<li>1<br/>\n *2</li>\n</ul>\n',
+            mail.outbox[1].alternatives[0][0],
+        )
 
         self.assertEqual('Hello\n\n--\n\nReply', mail.outbox[2].body[:16])
         # Sender name is not appended to message for PM missed messages
-        self.assertIn('>\n                    \n                        <p>Hello</p>\n',
-                      mail.outbox[2].alternatives[0][0])
+        self.assertIn(
+            '>\n                    \n                        <p>Hello</p>\n',
+            mail.outbox[2].alternatives[0][0],
+        )
 
     def test_multiple_missed_personal_messages(self) -> None:
         hamlet = self.example_user('hamlet')
-        msg_id_1 = self.send_personal_message(self.example_user('othello'),
-                                              hamlet,
-                                              'Personal Message 1')
-        msg_id_2 = self.send_personal_message(self.example_user('iago'),
-                                              hamlet,
-                                              'Personal Message 2')
+        msg_id_1 = self.send_personal_message(
+            self.example_user('othello'), hamlet, 'Personal Message 1'
+        )
+        msg_id_2 = self.send_personal_message(
+            self.example_user('iago'), hamlet, 'Personal Message 2'
+        )
 
-        handle_missedmessage_emails(hamlet.id, [
-            {'message_id': msg_id_1},
-            {'message_id': msg_id_2},
-        ])
+        handle_missedmessage_emails(
+            hamlet.id,
+            [
+                {'message_id': msg_id_1},
+                {'message_id': msg_id_2},
+            ],
+        )
         self.assertEqual(len(mail.outbox), 2)
         email_subject = 'PMs with Othello, the Moor of Venice'
         self.assertEqual(mail.outbox[0].subject, email_subject)
@@ -759,17 +926,16 @@ class TestMissedMessages(ZulipTestCase):
 
     def test_multiple_stream_messages(self) -> None:
         hamlet = self.example_user('hamlet')
-        msg_id_1 = self.send_stream_message(self.example_user('othello'),
-                                            "Denmark",
-                                            'Message1')
-        msg_id_2 = self.send_stream_message(self.example_user('iago'),
-                                            "Denmark",
-                                            'Message2')
+        msg_id_1 = self.send_stream_message(self.example_user('othello'), "Denmark", 'Message1')
+        msg_id_2 = self.send_stream_message(self.example_user('iago'), "Denmark", 'Message2')
 
-        handle_missedmessage_emails(hamlet.id, [
-            {'message_id': msg_id_1, "trigger": "stream_email_notify"},
-            {'message_id': msg_id_2, "trigger": "stream_email_notify"},
-        ])
+        handle_missedmessage_emails(
+            hamlet.id,
+            [
+                {'message_id': msg_id_1, "trigger": "stream_email_notify"},
+                {'message_id': msg_id_2, "trigger": "stream_email_notify"},
+            ],
+        )
         self.assertEqual(len(mail.outbox), 1)
         email_subject = '#Denmark > test'
         self.assertEqual(mail.outbox[0].subject, email_subject)
@@ -777,17 +943,18 @@ class TestMissedMessages(ZulipTestCase):
     def test_multiple_stream_messages_and_mentions(self) -> None:
         """Subject should be stream name and topic as usual."""
         hamlet = self.example_user('hamlet')
-        msg_id_1 = self.send_stream_message(self.example_user('iago'),
-                                            "Denmark",
-                                            'Regular message')
-        msg_id_2 = self.send_stream_message(self.example_user('othello'),
-                                            "Denmark",
-                                            '@**King Hamlet**')
+        msg_id_1 = self.send_stream_message(self.example_user('iago'), "Denmark", 'Regular message')
+        msg_id_2 = self.send_stream_message(
+            self.example_user('othello'), "Denmark", '@**King Hamlet**'
+        )
 
-        handle_missedmessage_emails(hamlet.id, [
-            {'message_id': msg_id_1, "trigger": "stream_email_notify"},
-            {'message_id': msg_id_2, "trigger": "mentioned"},
-        ])
+        handle_missedmessage_emails(
+            hamlet.id,
+            [
+                {'message_id': msg_id_1, "trigger": "stream_email_notify"},
+                {'message_id': msg_id_2, "trigger": "mentioned"},
+            ],
+        )
         self.assertEqual(len(mail.outbox), 1)
         email_subject = '#Denmark > test'
         self.assertEqual(mail.outbox[0].subject, email_subject)
@@ -796,29 +963,25 @@ class TestMissedMessages(ZulipTestCase):
         # Messages sent to a protected history-private stream shouldn't be
         # accessible/available in emails before subscribing
         stream_name = "private_stream"
-        self.make_stream(stream_name, invite_only=True,
-                         history_public_to_subscribers=False)
+        self.make_stream(stream_name, invite_only=True, history_public_to_subscribers=False)
         user = self.example_user('iago')
         self.subscribe(user, stream_name)
         late_subscribed_user = self.example_user('hamlet')
 
-        self.send_stream_message(user,
-                                 stream_name,
-                                 'Before subscribing')
+        self.send_stream_message(user, stream_name, 'Before subscribing')
 
         self.subscribe(late_subscribed_user, stream_name)
 
-        self.send_stream_message(user,
-                                 stream_name,
-                                 "After subscribing")
+        self.send_stream_message(user, stream_name, "After subscribing")
 
-        mention_msg_id = self.send_stream_message(user,
-                                                  stream_name,
-                                                  '@**King Hamlet**')
+        mention_msg_id = self.send_stream_message(user, stream_name, '@**King Hamlet**')
 
-        handle_missedmessage_emails(late_subscribed_user.id, [
-            {'message_id': mention_msg_id, "trigger": "mentioned"},
-        ])
+        handle_missedmessage_emails(
+            late_subscribed_user.id,
+            [
+                {'message_id': mention_msg_id, "trigger": "mentioned"},
+            ],
+        )
 
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].subject, '#private_stream > test')  # email subject
@@ -830,21 +993,24 @@ class TestMissedMessages(ZulipTestCase):
     def test_stream_mentions_multiple_people(self) -> None:
         """Subject should be stream name and topic as usual."""
         hamlet = self.example_user('hamlet')
-        msg_id_1 = self.send_stream_message(self.example_user('iago'),
-                                            "Denmark",
-                                            '@**King Hamlet**')
-        msg_id_2 = self.send_stream_message(self.example_user('othello'),
-                                            "Denmark",
-                                            '@**King Hamlet**')
-        msg_id_3 = self.send_stream_message(self.example_user('cordelia'),
-                                            "Denmark",
-                                            'Regular message')
+        msg_id_1 = self.send_stream_message(
+            self.example_user('iago'), "Denmark", '@**King Hamlet**'
+        )
+        msg_id_2 = self.send_stream_message(
+            self.example_user('othello'), "Denmark", '@**King Hamlet**'
+        )
+        msg_id_3 = self.send_stream_message(
+            self.example_user('cordelia'), "Denmark", 'Regular message'
+        )
 
-        handle_missedmessage_emails(hamlet.id, [
-            {'message_id': msg_id_1, "trigger": "mentioned"},
-            {'message_id': msg_id_2, "trigger": "mentioned"},
-            {'message_id': msg_id_3, "trigger": "stream_email_notify"},
-        ])
+        handle_missedmessage_emails(
+            hamlet.id,
+            [
+                {'message_id': msg_id_1, "trigger": "mentioned"},
+                {'message_id': msg_id_2, "trigger": "mentioned"},
+                {'message_id': msg_id_3, "trigger": "stream_email_notify"},
+            ],
+        )
         self.assertEqual(len(mail.outbox), 1)
         email_subject = '#Denmark > test'
         self.assertEqual(mail.outbox[0].subject, email_subject)
@@ -852,18 +1018,18 @@ class TestMissedMessages(ZulipTestCase):
     def test_multiple_stream_messages_different_topics(self) -> None:
         """Should receive separate emails for each topic within a stream."""
         hamlet = self.example_user('hamlet')
-        msg_id_1 = self.send_stream_message(self.example_user('othello'),
-                                            "Denmark",
-                                            'Message1')
-        msg_id_2 = self.send_stream_message(self.example_user('iago'),
-                                            "Denmark",
-                                            'Message2',
-                                            topic_name="test2")
+        msg_id_1 = self.send_stream_message(self.example_user('othello'), "Denmark", 'Message1')
+        msg_id_2 = self.send_stream_message(
+            self.example_user('iago'), "Denmark", 'Message2', topic_name="test2"
+        )
 
-        handle_missedmessage_emails(hamlet.id, [
-            {'message_id': msg_id_1, "trigger": "stream_email_notify"},
-            {'message_id': msg_id_2, "trigger": "stream_email_notify"},
-        ])
+        handle_missedmessage_emails(
+            hamlet.id,
+            [
+                {'message_id': msg_id_1, "trigger": "stream_email_notify"},
+                {'message_id': msg_id_2, "trigger": "stream_email_notify"},
+            ],
+        )
         self.assertEqual(len(mail.outbox), 2)
         email_subjects = {mail.outbox[0].subject, mail.outbox[1].subject}
         valid_email_subjects = {'#Denmark > test', '#Denmark > test2'}
@@ -883,9 +1049,13 @@ class TestMissedMessages(ZulipTestCase):
             test_data = test_fixtures[test_name]["expected_output"]
             output_data = relative_to_full_url("http://example.com", test_data)
             if re.search(r"""(?<=\=['"])/(?=[^<]+>)""", output_data) is not None:
-                raise AssertionError("Relative URL present in email: " + output_data +
-                                     "\nFailed test case's name is: " + test_name +
-                                     "\nIt is present in markdown_test_cases.json")
+                raise AssertionError(
+                    "Relative URL present in email: "
+                    + output_data
+                    + "\nFailed test case's name is: "
+                    + test_name
+                    + "\nIt is present in markdown_test_cases.json"
+                )
 
         # Specific test cases.
 
@@ -899,8 +1069,10 @@ class TestMissedMessages(ZulipTestCase):
         test_data = '<a href="/user_uploads/{realm_id}/1f/some_random_value">/user_uploads/{realm_id}/1f/some_random_value</a>'
         test_data = test_data.format(realm_id=zephyr_realm.id)
         actual_output = relative_to_full_url("http://example.com", test_data)
-        expected_output = '<a href="http://example.com/user_uploads/{realm_id}/1f/some_random_value">' + \
-            '/user_uploads/{realm_id}/1f/some_random_value</a>'
+        expected_output = (
+            '<a href="http://example.com/user_uploads/{realm_id}/1f/some_random_value">'
+            + '/user_uploads/{realm_id}/1f/some_random_value</a>'
+        )
         expected_output = expected_output.format(realm_id=zephyr_realm.id)
         self.assertEqual(actual_output, expected_output)
 
@@ -911,35 +1083,47 @@ class TestMissedMessages(ZulipTestCase):
         self.assertEqual(actual_output, expected_output)
 
         # A narrow URL which begins with a '#'.
-        test_data = '<p><a href="#narrow/stream/test/topic/test.20topic/near/142"' +  \
-                    'title="#narrow/stream/test/topic/test.20topic/near/142">Conversation</a></p>'
+        test_data = (
+            '<p><a href="#narrow/stream/test/topic/test.20topic/near/142"'
+            + 'title="#narrow/stream/test/topic/test.20topic/near/142">Conversation</a></p>'
+        )
         actual_output = relative_to_full_url("http://example.com", test_data)
-        expected_output = '<p><a href="http://example.com/#narrow/stream/test/topic/test.20topic/near/142" ' + \
-                          'title="http://example.com/#narrow/stream/test/topic/test.20topic/near/142">Conversation</a></p>'
+        expected_output = (
+            '<p><a href="http://example.com/#narrow/stream/test/topic/test.20topic/near/142" '
+            + 'title="http://example.com/#narrow/stream/test/topic/test.20topic/near/142">Conversation</a></p>'
+        )
         self.assertEqual(actual_output, expected_output)
 
         # Scrub inline images.
-        test_data = '<p>See this <a href="/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg" target="_blank" ' +   \
-                    'title="avatar_103.jpeg">avatar_103.jpeg</a>.</p>' +    \
-                    '<div class="message_inline_image"><a href="/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg" ' +    \
-                    'target="_blank" title="avatar_103.jpeg"><img src="/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg"></a></div>'
+        test_data = (
+            '<p>See this <a href="/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg" target="_blank" '
+            + 'title="avatar_103.jpeg">avatar_103.jpeg</a>.</p>'
+            + '<div class="message_inline_image"><a href="/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg" '
+            + 'target="_blank" title="avatar_103.jpeg"><img src="/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg"></a></div>'
+        )
         test_data = test_data.format(realm_id=zulip_realm.id)
         actual_output = relative_to_full_url("http://example.com", test_data)
-        expected_output = '<div><p>See this <a href="http://example.com/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg" target="_blank" ' +  \
-                          'title="avatar_103.jpeg">avatar_103.jpeg</a>.</p></div>'
+        expected_output = (
+            '<div><p>See this <a href="http://example.com/user_uploads/{realm_id}/52/fG7GM9e3afz_qsiUcSce2tl_/avatar_103.jpeg" target="_blank" '
+            + 'title="avatar_103.jpeg">avatar_103.jpeg</a>.</p></div>'
+        )
         expected_output = expected_output.format(realm_id=zulip_realm.id)
         self.assertEqual(actual_output, expected_output)
 
         # A message containing only an inline image URL preview, we do
         # somewhat more extensive surgery.
-        test_data = '<div class="message_inline_image"><a href="https://www.google.com/images/srpr/logo4w.png" ' + \
-                    'target="_blank" title="https://www.google.com/images/srpr/logo4w.png">' + \
-                    '<img data-src-fullsize="/thumbnail/https%3A//www.google.com/images/srpr/logo4w.png?size=0x0" ' + \
-                    'src="/thumbnail/https%3A//www.google.com/images/srpr/logo4w.png?size=0x100"></a></div>'
+        test_data = (
+            '<div class="message_inline_image"><a href="https://www.google.com/images/srpr/logo4w.png" '
+            + 'target="_blank" title="https://www.google.com/images/srpr/logo4w.png">'
+            + '<img data-src-fullsize="/thumbnail/https%3A//www.google.com/images/srpr/logo4w.png?size=0x0" '
+            + 'src="/thumbnail/https%3A//www.google.com/images/srpr/logo4w.png?size=0x100"></a></div>'
+        )
         actual_output = relative_to_full_url("http://example.com", test_data)
-        expected_output = '<p><a href="https://www.google.com/images/srpr/logo4w.png" ' + \
-                          'target="_blank" title="https://www.google.com/images/srpr/logo4w.png">' + \
-                          'https://www.google.com/images/srpr/logo4w.png</a></p>'
+        expected_output = (
+            '<p><a href="https://www.google.com/images/srpr/logo4w.png" '
+            + 'target="_blank" title="https://www.google.com/images/srpr/logo4w.png">'
+            + 'https://www.google.com/images/srpr/logo4w.png</a></p>'
+        )
         self.assertEqual(actual_output, expected_output)
 
     def test_spoilers_in_html_emails(self) -> None:
@@ -957,29 +1141,36 @@ class TestMissedMessages(ZulipTestCase):
         for test_name in test_fixtures:
             test_data = test_fixtures[test_name]["expected_output"]
             output_data = fix_spoilers_in_html(test_data, 'en')
-            assert('spoiler-header' not in output_data)
-            assert('spoiler-content' not in output_data)
-            assert('spoiler-block' in output_data)
-            assert('spoiler-title' in output_data)
+            assert 'spoiler-header' not in output_data
+            assert 'spoiler-content' not in output_data
+            assert 'spoiler-block' in output_data
+            assert 'spoiler-title' in output_data
 
     def test_spoilers_in_text_emails(self) -> None:
         content = "@**King Hamlet**\n\n```spoiler header text\nsecret-text\n```"
         msg_id = self.send_stream_message(self.example_user('othello'), "Denmark", content)
-        verify_body_include = [
-            "header text",
-            "Open Zulip to see the spoiler content"
-        ]
+        verify_body_include = ["header text", "Open Zulip to see the spoiler content"]
         verify_body_does_not_include = ["secret-text"]
         email_subject = '#Denmark > test'
         send_as_user = False
-        self._test_cases(msg_id, verify_body_include, email_subject, send_as_user, trigger='mentioned',
-                         verify_body_does_not_include=verify_body_does_not_include)
+        self._test_cases(
+            msg_id,
+            verify_body_include,
+            email_subject,
+            send_as_user,
+            trigger='mentioned',
+            verify_body_does_not_include=verify_body_does_not_include,
+        )
 
     def test_fix_emoji(self) -> None:
         # An emoji.
-        test_data = '<p>See <span aria-label="cloud with lightning and rain" class="emoji emoji-26c8" role="img" title="cloud with lightning and rain">' + \
-                    ':cloud_with_lightning_and_rain:</span>.</p>'
+        test_data = (
+            '<p>See <span aria-label="cloud with lightning and rain" class="emoji emoji-26c8" role="img" title="cloud with lightning and rain">'
+            + ':cloud_with_lightning_and_rain:</span>.</p>'
+        )
         actual_output = fix_emojis(test_data, "http://example.com", "google")
-        expected_output = '<p>See <img alt=":cloud_with_lightning_and_rain:" src="http://example.com/static/generated/emoji/images-google-64/26c8.png" ' + \
-                          'title="cloud with lightning and rain" style="height: 20px;">.</p>'
+        expected_output = (
+            '<p>See <img alt=":cloud_with_lightning_and_rain:" src="http://example.com/static/generated/emoji/images-google-64/26c8.png" '
+            + 'title="cloud with lightning and rain" style="height: 20px;">.</p>'
+        )
         self.assertEqual(actual_output, expected_output)
diff --git a/zerver/tests/test_embedded_bot_system.py b/zerver/tests/test_embedded_bot_system.py
index d1d2e5df93..de497bf86f 100644
--- a/zerver/tests/test_embedded_bot_system.py
+++ b/zerver/tests/test_embedded_bot_system.py
@@ -17,16 +17,18 @@ class TestEmbeddedBotMessaging(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user_profile = self.example_user("othello")
-        self.bot_profile = self.create_test_bot('embedded', self.user_profile,
-                                                full_name='Embedded bot',
-                                                bot_type=UserProfile.EMBEDDED_BOT,
-                                                service_name='helloworld',
-                                                config_data=orjson.dumps({'foo': 'bar'}).decode())
+        self.bot_profile = self.create_test_bot(
+            'embedded',
+            self.user_profile,
+            full_name='Embedded bot',
+            bot_type=UserProfile.EMBEDDED_BOT,
+            service_name='helloworld',
+            config_data=orjson.dumps({'foo': 'bar'}).decode(),
+        )
 
     def test_pm_to_embedded_bot(self) -> None:
         assert self.bot_profile is not None
-        self.send_personal_message(self.user_profile, self.bot_profile,
-                                   content="help")
+        self.send_personal_message(self.user_profile, self.bot_profile, content="help")
         last_message = self.get_last_message()
         self.assertEqual(last_message.content, "beep boop")
         self.assertEqual(last_message.sender_id, self.bot_profile.id)
@@ -37,9 +39,12 @@ class TestEmbeddedBotMessaging(ZulipTestCase):
 
     def test_stream_message_to_embedded_bot(self) -> None:
         assert self.bot_profile is not None
-        self.send_stream_message(self.user_profile, "Denmark",
-                                 content=f"@**{self.bot_profile.full_name}** foo",
-                                 topic_name="bar")
+        self.send_stream_message(
+            self.user_profile,
+            "Denmark",
+            content=f"@**{self.bot_profile.full_name}** foo",
+            topic_name="bar",
+        )
         last_message = self.get_last_message()
         self.assertEqual(last_message.content, "beep boop")
         self.assertEqual(last_message.sender_id, self.bot_profile.id)
@@ -48,43 +53,60 @@ class TestEmbeddedBotMessaging(ZulipTestCase):
         self.assertEqual(display_recipient, "Denmark")
 
     def test_stream_message_not_to_embedded_bot(self) -> None:
-        self.send_stream_message(self.user_profile, "Denmark",
-                                 content="foo", topic_name="bar")
+        self.send_stream_message(self.user_profile, "Denmark", content="foo", topic_name="bar")
         last_message = self.get_last_message()
         self.assertEqual(last_message.content, "foo")
 
     def test_message_to_embedded_bot_with_initialize(self) -> None:
         assert self.bot_profile is not None
-        with patch('zulip_bots.bots.helloworld.helloworld.HelloWorldHandler.initialize',
-                   create=True) as mock_initialize:
-            self.send_stream_message(self.user_profile, "Denmark",
-                                     content=f"@**{self.bot_profile.full_name}** foo",
-                                     topic_name="bar")
+        with patch(
+            'zulip_bots.bots.helloworld.helloworld.HelloWorldHandler.initialize', create=True
+        ) as mock_initialize:
+            self.send_stream_message(
+                self.user_profile,
+                "Denmark",
+                content=f"@**{self.bot_profile.full_name}** foo",
+                topic_name="bar",
+            )
             mock_initialize.assert_called_once()
 
     def test_embedded_bot_quit_exception(self) -> None:
         assert self.bot_profile is not None
-        with patch('zulip_bots.bots.helloworld.helloworld.HelloWorldHandler.handle_message',
-                   side_effect=EmbeddedBotQuitException("I'm quitting!")):
+        with patch(
+            'zulip_bots.bots.helloworld.helloworld.HelloWorldHandler.handle_message',
+            side_effect=EmbeddedBotQuitException("I'm quitting!"),
+        ):
             with self.assertLogs(level='WARNING') as m:
-                self.send_stream_message(self.user_profile, "Denmark",
-                                         content=f"@**{self.bot_profile.full_name}** foo",
-                                         topic_name="bar")
+                self.send_stream_message(
+                    self.user_profile,
+                    "Denmark",
+                    content=f"@**{self.bot_profile.full_name}** foo",
+                    topic_name="bar",
+                )
                 self.assertEqual(m.output, ['WARNING:root:I\'m quitting!'])
 
+
 class TestEmbeddedBotFailures(ZulipTestCase):
     def test_message_embedded_bot_with_invalid_service(self) -> None:
         user_profile = self.example_user("othello")
-        self.create_test_bot(short_name='embedded', user_profile=user_profile,
-                             bot_type=UserProfile.EMBEDDED_BOT,
-                             service_name='helloworld')
-        bot_profile = get_user("embedded-bot@zulip.testserver",
-                               get_realm('zulip'))
+        self.create_test_bot(
+            short_name='embedded',
+            user_profile=user_profile,
+            bot_type=UserProfile.EMBEDDED_BOT,
+            service_name='helloworld',
+        )
+        bot_profile = get_user("embedded-bot@zulip.testserver", get_realm('zulip'))
         service_profile = get_service_profile(bot_profile.id, 'helloworld')
         service_profile.name = 'invalid'
         service_profile.save()
         with self.assertLogs(level='ERROR') as m:
-            self.send_stream_message(user_profile, "Denmark",
-                                     content=f"@**{bot_profile.full_name}** foo",
-                                     topic_name="bar")
-            self.assertRegexpMatches(m.output[0], r'ERROR:root:Error: User [0-9]* has bot with invalid embedded bot service invalid')
+            self.send_stream_message(
+                user_profile,
+                "Denmark",
+                content=f"@**{bot_profile.full_name}** foo",
+                topic_name="bar",
+            )
+            self.assertRegexpMatches(
+                m.output[0],
+                r'ERROR:root:Error: User [0-9]* has bot with invalid embedded bot service invalid',
+            )
diff --git a/zerver/tests/test_event_queue.py b/zerver/tests/test_event_queue.py
index f3f8beff47..b1894dd15b 100644
--- a/zerver/tests/test_event_queue.py
+++ b/zerver/tests/test_event_queue.py
@@ -27,7 +27,9 @@ class MissedMessageNotificationsTest(ZulipTestCase):
     def check_will_notify(self, *args: Any, **kwargs: Any) -> Tuple[str, str]:
         email_notice = None
         mobile_notice = None
-        with mock_queue_publish("zerver.tornado.event_queue.queue_json_publish") as mock_queue_json_publish:
+        with mock_queue_publish(
+            "zerver.tornado.event_queue.queue_json_publish"
+        ) as mock_queue_json_publish:
             notified = maybe_enqueue_notifications(*args, **kwargs)
             for entry in mock_queue_json_publish.call_args_list:
                 args = entry[0]
@@ -53,52 +55,92 @@ class MissedMessageNotificationsTest(ZulipTestCase):
 
         # Boring message doesn't send a notice
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=True, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=True,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is None)
 
         # Private message sends a notice
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=True,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=True,
-            stream_name=None, always_push_notify=False, idle=True, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=True,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=True,
+            stream_name=None,
+            always_push_notify=False,
+            idle=True,
+            already_notified={},
+        )
         self.assertTrue(email_notice is not None)
         self.assertTrue(mobile_notice is not None)
 
         # Private message won't double-send either notice if we've
         # already sent notices before.
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=True,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=True, already_notified={
+            user_profile.id,
+            message_id,
+            private_message=True,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=True,
+            already_notified={
                 'push_notified': True,
                 'email_notified': False,
-            })
+            },
+        )
         self.assertTrue(email_notice is not None)
         self.assertTrue(mobile_notice is None)
 
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=True,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=True, already_notified={
+            user_profile.id,
+            message_id,
+            private_message=True,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=True,
+            already_notified={
                 'push_notified': False,
                 'email_notified': True,
-            })
+            },
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is not None)
 
         # Mention sends a notice
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=True, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=True, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=True,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=True,
+            already_notified={},
+        )
         self.assertTrue(email_notice is not None)
         self.assertTrue(mobile_notice is not None)
 
@@ -106,86 +148,154 @@ class MissedMessageNotificationsTest(ZulipTestCase):
         # direct mention, whether the notice is actually delivered is
         # determined later, in the email/push notification code)
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=False, wildcard_mention_notify=True,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=True, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=False,
+            wildcard_mention_notify=True,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=True,
+            already_notified={},
+        )
         self.assertTrue(email_notice is not None)
         self.assertTrue(mobile_notice is not None)
 
         # stream_push_notify pushes but doesn't email
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=True, stream_email_notify=False,
-            stream_name="Denmark", always_push_notify=False, idle=True, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=True,
+            stream_email_notify=False,
+            stream_name="Denmark",
+            always_push_notify=False,
+            idle=True,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is not None)
 
         # stream_email_notify emails but doesn't push
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=True,
-            stream_name="Denmark", always_push_notify=False, idle=True, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=True,
+            stream_name="Denmark",
+            always_push_notify=False,
+            idle=True,
+            already_notified={},
+        )
         self.assertTrue(email_notice is not None)
         self.assertTrue(mobile_notice is None)
 
         # Private message doesn't send a notice if not idle
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=True,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=True,
-            stream_name=None, always_push_notify=False, idle=False, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=True,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=True,
+            stream_name=None,
+            always_push_notify=False,
+            idle=False,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is None)
 
         # Mention doesn't send a notice if not idle
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=True, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=False, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=True,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=False,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is None)
 
         # Wildcard mention doesn't send a notice if not idle
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=False, wildcard_mention_notify=True,
-            stream_push_notify=False, stream_email_notify=False,
-            stream_name=None, always_push_notify=False, idle=False, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=False,
+            wildcard_mention_notify=True,
+            stream_push_notify=False,
+            stream_email_notify=False,
+            stream_name=None,
+            always_push_notify=False,
+            idle=False,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is None)
 
         # Private message sends push but not email if not idle but always_push_notify
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=True,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=False, stream_email_notify=True,
-            stream_name=None, always_push_notify=True, idle=False, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=True,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=False,
+            stream_email_notify=True,
+            stream_name=None,
+            always_push_notify=True,
+            idle=False,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is not None)
 
         # Stream message sends push but not email if not idle but always_push_notify
         email_notice, mobile_notice = self.check_will_notify(
-            user_profile.id, message_id, private_message=False,
-            mentioned=False, wildcard_mention_notify=False,
-            stream_push_notify=True, stream_email_notify=True,
-            stream_name="Denmark", always_push_notify=True, idle=False, already_notified={})
+            user_profile.id,
+            message_id,
+            private_message=False,
+            mentioned=False,
+            wildcard_mention_notify=False,
+            stream_push_notify=True,
+            stream_email_notify=True,
+            stream_name="Denmark",
+            always_push_notify=True,
+            idle=False,
+            already_notified={},
+        )
         self.assertTrue(email_notice is None)
         self.assertTrue(mobile_notice is not None)
 
-    def tornado_call(self, view_func: Callable[[HttpRequest, UserProfile], HttpResponse],
-                     user_profile: UserProfile, post_data: Dict[str, Any]) -> HttpResponse:
+    def tornado_call(
+        self,
+        view_func: Callable[[HttpRequest, UserProfile], HttpResponse],
+        user_profile: UserProfile,
+        post_data: Dict[str, Any],
+    ) -> HttpResponse:
         request = POSTRequestMock(post_data, user_profile)
         return view_func(request, user_profile)
 
     def test_stream_watchers(self) -> None:
-        '''
+        """
         We used to have a bug with stream_watchers, where we set their flags to
         None.
-        '''
+        """
         cordelia = self.example_user('cordelia')
         hamlet = self.example_user('hamlet')
         realm = hamlet.realm
@@ -230,30 +340,41 @@ class MissedMessageNotificationsTest(ZulipTestCase):
 
         # Fetch the Denmark stream for testing
         stream = get_stream("Denmark", user_profile.realm)
-        sub = Subscription.objects.get(user_profile=user_profile, recipient__type=Recipient.STREAM,
-                                       recipient__type_id=stream.id)
+        sub = Subscription.objects.get(
+            user_profile=user_profile,
+            recipient__type=Recipient.STREAM,
+            recipient__type_id=stream.id,
+        )
 
         self.login_user(user_profile)
 
-        def change_subscription_properties(user_profile: UserProfile, stream: Stream, sub: Subscription,
-                                           properties: Dict[str, bool]) -> None:
+        def change_subscription_properties(
+            user_profile: UserProfile,
+            stream: Stream,
+            sub: Subscription,
+            properties: Dict[str, bool],
+        ) -> None:
             for property_name, value in properties.items():
                 do_change_subscription_property(user_profile, sub, stream, property_name, value)
 
         def allocate_event_queue() -> ClientDescriptor:
-            result = self.tornado_call(get_events, user_profile,
-                                       {"apply_markdown": orjson.dumps(True).decode(),
-                                        "client_gravatar": orjson.dumps(True).decode(),
-                                        "event_types": orjson.dumps(["message"]).decode(),
-                                        "user_client": "website",
-                                        "dont_block": orjson.dumps(True).decode()})
+            result = self.tornado_call(
+                get_events,
+                user_profile,
+                {
+                    "apply_markdown": orjson.dumps(True).decode(),
+                    "client_gravatar": orjson.dumps(True).decode(),
+                    "event_types": orjson.dumps(["message"]).decode(),
+                    "user_client": "website",
+                    "dont_block": orjson.dumps(True).decode(),
+                },
+            )
             self.assert_json_success(result)
             queue_id = orjson.loads(result.content)["queue_id"]
             return get_client_descriptor(queue_id)
 
         def destroy_event_queue(queue_id: str) -> None:
-            result = self.tornado_call(cleanup_event_queue, user_profile,
-                                       {"queue_id": queue_id})
+            result = self.tornado_call(cleanup_event_queue, user_profile, {"queue_id": queue_id})
             self.assert_json_success(result)
 
         client_descriptor = allocate_event_queue()
@@ -273,9 +394,22 @@ class MissedMessageNotificationsTest(ZulipTestCase):
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False, False, False,
-                                         "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with a private message; this should trigger notifications
@@ -287,72 +421,143 @@ class MissedMessageNotificationsTest(ZulipTestCase):
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, True, False, False, False,
-                                         False, None, False, True,
-                                         {'email_notified': True, 'push_notified': True}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    True,
+                    False,
+                    False,
+                    False,
+                    False,
+                    None,
+                    False,
+                    True,
+                    {'email_notified': True, 'push_notified': True},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with a mention; this should trigger notifications
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="@**King Hamlet** what's up?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="@**King Hamlet** what's up?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, True, False, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': True, 'push_notified': True}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    True,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': True, 'push_notified': True},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with a wildcard mention; this should trigger notifications
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="@**all** what's up?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="@**all** what's up?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, True, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': True, 'push_notified': True}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    True,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': True, 'push_notified': True},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with a wildcard mention sent by the user
         # themself using a human client; should not notify.
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("hamlet"), "Denmark",
-                                          content="@**all** what's up?",
-                                          sending_client_name="website")
+        msg_id = self.send_stream_message(
+            self.example_user("hamlet"),
+            "Denmark",
+            content="@**all** what's up?",
+            sending_client_name="website",
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Wildcard mentions in muted streams don't notify.
         change_subscription_properties(user_profile, stream, sub, {'is_muted': True})
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="@**all** what's up?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="@**all** what's up?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
         change_subscription_properties(user_profile, stream, sub, {'is_muted': False})
 
@@ -361,16 +566,30 @@ class MissedMessageNotificationsTest(ZulipTestCase):
         user_profile.save()
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="@**all** what's up?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="@**all** what's up?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
         user_profile.wildcard_mentions_notify = True
         user_profile.save()
@@ -383,16 +602,30 @@ class MissedMessageNotificationsTest(ZulipTestCase):
         sub.save()
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="@**all** what's up?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="@**all** what's up?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, True, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': True, 'push_notified': True}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    True,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': True, 'push_notified': True},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
         user_profile.wildcard_mentions_notify = True
         sub.wildcard_mentions_notify = None
@@ -403,96 +636,167 @@ class MissedMessageNotificationsTest(ZulipTestCase):
         change_subscription_properties(user_profile, stream, sub, {'push_notifications': True})
         client_descriptor = allocate_event_queue()
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="what's up everyone?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="what's up everyone?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False,
-                                         True, False, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    True,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with a stream message with stream_email_notify
         client_descriptor = allocate_event_queue()
-        change_subscription_properties(user_profile, stream, sub,
-                                       {'push_notifications': False,
-                                        'email_notifications': True})
+        change_subscription_properties(
+            user_profile, stream, sub, {'push_notifications': False, 'email_notifications': True}
+        )
         self.assertTrue(client_descriptor.event_queue.empty())
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="what's up everyone?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="what's up everyone?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False,
-                                         False, True, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    True,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with stream message with stream_push_notify on
         # a muted topic, which we should not push notify for
         client_descriptor = allocate_event_queue()
-        change_subscription_properties(user_profile, stream, sub,
-                                       {'push_notifications': True,
-                                        'email_notifications': False})
+        change_subscription_properties(
+            user_profile, stream, sub, {'push_notifications': True, 'email_notifications': False}
+        )
 
         self.assertTrue(client_descriptor.event_queue.empty())
         do_mute_topic(user_profile, stream, "mutingtest")
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="what's up everyone?", topic_name="mutingtest")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"),
+            "Denmark",
+            content="what's up everyone?",
+            topic_name="mutingtest",
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False, False,
-                                         False, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Test the hook with stream message with stream_email_notify on
         # a muted stream, which we should not push notify for
         client_descriptor = allocate_event_queue()
-        change_subscription_properties(user_profile, stream, sub,
-                                       {'push_notifications': False,
-                                        'email_notifications': True})
+        change_subscription_properties(
+            user_profile, stream, sub, {'push_notifications': False, 'email_notifications': True}
+        )
 
         self.assertTrue(client_descriptor.event_queue.empty())
         change_subscription_properties(user_profile, stream, sub, {'is_muted': True})
-        msg_id = self.send_stream_message(self.example_user("iago"), "Denmark",
-                                          content="what's up everyone?")
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Denmark", content="what's up everyone?"
+        )
         with mock.patch("zerver.tornado.event_queue.maybe_enqueue_notifications") as mock_enqueue:
             missedmessage_hook(user_profile.id, client_descriptor, True)
             mock_enqueue.assert_called_once()
             args_list = mock_enqueue.call_args_list[0][0]
 
-            self.assertEqual(args_list, (user_profile.id, msg_id, False, False, False,
-                                         False, False, "Denmark", False, True,
-                                         {'email_notified': False, 'push_notified': False}))
+            self.assertEqual(
+                args_list,
+                (
+                    user_profile.id,
+                    msg_id,
+                    False,
+                    False,
+                    False,
+                    False,
+                    False,
+                    "Denmark",
+                    False,
+                    True,
+                    {'email_notified': False, 'push_notified': False},
+                ),
+            )
         destroy_event_queue(client_descriptor.event_queue.id)
 
         # Clean up the state we just changed (not necessary unless we add more test code below)
-        change_subscription_properties(user_profile, stream, sub,
-                                       {'push_notifications': True,
-                                        'is_muted': False})
+        change_subscription_properties(
+            user_profile, stream, sub, {'push_notifications': True, 'is_muted': False}
+        )
+
 
 class FileReloadLogicTest(ZulipTestCase):
     def test_persistent_queue_filename(self) -> None:
-        with self.settings(JSON_PERSISTENT_QUEUE_FILENAME_PATTERN="/home/zulip/tornado/event_queues%s.json"):
-            self.assertEqual(persistent_queue_filename(9800),
-                             "/home/zulip/tornado/event_queues.json")
-            self.assertEqual(persistent_queue_filename(9800, last=True),
-                             "/home/zulip/tornado/event_queues.json.last")
-        with self.settings(JSON_PERSISTENT_QUEUE_FILENAME_PATTERN="/home/zulip/tornado/event_queues%s.json",
-                           TORNADO_PROCESSES=4):
-            self.assertEqual(persistent_queue_filename(9800),
-                             "/home/zulip/tornado/event_queues.9800.json")
-            self.assertEqual(persistent_queue_filename(9800, last=True),
-                             "/home/zulip/tornado/event_queues.9800.last.json")
+        with self.settings(
+            JSON_PERSISTENT_QUEUE_FILENAME_PATTERN="/home/zulip/tornado/event_queues%s.json"
+        ):
+            self.assertEqual(
+                persistent_queue_filename(9800), "/home/zulip/tornado/event_queues.json"
+            )
+            self.assertEqual(
+                persistent_queue_filename(9800, last=True),
+                "/home/zulip/tornado/event_queues.json.last",
+            )
+        with self.settings(
+            JSON_PERSISTENT_QUEUE_FILENAME_PATTERN="/home/zulip/tornado/event_queues%s.json",
+            TORNADO_PROCESSES=4,
+        ):
+            self.assertEqual(
+                persistent_queue_filename(9800), "/home/zulip/tornado/event_queues.9800.json"
+            )
+            self.assertEqual(
+                persistent_queue_filename(9800, last=True),
+                "/home/zulip/tornado/event_queues.9800.last.json",
+            )
+
 
 class EventQueueTest(ZulipTestCase):
     def get_client_descriptor(self) -> ClientDescriptor:
@@ -553,6 +857,7 @@ class EventQueueTest(ZulipTestCase):
             * use the latest timestamp
             * concatenate the messages
         '''
+
         def umfe(timestamp: int, messages: List[int]) -> Dict[str, Any]:
             return dict(
                 type='update_message_flags',
@@ -578,19 +883,22 @@ class EventQueueTest(ZulipTestCase):
 
         self.verify_to_dict_end_to_end(client)
 
-        self.assertEqual(queue.contents(), [
-            dict(id=2, type='unknown'),
-            dict(id=5, type='restart', server_generation="2"),
-            dict(
-                id=6,
-                type='update_message_flags',
-                operation='add',
-                flag='read',
-                all=False,
-                timestamp=4,
-                messages=[101, 201, 202, 301, 302, 303, 401, 402, 403, 404],
-            ),
-        ])
+        self.assertEqual(
+            queue.contents(),
+            [
+                dict(id=2, type='unknown'),
+                dict(id=5, type='restart', server_generation="2"),
+                dict(
+                    id=6,
+                    type='update_message_flags',
+                    operation='add',
+                    flag='read',
+                    all=False,
+                    timestamp=4,
+                    messages=[101, 201, 202, 301, 302, 303, 401, 402, 403, 404],
+                ),
+            ],
+        )
 
         '''
         Note that calling queue.contents() has the side
@@ -601,130 +909,150 @@ class EventQueueTest(ZulipTestCase):
         queue.push(
             umfe(timestamp=5, messages=[501, 502, 503, 504, 505]),
         )
-        self.assertEqual(queue.contents(), [
-            dict(id=2, type='unknown'),
-            dict(id=5, type='restart', server_generation="2"),
-            dict(
-                id=6,
-                type='update_message_flags',
-                operation='add',
-                flag='read',
-                all=False,
-                timestamp=4,
-                messages=[101, 201, 202, 301, 302, 303, 401, 402, 403, 404],
-            ),
-            dict(
-                id=7,
-                type='update_message_flags',
-                operation='add',
-                flag='read',
-                all=False,
-                timestamp=5,
-                messages=[501, 502, 503, 504, 505],
-            ),
-        ])
+        self.assertEqual(
+            queue.contents(),
+            [
+                dict(id=2, type='unknown'),
+                dict(id=5, type='restart', server_generation="2"),
+                dict(
+                    id=6,
+                    type='update_message_flags',
+                    operation='add',
+                    flag='read',
+                    all=False,
+                    timestamp=4,
+                    messages=[101, 201, 202, 301, 302, 303, 401, 402, 403, 404],
+                ),
+                dict(
+                    id=7,
+                    type='update_message_flags',
+                    operation='add',
+                    flag='read',
+                    all=False,
+                    timestamp=5,
+                    messages=[501, 502, 503, 504, 505],
+                ),
+            ],
+        )
 
     def test_flag_add_collapsing(self) -> None:
         client = self.get_client_descriptor()
         queue = client.event_queue
-        queue.push({"type": "update_message_flags",
+        queue.push(
+            {
+                "type": "update_message_flags",
+                "flag": "read",
+                "operation": "add",
+                "all": False,
+                "messages": [1, 2, 3, 4],
+                "timestamp": "1",
+            }
+        )
+        self.verify_to_dict_end_to_end(client)
+        queue.push(
+            {
+                "type": "update_message_flags",
+                "flag": "read",
+                "all": False,
+                "operation": "add",
+                "messages": [5, 6],
+                "timestamp": "1",
+            }
+        )
+        self.verify_to_dict_end_to_end(client)
+        self.assertEqual(
+            queue.contents(),
+            [
+                {
+                    'id': 1,
+                    'type': 'update_message_flags',
+                    "all": False,
                     "flag": "read",
                     "operation": "add",
-                    "all": False,
-                    "messages": [1, 2, 3, 4],
-                    "timestamp": "1"})
-        self.verify_to_dict_end_to_end(client)
-        queue.push({"type": "update_message_flags",
-                    "flag": "read",
-                    "all": False,
-                    "operation": "add",
-                    "messages": [5, 6],
-                    "timestamp": "1"})
-        self.verify_to_dict_end_to_end(client)
-        self.assertEqual(queue.contents(),
-                         [{'id': 1,
-                           'type': 'update_message_flags',
-                           "all": False,
-                           "flag": "read",
-                           "operation": "add",
-                           "messages": [1, 2, 3, 4, 5, 6],
-                           "timestamp": "1"}])
+                    "messages": [1, 2, 3, 4, 5, 6],
+                    "timestamp": "1",
+                }
+            ],
+        )
         self.verify_to_dict_end_to_end(client)
 
     def test_flag_remove_collapsing(self) -> None:
         client = self.get_client_descriptor()
         queue = client.event_queue
-        queue.push({"type": "update_message_flags",
+        queue.push(
+            {
+                "type": "update_message_flags",
+                "flag": "collapsed",
+                "operation": "remove",
+                "all": False,
+                "messages": [1, 2, 3, 4],
+                "timestamp": "1",
+            }
+        )
+        self.verify_to_dict_end_to_end(client)
+        queue.push(
+            {
+                "type": "update_message_flags",
+                "flag": "collapsed",
+                "all": False,
+                "operation": "remove",
+                "messages": [5, 6],
+                "timestamp": "1",
+            }
+        )
+        self.verify_to_dict_end_to_end(client)
+        self.assertEqual(
+            queue.contents(),
+            [
+                {
+                    'id': 1,
+                    'type': 'update_message_flags',
+                    "all": False,
                     "flag": "collapsed",
                     "operation": "remove",
-                    "all": False,
-                    "messages": [1, 2, 3, 4],
-                    "timestamp": "1"})
-        self.verify_to_dict_end_to_end(client)
-        queue.push({"type": "update_message_flags",
-                    "flag": "collapsed",
-                    "all": False,
-                    "operation": "remove",
-                    "messages": [5, 6],
-                    "timestamp": "1"})
-        self.verify_to_dict_end_to_end(client)
-        self.assertEqual(queue.contents(),
-                         [{'id': 1,
-                           'type': 'update_message_flags',
-                           "all": False,
-                           "flag": "collapsed",
-                           "operation": "remove",
-                           "messages": [1, 2, 3, 4, 5, 6],
-                           "timestamp": "1"}])
+                    "messages": [1, 2, 3, 4, 5, 6],
+                    "timestamp": "1",
+                }
+            ],
+        )
         self.verify_to_dict_end_to_end(client)
 
     def test_collapse_event(self) -> None:
-        '''
+        """
         This mostly focues on the internals of
         how we store "virtual_events" that we
         can collapse if subsequent events are
         of the same form.  See the code in
         EventQueue.push for more context.
-        '''
+        """
         client = self.get_client_descriptor()
         queue = client.event_queue
-        queue.push({"type": "restart",
-                    "server_generation": 1,
-                    "timestamp": "1"})
+        queue.push({"type": "restart", "server_generation": 1, "timestamp": "1"})
         # Verify the server_generation event is stored as a virtual event
-        self.assertEqual(queue.virtual_events,
-                         {'restart':
-                          {'id': 0,
-                           'type': 'restart',
-                           'server_generation': 1,
-                           "timestamp": "1"}})
+        self.assertEqual(
+            queue.virtual_events,
+            {'restart': {'id': 0, 'type': 'restart', 'server_generation': 1, "timestamp": "1"}},
+        )
         # And we can reconstruct newest_pruned_id etc.
         self.verify_to_dict_end_to_end(client)
 
-        queue.push({"type": "unknown",
-                    "timestamp": "1"})
-        self.assertEqual(list(queue.queue),
-                         [{'id': 1,
-                           'type': 'unknown',
-                           "timestamp": "1"}])
-        self.assertEqual(queue.virtual_events,
-                         {'restart':
-                          {'id': 0,
-                           'type': 'restart',
-                           'server_generation': 1,
-                           "timestamp": "1"}})
+        queue.push({"type": "unknown", "timestamp": "1"})
+        self.assertEqual(list(queue.queue), [{'id': 1, 'type': 'unknown', "timestamp": "1"}])
+        self.assertEqual(
+            queue.virtual_events,
+            {'restart': {'id': 0, 'type': 'restart', 'server_generation': 1, "timestamp": "1"}},
+        )
         # And we can still reconstruct newest_pruned_id etc. correctly
         self.verify_to_dict_end_to_end(client)
 
         # Verify virtual events are converted to real events by .contents()
-        self.assertEqual(queue.contents(),
-                         [{'id': 0,
-                           'type': 'restart',
-                           "server_generation": 1,
-                           "timestamp": "1"},
-                          {'id': 1,
-                           'type': 'unknown',
-                           "timestamp": "1"}])
+        self.assertEqual(
+            queue.contents(),
+            [
+                {'id': 0, 'type': 'restart', "server_generation": 1, "timestamp": "1"},
+                {'id': 1, 'type': 'unknown', "timestamp": "1"},
+            ],
+        )
 
         # And now verify to_dict after pruning
         queue.prune(0)
diff --git a/zerver/tests/test_event_system.py b/zerver/tests/test_event_system.py
index a301ec6e08..7a9090e829 100644
--- a/zerver/tests/test_event_system.py
+++ b/zerver/tests/test_event_system.py
@@ -51,20 +51,20 @@ class EventsEndpointTest(ZulipTestCase):
         # We choose realm_emoji somewhat randomly--we want
         # a "boring" event type for the purpose of this test.
         event_type = 'realm_emoji'
-        test_event = dict(
-            id=6,
-            type=event_type,
-            realm_emoji=[]
-        )
+        test_event = dict(id=6, type=event_type, realm_emoji=[])
 
         # Test that call is made to deal with a returning soft deactivated user.
         with mock.patch('zerver.lib.events.reactivate_user_if_soft_deactivated') as fa:
             with stub_event_queue_user_events(return_event_queue, return_user_events):
-                result = self.api_post(user, '/json/register', dict(event_types=orjson.dumps([event_type]).decode()))
+                result = self.api_post(
+                    user, '/json/register', dict(event_types=orjson.dumps([event_type]).decode())
+                )
                 self.assertEqual(fa.call_count, 1)
 
         with stub_event_queue_user_events(return_event_queue, return_user_events):
-            result = self.api_post(user, '/json/register', dict(event_types=orjson.dumps([event_type]).decode()))
+            result = self.api_post(
+                user, '/json/register', dict(event_types=orjson.dumps([event_type]).decode())
+            )
 
         self.assert_json_success(result)
         result_dict = result.json()
@@ -76,7 +76,9 @@ class EventsEndpointTest(ZulipTestCase):
         return_user_events = [test_event]
 
         with stub_event_queue_user_events(return_event_queue, return_user_events):
-            result = self.api_post(user, '/json/register', dict(event_types=orjson.dumps([event_type]).decode()))
+            result = self.api_post(
+                user, '/json/register', dict(event_types=orjson.dumps([event_type]).decode())
+            )
 
         self.assert_json_success(result)
         result_dict = result.json()
@@ -89,9 +91,14 @@ class EventsEndpointTest(ZulipTestCase):
         # Now test with `fetch_event_types` not matching the event
         return_event_queue = '15:13'
         with stub_event_queue_user_events(return_event_queue, return_user_events):
-            result = self.api_post(user, '/json/register',
-                                   dict(event_types=orjson.dumps([event_type]).decode(),
-                                        fetch_event_types=orjson.dumps(['message']).decode()))
+            result = self.api_post(
+                user,
+                '/json/register',
+                dict(
+                    event_types=orjson.dumps([event_type]).decode(),
+                    fetch_event_types=orjson.dumps(['message']).decode(),
+                ),
+            )
         self.assert_json_success(result)
         result_dict = result.json()
         self.assertEqual(result_dict['last_event_id'], 6)
@@ -104,9 +111,14 @@ class EventsEndpointTest(ZulipTestCase):
 
         # Now test with `fetch_event_types` matching the event
         with stub_event_queue_user_events(return_event_queue, return_user_events):
-            result = self.api_post(user, '/json/register',
-                                   dict(fetch_event_types=orjson.dumps([event_type]).decode(),
-                                        event_types=orjson.dumps(['message']).decode()))
+            result = self.api_post(
+                user,
+                '/json/register',
+                dict(
+                    fetch_event_types=orjson.dumps([event_type]).decode(),
+                    event_types=orjson.dumps(['message']).decode(),
+                ),
+            )
         self.assert_json_success(result)
         result_dict = result.json()
         self.assertEqual(result_dict['last_event_id'], 6)
@@ -144,10 +156,14 @@ class EventsEndpointTest(ZulipTestCase):
         result = self.client_post_request('/notify_tornado', req)
         self.assert_json_success(result)
 
+
 class GetEventsTest(ZulipTestCase):
-    def tornado_call(self, view_func: Callable[[HttpRequest, UserProfile], HttpResponse],
-                     user_profile: UserProfile,
-                     post_data: Dict[str, Any]) -> HttpResponse:
+    def tornado_call(
+        self,
+        view_func: Callable[[HttpRequest, UserProfile], HttpResponse],
+        user_profile: UserProfile,
+        post_data: Dict[str, Any],
+    ) -> HttpResponse:
         request = POSTRequestMock(post_data, user_profile)
         return view_func(request, user_profile)
 
@@ -158,32 +174,44 @@ class GetEventsTest(ZulipTestCase):
         recipient_email = recipient_user_profile.email
         self.login_user(user_profile)
 
-        result = self.tornado_call(get_events, user_profile,
-                                   {"apply_markdown": orjson.dumps(True).decode(),
-                                    "client_gravatar": orjson.dumps(True).decode(),
-                                    "event_types": orjson.dumps(["message"]).decode(),
-                                    "user_client": "website",
-                                    "dont_block": orjson.dumps(True).decode(),
-                                    })
+        result = self.tornado_call(
+            get_events,
+            user_profile,
+            {
+                "apply_markdown": orjson.dumps(True).decode(),
+                "client_gravatar": orjson.dumps(True).decode(),
+                "event_types": orjson.dumps(["message"]).decode(),
+                "user_client": "website",
+                "dont_block": orjson.dumps(True).decode(),
+            },
+        )
         self.assert_json_success(result)
         queue_id = orjson.loads(result.content)["queue_id"]
 
-        recipient_result = self.tornado_call(get_events, recipient_user_profile,
-                                             {"apply_markdown": orjson.dumps(True).decode(),
-                                              "client_gravatar": orjson.dumps(True).decode(),
-                                              "event_types": orjson.dumps(["message"]).decode(),
-                                              "user_client": "website",
-                                              "dont_block": orjson.dumps(True).decode(),
-                                              })
+        recipient_result = self.tornado_call(
+            get_events,
+            recipient_user_profile,
+            {
+                "apply_markdown": orjson.dumps(True).decode(),
+                "client_gravatar": orjson.dumps(True).decode(),
+                "event_types": orjson.dumps(["message"]).decode(),
+                "user_client": "website",
+                "dont_block": orjson.dumps(True).decode(),
+            },
+        )
         self.assert_json_success(recipient_result)
         recipient_queue_id = orjson.loads(recipient_result.content)["queue_id"]
 
-        result = self.tornado_call(get_events, user_profile,
-                                   {"queue_id": queue_id,
-                                    "user_client": "website",
-                                    "last_event_id": -1,
-                                    "dont_block": orjson.dumps(True).decode(),
-                                    })
+        result = self.tornado_call(
+            get_events,
+            user_profile,
+            {
+                "queue_id": queue_id,
+                "user_client": "website",
+                "last_event_id": -1,
+                "dont_block": orjson.dumps(True).decode(),
+            },
+        )
         events = orjson.loads(result.content)["events"]
         self.assert_json_success(result)
         self.assert_length(events, 0)
@@ -200,12 +228,16 @@ class GetEventsTest(ZulipTestCase):
             sender_queue_id=queue_id,
         )
 
-        result = self.tornado_call(get_events, user_profile,
-                                   {"queue_id": queue_id,
-                                    "user_client": "website",
-                                    "last_event_id": -1,
-                                    "dont_block": orjson.dumps(True).decode(),
-                                    })
+        result = self.tornado_call(
+            get_events,
+            user_profile,
+            {
+                "queue_id": queue_id,
+                "user_client": "website",
+                "last_event_id": -1,
+                "dont_block": orjson.dumps(True).decode(),
+            },
+        )
         events = orjson.loads(result.content)["events"]
         self.assert_json_success(result)
         self.assert_length(events, 1)
@@ -229,12 +261,16 @@ class GetEventsTest(ZulipTestCase):
             sender_queue_id=queue_id,
         )
 
-        result = self.tornado_call(get_events, user_profile,
-                                   {"queue_id": queue_id,
-                                    "user_client": "website",
-                                    "last_event_id": last_event_id,
-                                    "dont_block": orjson.dumps(True).decode(),
-                                    })
+        result = self.tornado_call(
+            get_events,
+            user_profile,
+            {
+                "queue_id": queue_id,
+                "user_client": "website",
+                "last_event_id": last_event_id,
+                "dont_block": orjson.dumps(True).decode(),
+            },
+        )
         events = orjson.loads(result.content)["events"]
         self.assert_json_success(result)
         self.assert_length(events, 1)
@@ -244,12 +280,16 @@ class GetEventsTest(ZulipTestCase):
 
         # Test that the received message in the receiver's event queue
         # exists and does not contain a local id
-        recipient_result = self.tornado_call(get_events, recipient_user_profile,
-                                             {"queue_id": recipient_queue_id,
-                                              "user_client": "website",
-                                              "last_event_id": -1,
-                                              "dont_block": orjson.dumps(True).decode(),
-                                              })
+        recipient_result = self.tornado_call(
+            get_events,
+            recipient_user_profile,
+            {
+                "queue_id": recipient_queue_id,
+                "user_client": "website",
+                "last_event_id": -1,
+                "dont_block": orjson.dumps(True).decode(),
+            },
+        )
         recipient_events = orjson.loads(recipient_result.content)["events"]
         self.assert_json_success(recipient_result)
         self.assertEqual(len(recipient_events), 2)
@@ -281,12 +321,16 @@ class GetEventsTest(ZulipTestCase):
             self.assert_json_success(result)
             queue_id = orjson.loads(result.content)["queue_id"]
 
-            result = self.tornado_call(get_events, user_profile,
-                                       {"queue_id": queue_id,
-                                        "user_client": "website",
-                                        "last_event_id": -1,
-                                        "dont_block": orjson.dumps(True).decode(),
-                                        })
+            result = self.tornado_call(
+                get_events,
+                user_profile,
+                {
+                    "queue_id": queue_id,
+                    "user_client": "website",
+                    "last_event_id": -1,
+                    "dont_block": orjson.dumps(True).decode(),
+                },
+            )
             events = orjson.loads(result.content)["events"]
             self.assert_json_success(result)
             self.assert_length(events, 0)
@@ -294,12 +338,16 @@ class GetEventsTest(ZulipTestCase):
             self.send_personal_message(user_profile, self.example_user("othello"), "hello")
             self.send_stream_message(user_profile, "Denmark", "**hello**")
 
-            result = self.tornado_call(get_events, user_profile,
-                                       {"queue_id": queue_id,
-                                        "user_client": "website",
-                                        "last_event_id": -1,
-                                        "dont_block": orjson.dumps(True).decode(),
-                                        })
+            result = self.tornado_call(
+                get_events,
+                user_profile,
+                {
+                    "queue_id": queue_id,
+                    "user_client": "website",
+                    "last_event_id": -1,
+                    "dont_block": orjson.dumps(True).decode(),
+                },
+            )
             events = orjson.loads(result.content)["events"]
             self.assert_json_success(result)
             self.assert_length(events, 1)
@@ -326,6 +374,7 @@ class GetEventsTest(ZulipTestCase):
         self.assertEqual(message["content"], "<p><strong>hello</strong></p>")
         self.assertEqual(message["avatar_url"], None)
 
+
 class FetchInitialStateDataTest(ZulipTestCase):
     # Non-admin users don't have access to all bots
     def test_realm_bots_non_admin(self) -> None:
@@ -357,15 +406,17 @@ class FetchInitialStateDataTest(ZulipTestCase):
         user_profile = self.example_user('aaron')
         self.assertFalse(user_profile.is_realm_admin)
 
-        do_set_realm_property(user_profile.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE)
+        do_set_realm_property(
+            user_profile.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE
+        )
         result = fetch_initial_state_data(user_profile)
 
         for key, value in result['raw_users'].items():
             self.assertNotIn('delivery_email', value)
 
-        do_set_realm_property(user_profile.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            user_profile.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
         result = fetch_initial_state_data(user_profile)
 
         for key, value in result['raw_users'].items():
@@ -375,14 +426,16 @@ class FetchInitialStateDataTest(ZulipTestCase):
         user_profile = self.example_user('iago')
         self.assertTrue(user_profile.is_realm_admin)
 
-        do_set_realm_property(user_profile.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE)
+        do_set_realm_property(
+            user_profile.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE
+        )
         result = fetch_initial_state_data(user_profile)
         for key, value in result['raw_users'].items():
             self.assertNotIn('delivery_email', value)
 
-        do_set_realm_property(user_profile.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            user_profile.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
         result = fetch_initial_state_data(user_profile)
         for key, value in result['raw_users'].items():
             self.assertIn('delivery_email', value)
@@ -415,8 +468,11 @@ class FetchInitialStateDataTest(ZulipTestCase):
             else:
                 self.assertIsNotNone(user_dict['avatar_url'])
 
-        gravatar_users_id = [user_dict['user_id'] for user_dict in raw_users.values()
-                             if 'avatar_url' in user_dict and 'gravatar.com' in user_dict['avatar_url']]
+        gravatar_users_id = [
+            user_dict['user_id']
+            for user_dict in raw_users.values()
+            if 'avatar_url' in user_dict and 'gravatar.com' in user_dict['avatar_url']
+        ]
 
         # Test again with client_gravatar = True
         result = fetch_initial_state_data(
@@ -433,6 +489,7 @@ class FetchInitialStateDataTest(ZulipTestCase):
             else:
                 self.assertFalse('avatar_url' in user_dict)
 
+
 class ClientDescriptorsTest(ZulipTestCase):
     def test_get_client_info_for_all_public_streams(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -545,9 +602,9 @@ class ClientDescriptorsTest(ZulipTestCase):
         hamlet = self.example_user("hamlet")
 
         class MockClient:
-            def __init__(self, user_profile_id: int,
-                         apply_markdown: bool,
-                         client_gravatar: bool) -> None:
+            def __init__(
+                self, user_profile_id: int, apply_markdown: bool, client_gravatar: bool
+            ) -> None:
                 self.user_profile_id = user_profile_id
                 self.apply_markdown = apply_markdown
                 self.client_gravatar = client_gravatar
@@ -558,7 +615,7 @@ class ClientDescriptorsTest(ZulipTestCase):
                 return True
 
             def accepts_event(self, event: Dict[str, Any]) -> bool:
-                assert(event['type'] == 'message')
+                assert event['type'] == 'message'
                 return True
 
             def add_event(self, event: Dict[str, Any]) -> None:
@@ -617,7 +674,6 @@ class ClientDescriptorsTest(ZulipTestCase):
                 sender_id=sender.id,
                 type='stream',
                 client='website',
-
                 # NOTE: Some of these fields are clutter, but some
                 #       will be useful when we let clients specify
                 #       that they can compute their own gravatar URLs.
@@ -637,8 +693,9 @@ class ClientDescriptorsTest(ZulipTestCase):
         # and we are interested in how messages are put on event queue.
         users: List[Dict[str, Any]] = []
 
-        with mock.patch('zerver.tornado.event_queue.get_client_info_for_message_event',
-                        return_value=client_info):
+        with mock.patch(
+            'zerver.tornado.event_queue.get_client_info_for_message_event', return_value=client_info
+        ):
             process_message_event(message_event, users)
 
         # We are not closely examining avatar_url at this point, so
@@ -649,71 +706,84 @@ class ClientDescriptorsTest(ZulipTestCase):
             self.assertIn('gravatar.com', message['avatar_url'])
             message.pop('avatar_url')
 
-        self.assertEqual(client1.events, [
-            dict(
-                type='message',
-                message=dict(
-                    type='stream',
-                    sender_id=sender.id,
-                    sender_email=sender.email,
-                    id=999,
-                    content='<b>hello</b>',
-                    content_type='text/html',
-                    client='website',
+        self.assertEqual(
+            client1.events,
+            [
+                dict(
+                    type='message',
+                    message=dict(
+                        type='stream',
+                        sender_id=sender.id,
+                        sender_email=sender.email,
+                        id=999,
+                        content='<b>hello</b>',
+                        content_type='text/html',
+                        client='website',
+                    ),
+                    flags=['starred'],
                 ),
-                flags=['starred'],
-            ),
-        ])
+            ],
+        )
 
-        self.assertEqual(client2.events, [
-            dict(
-                type='message',
-                message=dict(
-                    type='stream',
-                    sender_id=sender.id,
-                    sender_email=sender.email,
-                    id=999,
-                    content='**hello**',
-                    content_type='text/x-markdown',
-                    client='website',
+        self.assertEqual(
+            client2.events,
+            [
+                dict(
+                    type='message',
+                    message=dict(
+                        type='stream',
+                        sender_id=sender.id,
+                        sender_email=sender.email,
+                        id=999,
+                        content='**hello**',
+                        content_type='text/x-markdown',
+                        client='website',
+                    ),
+                    flags=['has_alert_word'],
                 ),
-                flags=['has_alert_word'],
-            ),
-        ])
+            ],
+        )
 
-        self.assertEqual(client3.events, [
-            dict(
-                type='message',
-                message=dict(
-                    type='stream',
-                    sender_id=sender.id,
-                    sender_email=sender.email,
-                    avatar_url=None,
-                    id=999,
-                    content='<b>hello</b>',
-                    content_type='text/html',
-                    client='website',
+        self.assertEqual(
+            client3.events,
+            [
+                dict(
+                    type='message',
+                    message=dict(
+                        type='stream',
+                        sender_id=sender.id,
+                        sender_email=sender.email,
+                        avatar_url=None,
+                        id=999,
+                        content='<b>hello</b>',
+                        content_type='text/html',
+                        client='website',
+                    ),
+                    flags=[],
                 ),
-                flags=[],
-            ),
-        ])
+            ],
+        )
 
-        self.assertEqual(client4.events, [
-            dict(
-                type='message',
-                message=dict(
-                    type='stream',
-                    sender_id=sender.id,
-                    sender_email=sender.email,
-                    avatar_url=None,
-                    id=999,
-                    content='**hello**',
-                    content_type='text/x-markdown',
-                    client='website',
+        self.assertEqual(
+            client4.events,
+            [
+                dict(
+                    type='message',
+                    message=dict(
+                        type='stream',
+                        sender_id=sender.id,
+                        sender_email=sender.email,
+                        avatar_url=None,
+                        id=999,
+                        content='**hello**',
+                        content_type='text/x-markdown',
+                        client='website',
+                    ),
+                    flags=[],
                 ),
-                flags=[],
-            ),
-        ])
+            ],
+        )
+
 
 class FetchQueriesTest(ZulipTestCase):
     def test_queries(self) -> None:
@@ -758,10 +828,7 @@ class FetchQueriesTest(ZulipTestCase):
             video_calls=0,
         )
 
-        wanted_event_types = {
-            item[0][0] for item
-            in want_mock.call_args_list
-        }
+        wanted_event_types = {item[0][0] for item in want_mock.call_args_list}
 
         self.assertEqual(wanted_event_types, set(expected_counts))
 
@@ -820,6 +887,7 @@ class TestEventsRegisterAllPublicStreamsDefaults(ZulipTestCase):
         result = _default_all_public_streams(self.user_profile, None)
         self.assertFalse(result)
 
+
 class TestEventsRegisterNarrowDefaults(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -851,10 +919,15 @@ class TestEventsRegisterNarrowDefaults(ZulipTestCase):
         result = _default_narrow(self.user_profile, [])
         self.assertEqual(result, [])
 
+
 class TestGetRawUserDataSystemBotRealm(ZulipTestCase):
     def test_get_raw_user_data_on_system_bot_realm(self) -> None:
-        result = get_raw_user_data(get_realm("zulipinternal"), self.example_user('hamlet'),
-                                   client_gravatar=True, user_avatar_url_field_optional=True)
+        result = get_raw_user_data(
+            get_realm("zulipinternal"),
+            self.example_user('hamlet'),
+            client_gravatar=True,
+            user_avatar_url_field_optional=True,
+        )
 
         for bot_email in settings.CROSS_REALM_BOT_EMAILS:
             bot_profile = get_system_bot(bot_email)
diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
index f451bbc8ff..aeaa14c398 100644
--- a/zerver/tests/test_events.py
+++ b/zerver/tests/test_events.py
@@ -193,46 +193,51 @@ class BaseAction(ZulipTestCase):
     See https://zulip.readthedocs.io/en/latest/subsystems/events-system.html#testing
     for extensive design details for this testing system.
     """
+
     def setUp(self) -> None:
         super().setUp()
         self.user_profile = self.example_user('hamlet')
 
-    def verify_action(self,
-                      action: Callable[[], object],
-                      *,
-                      event_types: Optional[List[str]]=None,
-                      include_subscribers: bool=True,
-                      state_change_expected: bool=True,
-                      notification_settings_null: bool=False,
-                      client_gravatar: bool=True,
-                      user_avatar_url_field_optional: bool=False,
-                      slim_presence: bool=False,
-                      include_streams: bool=True,
-                      num_events: int=1,
-                      bulk_message_deletion: bool=True) -> List[Dict[str, Any]]:
-        '''
+    def verify_action(
+        self,
+        action: Callable[[], object],
+        *,
+        event_types: Optional[List[str]] = None,
+        include_subscribers: bool = True,
+        state_change_expected: bool = True,
+        notification_settings_null: bool = False,
+        client_gravatar: bool = True,
+        user_avatar_url_field_optional: bool = False,
+        slim_presence: bool = False,
+        include_streams: bool = True,
+        num_events: int = 1,
+        bulk_message_deletion: bool = True,
+    ) -> List[Dict[str, Any]]:
+        """
         Make sure we have a clean slate of client descriptors for these tests.
         If we don't do this, then certain failures will only manifest when you
         run multiple tests within a single test function.
 
         See also https://zulip.readthedocs.io/en/latest/subsystems/events-system.html#testing
         for details on the design of this test system.
-        '''
+        """
         clear_client_event_queues_for_testing()
 
         client = allocate_client_descriptor(
-            dict(user_profile_id = self.user_profile.id,
-                 realm_id = self.user_profile.realm_id,
-                 event_types = event_types,
-                 client_type_name = "website",
-                 apply_markdown = True,
-                 client_gravatar = client_gravatar,
-                 slim_presence = slim_presence,
-                 all_public_streams = False,
-                 queue_timeout = 600,
-                 last_connection_time = time.time(),
-                 narrow = [],
-                 bulk_message_deletion = bulk_message_deletion)
+            dict(
+                user_profile_id=self.user_profile.id,
+                realm_id=self.user_profile.realm_id,
+                event_types=event_types,
+                client_type_name="website",
+                apply_markdown=True,
+                client_gravatar=client_gravatar,
+                slim_presence=slim_presence,
+                all_public_streams=False,
+                queue_timeout=600,
+                last_connection_time=time.time(),
+                narrow=[],
+                bulk_message_deletion=bulk_message_deletion,
+            )
         )
 
         # hybrid_state = initial fetch state + re-applying events triggered by our action
@@ -254,7 +259,7 @@ class BaseAction(ZulipTestCase):
             # as tuples aren't valid JSON structure.
             'events': orjson.loads(orjson.dumps(events)),
             'msg': '',
-            'result': 'success'
+            'result': 'success',
         }
         validate_against_openapi_schema(content, '/events', 'get', '200', display_brief_error=True)
         self.assertEqual(len(events), num_events)
@@ -277,7 +282,9 @@ class BaseAction(ZulipTestCase):
             if before == after:  # nocoverage
                 print(orjson.dumps(initial_state, option=orjson.OPT_INDENT_2).decode())
                 print(events)
-                raise AssertionError('Test does not exercise enough code -- events do not change state.')
+                raise AssertionError(
+                    'Test does not exercise enough code -- events do not change state.'
+                )
         else:
             try:
                 self.match_states(initial_state, copy.deepcopy(hybrid_state), events)
@@ -297,8 +304,9 @@ class BaseAction(ZulipTestCase):
         self.match_states(hybrid_state, normal_state, events)
         return events
 
-    def match_states(self, state1: Dict[str, Any], state2: Dict[str, Any],
-                     events: List[Dict[str, Any]]) -> None:
+    def match_states(
+        self, state1: Dict[str, Any], state2: Dict[str, Any], events: List[Dict[str, Any]]
+    ) -> None:
         def normalize(state: Dict[str, Any]) -> None:
             for u in state['never_subscribed']:
                 if 'subscribers' in u:
@@ -310,6 +318,7 @@ class BaseAction(ZulipTestCase):
             state['unsubscribed'] = {u['name']: u for u in state['unsubscribed']}
             if 'realm_bots' in state:
                 state['realm_bots'] = {u['email']: u for u in state['realm_bots']}
+
         normalize(state1)
         normalize(state2)
 
@@ -327,6 +336,7 @@ class BaseAction(ZulipTestCase):
             # Printing out the events is a big help to
             # developers.
             import json
+
             for event in events:
                 print(json.dumps(event, indent=4))
 
@@ -338,18 +348,21 @@ class BaseAction(ZulipTestCase):
                         self.assertEqual({k: state1[k]}, {k: state2[k]})
                     except AssertionError as e:
                         print(e)
-            print('''
+            print(
+                '''
                 NOTE:
 
                     This is an advanced test that verifies how
                     we apply events after fetching data.  If you
                     do not know how to debug it, you can ask for
                     help on chat.
-                ''')
+                '''
+            )
 
             sys.stdout.flush()
             raise AssertionError('Mismatching states')
 
+
 class NormalActionsTest(BaseAction):
     def create_bot(self, email: str, **extras: Any) -> UserProfile:
         return self.create_test_bot(email, self.user_profile, **extras)
@@ -360,28 +373,21 @@ class NormalActionsTest(BaseAction):
         for i in range(3):
             content = 'mentioning... @**' + user.full_name + '** hello ' + str(i)
             self.verify_action(
-                lambda: self.send_stream_message(self.example_user('cordelia'),
-                                                 "Verona",
-                                                 content),
-
+                lambda: self.send_stream_message(self.example_user('cordelia'), "Verona", content),
             )
 
     def test_wildcard_mentioned_send_message_events(self) -> None:
         for i in range(3):
             content = 'mentioning... @**all** hello ' + str(i)
             self.verify_action(
-                lambda: self.send_stream_message(self.example_user('cordelia'),
-                                                 "Verona",
-                                                 content),
-
+                lambda: self.send_stream_message(self.example_user('cordelia'), "Verona", content),
             )
 
     def test_pm_send_message_events(self) -> None:
         self.verify_action(
-            lambda: self.send_personal_message(self.example_user('cordelia'),
-                                               self.example_user('hamlet'),
-                                               'hola'),
-
+            lambda: self.send_personal_message(
+                self.example_user('cordelia'), self.example_user('hamlet'), 'hola'
+            ),
         )
 
     def test_huddle_send_message_events(self) -> None:
@@ -390,10 +396,7 @@ class NormalActionsTest(BaseAction):
             self.example_user('othello'),
         ]
         self.verify_action(
-            lambda: self.send_huddle_message(self.example_user('cordelia'),
-                                             huddle,
-                                             'hola'),
-
+            lambda: self.send_huddle_message(self.example_user('cordelia'), huddle, 'hola'),
         )
 
     def test_stream_send_message_events(self) -> None:
@@ -437,7 +440,8 @@ class NormalActionsTest(BaseAction):
                 rendered_content,
                 prior_mention_user_ids,
                 mentioned_user_ids,
-                mention_data),
+                mention_data,
+            ),
             state_change_expected=True,
         )
         check_update_message(
@@ -449,8 +453,9 @@ class NormalActionsTest(BaseAction):
         )
 
         events = self.verify_action(
-            lambda: do_update_embedded_data(self.user_profile, message,
-                                            "embed_content", "<p>embed_content</p>"),
+            lambda: do_update_embedded_data(
+                self.user_profile, message, "embed_content", "<p>embed_content</p>"
+            ),
             state_change_expected=False,
         )
         check_update_message_embedded('events[0]', events[0])
@@ -479,7 +484,8 @@ class NormalActionsTest(BaseAction):
                 None,
                 set(),
                 set(),
-                None),
+                None,
+            ),
             state_change_expected=True,
             # There are 3 events generated for this action
             # * update_message: For updating existing messages
@@ -503,13 +509,17 @@ class NormalActionsTest(BaseAction):
         )
         user_profile = self.example_user('hamlet')
         events = self.verify_action(
-            lambda: do_update_message_flags(user_profile, get_client("website"), 'add', 'starred', [message]),
+            lambda: do_update_message_flags(
+                user_profile, get_client("website"), 'add', 'starred', [message]
+            ),
             state_change_expected=True,
         )
         check_update_message_flags_add("events[0]", events[0])
 
         events = self.verify_action(
-            lambda: do_update_message_flags(user_profile, get_client("website"), 'remove', 'starred', [message]),
+            lambda: do_update_message_flags(
+                user_profile, get_client("website"), 'remove', 'starred', [message]
+            ),
             state_change_expected=True,
         )
         check_update_message_flags_remove("events[0]", events[0])
@@ -527,7 +537,9 @@ class NormalActionsTest(BaseAction):
             )
 
             self.verify_action(
-                lambda: do_update_message_flags(user_profile, get_client("website"), 'add', 'read', [message]),
+                lambda: do_update_message_flags(
+                    user_profile, get_client("website"), 'add', 'read', [message]
+                ),
                 state_change_expected=True,
             )
 
@@ -547,8 +559,7 @@ class NormalActionsTest(BaseAction):
         message_id = self.send_stream_message(self.example_user("hamlet"), "Verona", "hello")
         message = Message.objects.get(id=message_id)
         events = self.verify_action(
-            lambda: do_add_reaction(
-                self.user_profile, message, "tada", "1f389", "unicode_emoji"),
+            lambda: do_add_reaction(self.user_profile, message, "tada", "1f389", "unicode_emoji"),
             state_change_expected=False,
         )
         check_reaction_add("events[0]", events[0])
@@ -577,8 +588,7 @@ class NormalActionsTest(BaseAction):
         message = Message.objects.get(id=message_id)
         do_add_reaction(self.user_profile, message, "tada", "1f389", "unicode_emoji")
         events = self.verify_action(
-            lambda: do_remove_reaction(
-                self.user_profile, message, "1f389", "unicode_emoji"),
+            lambda: do_remove_reaction(self.user_profile, message, "1f389", "unicode_emoji"),
             state_change_expected=False,
         )
         check_reaction_remove("events[0]", events[0])
@@ -601,7 +611,9 @@ class NormalActionsTest(BaseAction):
             streams.append(get_stream(stream_name, self.user_profile.realm))
 
         events = self.verify_action(
-            lambda: do_create_multiuse_invite_link(self.user_profile, PreregistrationUser.INVITE_AS['MEMBER'], streams),
+            lambda: do_create_multiuse_invite_link(
+                self.user_profile, PreregistrationUser.INVITE_AS['MEMBER'], streams
+            ),
             state_change_expected=False,
         )
         check_invites_changed('events[0]', events[0])
@@ -612,7 +624,9 @@ class NormalActionsTest(BaseAction):
         for stream_name in ["Denmark", "Verona"]:
             streams.append(get_stream(stream_name, self.user_profile.realm))
         do_invite_users(self.user_profile, ["foo@zulip.com"], streams, False)
-        prereg_users = PreregistrationUser.objects.filter(referred_by__realm=self.user_profile.realm)
+        prereg_users = PreregistrationUser.objects.filter(
+            referred_by__realm=self.user_profile.realm
+        )
         events = self.verify_action(
             lambda: do_revoke_user_invite(prereg_users[0]),
             state_change_expected=False,
@@ -624,7 +638,9 @@ class NormalActionsTest(BaseAction):
         streams = []
         for stream_name in ["Denmark", "Verona"]:
             streams.append(get_stream(stream_name, self.user_profile.realm))
-        do_create_multiuse_invite_link(self.user_profile, PreregistrationUser.INVITE_AS['MEMBER'], streams)
+        do_create_multiuse_invite_link(
+            self.user_profile, PreregistrationUser.INVITE_AS['MEMBER'], streams
+        )
 
         multiuse_object = MultiuseInvite.objects.get()
         events = self.verify_action(
@@ -661,21 +677,22 @@ class NormalActionsTest(BaseAction):
     def test_typing_events(self) -> None:
         events = self.verify_action(
             lambda: check_send_typing_notification(
-                self.user_profile, [self.example_user("cordelia").id], "start"),
+                self.user_profile, [self.example_user("cordelia").id], "start"
+            ),
             state_change_expected=False,
         )
         check_typing_start('events[0]', events[0])
         events = self.verify_action(
             lambda: check_send_typing_notification(
-                self.user_profile, [self.example_user("cordelia").id], "stop"),
+                self.user_profile, [self.example_user("cordelia").id], "stop"
+            ),
             state_change_expected=False,
         )
         check_typing_stop('events[0]', events[0])
 
     def test_custom_profile_fields_events(self) -> None:
         events = self.verify_action(
-            lambda: notify_realm_custom_profile_fields(
-                self.user_profile.realm, 'add'),
+            lambda: notify_realm_custom_profile_fields(self.user_profile.realm, 'add'),
             state_change_expected=False,
         )
         check_custom_profile_fields('events[0]', events[0])
@@ -687,54 +704,48 @@ class NormalActionsTest(BaseAction):
         try_update_realm_custom_profile_field(realm, field, name, hint=hint)
 
         events = self.verify_action(
-            lambda: notify_realm_custom_profile_fields(
-                self.user_profile.realm, 'add'),
+            lambda: notify_realm_custom_profile_fields(self.user_profile.realm, 'add'),
             state_change_expected=False,
         )
         check_custom_profile_fields('events[0]', events[0])
 
     def test_custom_profile_field_data_events(self) -> None:
         field_id = self.user_profile.realm.customprofilefield_set.get(
-            realm=self.user_profile.realm, name='Biography').id
+            realm=self.user_profile.realm, name='Biography'
+        ).id
         field = {
             "id": field_id,
             "value": "New value",
         }
         events = self.verify_action(
-            lambda: do_update_user_custom_profile_data_if_changed(
-                self.user_profile,
-                [field]))
+            lambda: do_update_user_custom_profile_data_if_changed(self.user_profile, [field])
+        )
         check_realm_user_update('events[0]', events[0], "custom_profile_field")
         self.assertEqual(
-            events[0]['person']['custom_profile_field'].keys(),
-            {"id", "value", "rendered_value"}
+            events[0]['person']['custom_profile_field'].keys(), {"id", "value", "rendered_value"}
         )
 
         # Test we pass correct stringify value in custom-user-field data event
         field_id = self.user_profile.realm.customprofilefield_set.get(
-            realm=self.user_profile.realm, name='Mentor').id
+            realm=self.user_profile.realm, name='Mentor'
+        ).id
         field = {
             "id": field_id,
             "value": [self.example_user("ZOE").id],
         }
         events = self.verify_action(
-            lambda: do_update_user_custom_profile_data_if_changed(
-                self.user_profile,
-                [field]))
-        check_realm_user_update('events[0]', events[0], "custom_profile_field")
-        self.assertEqual(
-            events[0]['person']['custom_profile_field'].keys(),
-            {"id", "value"}
+            lambda: do_update_user_custom_profile_data_if_changed(self.user_profile, [field])
         )
+        check_realm_user_update('events[0]', events[0], "custom_profile_field")
+        self.assertEqual(events[0]['person']['custom_profile_field'].keys(), {"id", "value"})
 
     def test_presence_events(self) -> None:
         events = self.verify_action(
             lambda: do_update_user_presence(
-                self.user_profile,
-                get_client("website"),
-                timezone_now(),
-                UserPresence.ACTIVE),
-            slim_presence=False)
+                self.user_profile, get_client("website"), timezone_now(), UserPresence.ACTIVE
+            ),
+            slim_presence=False,
+        )
 
         check_presence(
             "events[0]",
@@ -749,8 +760,10 @@ class NormalActionsTest(BaseAction):
                 self.example_user('cordelia'),
                 get_client("website"),
                 timezone_now(),
-                UserPresence.ACTIVE),
-            slim_presence=True)
+                UserPresence.ACTIVE,
+            ),
+            slim_presence=True,
+        )
 
         check_presence(
             "events[0]",
@@ -761,20 +774,22 @@ class NormalActionsTest(BaseAction):
         )
 
     def test_presence_events_multiple_clients(self) -> None:
-        self.api_post(self.user_profile, "/api/v1/users/me/presence", {'status': 'idle'},
-                      HTTP_USER_AGENT="ZulipAndroid/1.0")
+        self.api_post(
+            self.user_profile,
+            "/api/v1/users/me/presence",
+            {'status': 'idle'},
+            HTTP_USER_AGENT="ZulipAndroid/1.0",
+        )
         self.verify_action(
             lambda: do_update_user_presence(
-                self.user_profile,
-                get_client("website"),
-                timezone_now(),
-                UserPresence.ACTIVE))
+                self.user_profile, get_client("website"), timezone_now(), UserPresence.ACTIVE
+            )
+        )
         events = self.verify_action(
             lambda: do_update_user_presence(
-                self.user_profile,
-                get_client("ZulipAndroid/1.0"),
-                timezone_now(),
-                UserPresence.IDLE))
+                self.user_profile, get_client("ZulipAndroid/1.0"), timezone_now(), UserPresence.IDLE
+            )
+        )
 
         check_presence(
             "events[0]",
@@ -785,31 +800,32 @@ class NormalActionsTest(BaseAction):
         )
 
     def test_register_events(self) -> None:
-        events = self.verify_action(
-            lambda: self.register("test1@zulip.com", "test1"))
+        events = self.verify_action(lambda: self.register("test1@zulip.com", "test1"))
         self.assert_length(events, 1)
         check_realm_user_add('events[0]', events[0])
         new_user_profile = get_user_by_delivery_email("test1@zulip.com", self.user_profile.realm)
         self.assertEqual(new_user_profile.delivery_email, "test1@zulip.com")
 
     def test_register_events_email_address_visibility(self) -> None:
-        do_set_realm_property(self.user_profile.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            self.user_profile.realm,
+            "email_address_visibility",
+            Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS,
+        )
 
-        events = self.verify_action(
-            lambda: self.register("test1@zulip.com", "test1"))
+        events = self.verify_action(lambda: self.register("test1@zulip.com", "test1"))
         self.assert_length(events, 1)
         check_realm_user_add('events[0]', events[0])
         new_user_profile = get_user_by_delivery_email("test1@zulip.com", self.user_profile.realm)
         self.assertEqual(new_user_profile.email, f"user{new_user_profile.id}@zulip.testserver")
 
     def test_alert_words_events(self) -> None:
-        events = self.verify_action(
-            lambda: do_add_alert_words(self.user_profile, ["alert_word"]))
+        events = self.verify_action(lambda: do_add_alert_words(self.user_profile, ["alert_word"]))
         check_alert_words('events[0]', events[0])
 
         events = self.verify_action(
-            lambda: do_remove_alert_words(self.user_profile, ["alert_word"]))
+            lambda: do_remove_alert_words(self.user_profile, ["alert_word"])
+        )
         check_alert_words('events[0]', events[0])
 
     def test_away_events(self) -> None:
@@ -819,25 +835,25 @@ class NormalActionsTest(BaseAction):
                 user_profile=self.user_profile,
                 away=True,
                 status_text='out to lunch',
-                client_id=client.id))
+                client_id=client.id,
+            )
+        )
 
         check_user_status("events[0]", events[0], {"away", "status_text"})
 
         events = self.verify_action(
             lambda: do_update_user_status(
-                user_profile=self.user_profile,
-                away=False,
-                status_text='',
-                client_id=client.id))
+                user_profile=self.user_profile, away=False, status_text='', client_id=client.id
+            )
+        )
 
         check_user_status("events[0]", events[0], {"away", "status_text"})
 
         events = self.verify_action(
             lambda: do_update_user_status(
-                user_profile=self.user_profile,
-                away=True,
-                status_text=None,
-                client_id=client.id))
+                user_profile=self.user_profile, away=True, status_text=None, client_id=client.id
+            )
+        )
 
         check_user_status("events[0]", events[0], {"away"})
 
@@ -846,7 +862,9 @@ class NormalActionsTest(BaseAction):
                 user_profile=self.user_profile,
                 away=None,
                 status_text="at the beach",
-                client_id=client.id))
+                client_id=client.id,
+            )
+        )
 
         check_user_status("events[0]", events[0], {"status_text"})
 
@@ -854,39 +872,33 @@ class NormalActionsTest(BaseAction):
         othello = self.example_user('othello')
         events = self.verify_action(
             lambda: check_add_user_group(
-                self.user_profile.realm,
-                'backend',
-                [othello],
-                'Backend team'))
+                self.user_profile.realm, 'backend', [othello], 'Backend team'
+            )
+        )
         check_user_group_add('events[0]', events[0])
 
         # Test name update
         backend = UserGroup.objects.get(name='backend')
-        events = self.verify_action(
-            lambda: do_update_user_group_name(backend, 'backendteam'))
+        events = self.verify_action(lambda: do_update_user_group_name(backend, 'backendteam'))
         check_user_group_update('events[0]', events[0], 'name')
 
         # Test description update
         description = "Backend team to deal with backend code."
-        events = self.verify_action(
-            lambda: do_update_user_group_description(backend, description))
+        events = self.verify_action(lambda: do_update_user_group_description(backend, description))
         check_user_group_update('events[0]', events[0], 'description')
 
         # Test add members
         hamlet = self.example_user('hamlet')
-        events = self.verify_action(
-            lambda: bulk_add_members_to_user_group(backend, [hamlet]))
+        events = self.verify_action(lambda: bulk_add_members_to_user_group(backend, [hamlet]))
         check_user_group_add_members('events[0]', events[0])
 
         # Test remove members
         hamlet = self.example_user('hamlet')
-        events = self.verify_action(
-            lambda: remove_members_from_user_group(backend, [hamlet]))
+        events = self.verify_action(lambda: remove_members_from_user_group(backend, [hamlet]))
         check_user_group_remove_members('events[0]', events[0])
 
         # Test remove event
-        events = self.verify_action(
-            lambda: check_delete_user_group(backend.id, othello))
+        events = self.verify_action(lambda: check_delete_user_group(backend.id, othello))
         check_user_group_remove('events[0]', events[0])
 
     def test_default_stream_groups_events(self) -> None:
@@ -896,44 +908,44 @@ class NormalActionsTest(BaseAction):
 
         events = self.verify_action(
             lambda: do_create_default_stream_group(
-                self.user_profile.realm,
-                "group1",
-                "This is group1",
-                streams))
+                self.user_profile.realm, "group1", "This is group1", streams
+            )
+        )
         check_default_stream_groups('events[0]', events[0])
 
         group = lookup_default_stream_groups(["group1"], self.user_profile.realm)[0]
         venice_stream = get_stream("Venice", self.user_profile.realm)
         events = self.verify_action(
             lambda: do_add_streams_to_default_stream_group(
-                self.user_profile.realm,
-                group,
-                [venice_stream]))
+                self.user_profile.realm, group, [venice_stream]
+            )
+        )
         check_default_stream_groups('events[0]', events[0])
 
         events = self.verify_action(
             lambda: do_remove_streams_from_default_stream_group(
-                self.user_profile.realm,
-                group,
-                [venice_stream]))
+                self.user_profile.realm, group, [venice_stream]
+            )
+        )
         check_default_stream_groups('events[0]', events[0])
 
         events = self.verify_action(
             lambda: do_change_default_stream_group_description(
-                self.user_profile.realm,
-                group,
-                "New description"))
+                self.user_profile.realm, group, "New description"
+            )
+        )
         check_default_stream_groups('events[0]', events[0])
 
         events = self.verify_action(
             lambda: do_change_default_stream_group_name(
-                self.user_profile.realm,
-                group,
-                "New Group Name"))
+                self.user_profile.realm, group, "New Group Name"
+            )
+        )
         check_default_stream_groups('events[0]', events[0])
 
         events = self.verify_action(
-            lambda: do_remove_default_stream_group(self.user_profile.realm, group))
+            lambda: do_remove_default_stream_group(self.user_profile.realm, group)
+        )
         check_default_stream_groups('events[0]', events[0])
 
     def test_default_stream_group_events_guest(self) -> None:
@@ -941,67 +953,58 @@ class NormalActionsTest(BaseAction):
         for stream_name in ["Scotland", "Verona", "Denmark"]:
             streams.append(get_stream(stream_name, self.user_profile.realm))
 
-        do_create_default_stream_group(self.user_profile.realm, "group1",
-                                       "This is group1", streams)
+        do_create_default_stream_group(self.user_profile.realm, "group1", "This is group1", streams)
         group = lookup_default_stream_groups(["group1"], self.user_profile.realm)[0]
 
         do_change_user_role(self.user_profile, UserProfile.ROLE_GUEST)
         venice_stream = get_stream("Venice", self.user_profile.realm)
         self.verify_action(
             lambda: do_add_streams_to_default_stream_group(
-                self.user_profile.realm,
-                group,
-                [venice_stream]),
-            state_change_expected = False,
-            num_events=0)
+                self.user_profile.realm, group, [venice_stream]
+            ),
+            state_change_expected=False,
+            num_events=0,
+        )
 
     def test_default_streams_events(self) -> None:
         stream = get_stream("Scotland", self.user_profile.realm)
-        events = self.verify_action(
-            lambda: do_add_default_stream(stream))
+        events = self.verify_action(lambda: do_add_default_stream(stream))
         check_default_streams('events[0]', events[0])
-        events = self.verify_action(
-            lambda: do_remove_default_stream(stream))
+        events = self.verify_action(lambda: do_remove_default_stream(stream))
         check_default_streams('events[0]', events[0])
 
     def test_default_streams_events_guest(self) -> None:
         do_change_user_role(self.user_profile, UserProfile.ROLE_GUEST)
         stream = get_stream("Scotland", self.user_profile.realm)
         self.verify_action(
-            lambda: do_add_default_stream(stream),
-            state_change_expected = False,
-            num_events=0)
+            lambda: do_add_default_stream(stream), state_change_expected=False, num_events=0
+        )
         self.verify_action(
-            lambda: do_remove_default_stream(stream),
-            state_change_expected = False,
-            num_events=0)
+            lambda: do_remove_default_stream(stream), state_change_expected=False, num_events=0
+        )
 
     def test_muted_topics_events(self) -> None:
         stream = get_stream('Denmark', self.user_profile.realm)
-        events = self.verify_action(
-            lambda: do_mute_topic(
-                self.user_profile,
-                stream,
-                "topic"))
+        events = self.verify_action(lambda: do_mute_topic(self.user_profile, stream, "topic"))
         check_muted_topics('events[0]', events[0])
 
-        events = self.verify_action(
-            lambda: do_unmute_topic(
-                self.user_profile,
-                stream,
-                "topic"))
+        events = self.verify_action(lambda: do_unmute_topic(self.user_profile, stream, "topic"))
         check_muted_topics('events[0]', events[0])
 
     def test_change_avatar_fields(self) -> None:
         events = self.verify_action(
-            lambda: do_change_avatar_fields(self.user_profile, UserProfile.AVATAR_FROM_USER, acting_user=self.user_profile),
+            lambda: do_change_avatar_fields(
+                self.user_profile, UserProfile.AVATAR_FROM_USER, acting_user=self.user_profile
+            ),
         )
         check_realm_user_update('events[0]', events[0], "avatar_fields")
         assert isinstance(events[0]['person']['avatar_url'], str)
         assert isinstance(events[0]['person']['avatar_url_medium'], str)
 
         events = self.verify_action(
-            lambda: do_change_avatar_fields(self.user_profile, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=self.user_profile),
+            lambda: do_change_avatar_fields(
+                self.user_profile, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=self.user_profile
+            ),
         )
         check_realm_user_update('events[0]', events[0], "avatar_fields")
         self.assertEqual(events[0]['person']['avatar_url'], None)
@@ -1009,24 +1012,22 @@ class NormalActionsTest(BaseAction):
 
     def test_change_full_name(self) -> None:
         events = self.verify_action(
-            lambda: do_change_full_name(
-                self.user_profile,
-                'Sir Hamlet',
-                self.user_profile))
+            lambda: do_change_full_name(self.user_profile, 'Sir Hamlet', self.user_profile)
+        )
         check_realm_user_update('events[0]', events[0], 'full_name')
 
     def test_change_user_delivery_email_email_address_visibilty_admins(self) -> None:
-        do_set_realm_property(self.user_profile.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            self.user_profile.realm,
+            "email_address_visibility",
+            Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS,
+        )
         # Important: We need to refresh from the database here so that
         # we don't have a stale UserProfile object with an old value
         # for email being passed into this next function.
         self.user_profile.refresh_from_db()
         action = lambda: do_change_user_delivery_email(self.user_profile, 'newhamlet@zulip.com')
-        events = self.verify_action(
-            action,
-            num_events=2,
-            client_gravatar=False)
+        events = self.verify_action(action, num_events=2, client_gravatar=False)
 
         check_realm_user_update('events[0]', events[0], "delivery_email")
         check_realm_user_update('events[1]', events[1], "avatar_fields")
@@ -1045,19 +1046,21 @@ class NormalActionsTest(BaseAction):
             return self.settings(AUTHENTICATION_BACKENDS=backends)
 
         # Test transitions; any new backends should be tested with T/T/T/F/T
-        for (auth_method_dict) in \
-                ({'Google': True, 'Email': True, 'GitHub': True, 'LDAP': False, 'Dev': False},
-                 {'Google': True, 'Email': True, 'GitHub': False, 'LDAP': False, 'Dev': False},
-                 {'Google': True, 'Email': False, 'GitHub': False, 'LDAP': False, 'Dev': False},
-                 {'Google': True, 'Email': False, 'GitHub': True, 'LDAP': False, 'Dev': False},
-                 {'Google': False, 'Email': False, 'GitHub': False, 'LDAP': False, 'Dev': True},
-                 {'Google': False, 'Email': False, 'GitHub': True, 'LDAP': False, 'Dev': True},
-                 {'Google': False, 'Email': True, 'GitHub': True, 'LDAP': True, 'Dev': False}):
+        for auth_method_dict in (
+            {'Google': True, 'Email': True, 'GitHub': True, 'LDAP': False, 'Dev': False},
+            {'Google': True, 'Email': True, 'GitHub': False, 'LDAP': False, 'Dev': False},
+            {'Google': True, 'Email': False, 'GitHub': False, 'LDAP': False, 'Dev': False},
+            {'Google': True, 'Email': False, 'GitHub': True, 'LDAP': False, 'Dev': False},
+            {'Google': False, 'Email': False, 'GitHub': False, 'LDAP': False, 'Dev': True},
+            {'Google': False, 'Email': False, 'GitHub': True, 'LDAP': False, 'Dev': True},
+            {'Google': False, 'Email': True, 'GitHub': True, 'LDAP': True, 'Dev': False},
+        ):
             with fake_backends():
                 events = self.verify_action(
                     lambda: do_set_realm_authentication_methods(
-                        self.user_profile.realm,
-                        auth_method_dict))
+                        self.user_profile.realm, auth_method_dict
+                    )
+                )
 
             check_realm_update_dict('events[0]', events[0])
 
@@ -1068,11 +1071,9 @@ class NormalActionsTest(BaseAction):
         for pinned in (True, False):
             events = self.verify_action(
                 lambda: do_change_subscription_property(
-                    self.user_profile,
-                    sub,
-                    stream,
-                    "pin_to_top",
-                    pinned))
+                    self.user_profile, sub, stream, "pin_to_top", pinned
+                )
+            )
             check_subscription_update(
                 "events[0]",
                 events[0],
@@ -1089,11 +1090,10 @@ class NormalActionsTest(BaseAction):
             for value in (True, False):
                 events = self.verify_action(
                     lambda: do_change_subscription_property(
-                        self.user_profile,
-                        sub,
-                        stream,
-                        setting_name, value),
-                    notification_settings_null=True)
+                        self.user_profile, sub, stream, setting_name, value
+                    ),
+                    notification_settings_null=True,
+                )
                 check_subscription_update(
                     "events[0]",
                     events[0],
@@ -1104,11 +1104,9 @@ class NormalActionsTest(BaseAction):
             for value in (True, False):
                 events = self.verify_action(
                     lambda: do_change_subscription_property(
-                        self.user_profile,
-                        sub,
-                        stream,
-                        setting_name,
-                        value))
+                        self.user_profile, sub, stream, setting_name, value
+                    )
+                )
                 check_subscription_update(
                     "events[0]",
                     events[0],
@@ -1118,14 +1116,22 @@ class NormalActionsTest(BaseAction):
 
     def test_change_realm_message_edit_settings(self) -> None:
         # Test every transition among the four possibilities {T,F} x {0, non-0}
-        for (allow_message_editing, message_content_edit_limit_seconds) in \
-            ((True, 0), (False, 0), (False, 1234),
-             (True, 600), (False, 0), (True, 1234)):
+        for (allow_message_editing, message_content_edit_limit_seconds) in (
+            (True, 0),
+            (False, 0),
+            (False, 1234),
+            (True, 600),
+            (False, 0),
+            (True, 1234),
+        ):
             events = self.verify_action(
-                lambda: do_set_realm_message_editing(self.user_profile.realm,
-                                                     allow_message_editing,
-                                                     message_content_edit_limit_seconds,
-                                                     False))
+                lambda: do_set_realm_message_editing(
+                    self.user_profile.realm,
+                    allow_message_editing,
+                    message_content_edit_limit_seconds,
+                    False,
+                )
+            )
             check_realm_update_dict('events[0]', events[0])
 
     def test_change_realm_notifications_stream(self) -> None:
@@ -1134,19 +1140,26 @@ class NormalActionsTest(BaseAction):
 
         for notifications_stream, notifications_stream_id in ((stream, stream.id), (None, -1)):
             events = self.verify_action(
-                lambda: do_set_realm_notifications_stream(self.user_profile.realm,
-                                                          notifications_stream,
-                                                          notifications_stream_id))
+                lambda: do_set_realm_notifications_stream(
+                    self.user_profile.realm, notifications_stream, notifications_stream_id
+                )
+            )
             check_realm_update('events[0]', events[0], 'notifications_stream_id')
 
     def test_change_realm_signup_notifications_stream(self) -> None:
         stream = get_stream("Rome", self.user_profile.realm)
 
-        for signup_notifications_stream, signup_notifications_stream_id in ((stream, stream.id), (None, -1)):
+        for signup_notifications_stream, signup_notifications_stream_id in (
+            (stream, stream.id),
+            (None, -1),
+        ):
             events = self.verify_action(
-                lambda: do_set_realm_signup_notifications_stream(self.user_profile.realm,
-                                                                 signup_notifications_stream,
-                                                                 signup_notifications_stream_id))
+                lambda: do_set_realm_signup_notifications_stream(
+                    self.user_profile.realm,
+                    signup_notifications_stream,
+                    signup_notifications_stream_id,
+                )
+            )
             check_realm_update('events[0]', events[0], 'signup_notifications_stream_id')
 
     def test_change_is_admin(self) -> None:
@@ -1159,8 +1172,7 @@ class NormalActionsTest(BaseAction):
 
         do_change_user_role(self.user_profile, UserProfile.ROLE_MEMBER)
         for role in [UserProfile.ROLE_REALM_ADMINISTRATOR, UserProfile.ROLE_MEMBER]:
-            events = self.verify_action(
-                lambda: do_change_user_role(self.user_profile, role))
+            events = self.verify_action(lambda: do_change_user_role(self.user_profile, role))
             check_realm_user_update('events[0]', events[0], 'role')
             self.assertEqual(events[0]['person']['role'], role)
 
@@ -1174,8 +1186,7 @@ class NormalActionsTest(BaseAction):
 
         do_change_user_role(self.user_profile, UserProfile.ROLE_MEMBER)
         for role in [UserProfile.ROLE_REALM_OWNER, UserProfile.ROLE_MEMBER]:
-            events = self.verify_action(
-                lambda: do_change_user_role(self.user_profile, role))
+            events = self.verify_action(lambda: do_change_user_role(self.user_profile, role))
             check_realm_user_update('events[0]', events[0], 'role')
             self.assertEqual(events[0]['person']['role'], role)
 
@@ -1189,8 +1200,7 @@ class NormalActionsTest(BaseAction):
 
         do_change_user_role(self.user_profile, UserProfile.ROLE_MEMBER)
         for role in [UserProfile.ROLE_GUEST, UserProfile.ROLE_MEMBER]:
-            events = self.verify_action(
-                lambda: do_change_user_role(self.user_profile, role))
+            events = self.verify_action(lambda: do_change_user_role(self.user_profile, role))
             check_realm_user_update('events[0]', events[0], 'role')
             self.assertEqual(events[0]['person']['role'], role)
 
@@ -1200,8 +1210,9 @@ class NormalActionsTest(BaseAction):
                 # These settings are tested in their own tests.
                 continue
 
-            do_change_notification_settings(self.user_profile, notification_setting, False,
-                                            acting_user=self.user_profile)
+            do_change_notification_settings(
+                self.user_profile, notification_setting, False, acting_user=self.user_profile
+            )
 
             for setting_value in [True, False]:
                 events = self.verify_action(
@@ -1209,26 +1220,30 @@ class NormalActionsTest(BaseAction):
                         self.user_profile,
                         notification_setting,
                         setting_value,
-                        acting_user=self.user_profile))
+                        acting_user=self.user_profile,
+                    )
+                )
                 check_update_global_notifications('events[0]', events[0], setting_value)
 
                 # Also test with notification_settings_null=True
                 events = self.verify_action(
                     lambda: do_change_notification_settings(
-                        self.user_profile, notification_setting, setting_value,
-                        acting_user=self.user_profile),
+                        self.user_profile,
+                        notification_setting,
+                        setting_value,
+                        acting_user=self.user_profile,
+                    ),
                     notification_settings_null=True,
-                    state_change_expected=False)
+                    state_change_expected=False,
+                )
                 check_update_global_notifications('events[0]', events[0], setting_value)
 
     def test_change_notification_sound(self) -> None:
         notification_setting = "notification_sound"
 
         events = self.verify_action(
-            lambda: do_change_notification_settings(
-                self.user_profile,
-                notification_setting,
-                'ding'))
+            lambda: do_change_notification_settings(self.user_profile, notification_setting, 'ding')
+        )
         check_update_global_notifications('events[0]', events[0], 'ding')
 
     def test_change_desktop_icon_count_display(self) -> None:
@@ -1236,18 +1251,16 @@ class NormalActionsTest(BaseAction):
 
         events = self.verify_action(
             lambda: do_change_notification_settings(
-                self.user_profile,
-                notification_setting,
-                2,
-                acting_user=self.user_profile))
+                self.user_profile, notification_setting, 2, acting_user=self.user_profile
+            )
+        )
         check_update_global_notifications('events[0]', events[0], 2)
 
         events = self.verify_action(
             lambda: do_change_notification_settings(
-                self.user_profile,
-                notification_setting,
-                1,
-                acting_user=self.user_profile))
+                self.user_profile, notification_setting, 1, acting_user=self.user_profile
+            )
+        )
         check_update_global_notifications('events[0]', events[0], 1)
 
     def test_realm_update_plan_type(self) -> None:
@@ -1257,8 +1270,7 @@ class NormalActionsTest(BaseAction):
         self.assertEqual(state_data['realm_plan_type'], Realm.SELF_HOSTED)
         self.assertEqual(state_data['zulip_plan_is_not_limited'], True)
 
-        events = self.verify_action(
-            lambda: do_change_plan_type(realm, Realm.LIMITED))
+        events = self.verify_action(lambda: do_change_plan_type(realm, Realm.LIMITED))
         check_realm_update('events[0]', events[0], 'plan_type')
 
         state_data = fetch_initial_state_data(self.user_profile)
@@ -1269,16 +1281,14 @@ class NormalActionsTest(BaseAction):
         author = self.example_user('iago')
         with get_test_image_file('img.png') as img_file:
             events = self.verify_action(
-                lambda: check_add_realm_emoji(
-                    self.user_profile.realm,
-                    "my_emoji",
-                    author,
-                    img_file))
+                lambda: check_add_realm_emoji(self.user_profile.realm, "my_emoji", author, img_file)
+            )
 
         check_realm_emoji_update('events[0]', events[0])
 
         events = self.verify_action(
-            lambda: do_remove_realm_emoji(self.user_profile.realm, "my_emoji"))
+            lambda: do_remove_realm_emoji(self.user_profile.realm, "my_emoji")
+        )
         check_realm_emoji_update('events[0]', events[0])
 
     def test_realm_filter_events(self) -> None:
@@ -1286,32 +1296,32 @@ class NormalActionsTest(BaseAction):
         url = "https://realm.com/my_realm_filter/%(id)s"
 
         events = self.verify_action(
-            lambda: do_add_realm_filter(self.user_profile.realm, regex, url))
+            lambda: do_add_realm_filter(self.user_profile.realm, regex, url)
+        )
         check_realm_filters('events[0]', events[0])
 
         events = self.verify_action(
-            lambda: do_remove_realm_filter(self.user_profile.realm, "#(?P<id>[123])"))
+            lambda: do_remove_realm_filter(self.user_profile.realm, "#(?P<id>[123])")
+        )
         check_realm_filters('events[0]', events[0])
 
     def test_realm_domain_events(self) -> None:
         events = self.verify_action(
-            lambda: do_add_realm_domain(self.user_profile.realm, 'zulip.org', False))
+            lambda: do_add_realm_domain(self.user_profile.realm, 'zulip.org', False)
+        )
 
         check_realm_domains_add('events[0]', events[0])
         self.assertEqual(events[0]["realm_domain"]["domain"], "zulip.org")
         self.assertEqual(events[0]["realm_domain"]["allow_subdomains"], False)
 
-        test_domain = RealmDomain.objects.get(realm=self.user_profile.realm,
-                                              domain='zulip.org')
-        events = self.verify_action(
-            lambda: do_change_realm_domain(test_domain, True))
+        test_domain = RealmDomain.objects.get(realm=self.user_profile.realm, domain='zulip.org')
+        events = self.verify_action(lambda: do_change_realm_domain(test_domain, True))
 
         check_realm_domains_change("events[0]", events[0])
         self.assertEqual(events[0]["realm_domain"]["domain"], "zulip.org")
         self.assertEqual(events[0]["realm_domain"]["allow_subdomains"], True)
 
-        events = self.verify_action(
-            lambda: do_remove_realm_domain(test_domain))
+        events = self.verify_action(lambda: do_remove_realm_domain(test_domain))
 
         check_realm_domains_remove("events[0]", events[0])
         self.assertEqual(events[0]["domain"], "zulip.org")
@@ -1321,21 +1331,25 @@ class NormalActionsTest(BaseAction):
         events = self.verify_action(action, num_events=2)
         check_realm_bot_add('events[1]', events[1])
 
-        action = lambda: self.create_bot('test_outgoing_webhook',
-                                         full_name='Outgoing Webhook Bot',
-                                         payload_url=orjson.dumps('https://foo.bar.com').decode(),
-                                         interface_type=Service.GENERIC,
-                                         bot_type=UserProfile.OUTGOING_WEBHOOK_BOT)
+        action = lambda: self.create_bot(
+            'test_outgoing_webhook',
+            full_name='Outgoing Webhook Bot',
+            payload_url=orjson.dumps('https://foo.bar.com').decode(),
+            interface_type=Service.GENERIC,
+            bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
+        )
         events = self.verify_action(action, num_events=2)
         # The third event is the second call of notify_created_bot, which contains additional
         # data for services (in contrast to the first call).
         check_realm_bot_add('events[1]', events[1])
 
-        action = lambda: self.create_bot('test_embedded',
-                                         full_name='Embedded Bot',
-                                         service_name='helloworld',
-                                         config_data=orjson.dumps({'foo': 'bar'}).decode(),
-                                         bot_type=UserProfile.EMBEDDED_BOT)
+        action = lambda: self.create_bot(
+            'test_embedded',
+            full_name='Embedded Bot',
+            service_name='helloworld',
+            config_data=orjson.dumps({'foo': 'bar'}).decode(),
+            bot_type=UserProfile.EMBEDDED_BOT,
+        )
         events = self.verify_action(action, num_events=2)
         check_realm_bot_add('events[1]', events[1])
 
@@ -1353,7 +1367,9 @@ class NormalActionsTest(BaseAction):
 
     def test_change_bot_avatar_source(self) -> None:
         bot = self.create_bot('test')
-        action = lambda: do_change_avatar_fields(bot, bot.AVATAR_FROM_USER, acting_user=self.user_profile)
+        action = lambda: do_change_avatar_fields(
+            bot, bot.AVATAR_FROM_USER, acting_user=self.user_profile
+        )
         events = self.verify_action(action, num_events=2)
         check_realm_bot_update('events[0]', events[0], 'avatar_url')
         self.assertEqual(events[1]['type'], 'realm_user')
@@ -1364,12 +1380,16 @@ class NormalActionsTest(BaseAction):
         check_realm_update_dict('events[0]', events[0])
 
     def test_change_realm_day_mode_logo_source(self) -> None:
-        action = lambda: do_change_logo_source(self.user_profile.realm, Realm.LOGO_UPLOADED, False, acting_user=self.user_profile)
+        action = lambda: do_change_logo_source(
+            self.user_profile.realm, Realm.LOGO_UPLOADED, False, acting_user=self.user_profile
+        )
         events = self.verify_action(action, state_change_expected=True)
         check_realm_update_dict('events[0]', events[0])
 
     def test_change_realm_night_mode_logo_source(self) -> None:
-        action = lambda: do_change_logo_source(self.user_profile.realm, Realm.LOGO_UPLOADED, True, acting_user=self.user_profile)
+        action = lambda: do_change_logo_source(
+            self.user_profile.realm, Realm.LOGO_UPLOADED, True, acting_user=self.user_profile
+        )
         events = self.verify_action(action, state_change_expected=True)
         check_realm_update_dict('events[0]', events[0])
 
@@ -1430,12 +1450,14 @@ class NormalActionsTest(BaseAction):
 
     def test_do_update_outgoing_webhook_service(self) -> None:
         self.user_profile = self.example_user('iago')
-        bot = self.create_test_bot('test', self.user_profile,
-                                   full_name='Test Bot',
-                                   bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
-                                   payload_url=orjson.dumps('http://hostname.domain2.com').decode(),
-                                   interface_type=Service.GENERIC,
-                                   )
+        bot = self.create_test_bot(
+            'test',
+            self.user_profile,
+            full_name='Test Bot',
+            bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
+            payload_url=orjson.dumps('http://hostname.domain2.com').decode(),
+            interface_type=Service.GENERIC,
+        )
         action = lambda: do_update_outgoing_webhook_service(bot, 2, 'http://hostname.domain2.com')
         events = self.verify_action(action)
         check_realm_bot_update('events[0]', events[0], 'services')
@@ -1459,7 +1481,8 @@ class NormalActionsTest(BaseAction):
         self.user_profile.save(update_fields=['tutorial_status'])
 
         events = self.verify_action(
-            lambda: do_mark_hotspot_as_read(self.user_profile, 'intro_reply'))
+            lambda: do_mark_hotspot_as_read(self.user_profile, 'intro_reply')
+        )
         check_hotspots('events[0]', events[0])
 
     def test_rename_stream(self) -> None:
@@ -1513,9 +1536,8 @@ class NormalActionsTest(BaseAction):
         stream = get_stream("test_stream", self.user_profile.realm)
 
         action = lambda: bulk_remove_subscriptions(
-            [self.example_user('othello')],
-            [stream],
-            get_client("website"))
+            [self.example_user('othello')], [stream], get_client("website")
+        )
         events = self.verify_action(action)
         check_subscription_peer_remove('events[0]', events[0])
 
@@ -1523,10 +1545,7 @@ class NormalActionsTest(BaseAction):
         hamlet = self.example_user('hamlet')
         msg_id = self.send_stream_message(hamlet, "Verona")
         msg_id_2 = self.send_stream_message(hamlet, "Verona")
-        messages = [
-            Message.objects.get(id=msg_id),
-            Message.objects.get(id=msg_id_2)
-        ]
+        messages = [Message.objects.get(id=msg_id), Message.objects.get(id=msg_id_2)]
         events = self.verify_action(
             lambda: do_delete_messages(self.user_profile.realm, messages),
             state_change_expected=True,
@@ -1547,14 +1566,12 @@ class NormalActionsTest(BaseAction):
         hamlet = self.example_user('hamlet')
         msg_id = self.send_stream_message(hamlet, "Verona")
         msg_id_2 = self.send_stream_message(hamlet, "Verona")
-        messages = [
-            Message.objects.get(id=msg_id),
-            Message.objects.get(id=msg_id_2)
-        ]
+        messages = [Message.objects.get(id=msg_id), Message.objects.get(id=msg_id_2)]
         events = self.verify_action(
             lambda: do_delete_messages(self.user_profile.realm, messages),
-            state_change_expected=True, bulk_message_deletion=False,
-            num_events=2
+            state_change_expected=True,
+            bulk_message_deletion=False,
+            num_events=2,
         )
         check_delete_message(
             "events[0]",
@@ -1592,7 +1609,8 @@ class NormalActionsTest(BaseAction):
         message = Message.objects.get(id=msg_id)
         events = self.verify_action(
             lambda: do_delete_messages(self.user_profile.realm, [message]),
-            state_change_expected=True, bulk_message_deletion=False
+            state_change_expected=True,
+            bulk_message_deletion=False,
         )
         check_delete_message(
             "events[0]",
@@ -1630,11 +1648,9 @@ class NormalActionsTest(BaseAction):
             self.assertIn("uri", result.json())
             uri = result.json()["uri"]
             base = '/user_uploads/'
-            self.assertEqual(base, uri[:len(base)])
+            self.assertEqual(base, uri[: len(base)])
 
-        events = self.verify_action(
-            lambda: do_upload(),
-            num_events=1, state_change_expected=False)
+        events = self.verify_action(lambda: do_upload(), num_events=1, state_change_expected=False)
 
         check_attachment_add("events[0]", events[0])
         self.assertEqual(events[0]["upload_space_used"], 6)
@@ -1649,7 +1665,8 @@ class NormalActionsTest(BaseAction):
         body = f"First message ...[zulip.txt](http://{hamlet.realm.host}" + uri + ")"
         events = self.verify_action(
             lambda: self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test"),
-            num_events=2)
+            num_events=2,
+        )
 
         check_attachment_update("events[0]", events[0])
         self.assertEqual(events[0]["upload_space_used"], 6)
@@ -1657,7 +1674,9 @@ class NormalActionsTest(BaseAction):
         # Now remove the attachment
         events = self.verify_action(
             lambda: self.client_delete(f"/json/attachments/{entry.id}"),
-            num_events=1, state_change_expected=False)
+            num_events=1,
+            state_change_expected=False,
+        )
 
         check_attachment_remove("events[0]", events[0])
         self.assertEqual(events[0]["upload_space_used"], 0)
@@ -1666,15 +1685,17 @@ class NormalActionsTest(BaseAction):
         do_change_user_role(self.user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
         self.login_user(self.user_profile)
 
-        with mock.patch('zerver.lib.export.do_export_realm',
-                        return_value=create_dummy_file('test-export.tar.gz')):
+        with mock.patch(
+            'zerver.lib.export.do_export_realm',
+            return_value=create_dummy_file('test-export.tar.gz'),
+        ):
             with stdout_suppressed(), self.assertLogs(level='INFO') as info_logs:
                 events = self.verify_action(
                     lambda: self.client_post('/json/export/realm'),
-                    state_change_expected=True, num_events=3)
-            self.assertTrue(
-                'INFO:root:Completed data export for zulip in' in info_logs.output[0]
-            )
+                    state_change_expected=True,
+                    num_events=3,
+                )
+            self.assertTrue('INFO:root:Completed data export for zulip in' in info_logs.output[0])
 
         # We get two realm_export events for this action, where the first
         # is missing the export_url (because it's pending).
@@ -1696,10 +1717,13 @@ class NormalActionsTest(BaseAction):
 
         # Now we check the deletion of the export.
         audit_log_entry = RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.REALM_EXPORTED).first()
+            event_type=RealmAuditLog.REALM_EXPORTED
+        ).first()
         events = self.verify_action(
             lambda: self.client_delete(f'/json/export/realm/{audit_log_entry.id}'),
-            state_change_expected=False, num_events=1)
+            state_change_expected=False,
+            num_events=1,
+        )
 
         check_realm_export(
             "events[0]",
@@ -1713,13 +1737,15 @@ class NormalActionsTest(BaseAction):
         do_change_user_role(self.user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
         self.login_user(self.user_profile)
 
-        with mock.patch('zerver.lib.export.do_export_realm',
-                        side_effect=Exception("test")), \
-                self.assertLogs(level="ERROR") as error_log:
+        with mock.patch(
+            'zerver.lib.export.do_export_realm', side_effect=Exception("test")
+        ), self.assertLogs(level="ERROR") as error_log:
             with stdout_suppressed():
                 events = self.verify_action(
                     lambda: self.client_post('/json/export/realm'),
-                    state_change_expected=False, num_events=2)
+                    state_change_expected=False,
+                    num_events=2,
+                )
 
             # Log is of following format: "ERROR:root:Data export for zulip failed after 0.004499673843383789"
             # Where last floating number is time and will vary in each test hence the following assertion is
@@ -1748,10 +1774,10 @@ class NormalActionsTest(BaseAction):
         )
         check_has_zoom_token('events[0]', events[0], value=True)
 
-        events = self.verify_action(
-            lambda: do_set_zoom_token(self.user_profile, None))
+        events = self.verify_action(lambda: do_set_zoom_token(self.user_profile, None))
         check_has_zoom_token('events[0]', events[0], value=False)
 
+
 class RealmPropertyActionTest(BaseAction):
     def do_set_realm_property_test(self, name: str) -> None:
         bool_tests: List[bool] = [True, False, True]
@@ -1773,7 +1799,7 @@ class RealmPropertyActionTest(BaseAction):
                 Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'],
             ],
             default_code_block_language=['python', 'javascript'],
-            message_content_delete_limit_seconds=[1000, 1100, 1200]
+            message_content_delete_limit_seconds=[1000, 1100, 1200],
         )
 
         vals = test_values.get(name)
@@ -1785,24 +1811,42 @@ class RealmPropertyActionTest(BaseAction):
             raise AssertionError(f'No test created for {name}')
         now = timezone_now()
         do_set_realm_property(self.user_profile.realm, name, vals[0], acting_user=self.user_profile)
-        self.assertEqual(RealmAuditLog.objects.filter(realm=self.user_profile.realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
-                                                      event_time__gte=now, acting_user=self.user_profile).count(), 1)
+        self.assertEqual(
+            RealmAuditLog.objects.filter(
+                realm=self.user_profile.realm,
+                event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+                event_time__gte=now,
+                acting_user=self.user_profile,
+            ).count(),
+            1,
+        )
         for count, val in enumerate(vals[1:]):
             now = timezone_now()
             state_change_expected = True
             events = self.verify_action(
-                lambda: do_set_realm_property(self.user_profile.realm, name, val, acting_user=self.user_profile),
-                state_change_expected=state_change_expected)
+                lambda: do_set_realm_property(
+                    self.user_profile.realm, name, val, acting_user=self.user_profile
+                ),
+                state_change_expected=state_change_expected,
+            )
 
             old_value = vals[count]
-            self.assertEqual(RealmAuditLog.objects.filter(
-                realm=self.user_profile.realm, event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
-                event_time__gte=now, acting_user=self.user_profile,
-                extra_data=orjson.dumps({
-                    RealmAuditLog.OLD_VALUE: old_value,
-                    RealmAuditLog.NEW_VALUE: val,
-                    'property': name,
-                }).decode()).count(), 1)
+            self.assertEqual(
+                RealmAuditLog.objects.filter(
+                    realm=self.user_profile.realm,
+                    event_type=RealmAuditLog.REALM_PROPERTY_CHANGED,
+                    event_time__gte=now,
+                    acting_user=self.user_profile,
+                    extra_data=orjson.dumps(
+                        {
+                            RealmAuditLog.OLD_VALUE: old_value,
+                            RealmAuditLog.NEW_VALUE: val,
+                            'property': name,
+                        }
+                    ).decode(),
+                ).count(),
+                1,
+            )
             check_realm_update('events[0]', events[0], name)
 
     def test_change_realm_property(self) -> None:
@@ -1810,16 +1854,17 @@ class RealmPropertyActionTest(BaseAction):
             with self.settings(SEND_DIGEST_EMAILS=True):
                 self.do_set_realm_property_test(prop)
 
+
 class UserDisplayActionTest(BaseAction):
     def do_set_user_display_settings_test(self, setting_name: str) -> None:
         """Test updating each setting in UserProfile.property_types dict."""
 
         test_changes: Dict[str, Any] = dict(
-            emojiset = ['twitter'],
-            default_language = ['es', 'de', 'en'],
-            timezone = ['America/Denver', 'Pacific/Pago_Pago', 'Pacific/Galapagos', ''],
-            demote_inactive_streams = [2, 3, 1],
-            color_scheme = [2, 3, 1]
+            emojiset=['twitter'],
+            default_language=['es', 'de', 'en'],
+            timezone=['America/Denver', 'Pacific/Pago_Pago', 'Pacific/Galapagos', ''],
+            demote_inactive_streams=[2, 3, 1],
+            color_scheme=[2, 3, 1],
         )
 
         num_events = 1
@@ -1839,11 +1884,9 @@ class UserDisplayActionTest(BaseAction):
 
         for value in values:
             events = self.verify_action(
-                lambda: do_set_user_display_setting(
-                    self.user_profile,
-                    setting_name,
-                    value),
-                num_events=num_events)
+                lambda: do_set_user_display_setting(self.user_profile, setting_name, value),
+                num_events=num_events,
+            )
 
             check_update_display_settings('events[0]', events[0])
 
@@ -1854,6 +1897,7 @@ class UserDisplayActionTest(BaseAction):
         for prop in UserProfile.property_types:
             self.do_set_user_display_settings_test(prop)
 
+
 class SubscribeActionTest(BaseAction):
     def test_subscribe_events(self) -> None:
         self.do_test_subscribe_events(include_subscribers=True)
@@ -1863,11 +1907,12 @@ class SubscribeActionTest(BaseAction):
 
     def do_test_subscribe_events(self, include_subscribers: bool) -> None:
         # Subscribe to a totally new stream, so it's just Hamlet on it
-        action: Callable[[], object] = lambda: self.subscribe(self.example_user("hamlet"), "test_stream")
+        action: Callable[[], object] = lambda: self.subscribe(
+            self.example_user("hamlet"), "test_stream"
+        )
         events = self.verify_action(
-            action,
-            event_types=["subscription"],
-            include_subscribers=include_subscribers)
+            action, event_types=["subscription"], include_subscribers=include_subscribers
+        )
         check_subscription_add('events[0]', events[0])
 
         # Add another user to that totally new stream
@@ -1875,7 +1920,8 @@ class SubscribeActionTest(BaseAction):
         events = self.verify_action(
             action,
             include_subscribers=include_subscribers,
-            state_change_expected=include_subscribers)
+            state_change_expected=include_subscribers,
+        )
         check_subscription_peer_add('events[0]', events[0])
 
         stream = get_stream("test_stream", self.user_profile.realm)
@@ -1883,25 +1929,22 @@ class SubscribeActionTest(BaseAction):
         # Now remove the first user, to test the normal unsubscribe flow and
         # 'peer_remove' event for subscribed streams.
         action = lambda: bulk_remove_subscriptions(
-            [self.example_user('othello')],
-            [stream],
-            get_client("website"))
+            [self.example_user('othello')], [stream], get_client("website")
+        )
         events = self.verify_action(
             action,
             include_subscribers=include_subscribers,
-            state_change_expected=include_subscribers)
+            state_change_expected=include_subscribers,
+        )
         check_subscription_peer_remove('events[0]', events[0])
 
         # Now remove the user himself, to test the 'remove' event flow
         action = lambda: bulk_remove_subscriptions(
-            [self.example_user('hamlet')],
-            [stream],
-            get_client("website"))
+            [self.example_user('hamlet')], [stream], get_client("website")
+        )
         events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers,
-            include_streams=False,
-            num_events=2)
+            action, include_subscribers=include_subscribers, include_streams=False, num_events=2
+        )
         check_subscription_remove('events[0]', events[0])
         self.assertEqual(len(events[0]['subscriptions']), 1)
         self.assertEqual(
@@ -1915,53 +1958,46 @@ class SubscribeActionTest(BaseAction):
             action,
             event_types=["subscription"],
             include_subscribers=include_subscribers,
-            state_change_expected=include_subscribers)
+            state_change_expected=include_subscribers,
+        )
         check_subscription_peer_add('events[0]', events[0])
 
         # Remove the user to test 'peer_remove' event flow for unsubscribed stream.
         action = lambda: bulk_remove_subscriptions(
-            [self.example_user('iago')],
-            [stream],
-            get_client("website"))
+            [self.example_user('iago')], [stream], get_client("website")
+        )
         events = self.verify_action(
             action,
             include_subscribers=include_subscribers,
-            state_change_expected=include_subscribers)
+            state_change_expected=include_subscribers,
+        )
         check_subscription_peer_remove('events[0]', events[0])
 
         # Now resubscribe a user, to make sure that works on a vacated stream
         action = lambda: self.subscribe(self.example_user("hamlet"), "test_stream")
         events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers,
-            include_streams=False,
-            num_events=1)
+            action, include_subscribers=include_subscribers, include_streams=False, num_events=1
+        )
         check_subscription_add('events[0]', events[0])
 
         action = lambda: do_change_stream_description(stream, 'new description')
-        events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers)
+        events = self.verify_action(action, include_subscribers=include_subscribers)
         check_stream_update('events[0]', events[0])
 
         # Update stream privacy
-        action = lambda: do_change_stream_invite_only(stream, True, history_public_to_subscribers=True)
-        events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers)
+        action = lambda: do_change_stream_invite_only(
+            stream, True, history_public_to_subscribers=True
+        )
+        events = self.verify_action(action, include_subscribers=include_subscribers)
         check_stream_update('events[0]', events[0])
 
         # Update stream stream_post_policy property
         action = lambda: do_change_stream_post_policy(stream, Stream.STREAM_POST_POLICY_ADMINS)
-        events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers, num_events=2)
+        events = self.verify_action(action, include_subscribers=include_subscribers, num_events=2)
         check_stream_update('events[0]', events[0])
 
         action = lambda: do_change_stream_message_retention_days(stream, -1)
-        events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers, num_events=1)
+        events = self.verify_action(action, include_subscribers=include_subscribers, num_events=1)
         check_stream_update('events[0]', events[0])
 
         # Subscribe to a totally new invite-only stream, so it's just Hamlet on it
@@ -1971,10 +2007,7 @@ class SubscribeActionTest(BaseAction):
 
         user_profile = self.example_user('hamlet')
         action = lambda: bulk_add_subscriptions(user_profile.realm, [stream], [user_profile])
-        events = self.verify_action(
-            action,
-            include_subscribers=include_subscribers,
-            num_events=2)
+        events = self.verify_action(action, include_subscribers=include_subscribers, num_events=2)
         check_stream_create('events[0]', events[0])
         check_subscription_add('events[1]', events[1])
 
diff --git a/zerver/tests/test_external.py b/zerver/tests/test_external.py
index c601a9e451..f9c384a75e 100644
--- a/zerver/tests/test_external.py
+++ b/zerver/tests/test_external.py
@@ -20,29 +20,48 @@ from zerver.models import UserProfile
 
 class MITNameTest(ZulipTestCase):
     def test_valid_hesiod(self) -> None:
-        with mock.patch('DNS.dnslookup', return_value=[['starnine:*:84233:101:Athena Consulting Exchange User,,,:/mit/starnine:/bin/bash']]):
-            self.assertEqual(compute_mit_user_fullname(self.mit_email("starnine")), "Athena Consulting Exchange User")
-        with mock.patch('DNS.dnslookup', return_value=[['sipbexch:*:87824:101:Exch Sipb,,,:/mit/sipbexch:/bin/athena/bash']]):
+        with mock.patch(
+            'DNS.dnslookup',
+            return_value=[
+                ['starnine:*:84233:101:Athena Consulting Exchange User,,,:/mit/starnine:/bin/bash']
+            ],
+        ):
+            self.assertEqual(
+                compute_mit_user_fullname(self.mit_email("starnine")),
+                "Athena Consulting Exchange User",
+            )
+        with mock.patch(
+            'DNS.dnslookup',
+            return_value=[['sipbexch:*:87824:101:Exch Sipb,,,:/mit/sipbexch:/bin/athena/bash']],
+        ):
             self.assertEqual(compute_mit_user_fullname("sipbexch@mit.edu"), "Exch Sipb")
 
     def test_invalid_hesiod(self) -> None:
-        with mock.patch('DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)):
+        with mock.patch(
+            'DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)
+        ):
             self.assertEqual(compute_mit_user_fullname("1234567890@mit.edu"), "1234567890@mit.edu")
-        with mock.patch('DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)):
+        with mock.patch(
+            'DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)
+        ):
             self.assertEqual(compute_mit_user_fullname("ec-discuss@mit.edu"), "ec-discuss@mit.edu")
 
     def test_mailinglist(self) -> None:
-        with mock.patch('DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)):
+        with mock.patch(
+            'DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)
+        ):
             self.assertRaises(ValidationError, email_is_not_mit_mailing_list, "1234567890@mit.edu")
-        with mock.patch('DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)):
+        with mock.patch(
+            'DNS.dnslookup', side_effect=DNS.Base.ServerError('DNS query status: NXDOMAIN', 3)
+        ):
             self.assertRaises(ValidationError, email_is_not_mit_mailing_list, "ec-discuss@mit.edu")
 
     def test_notmailinglist(self) -> None:
         with mock.patch('DNS.dnslookup', return_value=[['POP IMAP.EXCHANGE.MIT.EDU starnine']]):
             email_is_not_mit_mailing_list("sipbexch@mit.edu")
 
-class RateLimitTests(ZulipTestCase):
 
+class RateLimitTests(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
 
@@ -68,11 +87,17 @@ class RateLimitTests(ZulipTestCase):
         super().tearDown()
 
     def send_api_message(self, user: UserProfile, content: str) -> HttpResponse:
-        return self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                        "to": "Verona",
-                                                        "client": "test suite",
-                                                        "content": content,
-                                                        "topic": "whatever"})
+        return self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": content,
+                "topic": "whatever",
+            },
+        )
 
     def test_headers(self) -> None:
         user = self.example_user('hamlet')
@@ -122,13 +147,18 @@ class RateLimitTests(ZulipTestCase):
         user = self.example_user('cordelia')
         RateLimitedUser(user).clear_history()
 
-        with mock.patch('zerver.lib.rate_limiter.RedisRateLimiterBackend.incr_ratelimit',
-                        side_effect=RateLimiterLockingException):
+        with mock.patch(
+            'zerver.lib.rate_limiter.RedisRateLimiterBackend.incr_ratelimit',
+            side_effect=RateLimiterLockingException,
+        ):
             with self.assertLogs("zerver.lib.rate_limiter", level="WARNING") as m:
                 result = self.send_api_message(user, "some stuff")
                 self.assertEqual(result.status_code, 429)
             self.assertEqual(
                 m.output,
-                ["WARNING:zerver.lib.rate_limiter:Deadlock trying to incr_ratelimit for {}".format(
-                    f"RateLimitedUser:{user.id}:api_by_user")]
+                [
+                    "WARNING:zerver.lib.rate_limiter:Deadlock trying to incr_ratelimit for {}".format(
+                        f"RateLimitedUser:{user.id}:api_by_user"
+                    )
+                ],
             )
diff --git a/zerver/tests/test_github.py b/zerver/tests/test_github.py
index d73f183eba..14d9e26cfa 100644
--- a/zerver/tests/test_github.py
+++ b/zerver/tests/test_github.py
@@ -7,30 +7,45 @@ from zerver.lib.test_classes import ZulipTestCase
 
 logger_string = "zerver.lib.github"
 
+
 class GitHubTestCase(ZulipTestCase):
     @responses.activate
     def test_get_latest_github_release_download_link_for_platform(self) -> None:
-        responses.add(responses.GET, "https://api.github.com/repos/zulip/zulip-desktop/releases/latest",
-                      json={"tag_name": "v5.4.3"}, status=200)
+        responses.add(
+            responses.GET,
+            "https://api.github.com/repos/zulip/zulip-desktop/releases/latest",
+            json={"tag_name": "v5.4.3"},
+            status=200,
+        )
 
-        responses.add(responses.HEAD, "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-Web-Setup-5.4.3.exe",
-                      status=302)
+        responses.add(
+            responses.HEAD,
+            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-Web-Setup-5.4.3.exe",
+            status=302,
+        )
         self.assertEqual(
             get_latest_github_release_download_link_for_platform("windows"),
-            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-Web-Setup-5.4.3.exe"
+            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-Web-Setup-5.4.3.exe",
         )
 
-        responses.add(responses.HEAD, "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3-x86_64.AppImage",
-                      status=302)
+        responses.add(
+            responses.HEAD,
+            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3-x86_64.AppImage",
+            status=302,
+        )
         self.assertEqual(
             get_latest_github_release_download_link_for_platform("linux"),
-            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3-x86_64.AppImage"
+            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3-x86_64.AppImage",
         )
 
-        responses.add(responses.HEAD, "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3.dmg", status=302)
+        responses.add(
+            responses.HEAD,
+            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3.dmg",
+            status=302,
+        )
         self.assertEqual(
             get_latest_github_release_download_link_for_platform("mac"),
-            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3.dmg"
+            "https://github.com/zulip/zulip-desktop/releases/download/v5.4.3/Zulip-5.4.3.dmg",
         )
 
         api_url = "https://api.github.com/repos/zulip/zulip-desktop/releases/latest"
@@ -39,26 +54,34 @@ class GitHubTestCase(ZulipTestCase):
         with self.assertLogs(logger_string, level='ERROR') as error_log:
             self.assertEqual(
                 get_latest_github_release_download_link_for_platform("windows"),
-                "https://github.com/zulip/zulip-desktop/releases/latest"
+                "https://github.com/zulip/zulip-desktop/releases/latest",
+            )
+            self.assertEqual(
+                error_log.output,
+                [
+                    f'ERROR:{logger_string}:Unable to fetch the latest release version from GitHub {api_url}'
+                ],
             )
-            self.assertEqual(error_log.output, [
-                f'ERROR:{logger_string}:Unable to fetch the latest release version from GitHub {api_url}'
-            ])
 
-        responses.replace(responses.GET, "https://api.github.com/repos/zulip/zulip-desktop/releases/latest",
-                          json={"tag_name": "5.4.4"}, status=200)
+        responses.replace(
+            responses.GET,
+            "https://api.github.com/repos/zulip/zulip-desktop/releases/latest",
+            json={"tag_name": "5.4.4"},
+            status=200,
+        )
         download_link = "https://github.com/zulip/zulip-desktop/releases/download/v5.4.4/Zulip-5.4.4-x86_64.AppImage"
         responses.add(responses.HEAD, download_link, status=404)
         cache_delete("download_link:linux")
         with self.assertLogs(logger_string, level='ERROR') as error_log:
             self.assertEqual(
                 get_latest_github_release_download_link_for_platform("linux"),
-                "https://github.com/zulip/zulip-desktop/releases/latest"
+                "https://github.com/zulip/zulip-desktop/releases/latest",
             )
 
-            self.assertEqual(error_log.output, [
-                f'ERROR:{logger_string}:App download link is broken {download_link}'
-            ])
+            self.assertEqual(
+                error_log.output,
+                [f'ERROR:{logger_string}:App download link is broken {download_link}'],
+            )
 
         with self.assertRaises(InvalidPlatform):
             get_latest_github_release_download_link_for_platform("plan9")
diff --git a/zerver/tests/test_gitter_importer.py b/zerver/tests/test_gitter_importer.py
index adbd789b1d..b46fea0504 100644
--- a/zerver/tests/test_gitter_importer.py
+++ b/zerver/tests/test_gitter_importer.py
@@ -11,7 +11,6 @@ from zerver.models import Message, UserProfile, get_realm
 
 
 class GitterImporter(ZulipTestCase):
-
     @mock.patch('zerver.data_import.gitter.process_avatars', return_value=[])
     def test_gitter_import_data_conversion(self, mock_process_avatars: mock.Mock) -> None:
         output_dir = self.make_import_output_dir("gitter")
@@ -31,8 +30,9 @@ class GitterImporter(ZulipTestCase):
         realm = read_file('realm.json')
 
         # test realm
-        self.assertEqual('Organization imported from Gitter!',
-                         realm['zerver_realm'][0]['description'])
+        self.assertEqual(
+            'Organization imported from Gitter!', realm['zerver_realm'][0]['description']
+        )
 
         # test users
         exported_user_ids = self.get_set(realm['zerver_userprofile'], 'id')
@@ -47,7 +47,9 @@ class GitterImporter(ZulipTestCase):
         self.assertEqual(realm['zerver_stream'][0]['deactivated'], False)
         self.assertEqual(realm['zerver_stream'][0]['realm'], realm['zerver_realm'][0]['id'])
 
-        self.assertEqual(realm['zerver_defaultstream'][0]['stream'], realm['zerver_stream'][0]['id'])
+        self.assertEqual(
+            realm['zerver_defaultstream'][0]['stream'], realm['zerver_stream'][0]['id']
+        )
 
         # test recipient
         exported_recipient_id = self.get_set(realm['zerver_recipient'], 'id')
@@ -55,7 +57,9 @@ class GitterImporter(ZulipTestCase):
         self.assertEqual({1, 2}, exported_recipient_type)
 
         # test subscription
-        exported_subscription_userprofile = self.get_set(realm['zerver_subscription'], 'user_profile')
+        exported_subscription_userprofile = self.get_set(
+            realm['zerver_subscription'], 'user_profile'
+        )
         self.assertEqual({0, 1}, exported_subscription_userprofile)
         exported_subscription_recipient = self.get_set(realm['zerver_subscription'], 'recipient')
         self.assertEqual(len(exported_subscription_recipient), 3)
@@ -70,7 +74,9 @@ class GitterImporter(ZulipTestCase):
         self.assertIn(messages['zerver_message'][0]['content'], 'test message')
 
         # test usermessages
-        exported_usermessage_userprofile = self.get_set(messages['zerver_usermessage'], 'user_profile')
+        exported_usermessage_userprofile = self.get_set(
+            messages['zerver_usermessage'], 'user_profile'
+        )
         self.assertEqual(exported_user_ids, exported_usermessage_userprofile)
         exported_usermessage_message = self.get_set(messages['zerver_usermessage'], 'message')
         self.assertEqual(exported_usermessage_message, exported_messages_id)
@@ -95,21 +101,30 @@ class GitterImporter(ZulipTestCase):
 
     def test_get_usermentions(self) -> None:
         user_map = {'57124a4': 3, '57124b4': 5, '57124c4': 8}
-        user_short_name_to_full_name = {'user': 'user name', 'user2': 'user2',
-                                        'user3': 'user name 3', 'user4': 'user 4'}
-        messages = [{'text': 'hi @user',
-                     'mentions': [{'screenName': 'user', 'userId': '57124a4'}]},
-                    {'text': 'hi @user2 @user3',
-                     'mentions': [{'screenName': 'user2', 'userId': '57124b4'},
-                                  {'screenName': 'user3', 'userId': '57124c4'}]},
-                    {'text': 'hi @user4',
-                     'mentions': [{'screenName': 'user4'}]},
-                    {'text': 'hi @user5',
-                     'mentions': [{'screenName': 'user', 'userId': '5712ds4'}]}]
+        user_short_name_to_full_name = {
+            'user': 'user name',
+            'user2': 'user2',
+            'user3': 'user name 3',
+            'user4': 'user 4',
+        }
+        messages = [
+            {'text': 'hi @user', 'mentions': [{'screenName': 'user', 'userId': '57124a4'}]},
+            {
+                'text': 'hi @user2 @user3',
+                'mentions': [
+                    {'screenName': 'user2', 'userId': '57124b4'},
+                    {'screenName': 'user3', 'userId': '57124c4'},
+                ],
+            },
+            {'text': 'hi @user4', 'mentions': [{'screenName': 'user4'}]},
+            {'text': 'hi @user5', 'mentions': [{'screenName': 'user', 'userId': '5712ds4'}]},
+        ]
 
         self.assertEqual(get_usermentions(messages[0], user_map, user_short_name_to_full_name), [3])
         self.assertEqual(messages[0]['text'], 'hi @**user name**')
-        self.assertEqual(get_usermentions(messages[1], user_map, user_short_name_to_full_name), [5, 8])
+        self.assertEqual(
+            get_usermentions(messages[1], user_map, user_short_name_to_full_name), [5, 8]
+        )
         self.assertEqual(messages[1]['text'], 'hi @**user2** @**user name 3**')
         self.assertEqual(get_usermentions(messages[2], user_map, user_short_name_to_full_name), [])
         self.assertEqual(messages[2]['text'], 'hi @user4')
diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py
index 92e7df01f6..a24225e856 100644
--- a/zerver/tests/test_home.py
+++ b/zerver/tests/test_home.py
@@ -33,6 +33,7 @@ from zerver.worker.queue_processors import UserActivityWorker
 
 logger_string = "zulip.soft_deactivation"
 
+
 class HomeTest(ZulipTestCase):
 
     # Keep this list sorted!!!
@@ -249,8 +250,9 @@ class HomeTest(ZulipTestCase):
             with patch('zerver.lib.cache.cache_set') as cache_mock:
                 result = self._get_home_page(stream='Denmark')
                 self.check_rendered_logged_in_app(result)
-        self.assertEqual(set(result["Cache-Control"].split(", ")),
-                         {"must-revalidate", "no-store", "no-cache"})
+        self.assertEqual(
+            set(result["Cache-Control"].split(", ")), {"must-revalidate", "no-store", "no-cache"}
+        )
 
         self.assert_length(queries, 39)
         self.assert_length(cache_mock.call_args_list, 5)
@@ -370,17 +372,17 @@ class HomeTest(ZulipTestCase):
         self.assertIn('test_stream_7', html)
 
     def _get_home_page(self, **kwargs: Any) -> HttpResponse:
-        with \
-                patch('zerver.lib.events.request_event_queue', return_value=42), \
-                patch('zerver.lib.events.get_user_events', return_value=[]):
+        with patch('zerver.lib.events.request_event_queue', return_value=42), patch(
+            'zerver.lib.events.get_user_events', return_value=[]
+        ):
             result = self.client_get('/', dict(**kwargs))
         return result
 
     def _sanity_check(self, result: HttpResponse) -> None:
-        '''
+        """
         Use this for tests that are geared toward specific edge cases, but
         which still want the home page to load properly.
-        '''
+        """
         html = result.content.decode('utf-8')
         if 'Compose your message' not in html:
             raise AssertionError('Home page probably did not load.')
@@ -393,9 +395,7 @@ class HomeTest(ZulipTestCase):
             user.tos_version = user_tos_version
             user.save()
 
-            with \
-                    self.settings(TERMS_OF_SERVICE='whatever'), \
-                    self.settings(TOS_VERSION='99.99'):
+            with self.settings(TERMS_OF_SERVICE='whatever'), self.settings(TOS_VERSION='99.99'):
 
                 result = self.client_get('/', dict(stream='Denmark'))
 
@@ -406,8 +406,7 @@ class HomeTest(ZulipTestCase):
         user = self.example_user('hamlet')
         self.login_user(user)
 
-        result = self.client_get('/',
-                                 HTTP_USER_AGENT="ZulipElectron/2.3.82")
+        result = self.client_get('/', HTTP_USER_AGENT="ZulipElectron/2.3.82")
         html = result.content.decode('utf-8')
         self.assertIn('You are using old version of the Zulip desktop', html)
 
@@ -422,8 +421,7 @@ class HomeTest(ZulipTestCase):
             "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)",
         ]
         for user_agent in unsupported_user_agents:
-            result = self.client_get('/',
-                                     HTTP_USER_AGENT=user_agent)
+            result = self.client_get('/', HTTP_USER_AGENT=user_agent)
             html = result.content.decode('utf-8')
             self.assertIn('Internet Explorer is not supported by Zulip.', html)
 
@@ -434,9 +432,9 @@ class HomeTest(ZulipTestCase):
         user.tos_version = None
         user.save()
 
-        with \
-                self.settings(FIRST_TIME_TOS_TEMPLATE='hello.html'), \
-                self.settings(TOS_VERSION='99.99'):
+        with self.settings(FIRST_TIME_TOS_TEMPLATE='hello.html'), self.settings(
+            TOS_VERSION='99.99'
+        ):
             result = self.client_post('/accounts/accept_terms/')
             self.assertEqual(result.status_code, 200)
             self.assert_in_response("I agree to the", result)
@@ -466,8 +464,9 @@ class HomeTest(ZulipTestCase):
         self._sanity_check(result)
         html = result.content.decode('utf-8')
         self.assertIn('lunch', html)
-        self.assertEqual(set(result["Cache-Control"].split(", ")),
-                         {"must-revalidate", "no-store", "no-cache"})
+        self.assertEqual(
+            set(result["Cache-Control"].split(", ")), {"must-revalidate", "no-store", "no-cache"}
+        )
 
     def test_notifications_stream(self) -> None:
         realm = get_realm('zulip')
@@ -476,7 +475,9 @@ class HomeTest(ZulipTestCase):
         self.login('hamlet')
         result = self._get_home_page()
         page_params = self._get_page_params(result)
-        self.assertEqual(page_params['realm_notifications_stream_id'], get_stream('Denmark', realm).id)
+        self.assertEqual(
+            page_params['realm_notifications_stream_id'], get_stream('Denmark', realm).id
+        )
 
     def create_bot(self, owner: UserProfile, bot_email: str, bot_name: str) -> UserProfile:
         user = do_create_user(
@@ -511,7 +512,9 @@ class HomeTest(ZulipTestCase):
         self.login('hamlet')
         result = self._get_home_page()
         page_params = self._get_page_params(result)
-        self.assertEqual(page_params['realm_signup_notifications_stream_id'], get_stream('Denmark', realm).id)
+        self.assertEqual(
+            page_params['realm_signup_notifications_stream_id'], get_stream('Denmark', realm).id
+        )
 
     def test_people(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -556,8 +559,7 @@ class HomeTest(ZulipTestCase):
             users = page_params[field]
             self.assertTrue(len(users) >= 3, field)
             for rec in users:
-                self.assertEqual(rec['user_id'],
-                                 get_user(rec['email'], realm).id)
+                self.assertEqual(rec['user_id'], get_user(rec['email'], realm).id)
                 if field == 'realm_bots':
                     self.assertNotIn('is_bot', rec)
                     self.assertIn('is_active', rec)
@@ -596,50 +598,56 @@ class HomeTest(ZulipTestCase):
 
         by_email = lambda d: d['email']
 
-        self.assertEqual(sorted(cross_bots, key=by_email), sorted([
-            dict(
-                avatar_version=email_gateway_bot.avatar_version,
-                bot_owner_id=None,
-                bot_type=1,
-                email=email_gateway_bot.email,
-                user_id=email_gateway_bot.id,
-                full_name=email_gateway_bot.full_name,
-                is_active=True,
-                is_bot=True,
-                is_admin=False,
-                is_owner=False,
-                is_cross_realm_bot=True,
-                is_guest=False,
+        self.assertEqual(
+            sorted(cross_bots, key=by_email),
+            sorted(
+                [
+                    dict(
+                        avatar_version=email_gateway_bot.avatar_version,
+                        bot_owner_id=None,
+                        bot_type=1,
+                        email=email_gateway_bot.email,
+                        user_id=email_gateway_bot.id,
+                        full_name=email_gateway_bot.full_name,
+                        is_active=True,
+                        is_bot=True,
+                        is_admin=False,
+                        is_owner=False,
+                        is_cross_realm_bot=True,
+                        is_guest=False,
+                    ),
+                    dict(
+                        avatar_version=email_gateway_bot.avatar_version,
+                        bot_owner_id=None,
+                        bot_type=1,
+                        email=notification_bot.email,
+                        user_id=notification_bot.id,
+                        full_name=notification_bot.full_name,
+                        is_active=True,
+                        is_bot=True,
+                        is_admin=False,
+                        is_owner=False,
+                        is_cross_realm_bot=True,
+                        is_guest=False,
+                    ),
+                    dict(
+                        avatar_version=email_gateway_bot.avatar_version,
+                        bot_owner_id=None,
+                        bot_type=1,
+                        email=welcome_bot.email,
+                        user_id=welcome_bot.id,
+                        full_name=welcome_bot.full_name,
+                        is_active=True,
+                        is_bot=True,
+                        is_admin=False,
+                        is_owner=False,
+                        is_cross_realm_bot=True,
+                        is_guest=False,
+                    ),
+                ],
+                key=by_email,
             ),
-            dict(
-                avatar_version=email_gateway_bot.avatar_version,
-                bot_owner_id=None,
-                bot_type=1,
-                email=notification_bot.email,
-                user_id=notification_bot.id,
-                full_name=notification_bot.full_name,
-                is_active=True,
-                is_bot=True,
-                is_admin=False,
-                is_owner=False,
-                is_cross_realm_bot=True,
-                is_guest=False,
-            ),
-            dict(
-                avatar_version=email_gateway_bot.avatar_version,
-                bot_owner_id=None,
-                bot_type=1,
-                email=welcome_bot.email,
-                user_id=welcome_bot.id,
-                full_name=welcome_bot.full_name,
-                is_active=True,
-                is_bot=True,
-                is_admin=False,
-                is_owner=False,
-                is_cross_realm_bot=True,
-                is_guest=False,
-            ),
-        ], key=by_email))
+        )
 
     def test_new_stream(self) -> None:
         user_profile = self.example_user("hamlet")
@@ -697,9 +705,14 @@ class HomeTest(ZulipTestCase):
         self.assertNotIn('Billing', result_html)
 
         # realm owner, with inactive CustomerPlan -> show billing link
-        CustomerPlan.objects.create(customer=customer, billing_cycle_anchor=timezone_now(),
-                                    billing_schedule=CustomerPlan.ANNUAL, next_invoice_date=timezone_now(),
-                                    tier=CustomerPlan.STANDARD, status=CustomerPlan.ENDED)
+        CustomerPlan.objects.create(
+            customer=customer,
+            billing_cycle_anchor=timezone_now(),
+            billing_schedule=CustomerPlan.ANNUAL,
+            next_invoice_date=timezone_now(),
+            tier=CustomerPlan.STANDARD,
+            status=CustomerPlan.ENDED,
+        )
         result_html = self._get_home_page().content.decode('utf-8')
         self.assertIn('Billing', result_html)
 
@@ -788,48 +801,67 @@ class HomeTest(ZulipTestCase):
 
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_NIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         "/static/images/logo/zulip-org-logo.svg?version=0")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params), "/static/images/logo/zulip-org-logo.svg?version=0"
+        )
 
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_LIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         "/static/images/logo/zulip-org-logo.svg?version=0")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params), "/static/images/logo/zulip-org-logo.svg?version=0"
+        )
 
-        do_change_logo_source(user_profile.realm, Realm.LOGO_UPLOADED, night=False, acting_user=user_profile)
+        do_change_logo_source(
+            user_profile.realm, Realm.LOGO_UPLOADED, night=False, acting_user=user_profile
+        )
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_NIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         f"/user_avatars/{user_profile.realm_id}/realm/logo.png?version=2")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params),
+            f"/user_avatars/{user_profile.realm_id}/realm/logo.png?version=2",
+        )
 
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_LIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         f"/user_avatars/{user_profile.realm_id}/realm/logo.png?version=2")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params),
+            f"/user_avatars/{user_profile.realm_id}/realm/logo.png?version=2",
+        )
 
-        do_change_logo_source(user_profile.realm, Realm.LOGO_UPLOADED, night=True, acting_user=user_profile)
+        do_change_logo_source(
+            user_profile.realm, Realm.LOGO_UPLOADED, night=True, acting_user=user_profile
+        )
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_NIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         f"/user_avatars/{user_profile.realm_id}/realm/night_logo.png?version=2")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params),
+            f"/user_avatars/{user_profile.realm_id}/realm/night_logo.png?version=2",
+        )
 
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_LIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         f"/user_avatars/{user_profile.realm_id}/realm/logo.png?version=2")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params),
+            f"/user_avatars/{user_profile.realm_id}/realm/logo.png?version=2",
+        )
 
         # This configuration isn't super supported in the UI and is a
         # weird choice, but we have a test for it anyway.
-        do_change_logo_source(user_profile.realm, Realm.LOGO_DEFAULT, night=False, acting_user=user_profile)
+        do_change_logo_source(
+            user_profile.realm, Realm.LOGO_DEFAULT, night=False, acting_user=user_profile
+        )
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_NIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         f"/user_avatars/{user_profile.realm_id}/realm/night_logo.png?version=2")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params),
+            f"/user_avatars/{user_profile.realm_id}/realm/night_logo.png?version=2",
+        )
 
         page_params = {"color_scheme": user_profile.COLOR_SCHEME_LIGHT}
         add_realm_logo_fields(page_params, user_profile.realm)
-        self.assertEqual(compute_navbar_logo_url(page_params),
-                         "/static/images/logo/zulip-org-logo.svg?version=0")
+        self.assertEqual(
+            compute_navbar_logo_url(page_params), "/static/images/logo/zulip-org-logo.svg?version=0"
+        )
 
     def test_generate_204(self) -> None:
         self.login('hamlet')
@@ -841,25 +873,29 @@ class HomeTest(ZulipTestCase):
 
         hamlet = self.example_user('hamlet')
         self.login_user(hamlet)
-        self.client_post("/json/messages/flags",
-                         {"messages": orjson.dumps([msg_id]).decode(),
-                          "op": "add",
-                          "flag": "read"})
+        self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps([msg_id]).decode(), "op": "add", "flag": "read"},
+        )
 
         # Manually process the UserActivity
         now = timezone_now()
         activity_time = calendar.timegm(now.timetuple())
-        user_activity_event = {'user_profile_id': hamlet.id,
-                               'client': 'test-client',
-                               'query': 'update_message_flags',
-                               'time': activity_time}
+        user_activity_event = {
+            'user_profile_id': hamlet.id,
+            'client': 'test-client',
+            'query': 'update_message_flags',
+            'time': activity_time,
+        }
 
         yesterday = now - timedelta(days=1)
         activity_time_2 = calendar.timegm(yesterday.timetuple())
-        user_activity_event_2 = {'user_profile_id': hamlet.id,
-                                 'client': 'test-client-2',
-                                 'query': 'update_message_flags',
-                                 'time': activity_time_2}
+        user_activity_event_2 = {
+            'user_profile_id': hamlet.id,
+            'client': 'test-client-2',
+            'query': 'update_message_flags',
+            'time': activity_time_2,
+        }
         UserActivityWorker().consume_batch([user_activity_event, user_activity_event_2])
 
         # verify furthest_read_time is last activity time, irrespective of client
@@ -887,13 +923,19 @@ class HomeTest(ZulipTestCase):
                 result = self._get_home_page()
             self._sanity_check(result)
 
-    def send_test_message(self, content: str, sender_name: str='iago',
-                          stream_name: str='Denmark', topic_name: str='foo') -> int:
+    def send_test_message(
+        self,
+        content: str,
+        sender_name: str = 'iago',
+        stream_name: str = 'Denmark',
+        topic_name: str = 'foo',
+    ) -> int:
         sender = self.example_user(sender_name)
-        return self.send_stream_message(sender, stream_name,
-                                        content=content, topic_name=topic_name)
+        return self.send_stream_message(sender, stream_name, content=content, topic_name=topic_name)
 
-    def soft_activate_and_get_unread_count(self, stream: str='Denmark', topic: str='foo') -> int:
+    def soft_activate_and_get_unread_count(
+        self, stream: str = 'Denmark', topic: str = 'foo'
+    ) -> int:
         stream_narrow = self._get_home_page(stream=stream, topic=topic)
         page_params = self._get_page_params(stream_narrow)
         return page_params['unread_msgs']['count']
@@ -914,10 +956,13 @@ class HomeTest(ZulipTestCase):
 
         with self.assertLogs(logger_string, level='INFO') as info_log:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_log.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_log.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         self.login_user(long_term_idle_user)
         message = 'Test Message 2'
@@ -939,10 +984,13 @@ class HomeTest(ZulipTestCase):
         self.send_test_message('Testing', sender_name='hamlet')
         with self.assertLogs(logger_string, level='INFO') as info_log:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_log.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_log.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         message = 'Test Message 1'
         self.send_test_message(message)
@@ -968,10 +1016,13 @@ class HomeTest(ZulipTestCase):
 
         with self.assertLogs(logger_string, level='INFO') as info_log:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_log.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_log.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         message = 'Test Message 3'
         self.send_test_message(message)
@@ -1000,9 +1051,9 @@ class HomeTest(ZulipTestCase):
         self.login_user(user)
         result = self._get_home_page()
         self.check_rendered_logged_in_app(result)
-        with \
-                patch('zerver.lib.events.request_event_queue', return_value=42), \
-                patch('zerver.lib.events.get_user_events', return_value=[]):
+        with patch('zerver.lib.events.request_event_queue', return_value=42), patch(
+            'zerver.lib.events.get_user_events', return_value=[]
+        ):
             result = self.client_get('/de/')
         page_params = self._get_page_params(result)
         self.assertEqual(page_params['default_language'], 'es')
diff --git a/zerver/tests/test_hotspots.py b/zerver/tests/test_hotspots.py
index 724cfcb1a2..2676afa03a 100644
--- a/zerver/tests/test_hotspots.py
+++ b/zerver/tests/test_hotspots.py
@@ -38,27 +38,36 @@ class TestGetNextHotspots(ZulipTestCase):
         self.assertEqual(get_next_hotspots(self.user), [])
 
     def test_send_all(self) -> None:
-        with self.settings(DEVELOPMENT=True, ALWAYS_SEND_ALL_HOTSPOTS = True):
+        with self.settings(DEVELOPMENT=True, ALWAYS_SEND_ALL_HOTSPOTS=True):
             self.assertEqual(len(ALL_HOTSPOTS), len(get_next_hotspots(self.user)))
 
+
 class TestHotspots(ZulipTestCase):
     def test_do_mark_hotspot_as_read(self) -> None:
         user = self.example_user('hamlet')
         do_mark_hotspot_as_read(user, 'intro_compose')
-        self.assertEqual(list(UserHotspot.objects.filter(user=user)
-                              .values_list('hotspot', flat=True)), ['intro_compose'])
+        self.assertEqual(
+            list(UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True)),
+            ['intro_compose'],
+        )
 
     def test_hotspots_url_endpoint(self) -> None:
         user = self.example_user('hamlet')
         self.login_user(user)
-        result = self.client_post('/json/users/me/hotspots',
-                                  {'hotspot': orjson.dumps('intro_reply').decode()})
+        result = self.client_post(
+            '/json/users/me/hotspots', {'hotspot': orjson.dumps('intro_reply').decode()}
+        )
         self.assert_json_success(result)
-        self.assertEqual(list(UserHotspot.objects.filter(user=user)
-                              .values_list('hotspot', flat=True)), ['intro_reply'])
+        self.assertEqual(
+            list(UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True)),
+            ['intro_reply'],
+        )
 
-        result = self.client_post('/json/users/me/hotspots',
-                                  {'hotspot': orjson.dumps('invalid').decode()})
+        result = self.client_post(
+            '/json/users/me/hotspots', {'hotspot': orjson.dumps('invalid').decode()}
+        )
         self.assert_json_error(result, "Unknown hotspot: invalid")
-        self.assertEqual(list(UserHotspot.objects.filter(user=user)
-                              .values_list('hotspot', flat=True)), ['intro_reply'])
+        self.assertEqual(
+            list(UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True)),
+            ['intro_reply'],
+        )
diff --git a/zerver/tests/test_i18n.py b/zerver/tests/test_i18n.py
index 1b4415015f..d56a966305 100644
--- a/zerver/tests/test_i18n.py
+++ b/zerver/tests/test_i18n.py
@@ -41,15 +41,31 @@ class EmailTranslationTestCase(ZulipTestCase):
         # in confirm_new_email.txt.
         # Also remove the "nocoverage" from check_translation above.
         # check_translation("Viele Grüße", "patch", "/json/settings", {"email": "hamlets-new@zulip.com"})
-        check_translation("Incrível!", "post", "/accounts/home/", {"email": "new-email@zulip.com"}, HTTP_ACCEPT_LANGUAGE="pt")
-        check_translation("Danke, dass du", "post", '/accounts/find/', {'emails': hamlet.delivery_email})
-        check_translation("Hallo", "post", "/json/invites",  {"invitee_emails": "new-email@zulip.com",
-                                                              "stream_ids": orjson.dumps([stream.id]).decode()})
+        check_translation(
+            "Incrível!",
+            "post",
+            "/accounts/home/",
+            {"email": "new-email@zulip.com"},
+            HTTP_ACCEPT_LANGUAGE="pt",
+        )
+        check_translation(
+            "Danke, dass du", "post", '/accounts/find/', {'emails': hamlet.delivery_email}
+        )
+        check_translation(
+            "Hallo",
+            "post",
+            "/json/invites",
+            {
+                "invitee_emails": "new-email@zulip.com",
+                "stream_ids": orjson.dumps([stream.id]).decode(),
+            },
+        )
 
         with self.settings(DEVELOPMENT_LOG_EMAILS=True):
             enqueue_welcome_emails(hamlet)
         check_translation("Viele Grüße", "")
 
+
 class TranslationTestCase(ZulipTestCase):
     """
     Translations strings should change with locale. URLs should be locale
@@ -63,28 +79,32 @@ class TranslationTestCase(ZulipTestCase):
     # e.g. self.client_post(url) if method is "post"
     def fetch(self, method: str, url: str, expected_status: int, **kwargs: Any) -> HttpResponse:
         response = getattr(self.client, method)(url, **kwargs)
-        self.assertEqual(response.status_code, expected_status,
-                         msg=f"Expected {expected_status}, received {response.status_code} for {method} to {url}")
+        self.assertEqual(
+            response.status_code,
+            expected_status,
+            msg=f"Expected {expected_status}, received {response.status_code} for {method} to {url}",
+        )
         return response
 
     def test_accept_language_header(self) -> None:
-        languages = [('en', 'Sign up'),
-                     ('de', 'Registrieren'),
-                     ('sr', 'Упишите се'),
-                     ('zh-hans', '注册'),
-                     ]
+        languages = [
+            ('en', 'Sign up'),
+            ('de', 'Registrieren'),
+            ('sr', 'Упишите се'),
+            ('zh-hans', '注册'),
+        ]
 
         for lang, word in languages:
-            response = self.fetch('get', '/integrations/', 200,
-                                  HTTP_ACCEPT_LANGUAGE=lang)
+            response = self.fetch('get', '/integrations/', 200, HTTP_ACCEPT_LANGUAGE=lang)
             self.assert_in_response(word, response)
 
     def test_cookie(self) -> None:
-        languages = [('en', 'Sign up'),
-                     ('de', 'Registrieren'),
-                     ('sr', 'Упишите се'),
-                     ('zh-hans', '注册'),
-                     ]
+        languages = [
+            ('en', 'Sign up'),
+            ('de', 'Registrieren'),
+            ('sr', 'Упишите се'),
+            ('zh-hans', '注册'),
+        ]
 
         for lang, word in languages:
             # Applying str function to LANGUAGE_COOKIE_NAME to convert Unicode
@@ -95,11 +115,12 @@ class TranslationTestCase(ZulipTestCase):
             self.assert_in_response(word, response)
 
     def test_i18n_urls(self) -> None:
-        languages = [('en', 'Sign up'),
-                     ('de', 'Registrieren'),
-                     ('sr', 'Упишите се'),
-                     ('zh-hans', '注册'),
-                     ]
+        languages = [
+            ('en', 'Sign up'),
+            ('de', 'Registrieren'),
+            ('sr', 'Упишите се'),
+            ('zh-hans', '注册'),
+        ]
 
         for lang, word in languages:
             response = self.fetch('get', f'/{lang}/integrations/', 200)
@@ -117,13 +138,10 @@ class JsonTranslationTestCase(ZulipTestCase):
         mock_gettext.return_value = dummy_value
 
         self.login('hamlet')
-        result = self.client_post("/json/invites",
-                                  HTTP_ACCEPT_LANGUAGE='de')
+        result = self.client_post("/json/invites", HTTP_ACCEPT_LANGUAGE='de')
 
         expected_error = "this arg is bad: 'invitee_emails' (translated to German)"
-        self.assert_json_error_contains(result,
-                                        expected_error,
-                                        status_code=400)
+        self.assert_json_error_contains(result, expected_error, status_code=400)
 
     @mock.patch('zerver.views.auth._')
     def test_jsonable_error(self, mock_gettext: Any) -> None:
@@ -133,9 +151,7 @@ class JsonTranslationTestCase(ZulipTestCase):
         self.login('hamlet')
         result = self.client_get("/de/accounts/login/jwt/")
 
-        self.assert_json_error_contains(result,
-                                        dummy_value,
-                                        status_code=400)
+        self.assert_json_error_contains(result, dummy_value, status_code=400)
 
 
 class FrontendRegexTestCase(ZulipTestCase):
@@ -143,29 +159,17 @@ class FrontendRegexTestCase(ZulipTestCase):
         command = makemessages.Command()
 
         data = [
-            ('{{#tr context}}english text with __variable__{{/tr}}{{/tr}}',
-             'english text with __variable__'),
-
-            ('{{t "english text" }}, "extra"}}',
-             'english text'),
-
-            ("{{t 'english text' }}, 'extra'}}",
-             'english text'),
-
-            ("{{> template var=(t 'english text') }}, 'extra'}}",
-             'english text'),
-
-            ('i18n.t("english text"), "extra",)',
-             'english text'),
-
-            ('i18n.t("english text", context), "extra",)',
-             'english text'),
-
-            ("i18n.t('english text'), 'extra',)",
-             'english text'),
-
-            ("i18n.t('english text', context), 'extra',)",
-             'english text'),
+            (
+                '{{#tr context}}english text with __variable__{{/tr}}{{/tr}}',
+                'english text with __variable__',
+            ),
+            ('{{t "english text" }}, "extra"}}', 'english text'),
+            ("{{t 'english text' }}, 'extra'}}", 'english text'),
+            ("{{> template var=(t 'english text') }}, 'extra'}}", 'english text'),
+            ('i18n.t("english text"), "extra",)', 'english text'),
+            ('i18n.t("english text", context), "extra",)', 'english text'),
+            ("i18n.t('english text'), 'extra',)", 'english text'),
+            ("i18n.t('english text', context), 'extra',)", 'english text'),
         ]
 
         for input_text, expected in data:
diff --git a/zerver/tests/test_import_export.py b/zerver/tests/test_import_export.py
index 118b6fb1c9..d25add5886 100644
--- a/zerver/tests/test_import_export.py
+++ b/zerver/tests/test_import_export.py
@@ -190,7 +190,6 @@ class QueryUtilTest(ZulipTestCase):
 
 
 class ImportExportTest(ZulipTestCase):
-
     def setUp(self) -> None:
         super().setUp()
         self.rm_tree(settings.LOCAL_UPLOADS_DIR)
@@ -201,8 +200,12 @@ class ImportExportTest(ZulipTestCase):
         os.makedirs(output_dir, exist_ok=True)
         return output_dir
 
-    def _export_realm(self, realm: Realm, exportable_user_ids: Optional[Set[int]]=None,
-                      consent_message_id: Optional[int]=None) -> Dict[str, Any]:
+    def _export_realm(
+        self,
+        realm: Realm,
+        exportable_user_ids: Optional[Set[int]] = None,
+        consent_message_id: Optional[int] = None,
+    ) -> Dict[str, Any]:
         output_dir = self._make_output_dir()
         with patch('logging.info'), patch('zerver.lib.export.create_soft_link'):
             do_export_realm(
@@ -255,7 +258,9 @@ class ImportExportTest(ZulipTestCase):
     def _setup_export_files(self, realm: Realm) -> Tuple[str, str, str, bytes]:
         message = Message.objects.all()[0]
         user_profile = message.sender
-        url = upload_message_file('dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile)
+        url = upload_message_file(
+            'dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile
+        )
         attachment_path_id = url.replace('/user_uploads/', '')
         claim_attachment(
             user_profile=user_profile,
@@ -340,8 +345,17 @@ class ImportExportTest(ZulipTestCase):
                 self.assertTrue(os.path.exists(image_path))
 
             image_files.add(os.path.basename(image_path))
-        self.assertEqual(set(image_files), {'night_logo.png', 'logo.original', 'logo.png',
-                                            'icon.png', 'night_logo.original', 'icon.original'})
+        self.assertEqual(
+            set(image_files),
+            {
+                'night_logo.png',
+                'logo.original',
+                'logo.png',
+                'icon.png',
+                'night_logo.original',
+                'icon.original',
+            },
+        )
 
         # Test avatars
         fn = os.path.join(full_data['avatar_dir'], original_avatar_path_id)
@@ -356,12 +370,15 @@ class ImportExportTest(ZulipTestCase):
 
     @use_s3_backend
     def test_export_files_from_s3(self) -> None:
-        create_s3_buckets(
-            settings.S3_AUTH_UPLOADS_BUCKET,
-            settings.S3_AVATAR_BUCKET)
+        create_s3_buckets(settings.S3_AUTH_UPLOADS_BUCKET, settings.S3_AVATAR_BUCKET)
 
         realm = Realm.objects.get(string_id='zulip')
-        attachment_path_id, emoji_path, original_avatar_path_id, test_image = self._setup_export_files(realm)
+        (
+            attachment_path_id,
+            emoji_path,
+            original_avatar_path_id,
+            test_image,
+        ) = self._setup_export_files(realm)
         full_data = self._export_realm(realm)
 
         data = full_data['attachment']
@@ -407,8 +424,17 @@ class ImportExportTest(ZulipTestCase):
                 self.assertTrue(os.path.exists(image_path))
 
             image_files.add(os.path.basename(image_path))
-        self.assertEqual(set(image_files), {'night_logo.png', 'logo.original', 'logo.png',
-                                            'icon.png', 'night_logo.original', 'icon.original'})
+        self.assertEqual(
+            set(image_files),
+            {
+                'night_logo.png',
+                'logo.original',
+                'logo.png',
+                'icon.png',
+                'night_logo.original',
+                'icon.original',
+            },
+        )
 
         # Test avatars
         fn = os.path.join(full_data['avatar_dir'], original_avatar_path_id)
@@ -428,7 +454,9 @@ class ImportExportTest(ZulipTestCase):
         default_bot = self.example_user('default_bot')
         pm_a_msg_id = self.send_personal_message(self.example_user("AARON"), default_bot)
         pm_b_msg_id = self.send_personal_message(default_bot, self.example_user("iago"))
-        pm_c_msg_id = self.send_personal_message(self.example_user("othello"), self.example_user("hamlet"))
+        pm_c_msg_id = self.send_personal_message(
+            self.example_user("othello"), self.example_user("hamlet")
+        )
 
         realm_emoji = RealmEmoji.objects.get(realm=realm)
         realm_emoji.delete()
@@ -456,10 +484,7 @@ class ImportExportTest(ZulipTestCase):
         num_zulip_users = 9
         self.assertEqual(len(exported_alert_words), num_zulip_users * 4)
 
-        self.assertIn(
-            'robotics',
-            {r['word'] for r in exported_alert_words}
-        )
+        self.assertIn('robotics', {r['word'] for r in exported_alert_words})
 
         data = full_data['message']
         um = UserMessage.objects.all()[0]
@@ -482,10 +507,18 @@ class ImportExportTest(ZulipTestCase):
         hamlet = self.example_user('hamlet')
         user_ids = {cordelia.id, hamlet.id}
 
-        pm_a_msg_id = self.send_personal_message(self.example_user("AARON"), self.example_user("othello"))
-        pm_b_msg_id = self.send_personal_message(self.example_user("cordelia"), self.example_user("iago"))
-        pm_c_msg_id = self.send_personal_message(self.example_user("hamlet"), self.example_user("othello"))
-        pm_d_msg_id = self.send_personal_message(self.example_user("iago"), self.example_user("hamlet"))
+        pm_a_msg_id = self.send_personal_message(
+            self.example_user("AARON"), self.example_user("othello")
+        )
+        pm_b_msg_id = self.send_personal_message(
+            self.example_user("cordelia"), self.example_user("iago")
+        )
+        pm_c_msg_id = self.send_personal_message(
+            self.example_user("hamlet"), self.example_user("othello")
+        )
+        pm_d_msg_id = self.send_personal_message(
+            self.example_user("iago"), self.example_user("hamlet")
+        )
 
         realm_emoji = RealmEmoji.objects.get(realm=realm)
         realm_emoji.delete()
@@ -526,44 +559,63 @@ class ImportExportTest(ZulipTestCase):
 
         create_stream_if_needed(realm, "Private B", invite_only=True)
         self.subscribe(self.example_user("prospero"), "Private B")
-        stream_b_message_id = self.send_stream_message(self.example_user("prospero"),
-                                                       "Private B", "Hello Stream B")
+        stream_b_message_id = self.send_stream_message(
+            self.example_user("prospero"), "Private B", "Hello Stream B"
+        )
         self.subscribe(self.example_user("hamlet"), "Private B")
 
         create_stream_if_needed(realm, "Private C", invite_only=True)
         self.subscribe(self.example_user("othello"), "Private C")
         self.subscribe(self.example_user("prospero"), "Private C")
-        stream_c_message_id = self.send_stream_message(self.example_user("othello"),
-                                                       "Private C", "Hello Stream C")
+        stream_c_message_id = self.send_stream_message(
+            self.example_user("othello"), "Private C", "Hello Stream C"
+        )
 
         # Create huddles
-        self.send_huddle_message(self.example_user("iago"), [self.example_user("cordelia"),
-                                                             self.example_user("AARON")])
+        self.send_huddle_message(
+            self.example_user("iago"), [self.example_user("cordelia"), self.example_user("AARON")]
+        )
         huddle_a = Huddle.objects.last()
-        self.send_huddle_message(self.example_user("ZOE"), [self.example_user("hamlet"),
-                                                            self.example_user("AARON"),
-                                                            self.example_user("othello")])
+        self.send_huddle_message(
+            self.example_user("ZOE"),
+            [self.example_user("hamlet"), self.example_user("AARON"), self.example_user("othello")],
+        )
         huddle_b = Huddle.objects.last()
 
         huddle_c_message_id = self.send_huddle_message(
-            self.example_user("AARON"), [self.example_user("cordelia"),
-                                         self.example_user("ZOE"),
-                                         self.example_user("othello")])
+            self.example_user("AARON"),
+            [self.example_user("cordelia"), self.example_user("ZOE"), self.example_user("othello")],
+        )
 
         # Create PMs
-        pm_a_msg_id = self.send_personal_message(self.example_user("AARON"), self.example_user("othello"))
-        pm_b_msg_id = self.send_personal_message(self.example_user("cordelia"), self.example_user("iago"))
-        pm_c_msg_id = self.send_personal_message(self.example_user("hamlet"), self.example_user("othello"))
-        pm_d_msg_id = self.send_personal_message(self.example_user("iago"), self.example_user("hamlet"))
+        pm_a_msg_id = self.send_personal_message(
+            self.example_user("AARON"), self.example_user("othello")
+        )
+        pm_b_msg_id = self.send_personal_message(
+            self.example_user("cordelia"), self.example_user("iago")
+        )
+        pm_c_msg_id = self.send_personal_message(
+            self.example_user("hamlet"), self.example_user("othello")
+        )
+        pm_d_msg_id = self.send_personal_message(
+            self.example_user("iago"), self.example_user("hamlet")
+        )
 
         # Send message advertising export and make users react
-        self.send_stream_message(self.example_user("othello"), "Verona",
-                                 topic_name="Export",
-                                 content="Thumbs up for export")
+        self.send_stream_message(
+            self.example_user("othello"),
+            "Verona",
+            topic_name="Export",
+            content="Thumbs up for export",
+        )
         message = Message.objects.last()
         consented_user_ids = [self.example_user(user).id for user in ["iago", "hamlet"]]
-        do_add_reaction(self.example_user("iago"), message, "outbox", "1f4e4",  Reaction.UNICODE_EMOJI)
-        do_add_reaction(self.example_user("hamlet"), message, "outbox", "1f4e4",  Reaction.UNICODE_EMOJI)
+        do_add_reaction(
+            self.example_user("iago"), message, "outbox", "1f4e4", Reaction.UNICODE_EMOJI
+        )
+        do_add_reaction(
+            self.example_user("hamlet"), message, "outbox", "1f4e4", Reaction.UNICODE_EMOJI
+        )
 
         realm_emoji = RealmEmoji.objects.get(realm=realm)
         realm_emoji.delete()
@@ -585,13 +637,22 @@ class ImportExportTest(ZulipTestCase):
         exported_streams = self.get_set(data['zerver_stream'], 'name')
         self.assertEqual(
             exported_streams,
-            {'Denmark', 'Rome', 'Scotland', 'Venice', 'Verona',
-             'Private A', 'Private B', 'Private C'},
+            {
+                'Denmark',
+                'Rome',
+                'Scotland',
+                'Venice',
+                'Verona',
+                'Private A',
+                'Private B',
+                'Private C',
+            },
         )
 
         data = full_data['message']
-        exported_usermessages = UserMessage.objects.filter(user_profile__in=[self.example_user("iago"),
-                                                                             self.example_user("hamlet")])
+        exported_usermessages = UserMessage.objects.filter(
+            user_profile__in=[self.example_user("iago"), self.example_user("hamlet")]
+        )
         um = exported_usermessages[0]
         self.assertEqual(len(data["zerver_usermessage"]), len(exported_usermessages))
         exported_um = self.find_by_id(data['zerver_usermessage'], um.id)
@@ -602,26 +663,54 @@ class ImportExportTest(ZulipTestCase):
         self.assertEqual(exported_message['content'], um.message.content)
 
         public_stream_names = ['Denmark', 'Rome', 'Scotland', 'Venice', 'Verona']
-        public_stream_ids = Stream.objects.filter(name__in=public_stream_names).values_list("id", flat=True)
-        public_stream_recipients = Recipient.objects.filter(type_id__in=public_stream_ids, type=Recipient.STREAM)
-        public_stream_message_ids = Message.objects.filter(recipient__in=public_stream_recipients).values_list("id", flat=True)
+        public_stream_ids = Stream.objects.filter(name__in=public_stream_names).values_list(
+            "id", flat=True
+        )
+        public_stream_recipients = Recipient.objects.filter(
+            type_id__in=public_stream_ids, type=Recipient.STREAM
+        )
+        public_stream_message_ids = Message.objects.filter(
+            recipient__in=public_stream_recipients
+        ).values_list("id", flat=True)
 
         # Messages from Private Stream C are not exported since no member gave consent
-        private_stream_ids = Stream.objects.filter(name__in=["Private A", "Private B"]).values_list("id", flat=True)
-        private_stream_recipients = Recipient.objects.filter(type_id__in=private_stream_ids, type=Recipient.STREAM)
-        private_stream_message_ids = Message.objects.filter(recipient__in=private_stream_recipients).values_list("id", flat=True)
+        private_stream_ids = Stream.objects.filter(name__in=["Private A", "Private B"]).values_list(
+            "id", flat=True
+        )
+        private_stream_recipients = Recipient.objects.filter(
+            type_id__in=private_stream_ids, type=Recipient.STREAM
+        )
+        private_stream_message_ids = Message.objects.filter(
+            recipient__in=private_stream_recipients
+        ).values_list("id", flat=True)
 
-        pm_recipients = Recipient.objects.filter(type_id__in=consented_user_ids, type=Recipient.PERSONAL)
+        pm_recipients = Recipient.objects.filter(
+            type_id__in=consented_user_ids, type=Recipient.PERSONAL
+        )
         pm_query = Q(recipient__in=pm_recipients) | Q(sender__in=consented_user_ids)
-        exported_pm_ids = Message.objects.filter(pm_query).values_list("id", flat=True).values_list("id", flat=True)
+        exported_pm_ids = (
+            Message.objects.filter(pm_query)
+            .values_list("id", flat=True)
+            .values_list("id", flat=True)
+        )
 
         # Third huddle is not exported since none of the members gave consent
-        huddle_recipients = Recipient.objects.filter(type_id__in=[huddle_a.id, huddle_b.id], type=Recipient.HUDDLE)
+        huddle_recipients = Recipient.objects.filter(
+            type_id__in=[huddle_a.id, huddle_b.id], type=Recipient.HUDDLE
+        )
         pm_query = Q(recipient__in=huddle_recipients) | Q(sender__in=consented_user_ids)
-        exported_huddle_ids = Message.objects.filter(pm_query).values_list("id", flat=True).values_list("id", flat=True)
+        exported_huddle_ids = (
+            Message.objects.filter(pm_query)
+            .values_list("id", flat=True)
+            .values_list("id", flat=True)
+        )
 
-        exported_msg_ids = set(public_stream_message_ids) | set(private_stream_message_ids) \
-            | set(exported_pm_ids) | set(exported_huddle_ids)
+        exported_msg_ids = (
+            set(public_stream_message_ids)
+            | set(private_stream_message_ids)
+            | set(exported_pm_ids)
+            | set(exported_huddle_ids)
+        )
         self.assertEqual(self.get_set(data["zerver_message"], "id"), exported_msg_ids)
 
         # TODO: This behavior is wrong and should be fixed. The message should not be exported
@@ -683,7 +772,9 @@ class ImportExportTest(ZulipTestCase):
             self.example_user('othello'),
         ]
         self.send_huddle_message(
-            self.example_user('cordelia'), huddle, 'test huddle message',
+            self.example_user('cordelia'),
+            huddle,
+            'test huddle message',
         )
 
         user_mention_message = '@**King Hamlet** Hello'
@@ -702,7 +793,8 @@ class ImportExportTest(ZulipTestCase):
 
         # data to test import of hotspots
         UserHotspot.objects.create(
-            user=sample_user, hotspot='intro_streams',
+            user=sample_user,
+            hotspot='intro_streams',
         )
 
         # data to test import of muted topic
@@ -711,9 +803,12 @@ class ImportExportTest(ZulipTestCase):
             user_profile=sample_user,
             stream_id=stream.id,
             recipient_id=stream.recipient.id,
-            topic_name='Verona2')
+            topic_name='Verona2',
+        )
 
-        do_update_user_presence(sample_user, get_client("website"), timezone_now(), UserPresence.ACTIVE)
+        do_update_user_presence(
+            sample_user, get_client("website"), timezone_now(), UserPresence.ACTIVE
+        )
 
         # data to test import of botstoragedata and botconfigdata
         bot_profile = do_create_user(
@@ -722,7 +817,8 @@ class ImportExportTest(ZulipTestCase):
             realm=original_realm,
             full_name="bot",
             bot_type=UserProfile.EMBEDDED_BOT,
-            bot_owner=sample_user)
+            bot_owner=sample_user,
+        )
         storage = StateHandler(bot_profile)
         storage.put('some key', 'some value')
 
@@ -732,8 +828,7 @@ class ImportExportTest(ZulipTestCase):
 
         with patch('logging.info'):
             with self.settings(BILLING_ENABLED=False):
-                do_import_realm(os.path.join(settings.TEST_WORKER_DIR, 'test-export'),
-                                'test-zulip')
+                do_import_realm(os.path.join(settings.TEST_WORKER_DIR, 'test-export'), 'test-zulip')
 
         # sanity checks
 
@@ -742,12 +837,12 @@ class ImportExportTest(ZulipTestCase):
         imported_realm = Realm.objects.get(string_id='test-zulip')
         self.assertNotEqual(imported_realm.id, original_realm.id)
 
-        def assert_realm_values(f: Callable[[Realm], Any], equal: bool=True) -> None:
+        def assert_realm_values(f: Callable[[Realm], Any], equal: bool = True) -> None:
             orig_realm_result = f(original_realm)
             imported_realm_result = f(imported_realm)
             # orig_realm_result should be truthy and have some values, otherwise
             # the test is kind of meaningless
-            assert(orig_realm_result)
+            assert orig_realm_result
             if equal:
                 self.assertEqual(orig_realm_result, imported_realm_result)
             else:
@@ -799,12 +894,10 @@ class ImportExportTest(ZulipTestCase):
 
         assert_realm_values(get_custom_profile_field_names)
 
-        def get_custom_profile_with_field_type_user(r: Realm) -> Tuple[Set[Any],
-                                                                       Set[Any],
-                                                                       Set[FrozenSet[str]]]:
-            fields = CustomProfileField.objects.filter(
-                field_type=CustomProfileField.USER,
-                realm=r)
+        def get_custom_profile_with_field_type_user(
+            r: Realm,
+        ) -> Tuple[Set[Any], Set[Any], Set[FrozenSet[str]]]:
+            fields = CustomProfileField.objects.filter(field_type=CustomProfileField.USER, realm=r)
 
             def get_email(user_id: int) -> str:
                 return UserProfile.objects.get(id=user_id).email
@@ -813,7 +906,9 @@ class ImportExportTest(ZulipTestCase):
                 user_id_list = orjson.loads(field_value.value)
                 return {get_email(user_id) for user_id in user_id_list}
 
-            def custom_profile_field_values_for(fields: List[CustomProfileField]) -> Set[FrozenSet[str]]:
+            def custom_profile_field_values_for(
+                fields: List[CustomProfileField],
+            ) -> Set[FrozenSet[str]]:
                 user_emails: Set[FrozenSet[str]] = set()
                 for field in fields:
                     values = CustomProfileFieldValue.objects.filter(field=field)
@@ -833,7 +928,8 @@ class ImportExportTest(ZulipTestCase):
         # test realmauditlog
         def get_realm_audit_log_event_type(r: Realm) -> Set[str]:
             realmauditlogs = RealmAuditLog.objects.filter(realm=r).exclude(
-                event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED)
+                event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED
+            )
             realmauditlog_event_type = {log.event_type for log in realmauditlogs}
             return realmauditlog_event_type
 
@@ -871,11 +967,7 @@ class ImportExportTest(ZulipTestCase):
 
         # test alertword
         def get_alertwords(r: Realm) -> Set[str]:
-            return {
-                rec.word
-                for rec in
-                AlertWord.objects.filter(realm_id=r.id)
-            }
+            return {rec.word for rec in AlertWord.objects.filter(realm_id=r.id)}
 
         assert_realm_values(get_alertwords)
 
@@ -951,7 +1043,9 @@ class ImportExportTest(ZulipTestCase):
         # are replaced correctly with the values of newer realm.
 
         def get_user_mention(r: Realm) -> Set[Any]:
-            mentioned_user = UserProfile.objects.get(delivery_email=self.example_email("hamlet"), realm=r)
+            mentioned_user = UserProfile.objects.get(
+                delivery_email=self.example_email("hamlet"), realm=r
+            )
             data_user_id = f'data-user-id="{mentioned_user.id}"'
             mention_message = get_stream_messages(r).get(rendered_content__contains=data_user_id)
             return mention_message.content
@@ -969,7 +1063,9 @@ class ImportExportTest(ZulipTestCase):
         def get_user_group_mention(r: Realm) -> Set[Any]:
             user_group = UserGroup.objects.get(realm=r, name='hamletcharacters')
             data_usergroup_id = f'data-user-group-id="{user_group.id}"'
-            mention_message = get_stream_messages(r).get(rendered_content__contains=data_usergroup_id)
+            mention_message = get_stream_messages(r).get(
+                rendered_content__contains=data_usergroup_id
+            )
             return mention_message.content
 
         assert_realm_values(get_user_group_mention)
@@ -988,15 +1084,20 @@ class ImportExportTest(ZulipTestCase):
         # are okay with using bs4 for this.  lxml package also has
         # similar behavior.
         orig_polonius_user = self.example_user('polonius')
-        original_msg = Message.objects.get(content=special_characters_message, sender__realm=original_realm)
+        original_msg = Message.objects.get(
+            content=special_characters_message, sender__realm=original_realm
+        )
         self.assertEqual(
             original_msg.rendered_content,
             '<div class="codehilite"><pre><span></span><code>&#39;\n</code></pre></div>\n'
             f'<p><span class="user-mention" data-user-id="{orig_polonius_user.id}">@Polonius</span></p>',
         )
-        imported_polonius_user = UserProfile.objects.get(delivery_email=self.example_email("polonius"),
-                                                         realm=imported_realm)
-        imported_msg = Message.objects.get(content=special_characters_message, sender__realm=imported_realm)
+        imported_polonius_user = UserProfile.objects.get(
+            delivery_email=self.example_email("polonius"), realm=imported_realm
+        )
+        imported_msg = Message.objects.get(
+            content=special_characters_message, sender__realm=imported_realm
+        )
         self.assertEqual(
             imported_msg.rendered_content,
             '<div class="codehilite"><pre><span></span><code>\'\n</code></pre></div>\n'
@@ -1005,16 +1106,22 @@ class ImportExportTest(ZulipTestCase):
 
         # Check recipient_id was generated correctly for the imported users and streams.
         for user_profile in UserProfile.objects.filter(realm=imported_realm):
-            self.assertEqual(user_profile.recipient_id, Recipient.objects.get(type=Recipient.PERSONAL,
-                                                                              type_id=user_profile.id).id)
+            self.assertEqual(
+                user_profile.recipient_id,
+                Recipient.objects.get(type=Recipient.PERSONAL, type_id=user_profile.id).id,
+            )
         for stream in Stream.objects.filter(realm=imported_realm):
-            self.assertEqual(stream.recipient_id, Recipient.objects.get(type=Recipient.STREAM,
-                                                                        type_id=stream.id).id)
+            self.assertEqual(
+                stream.recipient_id,
+                Recipient.objects.get(type=Recipient.STREAM, type_id=stream.id).id,
+            )
 
         for huddle_object in Huddle.objects.all():
             # Huddles don't have a realm column, so we just test all Huddles for simplicity.
-            self.assertEqual(huddle_object.recipient_id, Recipient.objects.get(type=Recipient.HUDDLE,
-                                                                               type_id=huddle_object.id).id)
+            self.assertEqual(
+                huddle_object.recipient_id,
+                Recipient.objects.get(type=Recipient.HUDDLE, type_id=huddle_object.id).id,
+            )
 
     def test_import_files_from_local(self) -> None:
         realm = Realm.objects.get(string_id='zulip')
@@ -1031,7 +1138,9 @@ class ImportExportTest(ZulipTestCase):
         uploaded_file = Attachment.objects.get(realm=imported_realm)
         self.assertEqual(len(b'zulip!'), uploaded_file.size)
 
-        attachment_file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, 'files', uploaded_file.path_id)
+        attachment_file_path = os.path.join(
+            settings.LOCAL_UPLOADS_DIR, 'files', uploaded_file.path_id
+        )
         self.assertTrue(os.path.isfile(attachment_file_path))
 
         # Test emojis
@@ -1076,8 +1185,8 @@ class ImportExportTest(ZulipTestCase):
     @use_s3_backend
     def test_import_files_from_s3(self) -> None:
         uploads_bucket, avatar_bucket = create_s3_buckets(
-            settings.S3_AUTH_UPLOADS_BUCKET,
-            settings.S3_AVATAR_BUCKET)
+            settings.S3_AUTH_UPLOADS_BUCKET, settings.S3_AVATAR_BUCKET
+        )
 
         realm = Realm.objects.get(string_id='zulip')
         self._setup_export_files(realm)
@@ -1144,7 +1253,9 @@ class ImportExportTest(ZulipTestCase):
         self.assertEqual(imported_realm.night_logo_source, Realm.LOGO_UPLOADED)
 
     def test_get_incoming_message_ids(self) -> None:
-        import_dir = os.path.join(settings.DEPLOY_ROOT, "zerver", "tests", "fixtures", "import_fixtures")
+        import_dir = os.path.join(
+            settings.DEPLOY_ROOT, "zerver", "tests", "fixtures", "import_fixtures"
+        )
         message_ids = get_incoming_message_ids(
             import_dir=import_dir,
             sort_by_date=True,
@@ -1168,20 +1279,28 @@ class ImportExportTest(ZulipTestCase):
 
         with patch('logging.info'):
             with self.settings(BILLING_ENABLED=True):
-                realm = do_import_realm(os.path.join(settings.TEST_WORKER_DIR, 'test-export'),
-                                        'test-zulip-1')
+                realm = do_import_realm(
+                    os.path.join(settings.TEST_WORKER_DIR, 'test-export'), 'test-zulip-1'
+                )
                 self.assertEqual(realm.plan_type, Realm.LIMITED)
                 self.assertEqual(realm.max_invites, 100)
                 self.assertEqual(realm.upload_quota_gb, 5)
                 self.assertEqual(realm.message_visibility_limit, 10000)
-                self.assertTrue(RealmAuditLog.objects.filter(
-                    realm=realm, event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED).exists())
+                self.assertTrue(
+                    RealmAuditLog.objects.filter(
+                        realm=realm, event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED
+                    ).exists()
+                )
             with self.settings(BILLING_ENABLED=False):
-                realm = do_import_realm(os.path.join(settings.TEST_WORKER_DIR, 'test-export'),
-                                        'test-zulip-2')
+                realm = do_import_realm(
+                    os.path.join(settings.TEST_WORKER_DIR, 'test-export'), 'test-zulip-2'
+                )
                 self.assertEqual(realm.plan_type, Realm.SELF_HOSTED)
                 self.assertEqual(realm.max_invites, 100)
                 self.assertEqual(realm.upload_quota_gb, None)
                 self.assertEqual(realm.message_visibility_limit, None)
-                self.assertTrue(RealmAuditLog.objects.filter(
-                    realm=realm, event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED).exists())
+                self.assertTrue(
+                    RealmAuditLog.objects.filter(
+                        realm=realm, event_type=RealmAuditLog.REALM_PLAN_TYPE_CHANGED
+                    ).exists()
+                )
diff --git a/zerver/tests/test_integrations.py b/zerver/tests/test_integrations.py
index ff0bb2b7d4..ec79c92626 100644
--- a/zerver/tests/test_integrations.py
+++ b/zerver/tests/test_integrations.py
@@ -12,7 +12,6 @@ from zerver.lib.test_classes import ZulipTestCase
 
 
 class IntegrationsTestCase(ZulipTestCase):
-
     def test_split_fixture_path(self) -> None:
         path = 'zerver/webhooks/semaphore/fixtures/push.json'
         integration_name, fixture_name = split_fixture_path(path)
@@ -29,7 +28,9 @@ class IntegrationsTestCase(ZulipTestCase):
 
     def test_get_bot_avatar_path(self) -> None:
         integration = INTEGRATIONS['alertmanager']
-        self.assertEqual(integration.get_bot_avatar_path(), 'images/integrations/bot_avatars/prometheus.png')
+        self.assertEqual(
+            integration.get_bot_avatar_path(), 'images/integrations/bot_avatars/prometheus.png'
+        )
 
         # New instance with logo parameter not set
         integration = WebhookIntegration('alertmanager', ['misc'])
@@ -38,7 +39,7 @@ class IntegrationsTestCase(ZulipTestCase):
     def test_no_missing_doc_screenshot_config(self) -> None:
         webhook_names = {webhook.name for webhook in WEBHOOK_INTEGRATIONS}
         webhooks_with_screenshot_config = set(DOC_SCREENSHOT_CONFIG.keys())
-        missing_webhooks = (webhook_names - webhooks_with_screenshot_config - NO_SCREENSHOT_WEBHOOKS)
+        missing_webhooks = webhook_names - webhooks_with_screenshot_config - NO_SCREENSHOT_WEBHOOKS
         message = (
             f"These webhooks are missing screenshot config: {missing_webhooks}.\n"
             "Add them to zerver.lib.integrations.DOC_SCREENSHOT_CONFIG"
diff --git a/zerver/tests/test_integrations_dev_panel.py b/zerver/tests/test_integrations_dev_panel.py
index bd2155402e..8a61ab178f 100644
--- a/zerver/tests/test_integrations_dev_panel.py
+++ b/zerver/tests/test_integrations_dev_panel.py
@@ -33,7 +33,9 @@ class TestIntegrationsDevPanel(ZulipTestCase):
         # so just testing KeyError is printed along with Traceback in logs
         self.assertTrue("KeyError" in logs.output[0])
         self.assertTrue("Traceback (most recent call last)" in logs.output[0])
-        self.assertEqual(logs.output[1], "ERROR:django.request:Internal Server Error: /api/v1/external/airbrake")
+        self.assertEqual(
+            logs.output[1], "ERROR:django.request:Internal Server Error: /api/v1/external/airbrake"
+        )
 
     def test_check_send_webhook_fixture_message_for_success_without_headers(self) -> None:
         bot = get_user('webhook-bot@zulip.com', self.zulip_realm)
@@ -50,9 +52,15 @@ class TestIntegrationsDevPanel(ZulipTestCase):
         }
 
         response = self.client_post(target_url, data)
-        expected_response = {'responses': [{'status_code': 200, 'message': {"result": "success", "msg": ""}}], 'result': 'success', 'msg': ''}
+        expected_response = {
+            'responses': [{'status_code': 200, 'message': {"result": "success", "msg": ""}}],
+            'result': 'success',
+            'msg': '',
+        }
         response_content = orjson.loads(response.content)
-        response_content["responses"][0]["message"] = orjson.loads(response_content["responses"][0]["message"])
+        response_content["responses"][0]["message"] = orjson.loads(
+            response_content["responses"][0]["message"]
+        )
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response_content, expected_response)
 
@@ -85,7 +93,9 @@ class TestIntegrationsDevPanel(ZulipTestCase):
         self.assertEqual(Stream.objects.get(id=latest_msg.recipient.type_id).name, "Denmark")
         self.assertEqual(latest_msg.topic_name(), "GitHub Notifications")
 
-    def test_check_send_webhook_fixture_message_for_success_with_headers_and_non_json_fixtures(self) -> None:
+    def test_check_send_webhook_fixture_message_for_success_with_headers_and_non_json_fixtures(
+        self,
+    ) -> None:
         bot = get_user('webhook-bot@zulip.com', self.zulip_realm)
         url = f"/api/v1/external/wordpress?api_key={bot.api_key}&stream=Denmark&topic=WordPress Notifications"
         target_url = "/devtools/integrations/check_send_webhook_fixture_message"
@@ -95,7 +105,9 @@ class TestIntegrationsDevPanel(ZulipTestCase):
         data = {
             "url": url,
             "body": body,
-            "custom_headers": orjson.dumps({"Content-Type": "application/x-www-form-urlencoded"}).decode(),
+            "custom_headers": orjson.dumps(
+                {"Content-Type": "application/x-www-form-urlencoded"}
+            ).decode(),
             "is_json": "false",
         }
 
@@ -111,16 +123,24 @@ class TestIntegrationsDevPanel(ZulipTestCase):
     def test_get_fixtures_for_nonexistant_integration(self) -> None:
         target_url = "/devtools/integrations/somerandomnonexistantintegration/fixtures"
         response = self.client_get(target_url)
-        expected_response = {'msg': '"somerandomnonexistantintegration" is not a valid webhook integration.', 'result': 'error'}
+        expected_response = {
+            'msg': '"somerandomnonexistantintegration" is not a valid webhook integration.',
+            'result': 'error',
+        }
         self.assertEqual(response.status_code, 404)
         self.assertEqual(orjson.loads(response.content), expected_response)
 
     @patch("zerver.views.development.integrations.os.path.exists")
-    def test_get_fixtures_for_integration_without_fixtures(self, os_path_exists_mock: MagicMock) -> None:
+    def test_get_fixtures_for_integration_without_fixtures(
+        self, os_path_exists_mock: MagicMock
+    ) -> None:
         os_path_exists_mock.return_value = False
         target_url = "/devtools/integrations/airbrake/fixtures"
         response = self.client_get(target_url)
-        expected_response = {'msg': 'The integration "airbrake" does not have fixtures.', 'result': 'error'}
+        expected_response = {
+            'msg': 'The integration "airbrake" does not have fixtures.',
+            'result': 'error',
+        }
         self.assertEqual(response.status_code, 404)
         self.assertEqual(orjson.loads(response.content), expected_response)
 
@@ -171,7 +191,10 @@ class TestIntegrationsDevPanel(ZulipTestCase):
             expected_responses.remove(r)
 
         new_messages = Message.objects.order_by('-id')[0:2]
-        expected_messages = ["Webhook integration was successful.\nTest User / Acme (Google Play)", "Acme - Group chat\nApp Store, Acme Technologies, Inc.\n★★★★★ United States\n**Great for Information Management**\nAcme enables me to manage the flow of information quite well. I only wish I could create and edit my Acme Post files in the iOS app.\n*by* **Mr RESOLUTIONARY** *for v3.9*\n[Permalink](http://appfollow.io/permalink) · [Add tag](http://watch.appfollow.io/add_tag)"]
+        expected_messages = [
+            "Webhook integration was successful.\nTest User / Acme (Google Play)",
+            "Acme - Group chat\nApp Store, Acme Technologies, Inc.\n★★★★★ United States\n**Great for Information Management**\nAcme enables me to manage the flow of information quite well. I only wish I could create and edit my Acme Post files in the iOS app.\n*by* **Mr RESOLUTIONARY** *for v3.9*\n[Permalink](http://appfollow.io/permalink) · [Add tag](http://watch.appfollow.io/add_tag)",
+        ]
         for msg in new_messages:
             # new_messages -> expected_messages or expected_messages -> new_messages shouldn't make
             # a difference since equality is commutative.
@@ -194,42 +217,66 @@ class TestIntegrationsDevPanel(ZulipTestCase):
         response = self.client_post(target_url, data)
         expected_responses = [
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "user_register.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "publish_post_no_data_provided.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "unknown_action_no_data.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "publish_page.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "unknown_action_no_hook_provided.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "publish_post_type_not_provided.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "wp_login.txt",
                 "status_code": 400,
             },
             {
-                "message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
+                "message": {
+                    'msg': 'Unknown WordPress webhook action: WordPress Action',
+                    'result': 'error',
+                },
                 "fixture_name": "publish_post.txt",
                 "status_code": 400,
             },
@@ -249,7 +296,9 @@ class TestIntegrationsDevPanel(ZulipTestCase):
             expected_responses.remove(r)
 
     @patch("zerver.views.development.integrations.os.path.exists")
-    def test_send_all_webhook_fixture_messages_for_missing_fixtures(self, os_path_exists_mock: MagicMock) -> None:
+    def test_send_all_webhook_fixture_messages_for_missing_fixtures(
+        self, os_path_exists_mock: MagicMock
+    ) -> None:
         os_path_exists_mock.return_value = False
         bot = get_user('webhook-bot@zulip.com', self.zulip_realm)
         url = f"/api/v1/external/appfollow?api_key={bot.api_key}&stream=Denmark&topic=Appfollow Bulk Notifications"
@@ -258,7 +307,12 @@ class TestIntegrationsDevPanel(ZulipTestCase):
             "custom_headers": "{}",
             "integration_name": "appfollow",
         }
-        response = self.client_post("/devtools/integrations/send_all_webhook_fixture_messages", data)
-        expected_response = {'msg': 'The integration "appfollow" does not have fixtures.', 'result': 'error'}
+        response = self.client_post(
+            "/devtools/integrations/send_all_webhook_fixture_messages", data
+        )
+        expected_response = {
+            'msg': 'The integration "appfollow" does not have fixtures.',
+            'result': 'error',
+        }
         self.assertEqual(response.status_code, 404)
         self.assertEqual(orjson.loads(response.content), expected_response)
diff --git a/zerver/tests/test_internet.py b/zerver/tests/test_internet.py
index 6172c6f4c2..e21aac91ea 100644
--- a/zerver/tests/test_internet.py
+++ b/zerver/tests/test_internet.py
@@ -13,9 +13,13 @@ class ResponsesTest(ZulipTestCase):
         # A test can invoke its own responses.RequestsMock context manager
         # and register URLs to mock, accessible from within the context.
         with responses.RequestsMock() as requests_mock:
-            requests_mock.add(responses.GET, 'https://www.google.com',
-                              body='{}', status=200,
-                              content_type='application/json')
+            requests_mock.add(
+                responses.GET,
+                'https://www.google.com',
+                body='{}',
+                status=200,
+                content_type='application/json',
+            )
             result = requests.request('GET', 'https://www.google.com')
             self.assertEqual(result.status_code, 200)
             self.assertEqual(result.text, '{}')
diff --git a/zerver/tests/test_link_embed.py b/zerver/tests/test_link_embed.py
index 3e2bba48d5..a5f84ad331 100644
--- a/zerver/tests/test_link_embed.py
+++ b/zerver/tests/test_link_embed.py
@@ -31,6 +31,7 @@ TEST_CACHES = {
     },
 }
 
+
 @override_settings(INLINE_URL_EMBED_PREVIEW=True)
 class OembedTestCase(ZulipTestCase):
     @mock.patch('pyoembed.requests.get')
@@ -47,7 +48,8 @@ class OembedTestCase(ZulipTestCase):
             'html': '<p>test</p>',
             'version': '1.0',
             'width': 658,
-            'height': 400}
+            'height': 400,
+        }
         response.text = orjson.dumps(response_data).decode()
         url = 'http://instagram.com/p/BLtI2WdAymy'
         data = get_oembed_data(url)
@@ -71,7 +73,8 @@ class OembedTestCase(ZulipTestCase):
             'html': '<p>test</p>',
             'version': '1.0',
             'width': 658,
-            'height': 400}
+            'height': 400,
+        }
         response.text = orjson.dumps(response_data).decode()
         url = 'http://imgur.com/photo/158727223'
         data = get_oembed_data(url)
@@ -95,7 +98,8 @@ class OembedTestCase(ZulipTestCase):
             'html': '<p>test</p>',
             'version': '1.0',
             'width': 658,
-            'height': 400}
+            'height': 400,
+        }
         response.text = orjson.dumps(response_data).decode()
         url = 'http://blip.tv/video/158727223'
         data = get_oembed_data(url)
@@ -178,7 +182,9 @@ class OpenGraphParserTestCase(ZulipTestCase):
           <head>
             <meta property="og:title" content="中文" />
           </head>
-        </html>""".encode("big5")
+        </html>""".encode(
+            "big5"
+        )
         parser = OpenGraphParser(html, "text/html; charset=Big5")
         result = parser.extract_data()
         self.assertEqual(result["title"], "中文")
@@ -189,11 +195,14 @@ class OpenGraphParserTestCase(ZulipTestCase):
             <meta content-type="text/html; charset=Big5" />
             <meta property="og:title" content="中文" />
           </head>
-        </html>""".encode("big5")
+        </html>""".encode(
+            "big5"
+        )
         parser = OpenGraphParser(html, "text/html")
         result = parser.extract_data()
         self.assertEqual(result["title"], "中文")
 
+
 class GenericParserTestCase(ZulipTestCase):
     def test_parser(self) -> None:
         html = b"""
@@ -285,9 +294,13 @@ class PreviewTestCase(ZulipTestCase):
         Realm.objects.all().update(inline_url_embed_preview=True)
 
     @classmethod
-    def create_mock_response(cls, url: str, relative_url: bool=False,
-                             headers: Optional[Dict[str, str]]=None,
-                             html: Optional[str]=None) -> Callable[..., MockPythonResponse]:
+    def create_mock_response(
+        cls,
+        url: str,
+        relative_url: bool = False,
+        headers: Optional[Dict[str, str]] = None,
+        html: Optional[str] = None,
+    ) -> Callable[..., MockPythonResponse]:
         if html is None:
             html = cls.open_graph_html
         if relative_url is True:
@@ -299,16 +312,21 @@ class PreviewTestCase(ZulipTestCase):
     def test_edit_message_history(self) -> None:
         user = self.example_user('hamlet')
         self.login_user(user)
-        msg_id = self.send_stream_message(user, "Scotland",
-                                          topic_name="editing", content="original")
+        msg_id = self.send_stream_message(
+            user, "Scotland", topic_name="editing", content="original"
+        )
 
         url = 'http://test.org/'
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url))
 
         with mock_queue_publish('zerver.views.message_edit.queue_json_publish') as patched:
-            result = self.client_patch("/json/messages/" + str(msg_id), {
-                'message_id': msg_id, 'content': url,
-            })
+            result = self.client_patch(
+                "/json/messages/" + str(msg_id),
+                {
+                    'message_id': msg_id,
+                    'content': url,
+                },
+            )
             self.assert_json_success(result)
             patched.assert_called_once()
             queue = patched.call_args[0][0]
@@ -316,10 +334,13 @@ class PreviewTestCase(ZulipTestCase):
             event = patched.call_args[0][1]
 
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                in info_logs.output[0]
             )
 
         embedded_link = f'<a href="{url}" title="The Rock">The Rock</a>'
@@ -327,8 +348,9 @@ class PreviewTestCase(ZulipTestCase):
         self.assertIn(embedded_link, msg.rendered_content)
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
-    def _send_message_with_test_org_url(self, sender: UserProfile, queue_should_run: bool=True,
-                                        relative_url: bool=False) -> Message:
+    def _send_message_with_test_org_url(
+        self, sender: UserProfile, queue_should_run: bool = True, relative_url: bool = False
+    ) -> Message:
         url = 'http://test.org/'
         with mock_queue_publish('zerver.lib.actions.queue_json_publish') as patched:
             msg_id = self.send_personal_message(
@@ -349,19 +371,22 @@ class PreviewTestCase(ZulipTestCase):
 
         # Verify the initial message doesn't have the embedded links rendered
         msg = Message.objects.select_related("sender").get(id=msg_id)
-        self.assertNotIn(
-            f'<a href="{url}" title="The Rock">The Rock</a>',
-            msg.rendered_content)
+        self.assertNotIn(f'<a href="{url}" title="The Rock">The Rock</a>', msg.rendered_content)
 
         # Mock the network request result so the test can be fast without Internet
-        mocked_response = mock.Mock(side_effect=self.create_mock_response(url, relative_url=relative_url))
+        mocked_response = mock.Mock(
+            side_effect=self.create_mock_response(url, relative_url=relative_url)
+        )
 
         # Run the queue processor to potentially rerender things
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                in info_logs.output[0]
             )
 
         msg = Message.objects.select_related("sender").get(id=msg_id)
@@ -374,8 +399,9 @@ class PreviewTestCase(ZulipTestCase):
         original_url = 'http://test.org/'
         edited_url = 'http://edited.org/'
         with mock_queue_publish('zerver.lib.actions.queue_json_publish') as patched:
-            msg_id = self.send_stream_message(user, "Scotland",
-                                              topic_name="foo", content=original_url)
+            msg_id = self.send_stream_message(
+                user, "Scotland", topic_name="foo", content=original_url
+            )
             patched.assert_called_once()
             queue = patched.call_args[0][0]
             self.assertEqual(queue, "embed_links")
@@ -383,40 +409,57 @@ class PreviewTestCase(ZulipTestCase):
 
         def wrapped_queue_json_publish(*args: Any, **kwargs: Any) -> None:
             # Mock the network request result so the test can be fast without Internet
-            mocked_response_original = mock.Mock(side_effect=self.create_mock_response(original_url))
+            mocked_response_original = mock.Mock(
+                side_effect=self.create_mock_response(original_url)
+            )
             mocked_response_edited = mock.Mock(side_effect=self.create_mock_response(edited_url))
 
             with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-                with mock.patch('requests.get', mocked_response_original), self.assertLogs(level='INFO') as info_logs:
+                with mock.patch('requests.get', mocked_response_original), self.assertLogs(
+                    level='INFO'
+                ) as info_logs:
                     # Run the queue processor. This will simulate the event for original_url being
                     # processed after the message has been edited.
                     FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                in info_logs.output[0]
             )
             msg = Message.objects.select_related("sender").get(id=msg_id)
             # The content of the message has changed since the event for original_url has been created,
             # it should not be rendered. Another, up-to-date event will have been sent (edited_url).
-            self.assertNotIn(f'<a href="{original_url}" title="The Rock">The Rock</a>',
-                             msg.rendered_content)
+            self.assertNotIn(
+                f'<a href="{original_url}" title="The Rock">The Rock</a>', msg.rendered_content
+            )
             mocked_response_edited.assert_not_called()
 
             with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-                with mock.patch('requests.get', mocked_response_edited), self.assertLogs(level='INFO') as info_logs:
+                with mock.patch('requests.get', mocked_response_edited), self.assertLogs(
+                    level='INFO'
+                ) as info_logs:
                     # Now proceed with the original queue_json_publish and call the
                     # up-to-date event for edited_url.
                     queue_json_publish(*args, **kwargs)
                     msg = Message.objects.select_related("sender").get(id=msg_id)
-                    self.assertIn(f'<a href="{edited_url}" title="The Rock">The Rock</a>',
-                                  msg.rendered_content)
+                    self.assertIn(
+                        f'<a href="{edited_url}" title="The Rock">The Rock</a>',
+                        msg.rendered_content,
+                    )
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://edited.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://edited.org/: '
+                in info_logs.output[0]
             )
 
-        with mock_queue_publish('zerver.views.message_edit.queue_json_publish', wraps=wrapped_queue_json_publish):
-            result = self.client_patch("/json/messages/" + str(msg_id), {
-                'message_id': msg_id, 'content': edited_url,
-            })
+        with mock_queue_publish(
+            'zerver.views.message_edit.queue_json_publish', wraps=wrapped_queue_json_publish
+        ):
+            result = self.client_patch(
+                "/json/messages/" + str(msg_id),
+                {
+                    'message_id': msg_id,
+                    'content': edited_url,
+                },
+            )
             self.assert_json_success(result)
 
     def test_get_link_embed_data(self) -> None:
@@ -428,8 +471,9 @@ class PreviewTestCase(ZulipTestCase):
         self.assertIn(embedded_link, msg.rendered_content)
 
         # We don't want embedded content for bots.
-        msg = self._send_message_with_test_org_url(sender=self.example_user('webhook_bot'),
-                                                   queue_should_run=False)
+        msg = self._send_message_with_test_org_url(
+            sender=self.example_user('webhook_bot'), queue_should_run=False
+        )
         self.assertNotIn(embedded_link, msg.rendered_content)
 
         # Try another human to make sure bot failure was due to the
@@ -447,7 +491,9 @@ class PreviewTestCase(ZulipTestCase):
         setattr(realm, 'inline_url_embed_preview', False)
         realm.save()
 
-        msg = self._send_message_with_test_org_url(sender=self.example_user('prospero'), queue_should_run=False)
+        msg = self._send_message_with_test_org_url(
+            sender=self.example_user('prospero'), queue_should_run=False
+        )
         self.assertEqual(msg.rendered_content, without_preview)
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
@@ -464,7 +510,9 @@ class PreviewTestCase(ZulipTestCase):
     def test_inline_url_embed_preview_with_relative_image_url(self) -> None:
         with_preview_relative = '<p><a href="http://test.org/">http://test.org/</a></p>\n<div class="message_embed"><a class="message_embed_image" href="http://test.org/" style="background-image: url(http://test.org/images/rock.jpg)"></a><div class="data-container"><div class="message_embed_title"><a href="http://test.org/" title="The Rock">The Rock</a></div><div class="message_embed_description">Description text</div></div></div>'
         # Try case where the Open Graph image is a relative URL.
-        msg = self._send_message_with_test_org_url(sender=self.example_user('prospero'), relative_url=True)
+        msg = self._send_message_with_test_org_url(
+            sender=self.example_user('prospero'), relative_url=True
+        )
         self.assertEqual(msg.rendered_content, with_preview_relative)
 
     def test_http_error_get_data(self) -> None:
@@ -479,19 +527,22 @@ class PreviewTestCase(ZulipTestCase):
             'message_id': msg_id,
             'urls': [url],
             'message_realm_id': msg.sender.realm_id,
-            'message_content': url}
+            'message_content': url,
+        }
         with self.settings(INLINE_URL_EMBED_PREVIEW=True, TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mock.Mock(side_effect=ConnectionError())), \
-                    self.assertLogs(level='INFO') as info_logs:
+            with mock.patch(
+                'requests.get', mock.Mock(side_effect=ConnectionError())
+            ), self.assertLogs(level='INFO') as info_logs:
                 FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                in info_logs.output[0]
             )
 
         msg = Message.objects.get(id=msg_id)
         self.assertEqual(
-            '<p><a href="http://test.org/">http://test.org/</a></p>',
-            msg.rendered_content)
+            '<p><a href="http://test.org/">http://test.org/</a></p>', msg.rendered_content
+        )
 
     def test_invalid_link(self) -> None:
         with self.settings(INLINE_URL_EMBED_PREVIEW=True, TEST_SUITE=False, CACHES=TEST_CACHES):
@@ -526,19 +577,22 @@ class PreviewTestCase(ZulipTestCase):
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url, headers=headers))
 
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
                 cached_data = link_embed_data_from_cache(url)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/audio.mp3: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/audio.mp3: '
+                in info_logs.output[0]
             )
 
         self.assertIsNone(cached_data)
         msg = Message.objects.select_related("sender").get(id=msg_id)
         self.assertEqual(
-            ('<p><a href="http://test.org/audio.mp3">'
-             'http://test.org/audio.mp3</a></p>'),
-            msg.rendered_content)
+            ('<p><a href="http://test.org/audio.mp3">' 'http://test.org/audio.mp3</a></p>'),
+            msg.rendered_content,
+        )
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
     def test_link_preview_no_open_graph_image(self) -> None:
@@ -553,23 +607,28 @@ class PreviewTestCase(ZulipTestCase):
             event = patched.call_args[0][1]
 
         # HTML without the og:image metadata
-        html = '\n'.join(line for line in self.open_graph_html.splitlines() if 'og:image' not in line)
+        html = '\n'.join(
+            line for line in self.open_graph_html.splitlines() if 'og:image' not in line
+        )
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url, html=html))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
                 cached_data = link_embed_data_from_cache(url)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: '
+                in info_logs.output[0]
             )
 
         self.assertIn('title', cached_data)
         self.assertNotIn('image', cached_data)
         msg = Message.objects.select_related("sender").get(id=msg_id)
         self.assertEqual(
-            ('<p><a href="http://test.org/foo.html">'
-             'http://test.org/foo.html</a></p>'),
-            msg.rendered_content)
+            ('<p><a href="http://test.org/foo.html">' 'http://test.org/foo.html</a></p>'),
+            msg.rendered_content,
+        )
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
     def test_link_preview_open_graph_image_missing_content(self) -> None:
@@ -584,24 +643,29 @@ class PreviewTestCase(ZulipTestCase):
             event = patched.call_args[0][1]
 
         # HTML without the og:image metadata
-        html = '\n'.join(line if 'og:image' not in line else '<meta property="og:image"/>'
-                         for line in self.open_graph_html.splitlines())
+        html = '\n'.join(
+            line if 'og:image' not in line else '<meta property="og:image"/>'
+            for line in self.open_graph_html.splitlines()
+        )
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url, html=html))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
                 cached_data = link_embed_data_from_cache(url)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/foo.html: '
+                in info_logs.output[0]
             )
 
         self.assertIn('title', cached_data)
         self.assertNotIn('image', cached_data)
         msg = Message.objects.select_related("sender").get(id=msg_id)
         self.assertEqual(
-            ('<p><a href="http://test.org/foo.html">'
-             'http://test.org/foo.html</a></p>'),
-            msg.rendered_content)
+            ('<p><a href="http://test.org/foo.html">' 'http://test.org/foo.html</a></p>'),
+            msg.rendered_content,
+        )
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
     def test_link_preview_no_content_type_header(self) -> None:
@@ -618,11 +682,14 @@ class PreviewTestCase(ZulipTestCase):
         headers = {'content-type': ''}  # No content type header
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url, headers=headers))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
                 data = link_embed_data_from_cache(url)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                in info_logs.output[0]
             )
 
         self.assertIn('title', data)
@@ -646,16 +713,24 @@ class PreviewTestCase(ZulipTestCase):
             'message_id': msg_id,
             'urls': [url],
             'message_realm_id': msg.sender.realm_id,
-            'message_content': url}
+            'message_content': url,
+        }
 
-        with mock.patch('zerver.lib.url_preview.preview.get_oembed_data', side_effect=lambda *args, **kwargs: None):
-            with mock.patch('zerver.lib.url_preview.preview.valid_content_type', side_effect=lambda k: True):
+        with mock.patch(
+            'zerver.lib.url_preview.preview.get_oembed_data',
+            side_effect=lambda *args, **kwargs: None,
+        ):
+            with mock.patch(
+                'zerver.lib.url_preview.preview.valid_content_type', side_effect=lambda k: True
+            ):
                 with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-                    with mock.patch('requests.get', mock.Mock(side_effect=ConnectionError())), \
-                            self.assertLogs(level='INFO') as info_logs:
+                    with mock.patch(
+                        'requests.get', mock.Mock(side_effect=ConnectionError())
+                    ), self.assertLogs(level='INFO') as info_logs:
                         FetchLinksEmbedData().consume(event)
                     self.assertTrue(
-                        'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                        'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                        in info_logs.output[0]
                     )
 
                     with self.assertRaises(NotFoundInCache):
@@ -663,8 +738,8 @@ class PreviewTestCase(ZulipTestCase):
 
         msg.refresh_from_db()
         self.assertEqual(
-            '<p><a href="http://test.org/">http://test.org/</a></p>',
-            msg.rendered_content)
+            '<p><a href="http://test.org/">http://test.org/</a></p>', msg.rendered_content
+        )
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
     def test_invalid_url(self) -> None:
@@ -681,14 +756,18 @@ class PreviewTestCase(ZulipTestCase):
             'message_id': msg_id,
             'urls': [error_url],
             'message_realm_id': msg.sender.realm_id,
-            'message_content': error_url}
+            'message_content': error_url,
+        }
 
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/x: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/x: '
+                in info_logs.output[0]
             )
             cached_data = link_embed_data_from_cache(error_url)
 
@@ -696,8 +775,8 @@ class PreviewTestCase(ZulipTestCase):
         self.assertIsNone(cached_data)
         msg.refresh_from_db()
         self.assertEqual(
-            '<p><a href="http://test.org/x">http://test.org/x</a></p>',
-            msg.rendered_content)
+            '<p><a href="http://test.org/x">http://test.org/x</a></p>', msg.rendered_content
+        )
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=True)
     def test_safe_oembed_html_url(self) -> None:
@@ -713,19 +792,29 @@ class PreviewTestCase(ZulipTestCase):
             'message_id': msg_id,
             'urls': [url],
             'message_realm_id': msg.sender.realm_id,
-            'message_content': url}
+            'message_content': url,
+        }
 
-        mocked_data = {'html': f'<iframe src="{url}"></iframe>',
-                       'oembed': True, 'type': 'video', 'image': f'{url}/image.png'}
+        mocked_data = {
+            'html': f'<iframe src="{url}"></iframe>',
+            'oembed': True,
+            'type': 'video',
+            'image': f'{url}/image.png',
+        }
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
-                with mock.patch('zerver.lib.url_preview.preview.get_oembed_data',
-                                lambda *args, **kwargs: mocked_data):
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
+                with mock.patch(
+                    'zerver.lib.url_preview.preview.get_oembed_data',
+                    lambda *args, **kwargs: mocked_data,
+                ):
                     FetchLinksEmbedData().consume(event)
                     data = link_embed_data_from_cache(url)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for http://test.org/: ' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for http://test.org/: '
+                in info_logs.output[0]
             )
 
         self.assertEqual(data, mocked_data)
@@ -746,17 +835,23 @@ class PreviewTestCase(ZulipTestCase):
             'message_id': msg_id,
             'urls': [url],
             'message_realm_id': msg.sender.realm_id,
-            'message_content': url}
+            'message_content': url,
+        }
 
         mocked_data = {'title': 'Clearer Code at Scale - Static Types at Zulip and Dropbox'}
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
-                with mock.patch('zerver.lib.markdown.link_preview.link_embed_data_from_cache',
-                                lambda *args, **kwargs: mocked_data):
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
+                with mock.patch(
+                    'zerver.lib.markdown.link_preview.link_embed_data_from_cache',
+                    lambda *args, **kwargs: mocked_data,
+                ):
                     FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for https://www.youtube.com/watch?v=eSJTXC7Ixgg:' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for https://www.youtube.com/watch?v=eSJTXC7Ixgg:'
+                in info_logs.output[0]
             )
 
         msg.refresh_from_db()
@@ -777,17 +872,23 @@ class PreviewTestCase(ZulipTestCase):
             'message_id': msg_id,
             'urls': [url],
             'message_realm_id': msg.sender.realm_id,
-            'message_content': url}
+            'message_content': url,
+        }
 
         mocked_data = {'title': 'Clearer Code at Scale - Static Types at Zulip and Dropbox'}
         mocked_response = mock.Mock(side_effect=self.create_mock_response(url))
         with self.settings(TEST_SUITE=False, CACHES=TEST_CACHES):
-            with mock.patch('requests.get', mocked_response), self.assertLogs(level='INFO') as info_logs:
-                with mock.patch('zerver.lib.markdown.link_preview.link_embed_data_from_cache',
-                                lambda *args, **kwargs: mocked_data):
+            with mock.patch('requests.get', mocked_response), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
+                with mock.patch(
+                    'zerver.lib.markdown.link_preview.link_embed_data_from_cache',
+                    lambda *args, **kwargs: mocked_data,
+                ):
                     FetchLinksEmbedData().consume(event)
             self.assertTrue(
-                'INFO:root:Time spent on get_link_embed_data for [YouTube link](https://www.youtube.com/watch?v=eSJTXC7Ixgg):' in info_logs.output[0]
+                'INFO:root:Time spent on get_link_embed_data for [YouTube link](https://www.youtube.com/watch?v=eSJTXC7Ixgg):'
+                in info_logs.output[0]
             )
 
         msg.refresh_from_db()
diff --git a/zerver/tests/test_logging_handlers.py b/zerver/tests/test_logging_handlers.py
index bffdad6f97..5b5b70c03b 100644
--- a/zerver/tests/test_logging_handlers.py
+++ b/zerver/tests/test_logging_handlers.py
@@ -16,8 +16,12 @@ from zerver.lib.types import ViewFuncT
 from zerver.logging_handlers import AdminNotifyHandler, HasRequest
 
 captured_request: Optional[HttpRequest] = None
-captured_exc_info: Optional[Union[Tuple[Type[BaseException], BaseException, TracebackType], Tuple[None, None, None]]] = None
-def capture_and_throw(domain: Optional[str]=None) -> Callable[[ViewFuncT], ViewFuncT]:
+captured_exc_info: Optional[
+    Union[Tuple[Type[BaseException], BaseException, TracebackType], Tuple[None, None, None]]
+] = None
+
+
+def capture_and_throw(domain: Optional[str] = None) -> Callable[[ViewFuncT], ViewFuncT]:
     def wrapper(view_func: ViewFuncT) -> ViewFuncT:
         @wraps(view_func)
         def wrapped_view(request: HttpRequest, *args: object, **kwargs: object) -> NoReturn:
@@ -29,9 +33,12 @@ def capture_and_throw(domain: Optional[str]=None) -> Callable[[ViewFuncT], ViewF
                 global captured_exc_info
                 captured_exc_info = sys.exc_info()
                 raise e
+
         return cast(ViewFuncT, wrapped_view)  # https://github.com/python/mypy/issues/1927
+
     return wrapper
 
+
 class AdminNotifyHandlerTest(ZulipTestCase):
     logger = logging.getLogger('django')
 
@@ -52,10 +59,7 @@ class AdminNotifyHandlerTest(ZulipTestCase):
         super().tearDown()
 
     def get_admin_zulip_handler(self) -> AdminNotifyHandler:
-        return [
-            h for h in logging.getLogger('').handlers
-            if isinstance(h, AdminNotifyHandler)
-        ][0]
+        return [h for h in logging.getLogger('').handlers if isinstance(h, AdminNotifyHandler)][0]
 
     @patch('zerver.logging_handlers.try_git_describe')
     def test_basic(self, mock_function: MagicMock) -> None:
@@ -66,28 +70,30 @@ class AdminNotifyHandlerTest(ZulipTestCase):
             raise Exception("Testing error!")
         except Exception:
             exc_info = sys.exc_info()
-        record = self.logger.makeRecord('name', logging.ERROR, 'function', 16,
-                                        'message', {}, exc_info)
+        record = self.logger.makeRecord(
+            'name', logging.ERROR, 'function', 16, 'message', {}, exc_info
+        )
         handler.emit(record)
 
     def simulate_error(self) -> logging.LogRecord:
         self.login('hamlet')
-        with patch("zerver.decorator.rate_limit") as rate_limit_patch, \
-                self.assertLogs('django.request', level='ERROR') as request_error_log, \
-                self.assertLogs('zerver.middleware.json_error_handler', level='ERROR') as json_error_handler_log:
+        with patch("zerver.decorator.rate_limit") as rate_limit_patch, self.assertLogs(
+            'django.request', level='ERROR'
+        ) as request_error_log, self.assertLogs(
+            'zerver.middleware.json_error_handler', level='ERROR'
+        ) as json_error_handler_log:
             rate_limit_patch.side_effect = capture_and_throw
             result = self.client_get("/json/users")
             self.assert_json_error(result, "Internal server error", status_code=500)
             rate_limit_patch.assert_called_once()
-        self.assertEqual(request_error_log.output, [
-            'ERROR:django.request:Internal Server Error: /json/users'
-        ])
-        self.assertTrue(
-            'ERROR:zerver.middleware.json_error_handler:Traceback (most recent call last):' in json_error_handler_log.output[0]
+        self.assertEqual(
+            request_error_log.output, ['ERROR:django.request:Internal Server Error: /json/users']
         )
         self.assertTrue(
-            'Exception: Request error' in json_error_handler_log.output[0]
+            'ERROR:zerver.middleware.json_error_handler:Traceback (most recent call last):'
+            in json_error_handler_log.output[0]
         )
+        self.assertTrue('Exception: Request error' in json_error_handler_log.output[0])
 
         record = self.logger.makeRecord(
             'name',
@@ -140,8 +146,10 @@ class AdminNotifyHandlerTest(ZulipTestCase):
 
         # Test that `add_request_metadata` throwing an exception is fine
         with patch("zerver.logging_handlers.traceback.print_exc"):
-            with patch("zerver.logging_handlers.add_request_metadata",
-                       side_effect=Exception("Unexpected exception!")):
+            with patch(
+                "zerver.logging_handlers.add_request_metadata",
+                side_effect=Exception("Unexpected exception!"),
+            ):
                 report = self.run_handler(record)
         self.assertNotIn("user", report)
         self.assertIn("message", report)
@@ -163,6 +171,7 @@ class AdminNotifyHandlerTest(ZulipTestCase):
         # Now simulate a DisallowedHost exception
         def get_host_error() -> None:
             raise Exception("Get host failure!")
+
         orig_get_host = record.request.get_host
         record.request.get_host = get_host_error
         report = self.run_handler(record)
@@ -175,8 +184,7 @@ class AdminNotifyHandlerTest(ZulipTestCase):
         self.assertIn("stack_trace", report)
 
         # Test an exception_filter exception
-        with patch("zerver.logging_handlers.get_exception_reporter_filter",
-                   return_value=15):
+        with patch("zerver.logging_handlers.get_exception_reporter_filter", return_value=15):
             record.request.method = "POST"
             report = self.run_handler(record)
             record.request.method = "GET"
@@ -188,17 +196,20 @@ class AdminNotifyHandlerTest(ZulipTestCase):
         self.assertIn("stack_trace", report)
 
         # Test the catch-all exception handler doesn't throw
-        with patch('zerver.lib.error_notify.notify_server_error',
-                   side_effect=Exception("queue error")):
+        with patch(
+            'zerver.lib.error_notify.notify_server_error', side_effect=Exception("queue error")
+        ):
             self.handler.emit(record)
         with self.settings(STAGING_ERROR_NOTIFICATIONS=False):
-            with mock_queue_publish('zerver.logging_handlers.queue_json_publish',
-                                    side_effect=Exception("queue error")) as m:
+            with mock_queue_publish(
+                'zerver.logging_handlers.queue_json_publish', side_effect=Exception("queue error")
+            ) as m:
                 with patch('logging.warning') as log_mock:
                     self.handler.emit(record)
                     m.assert_called_once()
-                    log_mock.assert_called_once_with('Reporting an exception triggered an exception!',
-                                                     exc_info=True)
+                    log_mock.assert_called_once_with(
+                        'Reporting an exception triggered an exception!', exc_info=True
+                    )
             with mock_queue_publish('zerver.logging_handlers.queue_json_publish') as m:
                 with patch('logging.warning') as log_mock:
                     self.handler.emit(record)
@@ -226,6 +237,7 @@ class AdminNotifyHandlerTest(ZulipTestCase):
         self.assertIn("message", report)
         self.assertIn("stack_trace", report)
 
+
 class LoggingConfigTest(ZulipTestCase):
     @staticmethod
     def all_loggers() -> Iterator[logging.Logger]:
@@ -244,13 +256,20 @@ class LoggingConfigTest(ZulipTestCase):
             for handler in logger.handlers:
                 assert not isinstance(handler, AdminEmailHandler)
 
+
 class ErrorFiltersTest(ZulipTestCase):
     def test_clean_data_from_query_parameters(self) -> None:
         from zerver.filters import clean_data_from_query_parameters
-        self.assertEqual(clean_data_from_query_parameters("api_key=abcdz&stream=1"),
-                         "api_key=******&stream=******")
-        self.assertEqual(clean_data_from_query_parameters("api_key=abcdz&stream=foo&topic=bar"),
-                         "api_key=******&stream=******&topic=******")
+
+        self.assertEqual(
+            clean_data_from_query_parameters("api_key=abcdz&stream=1"),
+            "api_key=******&stream=******",
+        )
+        self.assertEqual(
+            clean_data_from_query_parameters("api_key=abcdz&stream=foo&topic=bar"),
+            "api_key=******&stream=******&topic=******",
+        )
+
 
 class RateLimitFilterTest(ZulipTestCase):
     # This logger has special settings configured in
@@ -259,7 +278,9 @@ class RateLimitFilterTest(ZulipTestCase):
 
     def test_recursive_filter_handling(self) -> None:
         def mocked_cache_get(key: str) -> int:
-            self.logger.error("Log an error to trigger recursive filter() calls in _RateLimitFilter.")
+            self.logger.error(
+                "Log an error to trigger recursive filter() calls in _RateLimitFilter."
+            )
             raise Exception
 
         with patch("zerver.lib.logging_util.cache.get", side_effect=mocked_cache_get) as m:
diff --git a/zerver/tests/test_management_commands.py b/zerver/tests/test_management_commands.py
index 1a4a631d6b..35357bfe9f 100644
--- a/zerver/tests/test_management_commands.py
+++ b/zerver/tests/test_management_commands.py
@@ -32,7 +32,9 @@ class TestCheckConfig(ZulipTestCase):
     def test_check_config(self) -> None:
         check_config()
         with self.settings(REQUIRED_SETTINGS=[('asdf', 'not asdf')]):
-            with self.assertRaisesRegex(CommandError, "Error: You must set asdf in /etc/zulip/settings.py."):
+            with self.assertRaisesRegex(
+                CommandError, "Error: You must set asdf in /etc/zulip/settings.py."
+            ):
                 check_config()
 
     @override_settings(WARN_NO_EMAIL=True)
@@ -40,6 +42,7 @@ class TestCheckConfig(ZulipTestCase):
         with self.assertRaisesRegex(CommandError, "Outgoing email not yet configured, see"):
             call_command("send_test_email", 'test@example.com')
 
+
 class TestZulipBaseCommand(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -52,8 +55,9 @@ class TestZulipBaseCommand(ZulipTestCase):
     def test_get_realm(self) -> None:
         self.assertEqual(self.command.get_realm(dict(realm_id='zulip')), self.zulip_realm)
         self.assertEqual(self.command.get_realm(dict(realm_id=None)), None)
-        self.assertEqual(self.command.get_realm(dict(realm_id=str(self.zulip_realm.id))),
-                         self.zulip_realm)
+        self.assertEqual(
+            self.command.get_realm(dict(realm_id=str(self.zulip_realm.id))), self.zulip_realm
+        )
         with self.assertRaisesRegex(CommandError, "There is no realm with id"):
             self.command.get_realm(dict(realm_id='17'))
         with self.assertRaisesRegex(CommandError, "There is no realm with id"):
@@ -85,19 +89,22 @@ class TestZulipBaseCommand(ZulipTestCase):
 
         self.assertEqual(get_user_profile_by_email(email), user_profile)
 
-    def get_users_sorted(self, options: Dict[str, Any], realm: Optional[Realm],
-                         **kwargs: Any) -> List[UserProfile]:
+    def get_users_sorted(
+        self, options: Dict[str, Any], realm: Optional[Realm], **kwargs: Any
+    ) -> List[UserProfile]:
         user_profiles = self.command.get_users(options, realm, **kwargs)
-        return sorted(user_profiles, key = lambda x: x.email)
+        return sorted(user_profiles, key=lambda x: x.email)
 
     def sorted_users(self, users: List[UserProfile]) -> List[UserProfile]:
-        return sorted(users, key = lambda x: x.email)
+        return sorted(users, key=lambda x: x.email)
 
     def test_get_users(self) -> None:
-        expected_user_profiles = self.sorted_users([
-            self.example_user('hamlet'),
-            self.example_user('iago'),
-        ])
+        expected_user_profiles = self.sorted_users(
+            [
+                self.example_user('hamlet'),
+                self.example_user('iago'),
+            ]
+        )
 
         user_emails = ','.join(u.delivery_email for u in expected_user_profiles)
         user_profiles = self.get_users_sorted(dict(users=user_emails), self.zulip_realm)
@@ -105,10 +112,12 @@ class TestZulipBaseCommand(ZulipTestCase):
         user_profiles = self.get_users_sorted(dict(users=user_emails), None)
         self.assertEqual(user_profiles, expected_user_profiles)
 
-        expected_user_profiles = self.sorted_users([
-            self.mit_user('sipbtest'),
-            self.example_user('iago'),
-        ])
+        expected_user_profiles = self.sorted_users(
+            [
+                self.mit_user('sipbtest'),
+                self.example_user('iago'),
+            ]
+        )
         user_emails = ','.join(u.delivery_email for u in expected_user_profiles)
         user_profiles = self.get_users_sorted(dict(users=user_emails), None)
         self.assertEqual(user_profiles, expected_user_profiles)
@@ -116,47 +125,57 @@ class TestZulipBaseCommand(ZulipTestCase):
         with self.assertRaisesRegex(CommandError, error_message):
             self.command.get_users(dict(users=user_emails), self.zulip_realm)
 
-        self.assertEqual(self.command.get_users(dict(users=self.example_email("iago")), self.zulip_realm),
-                         [self.example_user("iago")])
+        self.assertEqual(
+            self.command.get_users(dict(users=self.example_email("iago")), self.zulip_realm),
+            [self.example_user("iago")],
+        )
 
         self.assertEqual(self.command.get_users(dict(users=None), None), [])
 
     def test_get_users_with_all_users_argument_enabled(self) -> None:
-        expected_user_profiles = self.sorted_users([
-            self.example_user('hamlet'),
-            self.example_user('iago'),
-        ])
+        expected_user_profiles = self.sorted_users(
+            [
+                self.example_user('hamlet'),
+                self.example_user('iago'),
+            ]
+        )
         user_emails = ','.join(u.delivery_email for u in expected_user_profiles)
-        user_profiles = self.get_users_sorted(dict(users=user_emails, all_users=False), self.zulip_realm)
+        user_profiles = self.get_users_sorted(
+            dict(users=user_emails, all_users=False), self.zulip_realm
+        )
         self.assertEqual(user_profiles, expected_user_profiles)
         error_message = "You can't use both -u/--users and -a/--all-users."
         with self.assertRaisesRegex(CommandError, error_message):
             self.command.get_users(dict(users=user_emails, all_users=True), None)
 
         # Test the default mode excluding bots and deactivated users
-        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
-                                                                   is_active=True, is_bot=False),
-                                        key = lambda x: x.email)
-        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
-                                              self.zulip_realm,
-                                              is_bot=False)
+        expected_user_profiles = sorted(
+            UserProfile.objects.filter(realm=self.zulip_realm, is_active=True, is_bot=False),
+            key=lambda x: x.email,
+        )
+        user_profiles = self.get_users_sorted(
+            dict(users=None, all_users=True), self.zulip_realm, is_bot=False
+        )
         self.assertEqual(user_profiles, expected_user_profiles)
 
         # Test the default mode excluding bots and deactivated users
-        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
-                                                                   is_active=True),
-                                        key = lambda x: x.email)
-        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
-                                              self.zulip_realm)
+        expected_user_profiles = sorted(
+            UserProfile.objects.filter(realm=self.zulip_realm, is_active=True),
+            key=lambda x: x.email,
+        )
+        user_profiles = self.get_users_sorted(dict(users=None, all_users=True), self.zulip_realm)
         self.assertEqual(user_profiles, expected_user_profiles)
 
         # Test include_deactivated
-        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
-                                                                   is_bot=False),
-                                        key = lambda x: x.email)
-        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
-                                              self.zulip_realm,
-                                              is_bot=False, include_deactivated=True)
+        expected_user_profiles = sorted(
+            UserProfile.objects.filter(realm=self.zulip_realm, is_bot=False), key=lambda x: x.email
+        )
+        user_profiles = self.get_users_sorted(
+            dict(users=None, all_users=True),
+            self.zulip_realm,
+            is_bot=False,
+            include_deactivated=True,
+        )
         self.assertEqual(user_profiles, expected_user_profiles)
 
         error_message = "You have to pass either -u/--users or -a/--all-users."
@@ -168,16 +187,16 @@ class TestZulipBaseCommand(ZulipTestCase):
             self.command.get_users(dict(users=None, all_users=True), None)
 
     def test_get_non_bot_users(self) -> None:
-        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
-                                                                   is_bot=False),
-                                        key = lambda x: x.email)
-        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
-                                              self.zulip_realm,
-                                              is_bot=False)
+        expected_user_profiles = sorted(
+            UserProfile.objects.filter(realm=self.zulip_realm, is_bot=False), key=lambda x: x.email
+        )
+        user_profiles = self.get_users_sorted(
+            dict(users=None, all_users=True), self.zulip_realm, is_bot=False
+        )
         self.assertEqual(user_profiles, expected_user_profiles)
 
-class TestCommandsCanStart(ZulipTestCase):
 
+class TestCommandsCanStart(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.commands = [
@@ -198,6 +217,7 @@ class TestCommandsCanStart(ZulipTestCase):
         # we need to reset it here.  See #3685 for details.
         settings.RUNNING_INSIDE_TORNADO = False
 
+
 class TestSendWebhookFixtureMessage(ZulipTestCase):
     COMMAND_NAME = 'send_webhook_fixture_message'
 
@@ -207,14 +227,18 @@ class TestSendWebhookFixtureMessage(ZulipTestCase):
         self.url = '/some/url/with/hook'
 
     @patch('zerver.management.commands.send_webhook_fixture_message.Command.print_help')
-    def test_check_if_command_exits_when_fixture_param_is_empty(self, print_help_mock: MagicMock) -> None:
+    def test_check_if_command_exits_when_fixture_param_is_empty(
+        self, print_help_mock: MagicMock
+    ) -> None:
         with self.assertRaises(CommandError):
             call_command(self.COMMAND_NAME, url=self.url)
 
         print_help_mock.assert_any_call('./manage.py', self.COMMAND_NAME)
 
     @patch('zerver.management.commands.send_webhook_fixture_message.Command.print_help')
-    def test_check_if_command_exits_when_url_param_is_empty(self, print_help_mock: MagicMock) -> None:
+    def test_check_if_command_exits_when_url_param_is_empty(
+        self, print_help_mock: MagicMock
+    ) -> None:
         with self.assertRaises(CommandError):
             call_command(self.COMMAND_NAME, fixture=self.fixture_path)
 
@@ -222,7 +246,8 @@ class TestSendWebhookFixtureMessage(ZulipTestCase):
 
     @patch('zerver.management.commands.send_webhook_fixture_message.os.path.exists')
     def test_check_if_command_exits_when_fixture_path_does_not_exist(
-            self, os_path_exists_mock: MagicMock) -> None:
+        self, os_path_exists_mock: MagicMock
+    ) -> None:
         os_path_exists_mock.return_value = False
 
         with self.assertRaises(CommandError):
@@ -234,11 +259,13 @@ class TestSendWebhookFixtureMessage(ZulipTestCase):
     @patch('zerver.management.commands.send_webhook_fixture_message.Client')
     @patch('zerver.management.commands.send_webhook_fixture_message.orjson')
     @patch("zerver.management.commands.send_webhook_fixture_message.open", create=True)
-    def test_check_if_command_post_request_to_url_with_fixture(self,
-                                                               open_mock: MagicMock,
-                                                               orjson_mock: MagicMock,
-                                                               client_mock: MagicMock,
-                                                               os_path_exists_mock: MagicMock) -> None:
+    def test_check_if_command_post_request_to_url_with_fixture(
+        self,
+        open_mock: MagicMock,
+        orjson_mock: MagicMock,
+        client_mock: MagicMock,
+        os_path_exists_mock: MagicMock,
+    ) -> None:
         orjson_mock.loads.return_value = {}
         orjson_mock.dumps.return_value = b"{}"
         os_path_exists_mock.return_value = True
@@ -250,8 +277,10 @@ class TestSendWebhookFixtureMessage(ZulipTestCase):
         self.assertTrue(orjson_mock.dumps.called)
         self.assertTrue(orjson_mock.loads.called)
         self.assertTrue(open_mock.called)
-        client.post.assert_called_once_with(self.url, b"{}", content_type="application/json",
-                                            HTTP_HOST="zulip.testserver")
+        client.post.assert_called_once_with(
+            self.url, b"{}", content_type="application/json", HTTP_HOST="zulip.testserver"
+        )
+
 
 class TestGenerateRealmCreationLink(ZulipTestCase):
     COMMAND_NAME = "generate_realm_creation_link"
@@ -278,7 +307,9 @@ class TestGenerateRealmCreationLink(ZulipTestCase):
 
         # Original link is now dead
         result = self.client_get(generated_link)
-        self.assert_in_success_response(["The organization creation link has expired or is not valid."], result)
+        self.assert_in_success_response(
+            ["The organization creation link has expired or is not valid."], result
+        )
 
     @override_settings(OPEN_REALM_CREATION=False)
     def test_generate_link_confirm_email(self) -> None:
@@ -287,21 +318,24 @@ class TestGenerateRealmCreationLink(ZulipTestCase):
 
         result = self.client_post(generated_link, {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(re.search(f'/accounts/new/send_confirm/{email}$',
-                                  result["Location"]))
+        self.assertTrue(re.search(f'/accounts/new/send_confirm/{email}$', result["Location"]))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started", result)
 
         # Original link is now dead
         result = self.client_get(generated_link)
-        self.assert_in_success_response(["The organization creation link has expired or is not valid."], result)
+        self.assert_in_success_response(
+            ["The organization creation link has expired or is not valid."], result
+        )
 
     @override_settings(OPEN_REALM_CREATION=False)
     def test_realm_creation_with_random_link(self) -> None:
         # Realm creation attempt with an invalid link should fail
         random_link = "/new/5e89081eb13984e0f3b130bf7a4121d153f1614b"
         result = self.client_get(random_link)
-        self.assert_in_success_response(["The organization creation link has expired or is not valid."], result)
+        self.assert_in_success_response(
+            ["The organization creation link has expired or is not valid."], result
+        )
 
     @override_settings(OPEN_REALM_CREATION=False)
     def test_realm_creation_with_expired_link(self) -> None:
@@ -309,11 +343,16 @@ class TestGenerateRealmCreationLink(ZulipTestCase):
         key = generated_link[-24:]
         # Manually expire the link by changing the date of creation
         obj = RealmCreationKey.objects.get(creation_key=key)
-        obj.date_created = obj.date_created - timedelta(days=settings.REALM_CREATION_LINK_VALIDITY_DAYS + 1)
+        obj.date_created = obj.date_created - timedelta(
+            days=settings.REALM_CREATION_LINK_VALIDITY_DAYS + 1
+        )
         obj.save()
 
         result = self.client_get(generated_link)
-        self.assert_in_success_response(["The organization creation link has expired or is not valid."], result)
+        self.assert_in_success_response(
+            ["The organization creation link has expired or is not valid."], result
+        )
+
 
 @skipUnless(settings.ZILENCER_ENABLED, "requires zilencer")
 class TestCalculateFirstVisibleMessageID(ZulipTestCase):
@@ -330,18 +369,21 @@ class TestCalculateFirstVisibleMessageID(ZulipTestCase):
         calls = [call(realm, 35) for realm in Realm.objects.all()]
         m.assert_has_calls(calls, any_order=True)
 
+
 class TestPasswordRestEmail(ZulipTestCase):
     COMMAND_NAME = "send_password_reset_email"
 
     def test_if_command_sends_password_reset_email(self) -> None:
         call_command(self.COMMAND_NAME, users=self.example_email("iago"))
         from django.core.mail import outbox
+
         self.assertRegex(
             outbox[0].from_email,
             fr"^Zulip Account Security <{self.TOKENIZED_NOREPLY_REGEX}>\Z",
         )
         self.assertIn("reset your password", outbox[0].body)
 
+
 class TestRealmReactivationEmail(ZulipTestCase):
     COMMAND_NAME = "send_realm_reactivation_email"
 
@@ -350,6 +392,7 @@ class TestRealmReactivationEmail(ZulipTestCase):
         with self.assertRaisesRegex(CommandError, f"The realm {realm.name} is already active."):
             call_command(self.COMMAND_NAME, "--realm=zulip")
 
+
 class TestSendToEmailMirror(ZulipTestCase):
     COMMAND_NAME = "send_to_email_mirror"
 
@@ -361,9 +404,10 @@ class TestSendToEmailMirror(ZulipTestCase):
 
         with self.assertLogs('zerver.lib.email_mirror', level='INFO') as info_log:
             call_command(self.COMMAND_NAME, f"--fixture={fixture_path}")
-        self.assertEqual(info_log.output, [
-            'INFO:zerver.lib.email_mirror:Successfully processed email to Denmark (zulip)'
-        ])
+        self.assertEqual(
+            info_log.output,
+            ['INFO:zerver.lib.email_mirror:Successfully processed email to Denmark (zulip)'],
+        )
         message = most_recent_message(user_profile)
 
         # last message should be equal to the body of the email in 1.txt
@@ -377,9 +421,10 @@ class TestSendToEmailMirror(ZulipTestCase):
 
         with self.assertLogs('zerver.lib.email_mirror', level='INFO') as info_log:
             call_command(self.COMMAND_NAME, f"--fixture={fixture_path}")
-        self.assertEqual(info_log.output, [
-            'INFO:zerver.lib.email_mirror:Successfully processed email to Denmark (zulip)'
-        ])
+        self.assertEqual(
+            info_log.output,
+            ['INFO:zerver.lib.email_mirror:Successfully processed email to Denmark (zulip)'],
+        )
         message = most_recent_message(user_profile)
 
         # last message should be equal to the body of the email in 1.json
@@ -393,9 +438,10 @@ class TestSendToEmailMirror(ZulipTestCase):
 
         with self.assertLogs('zerver.lib.email_mirror', level='INFO') as info_log:
             call_command(self.COMMAND_NAME, f"--fixture={fixture_path}", "--stream=Denmark2")
-        self.assertEqual(info_log.output, [
-            'INFO:zerver.lib.email_mirror:Successfully processed email to Denmark2 (zulip)'
-        ])
+        self.assertEqual(
+            info_log.output,
+            ['INFO:zerver.lib.email_mirror:Successfully processed email to Denmark2 (zulip)'],
+        )
         message = most_recent_message(user_profile)
 
         # last message should be equal to the body of the email in 1.txt
@@ -405,12 +451,14 @@ class TestSendToEmailMirror(ZulipTestCase):
         self.assertEqual(message.recipient.type, Recipient.STREAM)
         self.assertEqual(message.recipient.type_id, stream_id)
 
+
 class TestConvertMattermostData(ZulipTestCase):
     COMMAND_NAME = 'convert_mattermost_data'
 
     def test_if_command_calls_do_convert_data(self) -> None:
-        with patch('zerver.management.commands.convert_mattermost_data.do_convert_data') as m, \
-                patch('builtins.print') as mock_print:
+        with patch(
+            'zerver.management.commands.convert_mattermost_data.do_convert_data'
+        ) as m, patch('builtins.print') as mock_print:
             mm_fixtures = self.fixture_file_name("", "mattermost_fixtures")
             output_dir = self.make_import_output_dir("mattermost")
             call_command(self.COMMAND_NAME, mm_fixtures, f"--output={output_dir}")
@@ -420,9 +468,8 @@ class TestConvertMattermostData(ZulipTestCase):
             mattermost_data_dir=os.path.realpath(mm_fixtures),
             output_dir=os.path.realpath(output_dir),
         )
-        self.assertEqual(mock_print.mock_calls, [
-            call('Converting data ...')
-        ])
+        self.assertEqual(mock_print.mock_calls, [call('Converting data ...')])
+
 
 @skipUnless(settings.ZILENCER_ENABLED, "requires zilencer")
 class TestInvoicePlans(ZulipTestCase):
@@ -434,57 +481,90 @@ class TestInvoicePlans(ZulipTestCase):
 
         m.assert_called_once()
 
+
 class TestExport(ZulipTestCase):
     COMMAND_NAME = 'export'
 
     def test_command_with_consented_message_id(self) -> None:
         realm = get_realm("zulip")
-        self.send_stream_message(self.example_user("othello"), "Verona",
-                                 topic_name="Export",
-                                 content="Outbox emoji for export")
+        self.send_stream_message(
+            self.example_user("othello"),
+            "Verona",
+            topic_name="Export",
+            content="Outbox emoji for export",
+        )
         message = Message.objects.last()
-        do_add_reaction(self.example_user("iago"), message, "outbox", "1f4e4",  Reaction.UNICODE_EMOJI)
-        do_add_reaction(self.example_user("hamlet"), message, "outbox", "1f4e4",  Reaction.UNICODE_EMOJI)
+        do_add_reaction(
+            self.example_user("iago"), message, "outbox", "1f4e4", Reaction.UNICODE_EMOJI
+        )
+        do_add_reaction(
+            self.example_user("hamlet"), message, "outbox", "1f4e4", Reaction.UNICODE_EMOJI
+        )
 
-        with patch("zerver.management.commands.export.export_realm_wrapper") as m, \
-                patch('builtins.print') as mock_print, \
-                patch('builtins.input', return_value='y') as mock_input:
+        with patch("zerver.management.commands.export.export_realm_wrapper") as m, patch(
+            'builtins.print'
+        ) as mock_print, patch('builtins.input', return_value='y') as mock_input:
             call_command(self.COMMAND_NAME, "-r=zulip", f"--consent-message-id={message.id}")
-            m.assert_called_once_with(realm=realm, public_only=False, consent_message_id=message.id,
-                                      delete_after_upload=False, threads=mock.ANY, output_dir=mock.ANY,
-                                      percent_callback=mock.ANY,
-                                      upload=False)
+            m.assert_called_once_with(
+                realm=realm,
+                public_only=False,
+                consent_message_id=message.id,
+                delete_after_upload=False,
+                threads=mock.ANY,
+                output_dir=mock.ANY,
+                percent_callback=mock.ANY,
+                upload=False,
+            )
             mock_input.assert_called_once_with('Continue? [y/N] ')
 
-        self.assertEqual(mock_print.mock_calls, [
-            call('\033[94mExporting realm\033[0m: zulip'),
-            call('\n\033[94mMessage content:\033[0m\nOutbox emoji for export\n'),
-            call('\033[94mNumber of users that reacted outbox:\033[0m 2 / 8 total non-guest users\n'),
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [
+                call('\033[94mExporting realm\033[0m: zulip'),
+                call('\n\033[94mMessage content:\033[0m\nOutbox emoji for export\n'),
+                call(
+                    '\033[94mNumber of users that reacted outbox:\033[0m 2 / 8 total non-guest users\n'
+                ),
+            ],
+        )
 
-        with self.assertRaisesRegex(CommandError, "Message with given ID does not"), \
-                patch('builtins.print') as mock_print:
+        with self.assertRaisesRegex(CommandError, "Message with given ID does not"), patch(
+            'builtins.print'
+        ) as mock_print:
             call_command(self.COMMAND_NAME, "-r=zulip", "--consent-message-id=123456")
-        self.assertEqual(mock_print.mock_calls, [
-            call('\033[94mExporting realm\033[0m: zulip'),
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [
+                call('\033[94mExporting realm\033[0m: zulip'),
+            ],
+        )
 
         message.last_edit_time = timezone_now()
         message.save()
-        with self.assertRaisesRegex(CommandError, "Message was edited. Aborting..."), \
-                patch('builtins.print') as mock_print:
+        with self.assertRaisesRegex(CommandError, "Message was edited. Aborting..."), patch(
+            'builtins.print'
+        ) as mock_print:
             call_command(self.COMMAND_NAME, "-r=zulip", f"--consent-message-id={message.id}")
-        self.assertEqual(mock_print.mock_calls, [
-            call('\033[94mExporting realm\033[0m: zulip'),
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [
+                call('\033[94mExporting realm\033[0m: zulip'),
+            ],
+        )
 
         message.last_edit_time = None
         message.save()
-        do_add_reaction(self.mit_user("sipbtest"), message, "outbox", "1f4e4",  Reaction.UNICODE_EMOJI)
-        with self.assertRaisesRegex(CommandError, "Users from a different realm reacted to message. Aborting..."), \
-                patch('builtins.print') as mock_print:
+        do_add_reaction(
+            self.mit_user("sipbtest"), message, "outbox", "1f4e4", Reaction.UNICODE_EMOJI
+        )
+        with self.assertRaisesRegex(
+            CommandError, "Users from a different realm reacted to message. Aborting..."
+        ), patch('builtins.print') as mock_print:
             call_command(self.COMMAND_NAME, "-r=zulip", f"--consent-message-id={message.id}")
 
-        self.assertEqual(mock_print.mock_calls, [
-            call('\033[94mExporting realm\033[0m: zulip'),
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [
+                call('\033[94mExporting realm\033[0m: zulip'),
+            ],
+        )
diff --git a/zerver/tests/test_markdown.py b/zerver/tests/test_markdown.py
index d5f181985a..e1005ae82b 100644
--- a/zerver/tests/test_markdown.py
+++ b/zerver/tests/test_markdown.py
@@ -191,12 +191,14 @@ class FencedBlockPreprocessorTest(ZulipTestCase):
         lines = processor.run(markdown_input)
         self.assertEqual(lines, expected)
 
+
 def markdown_convert_wrapper(content: str) -> str:
     return markdown_convert(
         content=content,
         message_realm=get_realm('zulip'),
     )
 
+
 class MarkdownMiscTest(ZulipTestCase):
     def test_diffs_work_as_expected(self) -> None:
         str1 = "<p>The quick brown fox jumps over the lazy dog.  Animal stories are fun, yeah</p>"
@@ -227,24 +229,29 @@ class MarkdownMiscTest(ZulipTestCase):
 
         fred4 = make_user('fred4@example.com', 'Fred Flintstone')
 
-        lst = get_possible_mentions_info(realm.id, {'Fred Flintstone', 'cordelia LEAR', 'Not A User'})
+        lst = get_possible_mentions_info(
+            realm.id, {'Fred Flintstone', 'cordelia LEAR', 'Not A User'}
+        )
         set_of_names = set(map(lambda x: x['full_name'].lower(), lst))
         self.assertEqual(set_of_names, {'fred flintstone', 'cordelia lear'})
 
-        by_id = {
-            row['id']: row
-            for row in lst
-        }
-        self.assertEqual(by_id.get(fred2.id), dict(
-            email=fred2.email,
-            full_name='Fred Flintstone',
-            id=fred2.id,
-        ))
-        self.assertEqual(by_id.get(fred4.id), dict(
-            email=fred4.email,
-            full_name='Fred Flintstone',
-            id=fred4.id,
-        ))
+        by_id = {row['id']: row for row in lst}
+        self.assertEqual(
+            by_id.get(fred2.id),
+            dict(
+                email=fred2.email,
+                full_name='Fred Flintstone',
+                id=fred2.id,
+            ),
+        )
+        self.assertEqual(
+            by_id.get(fred4.id),
+            dict(
+                email=fred4.email,
+                full_name='Fred Flintstone',
+                id=fred4.id,
+            ),
+        )
 
     def test_mention_data(self) -> None:
         realm = get_realm('zulip')
@@ -253,14 +260,17 @@ class MarkdownMiscTest(ZulipTestCase):
         content = '@**King Hamlet** @**Cordelia lear**'
         mention_data = MentionData(realm.id, content)
         self.assertEqual(mention_data.get_user_ids(), {hamlet.id, cordelia.id})
-        self.assertEqual(mention_data.get_user_by_id(hamlet.id), dict(
-            email=hamlet.email,
-            full_name=hamlet.full_name,
-            id=hamlet.id,
-        ))
+        self.assertEqual(
+            mention_data.get_user_by_id(hamlet.id),
+            dict(
+                email=hamlet.email,
+                full_name=hamlet.full_name,
+                id=hamlet.id,
+            ),
+        )
 
         user = mention_data.get_user_by_name('king hamLET')
-        assert(user is not None)
+        assert user is not None
         self.assertEqual(user['email'], hamlet.email)
 
         self.assertFalse(mention_data.message_has_wildcards())
@@ -274,6 +284,7 @@ class MarkdownMiscTest(ZulipTestCase):
                 render_tex("random text")
             self.assertEqual(m.output, ["ERROR:root:Cannot find KaTeX for latex rendering!"])
 
+
 class MarkdownListPreprocessorTest(ZulipTestCase):
     # We test that the preprocessor inserts blank lines at correct places.
     # We use <> to indicate that we need to insert a blank line here.
@@ -289,7 +300,9 @@ class MarkdownListPreprocessorTest(ZulipTestCase):
 
     def test_list_after_quotes(self) -> None:
         preprocessor = MarkdownListPreprocessor()
-        original, expected = self.split_message('```quote\nSomething\n```\n\nList without a gap\n<>* One\n* Two')
+        original, expected = self.split_message(
+            '```quote\nSomething\n```\n\nList without a gap\n<>* One\n* Two'
+        )
         self.assertEqual(preprocessor.run(original), expected)
 
     def test_list_in_code(self) -> None:
@@ -361,6 +374,7 @@ Outside. Should convert:<>
         original, expected = self.split_message(msg)
         self.assertEqual(preprocessor.run(original), expected)
 
+
 class MarkdownTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -369,14 +383,19 @@ class MarkdownTest(ZulipTestCase):
     def assertEqual(self, first: Any, second: Any, msg: str = "") -> None:
         if isinstance(first, str) and isinstance(second, str):
             if first != second:
-                raise AssertionError("Actual and expected outputs do not match; showing diff.\n" +
-                                     diff_strings(first, second) + msg)
+                raise AssertionError(
+                    "Actual and expected outputs do not match; showing diff.\n"
+                    + diff_strings(first, second)
+                    + msg
+                )
         else:
             super().assertEqual(first, second)
 
     def load_markdown_tests(self) -> Tuple[Dict[str, Any], List[List[str]]]:
         test_fixtures = {}
-        with open(os.path.join(os.path.dirname(__file__), 'fixtures/markdown_test_cases.json'), "rb") as f:
+        with open(
+            os.path.join(os.path.dirname(__file__), 'fixtures/markdown_test_cases.json'), "rb"
+        ) as f:
             data = orjson.loads(f.read())
         for test in data['regular_tests']:
             test_fixtures[test['name']] = test
@@ -393,10 +412,16 @@ class MarkdownTest(ZulipTestCase):
 
     def test_markdown_fixtures(self) -> None:
         format_tests, linkify_tests = self.load_markdown_tests()
-        valid_keys = {"name", "input", "expected_output",
-                      "backend_only_rendering",
-                      "marked_expected_output", "text_content",
-                      "translate_emoticons", "ignore"}
+        valid_keys = {
+            "name",
+            "input",
+            "expected_output",
+            "backend_only_rendering",
+            "marked_expected_output",
+            "text_content",
+            "translate_emoticons",
+            "ignore",
+        }
 
         for name, test in format_tests.items():
             with self.subTest(markdown_test_case=name):
@@ -417,7 +442,7 @@ class MarkdownTest(ZulipTestCase):
 
                 self.assertEqual(converted, test['expected_output'])
 
-        def replaced(payload: str, url: str, phrase: str='') -> str:
+        def replaced(payload: str, url: str, phrase: str = '') -> str:
             if url[:4] == 'http':
                 href = url
             elif '@' in url:
@@ -426,7 +451,9 @@ class MarkdownTest(ZulipTestCase):
                 href = 'http://' + url
             return payload % (f"<a href=\"{href}\">{url}</a>",)
 
-        with mock.patch('zerver.lib.url_preview.preview.link_embed_data_from_cache', return_value=None):
+        with mock.patch(
+            'zerver.lib.url_preview.preview.link_embed_data_from_cache', return_value=None
+        ):
             for inline_url, reference, url in linkify_tests:
                 try:
                     match = replaced(reference, url, phrase=inline_url)
@@ -438,62 +465,96 @@ class MarkdownTest(ZulipTestCase):
     def test_inline_file(self) -> None:
         msg = 'Check out this file file:///Volumes/myserver/Users/Shared/pi.py'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>Check out this file <a href="file:///Volumes/myserver/Users/Shared/pi.py">file:///Volumes/myserver/Users/Shared/pi.py</a></p>')
+        self.assertEqual(
+            converted,
+            '<p>Check out this file <a href="file:///Volumes/myserver/Users/Shared/pi.py">file:///Volumes/myserver/Users/Shared/pi.py</a></p>',
+        )
 
         clear_state_for_testing()
         with self.settings(ENABLE_FILE_LINKS=False):
             realm = Realm.objects.create(string_id='file_links_test')
             maybe_update_markdown_engines(realm.id, False)
             converted = markdown_convert(msg, message_realm=realm)
-            self.assertEqual(converted, '<p>Check out this file file:///Volumes/myserver/Users/Shared/pi.py</p>')
+            self.assertEqual(
+                converted, '<p>Check out this file file:///Volumes/myserver/Users/Shared/pi.py</p>'
+            )
 
     def test_inline_bitcoin(self) -> None:
         msg = 'To bitcoin:1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa or not to bitcoin'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>To <a href="bitcoin:1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa">bitcoin:1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa</a> or not to bitcoin</p>')
+        self.assertEqual(
+            converted,
+            '<p>To <a href="bitcoin:1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa">bitcoin:1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa</a> or not to bitcoin</p>',
+        )
 
     def test_inline_youtube(self) -> None:
         msg = 'Check out the debate: http://www.youtube.com/watch?v=hx1mjT73xYE'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Check out the debate: <a href="http://www.youtube.com/watch?v=hx1mjT73xYE">http://www.youtube.com/watch?v=hx1mjT73xYE</a></p>\n<div class="youtube-video message_inline_image"><a data-id="hx1mjT73xYE" href="http://www.youtube.com/watch?v=hx1mjT73xYE"><img src="https://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p>Check out the debate: <a href="http://www.youtube.com/watch?v=hx1mjT73xYE">http://www.youtube.com/watch?v=hx1mjT73xYE</a></p>\n<div class="youtube-video message_inline_image"><a data-id="hx1mjT73xYE" href="http://www.youtube.com/watch?v=hx1mjT73xYE"><img src="https://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>',
+        )
 
         msg = 'http://www.youtube.com/watch?v=hx1mjT73xYE'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="http://www.youtube.com/watch?v=hx1mjT73xYE">http://www.youtube.com/watch?v=hx1mjT73xYE</a></p>\n<div class="youtube-video message_inline_image"><a data-id="hx1mjT73xYE" href="http://www.youtube.com/watch?v=hx1mjT73xYE"><img src="https://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="http://www.youtube.com/watch?v=hx1mjT73xYE">http://www.youtube.com/watch?v=hx1mjT73xYE</a></p>\n<div class="youtube-video message_inline_image"><a data-id="hx1mjT73xYE" href="http://www.youtube.com/watch?v=hx1mjT73xYE"><img src="https://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>',
+        )
 
         msg = 'https://youtu.be/hx1mjT73xYE'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="https://youtu.be/hx1mjT73xYE">https://youtu.be/hx1mjT73xYE</a></p>\n<div class="youtube-video message_inline_image"><a data-id="hx1mjT73xYE" href="https://youtu.be/hx1mjT73xYE"><img src="https://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://youtu.be/hx1mjT73xYE">https://youtu.be/hx1mjT73xYE</a></p>\n<div class="youtube-video message_inline_image"><a data-id="hx1mjT73xYE" href="https://youtu.be/hx1mjT73xYE"><img src="https://i.ytimg.com/vi/hx1mjT73xYE/default.jpg"></a></div>',
+        )
 
         msg = 'https://www.youtube.com/playlist?list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo'
         not_converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(not_converted, '<p><a href="https://www.youtube.com/playlist?list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo">https://www.youtube.com/playlist?list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo</a></p>')
+        self.assertEqual(
+            not_converted,
+            '<p><a href="https://www.youtube.com/playlist?list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo">https://www.youtube.com/playlist?list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo</a></p>',
+        )
 
-        msg = 'https://www.youtube.com/playlist?v=O5nskjZ_GoI&list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo'
+        msg = (
+            'https://www.youtube.com/playlist?v=O5nskjZ_GoI&list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo'
+        )
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="https://www.youtube.com/playlist?v=O5nskjZ_GoI&amp;list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo">https://www.youtube.com/playlist?v=O5nskjZ_GoI&amp;list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo</a></p>\n<div class="youtube-video message_inline_image"><a data-id="O5nskjZ_GoI" href="https://www.youtube.com/playlist?v=O5nskjZ_GoI&amp;list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo"><img src="https://i.ytimg.com/vi/O5nskjZ_GoI/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://www.youtube.com/playlist?v=O5nskjZ_GoI&amp;list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo">https://www.youtube.com/playlist?v=O5nskjZ_GoI&amp;list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo</a></p>\n<div class="youtube-video message_inline_image"><a data-id="O5nskjZ_GoI" href="https://www.youtube.com/playlist?v=O5nskjZ_GoI&amp;list=PL8dPuuaLjXtNlUrzyH5r6jN9ulIgZBpdo"><img src="https://i.ytimg.com/vi/O5nskjZ_GoI/default.jpg"></a></div>',
+        )
 
         msg = 'http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw">http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw</a></p>\n<div class="youtube-video message_inline_image"><a data-id="nOJgD4fcZhI" href="http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw"><img src="https://i.ytimg.com/vi/nOJgD4fcZhI/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw">http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw</a></p>\n<div class="youtube-video message_inline_image"><a data-id="nOJgD4fcZhI" href="http://www.youtube.com/watch_videos?video_ids=nOJgD4fcZhI,i96UO8-GFvw"><img src="https://i.ytimg.com/vi/nOJgD4fcZhI/default.jpg"></a></div>',
+        )
 
     @override_settings(INLINE_URL_EMBED_PREVIEW=False)
     def test_inline_vimeo(self) -> None:
         msg = 'Check out the debate: https://vimeo.com/246979354'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Check out the debate: <a href="https://vimeo.com/246979354">https://vimeo.com/246979354</a></p>')
+        self.assertEqual(
+            converted,
+            '<p>Check out the debate: <a href="https://vimeo.com/246979354">https://vimeo.com/246979354</a></p>',
+        )
 
         msg = 'https://vimeo.com/246979354'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="https://vimeo.com/246979354">https://vimeo.com/246979354</a></p>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://vimeo.com/246979354">https://vimeo.com/246979354</a></p>',
+        )
 
     @override_settings(INLINE_IMAGE_PREVIEW=True)
     def test_inline_image_thumbnail_url(self) -> None:
@@ -640,8 +701,7 @@ class MarkdownTest(ZulipTestCase):
         ret = image_preview_enabled(message)
         self.assertEqual(ret, True)
 
-        ret = image_preview_enabled(message, realm,
-                                    no_previews=True)
+        ret = image_preview_enabled(message, realm, no_previews=True)
         self.assertEqual(ret, False)
 
         ret = image_preview_enabled(message, no_previews=True)
@@ -650,7 +710,9 @@ class MarkdownTest(ZulipTestCase):
     @override_settings(INLINE_URL_EMBED_PREVIEW=False)
     def test_url_embed_preview_enabled(self) -> None:
         sender_user_profile = self.example_user('othello')
-        message = copy.deepcopy(Message(sender=sender_user_profile, sending_client=get_client("test")))
+        message = copy.deepcopy(
+            Message(sender=sender_user_profile, sending_client=get_client("test"))
+        )
         realm = message.get_realm()
         realm.inline_url_embed_preview = True  # off by default
         realm.save(update_fields=['inline_url_embed_preview'])
@@ -676,27 +738,48 @@ class MarkdownTest(ZulipTestCase):
 
     def test_inline_dropbox(self) -> None:
         msg = 'Look at how hilarious our old office was: https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG'
-        image_info = {'image': 'https://photos-4.dropbox.com/t/2/AABIre1oReJgPYuc_53iv0IHq1vUzRaDg2rrCfTpiWMccQ/12/129/jpeg/1024x1024/2/_/0/4/IMG_0923.JPG/CIEBIAEgAiAHKAIoBw/ymdijjcg67hv2ta/AABz2uuED1ox3vpWWvMpBxu6a/IMG_0923.JPG', 'desc': 'Shared with Dropbox', 'title': 'IMG_0923.JPG'}
+        image_info = {
+            'image': 'https://photos-4.dropbox.com/t/2/AABIre1oReJgPYuc_53iv0IHq1vUzRaDg2rrCfTpiWMccQ/12/129/jpeg/1024x1024/2/_/0/4/IMG_0923.JPG/CIEBIAEgAiAHKAIoBw/ymdijjcg67hv2ta/AABz2uuED1ox3vpWWvMpBxu6a/IMG_0923.JPG',
+            'desc': 'Shared with Dropbox',
+            'title': 'IMG_0923.JPG',
+        }
         with mock.patch('zerver.lib.markdown.fetch_open_graph_image', return_value=image_info):
             converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Look at how hilarious our old office was: <a href="https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG">https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG</a></p>\n<div class="message_inline_image"><a href="https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG" title="IMG_0923.JPG"><img src="https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG?dl=1"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p>Look at how hilarious our old office was: <a href="https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG">https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG</a></p>\n<div class="message_inline_image"><a href="https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG" title="IMG_0923.JPG"><img src="https://www.dropbox.com/s/ymdijjcg67hv2ta/IMG_0923.JPG?dl=1"></a></div>',
+        )
 
         msg = 'Look at my hilarious drawing folder: https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl='
-        image_info = {'image': 'https://cf.dropboxstatic.com/static/images/icons128/folder_dropbox.png', 'desc': 'Shared with Dropbox', 'title': 'Saves'}
+        image_info = {
+            'image': 'https://cf.dropboxstatic.com/static/images/icons128/folder_dropbox.png',
+            'desc': 'Shared with Dropbox',
+            'title': 'Saves',
+        }
         with mock.patch('zerver.lib.markdown.fetch_open_graph_image', return_value=image_info):
             converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Look at my hilarious drawing folder: <a href="https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl=">https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl=</a></p>\n<div class="message_inline_ref"><a href="https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl=" title="Saves"><img src="https://cf.dropboxstatic.com/static/images/icons128/folder_dropbox.png"></a><div><div class="message_inline_image_title">Saves</div><desc class="message_inline_image_desc"></desc></div></div>')
+        self.assertEqual(
+            converted,
+            '<p>Look at my hilarious drawing folder: <a href="https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl=">https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl=</a></p>\n<div class="message_inline_ref"><a href="https://www.dropbox.com/sh/cm39k9e04z7fhim/AAAII5NK-9daee3FcF41anEua?dl=" title="Saves"><img src="https://cf.dropboxstatic.com/static/images/icons128/folder_dropbox.png"></a><div><div class="message_inline_image_title">Saves</div><desc class="message_inline_image_desc"></desc></div></div>',
+        )
 
     def test_inline_dropbox_preview(self) -> None:
         # Test photo album previews
         msg = 'https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5'
-        image_info = {'image': 'https://photos-6.dropbox.com/t/2/AAAlawaeD61TyNewO5vVi-DGf2ZeuayfyHFdNTNzpGq-QA/12/271544745/jpeg/1024x1024/2/_/0/5/baby-piglet.jpg/CKnjvYEBIAIgBygCKAc/tditp9nitko60n5/AADX03VAIrQlTl28CtujDcMla/0', 'desc': 'Shared with Dropbox', 'title': '1 photo'}
+        image_info = {
+            'image': 'https://photos-6.dropbox.com/t/2/AAAlawaeD61TyNewO5vVi-DGf2ZeuayfyHFdNTNzpGq-QA/12/271544745/jpeg/1024x1024/2/_/0/5/baby-piglet.jpg/CKnjvYEBIAIgBygCKAc/tditp9nitko60n5/AADX03VAIrQlTl28CtujDcMla/0',
+            'desc': 'Shared with Dropbox',
+            'title': '1 photo',
+        }
         with mock.patch('zerver.lib.markdown.fetch_open_graph_image', return_value=image_info):
             converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5">https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5</a></p>\n<div class="message_inline_image"><a href="https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5" title="1 photo"><img src="https://photos-6.dropbox.com/t/2/AAAlawaeD61TyNewO5vVi-DGf2ZeuayfyHFdNTNzpGq-QA/12/271544745/jpeg/1024x1024/2/_/0/5/baby-piglet.jpg/CKnjvYEBIAIgBygCKAc/tditp9nitko60n5/AADX03VAIrQlTl28CtujDcMla/0"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5">https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5</a></p>\n<div class="message_inline_image"><a href="https://www.dropbox.com/sc/tditp9nitko60n5/03rEiZldy5" title="1 photo"><img src="https://photos-6.dropbox.com/t/2/AAAlawaeD61TyNewO5vVi-DGf2ZeuayfyHFdNTNzpGq-QA/12/271544745/jpeg/1024x1024/2/_/0/5/baby-piglet.jpg/CKnjvYEBIAIgBygCKAc/tditp9nitko60n5/AADX03VAIrQlTl28CtujDcMla/0"></a></div>',
+        )
 
     def test_inline_dropbox_negative(self) -> None:
         # Make sure we're not overzealous in our conversion:
@@ -704,90 +787,134 @@ class MarkdownTest(ZulipTestCase):
         with mock.patch('zerver.lib.markdown.fetch_open_graph_image', return_value=None):
             converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Look at the new dropbox logo: <a href="https://www.dropbox.com/static/images/home_logo.png">https://www.dropbox.com/static/images/home_logo.png</a></p>\n<div class="message_inline_image"><a href="https://www.dropbox.com/static/images/home_logo.png"><img data-src-fullsize="/thumbnail?url=https%3A%2F%2Fwww.dropbox.com%2Fstatic%2Fimages%2Fhome_logo.png&amp;size=full" src="/thumbnail?url=https%3A%2F%2Fwww.dropbox.com%2Fstatic%2Fimages%2Fhome_logo.png&amp;size=thumbnail"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p>Look at the new dropbox logo: <a href="https://www.dropbox.com/static/images/home_logo.png">https://www.dropbox.com/static/images/home_logo.png</a></p>\n<div class="message_inline_image"><a href="https://www.dropbox.com/static/images/home_logo.png"><img data-src-fullsize="/thumbnail?url=https%3A%2F%2Fwww.dropbox.com%2Fstatic%2Fimages%2Fhome_logo.png&amp;size=full" src="/thumbnail?url=https%3A%2F%2Fwww.dropbox.com%2Fstatic%2Fimages%2Fhome_logo.png&amp;size=thumbnail"></a></div>',
+        )
 
     def test_inline_dropbox_bad(self) -> None:
         # Don't fail on bad dropbox links
         msg = "https://zulip-test.dropbox.com/photos/cl/ROmr9K1XYtmpneM"
         with mock.patch('zerver.lib.markdown.fetch_open_graph_image', return_value=None):
             converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p><a href="https://zulip-test.dropbox.com/photos/cl/ROmr9K1XYtmpneM">https://zulip-test.dropbox.com/photos/cl/ROmr9K1XYtmpneM</a></p>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://zulip-test.dropbox.com/photos/cl/ROmr9K1XYtmpneM">https://zulip-test.dropbox.com/photos/cl/ROmr9K1XYtmpneM</a></p>',
+        )
 
     def test_inline_github_preview(self) -> None:
         # Test photo album previews
         msg = 'Test: https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Test: <a href="https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png">https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png</a></p>\n<div class="message_inline_image"><a href="https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png"><img data-src-fullsize="/thumbnail?url=https%3A%2F%2Fraw.githubusercontent.com%2Fzulip%2Fzulip%2Fmaster%2Fstatic%2Fimages%2Flogo%2Fzulip-icon-128x128.png&amp;size=full" src="/thumbnail?url=https%3A%2F%2Fraw.githubusercontent.com%2Fzulip%2Fzulip%2Fmaster%2Fstatic%2Fimages%2Flogo%2Fzulip-icon-128x128.png&amp;size=thumbnail"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p>Test: <a href="https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png">https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png</a></p>\n<div class="message_inline_image"><a href="https://github.com/zulip/zulip/blob/master/static/images/logo/zulip-icon-128x128.png"><img data-src-fullsize="/thumbnail?url=https%3A%2F%2Fraw.githubusercontent.com%2Fzulip%2Fzulip%2Fmaster%2Fstatic%2Fimages%2Flogo%2Fzulip-icon-128x128.png&amp;size=full" src="/thumbnail?url=https%3A%2F%2Fraw.githubusercontent.com%2Fzulip%2Fzulip%2Fmaster%2Fstatic%2Fimages%2Flogo%2Fzulip-icon-128x128.png&amp;size=thumbnail"></a></div>',
+        )
 
         msg = 'Test: https://developer.github.com/assets/images/hero-circuit-bg.png'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p>Test: <a href="https://developer.github.com/assets/images/hero-circuit-bg.png">https://developer.github.com/assets/images/hero-circuit-bg.png</a></p>\n<div class="message_inline_image"><a href="https://developer.github.com/assets/images/hero-circuit-bg.png"><img data-src-fullsize="/thumbnail?url=https%3A%2F%2Fdeveloper.github.com%2Fassets%2Fimages%2Fhero-circuit-bg.png&amp;size=full" src="/thumbnail?url=https%3A%2F%2Fdeveloper.github.com%2Fassets%2Fimages%2Fhero-circuit-bg.png&amp;size=thumbnail"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p>Test: <a href="https://developer.github.com/assets/images/hero-circuit-bg.png">https://developer.github.com/assets/images/hero-circuit-bg.png</a></p>\n<div class="message_inline_image"><a href="https://developer.github.com/assets/images/hero-circuit-bg.png"><img data-src-fullsize="/thumbnail?url=https%3A%2F%2Fdeveloper.github.com%2Fassets%2Fimages%2Fhero-circuit-bg.png&amp;size=full" src="/thumbnail?url=https%3A%2F%2Fdeveloper.github.com%2Fassets%2Fimages%2Fhero-circuit-bg.png&amp;size=thumbnail"></a></div>',
+        )
 
     def test_inline_youtube_preview(self) -> None:
         # Test YouTube URLs in spoilers
         msg = """\n```spoiler Check out this PyCon video\nhttps://www.youtube.com/watch?v=0c46YHS3RY8\n```"""
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<div class="spoiler-block"><div class="spoiler-header">\n<p>Check out this PyCon video</p>\n</div><div class="spoiler-content" aria-hidden="true">\n<p><a href="https://www.youtube.com/watch?v=0c46YHS3RY8">https://www.youtube.com/watch?v=0c46YHS3RY8</a></p>\n<div class="youtube-video message_inline_image"><a data-id="0c46YHS3RY8" href="https://www.youtube.com/watch?v=0c46YHS3RY8"><img src="https://i.ytimg.com/vi/0c46YHS3RY8/default.jpg"></a></div></div></div>')
+        self.assertEqual(
+            converted,
+            '<div class="spoiler-block"><div class="spoiler-header">\n<p>Check out this PyCon video</p>\n</div><div class="spoiler-content" aria-hidden="true">\n<p><a href="https://www.youtube.com/watch?v=0c46YHS3RY8">https://www.youtube.com/watch?v=0c46YHS3RY8</a></p>\n<div class="youtube-video message_inline_image"><a data-id="0c46YHS3RY8" href="https://www.youtube.com/watch?v=0c46YHS3RY8"><img src="https://i.ytimg.com/vi/0c46YHS3RY8/default.jpg"></a></div></div></div>',
+        )
 
         # Test YouTube URLs in normal messages.
         msg = '[YouTube link](https://www.youtube.com/watch?v=0c46YHS3RY8)'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="https://www.youtube.com/watch?v=0c46YHS3RY8">YouTube link</a></p>\n<div class="youtube-video message_inline_image"><a data-id="0c46YHS3RY8" href="https://www.youtube.com/watch?v=0c46YHS3RY8"><img src="https://i.ytimg.com/vi/0c46YHS3RY8/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://www.youtube.com/watch?v=0c46YHS3RY8">YouTube link</a></p>\n<div class="youtube-video message_inline_image"><a data-id="0c46YHS3RY8" href="https://www.youtube.com/watch?v=0c46YHS3RY8"><img src="https://i.ytimg.com/vi/0c46YHS3RY8/default.jpg"></a></div>',
+        )
 
         msg = 'https://www.youtube.com/watch?v=0c46YHS3RY8\n\nSample text\n\nhttps://www.youtube.com/watch?v=lXFO2ULktEI'
         converted = markdown_convert_wrapper(msg)
 
-        self.assertEqual(converted, '<p><a href="https://www.youtube.com/watch?v=0c46YHS3RY8">https://www.youtube.com/watch?v=0c46YHS3RY8</a></p>\n<div class="youtube-video message_inline_image"><a data-id="0c46YHS3RY8" href="https://www.youtube.com/watch?v=0c46YHS3RY8"><img src="https://i.ytimg.com/vi/0c46YHS3RY8/default.jpg"></a></div><p>Sample text</p>\n<p><a href="https://www.youtube.com/watch?v=lXFO2ULktEI">https://www.youtube.com/watch?v=lXFO2ULktEI</a></p>\n<div class="youtube-video message_inline_image"><a data-id="lXFO2ULktEI" href="https://www.youtube.com/watch?v=lXFO2ULktEI"><img src="https://i.ytimg.com/vi/lXFO2ULktEI/default.jpg"></a></div>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://www.youtube.com/watch?v=0c46YHS3RY8">https://www.youtube.com/watch?v=0c46YHS3RY8</a></p>\n<div class="youtube-video message_inline_image"><a data-id="0c46YHS3RY8" href="https://www.youtube.com/watch?v=0c46YHS3RY8"><img src="https://i.ytimg.com/vi/0c46YHS3RY8/default.jpg"></a></div><p>Sample text</p>\n<p><a href="https://www.youtube.com/watch?v=lXFO2ULktEI">https://www.youtube.com/watch?v=lXFO2ULktEI</a></p>\n<div class="youtube-video message_inline_image"><a data-id="lXFO2ULktEI" href="https://www.youtube.com/watch?v=lXFO2ULktEI"><img src="https://i.ytimg.com/vi/lXFO2ULktEI/default.jpg"></a></div>',
+        )
 
     def test_twitter_id_extraction(self) -> None:
-        self.assertEqual(get_tweet_id('http://twitter.com/#!/VizzQuotes/status/409030735191097344'), '409030735191097344')
-        self.assertEqual(get_tweet_id('http://twitter.com/VizzQuotes/status/409030735191097344'), '409030735191097344')
-        self.assertEqual(get_tweet_id('http://twitter.com/VizzQuotes/statuses/409030735191097344'), '409030735191097344')
+        self.assertEqual(
+            get_tweet_id('http://twitter.com/#!/VizzQuotes/status/409030735191097344'),
+            '409030735191097344',
+        )
+        self.assertEqual(
+            get_tweet_id('http://twitter.com/VizzQuotes/status/409030735191097344'),
+            '409030735191097344',
+        )
+        self.assertEqual(
+            get_tweet_id('http://twitter.com/VizzQuotes/statuses/409030735191097344'),
+            '409030735191097344',
+        )
         self.assertEqual(get_tweet_id('https://twitter.com/wdaher/status/1017581858'), '1017581858')
-        self.assertEqual(get_tweet_id('https://twitter.com/wdaher/status/1017581858/'), '1017581858')
-        self.assertEqual(get_tweet_id('https://twitter.com/windyoona/status/410766290349879296/photo/1'), '410766290349879296')
-        self.assertEqual(get_tweet_id('https://twitter.com/windyoona/status/410766290349879296/'), '410766290349879296')
+        self.assertEqual(
+            get_tweet_id('https://twitter.com/wdaher/status/1017581858/'), '1017581858'
+        )
+        self.assertEqual(
+            get_tweet_id('https://twitter.com/windyoona/status/410766290349879296/photo/1'),
+            '410766290349879296',
+        )
+        self.assertEqual(
+            get_tweet_id('https://twitter.com/windyoona/status/410766290349879296/'),
+            '410766290349879296',
+        )
 
     def test_inline_interesting_links(self) -> None:
         def make_link(url: str) -> str:
             return f'<a href="{url}">{url}</a>'
 
-        normal_tweet_html = ('<a href="https://twitter.com/Twitter"'
-                             '>@Twitter</a> '
-                             'meets @seepicturely at #tcdisrupt cc.'
-                             '<a href="https://twitter.com/boscomonkey"'
-                             '>@boscomonkey</a> '
-                             '<a href="https://twitter.com/episod"'
-                             '>@episod</a> '
-                             '<a href="http://t.co/6J2EgYM"'
-                             '>http://instagr.am/p/MuW67/</a>')
+        normal_tweet_html = (
+            '<a href="https://twitter.com/Twitter"'
+            '>@Twitter</a> '
+            'meets @seepicturely at #tcdisrupt cc.'
+            '<a href="https://twitter.com/boscomonkey"'
+            '>@boscomonkey</a> '
+            '<a href="https://twitter.com/episod"'
+            '>@episod</a> '
+            '<a href="http://t.co/6J2EgYM"'
+            '>http://instagr.am/p/MuW67/</a>'
+        )
 
         mention_in_link_tweet_html = """<a href="http://t.co/@foo">http://foo.com</a>"""
 
-        media_tweet_html = ('<a href="http://t.co/xo7pAhK6n3">'
-                            'http://twitter.com/NEVNBoston/status/421654515616849920/photo/1</a>')
+        media_tweet_html = (
+            '<a href="http://t.co/xo7pAhK6n3">'
+            'http://twitter.com/NEVNBoston/status/421654515616849920/photo/1</a>'
+        )
 
         emoji_in_tweet_html = """Zulip is <span aria-label=\"100\" class="emoji emoji-1f4af" role=\"img\" title="100">:100:</span>% open-source!"""
 
-        def make_inline_twitter_preview(url: str, tweet_html: str, image_html: str='') -> str:
+        def make_inline_twitter_preview(url: str, tweet_html: str, image_html: str = '') -> str:
             ## As of right now, all previews are mocked to be the exact same tweet
-            return ('<div class="inline-preview-twitter">'
-                    '<div class="twitter-tweet">'
-                    f'<a href="{url}">'
-                    '<img class="twitter-avatar"'
-                    ' src="https://external-content.zulipcdn.net/external_content/1f7cd2436976d410eab8189ebceda87ae0b34ead/687474703a2f2f7062732e7477696d672e63'
-                    '6f6d2f70726f66696c655f696d616765732f313338303931323137332f53637265656e5f73686f745f323031312d30362d30335f61745f372e33352e33'
-                    '365f504d5f6e6f726d616c2e706e67">'
-                    '</a>'
-                    f'<p>{tweet_html}</p>'
-                    '<span>- Eoin McMillan (@imeoin)</span>'
-                    f'{image_html}'
-                    '</div>'
-                    '</div>')
+            return (
+                '<div class="inline-preview-twitter">'
+                '<div class="twitter-tweet">'
+                f'<a href="{url}">'
+                '<img class="twitter-avatar"'
+                ' src="https://external-content.zulipcdn.net/external_content/1f7cd2436976d410eab8189ebceda87ae0b34ead/687474703a2f2f7062732e7477696d672e63'
+                '6f6d2f70726f66696c655f696d616765732f313338303931323137332f53637265656e5f73686f745f323031312d30362d30335f61745f372e33352e33'
+                '365f504d5f6e6f726d616c2e706e67">'
+                '</a>'
+                f'<p>{tweet_html}</p>'
+                '<span>- Eoin McMillan (@imeoin)</span>'
+                f'{image_html}'
+                '</div>'
+                '</div>'
+            )
 
         msg = 'http://www.twitter.com'
         converted = markdown_convert_wrapper(msg)
@@ -799,112 +926,201 @@ class MarkdownTest(ZulipTestCase):
 
         msg = 'http://www.twitter.com/wdaher/status/3'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>'.format(make_link('http://www.twitter.com/wdaher/status/3')))
+        self.assertEqual(
+            converted, '<p>{}</p>'.format(make_link('http://www.twitter.com/wdaher/status/3'))
+        )
 
         # id too long
         msg = 'http://www.twitter.com/wdaher/status/2879779692873154569'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>'.format(make_link('http://www.twitter.com/wdaher/status/2879779692873154569')))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>'.format(
+                make_link('http://www.twitter.com/wdaher/status/2879779692873154569')
+            ),
+        )
 
         # id too large (i.e. tweet doesn't exist)
         msg = 'http://www.twitter.com/wdaher/status/999999999999999999'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>'.format(make_link('http://www.twitter.com/wdaher/status/999999999999999999')))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>'.format(
+                make_link('http://www.twitter.com/wdaher/status/999999999999999999')
+            ),
+        )
 
         msg = 'http://www.twitter.com/wdaher/status/287977969287315456'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>\n{}'.format(
-            make_link('http://www.twitter.com/wdaher/status/287977969287315456'),
-            make_inline_twitter_preview('http://www.twitter.com/wdaher/status/287977969287315456', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>\n{}'.format(
+                make_link('http://www.twitter.com/wdaher/status/287977969287315456'),
+                make_inline_twitter_preview(
+                    'http://www.twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+            ),
+        )
 
         msg = 'https://www.twitter.com/wdaher/status/287977969287315456'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>\n{}'.format(
-            make_link('https://www.twitter.com/wdaher/status/287977969287315456'),
-            make_inline_twitter_preview('https://www.twitter.com/wdaher/status/287977969287315456', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>\n{}'.format(
+                make_link('https://www.twitter.com/wdaher/status/287977969287315456'),
+                make_inline_twitter_preview(
+                    'https://www.twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+            ),
+        )
 
         msg = 'http://twitter.com/wdaher/status/287977969287315456'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>\n{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315456'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>\n{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315456'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+            ),
+        )
 
         # Repeated links will only be converted once
-        msg = ('http://twitter.com/wdaher/status/287977969287315456 '
-               'http://twitter.com/wdaher/status/287977969287315457 '
-               'http://twitter.com/wdaher/status/287977969287315457 '
-               'http://twitter.com/wdaher/status/287977969287315457')
+        msg = (
+            'http://twitter.com/wdaher/status/287977969287315456 '
+            'http://twitter.com/wdaher/status/287977969287315457 '
+            'http://twitter.com/wdaher/status/287977969287315457 '
+            'http://twitter.com/wdaher/status/287977969287315457'
+        )
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{} {} {} {}</p>\n{}{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315456'),
-            make_link('http://twitter.com/wdaher/status/287977969287315457'),
-            make_link('http://twitter.com/wdaher/status/287977969287315457'),
-            make_link('http://twitter.com/wdaher/status/287977969287315457'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315457', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{} {} {} {}</p>\n{}{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315456'),
+                make_link('http://twitter.com/wdaher/status/287977969287315457'),
+                make_link('http://twitter.com/wdaher/status/287977969287315457'),
+                make_link('http://twitter.com/wdaher/status/287977969287315457'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315457', normal_tweet_html
+                ),
+            ),
+        )
 
         # A max of 3 will be converted
-        msg = ('http://twitter.com/wdaher/status/287977969287315456 '
-               'http://twitter.com/wdaher/status/287977969287315457 '
-               'https://twitter.com/wdaher/status/287977969287315456 '
-               'http://twitter.com/wdaher/status/287977969287315460')
+        msg = (
+            'http://twitter.com/wdaher/status/287977969287315456 '
+            'http://twitter.com/wdaher/status/287977969287315457 '
+            'https://twitter.com/wdaher/status/287977969287315456 '
+            'http://twitter.com/wdaher/status/287977969287315460'
+        )
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{} {} {} {}</p>\n{}{}{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315456'),
-            make_link('http://twitter.com/wdaher/status/287977969287315457'),
-            make_link('https://twitter.com/wdaher/status/287977969287315456'),
-            make_link('http://twitter.com/wdaher/status/287977969287315460'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315457', normal_tweet_html),
-            make_inline_twitter_preview('https://twitter.com/wdaher/status/287977969287315456', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{} {} {} {}</p>\n{}{}{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315456'),
+                make_link('http://twitter.com/wdaher/status/287977969287315457'),
+                make_link('https://twitter.com/wdaher/status/287977969287315456'),
+                make_link('http://twitter.com/wdaher/status/287977969287315460'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315457', normal_tweet_html
+                ),
+                make_inline_twitter_preview(
+                    'https://twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+            ),
+        )
 
         # Test smart in-place inlining behavior:
-        msg = ('Paragraph 1: http://twitter.com/wdaher/status/287977969287315456\n\n'
-               'Paragraph 2\n\n'
-               'Paragraph 3: http://twitter.com/wdaher/status/287977969287315457')
+        msg = (
+            'Paragraph 1: http://twitter.com/wdaher/status/287977969287315456\n\n'
+            'Paragraph 2\n\n'
+            'Paragraph 3: http://twitter.com/wdaher/status/287977969287315457'
+        )
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>Paragraph 1: {}</p>\n{}<p>Paragraph 2</p>\n<p>Paragraph 3: {}</p>\n{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315456'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html),
-            make_link('http://twitter.com/wdaher/status/287977969287315457'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315457', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>Paragraph 1: {}</p>\n{}<p>Paragraph 2</p>\n<p>Paragraph 3: {}</p>\n{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315456'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+                make_link('http://twitter.com/wdaher/status/287977969287315457'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315457', normal_tweet_html
+                ),
+            ),
+        )
 
         # Tweet has a mention in a URL, only the URL is linked
         msg = 'http://twitter.com/wdaher/status/287977969287315458'
 
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>\n{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315458'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315458', mention_in_link_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>\n{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315458'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315458',
+                    mention_in_link_tweet_html,
+                ),
+            ),
+        )
 
         # Tweet with an image
         msg = 'http://twitter.com/wdaher/status/287977969287315459'
 
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>\n{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315459'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315459',
-                                        media_tweet_html,
-                                        ('<div class="twitter-image">'
-                                         '<a href="http://t.co/xo7pAhK6n3">'
-                                         '<img src="https://pbs.twimg.com/media/BdoEjD4IEAIq86Z.jpg:small">'
-                                         '</a>'
-                                         '</div>'))))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>\n{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315459'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315459',
+                    media_tweet_html,
+                    (
+                        '<div class="twitter-image">'
+                        '<a href="http://t.co/xo7pAhK6n3">'
+                        '<img src="https://pbs.twimg.com/media/BdoEjD4IEAIq86Z.jpg:small">'
+                        '</a>'
+                        '</div>'
+                    ),
+                ),
+            ),
+        )
 
         msg = 'http://twitter.com/wdaher/status/287977969287315460'
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p>{}</p>\n{}'.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315460'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315460', emoji_in_tweet_html)))
+        self.assertEqual(
+            converted,
+            '<p>{}</p>\n{}'.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315460'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315460', emoji_in_tweet_html
+                ),
+            ),
+        )
 
         # Test Twitter previews in spoiler tags.
         msg = '```spoiler secret tweet\nTweet: http://twitter.com/wdaher/status/287977969287315456\n```'
         converted = markdown_convert_wrapper(msg)
 
         rendered_spoiler = "<div class=\"spoiler-block\"><div class=\"spoiler-header\">\n<p>secret tweet</p>\n</div><div class=\"spoiler-content\" aria-hidden=\"true\">\n<p>Tweet: {}</p>\n{}</div></div>"
-        self.assertEqual(converted, rendered_spoiler.format(
-            make_link('http://twitter.com/wdaher/status/287977969287315456'),
-            make_inline_twitter_preview('http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html)))
+        self.assertEqual(
+            converted,
+            rendered_spoiler.format(
+                make_link('http://twitter.com/wdaher/status/287977969287315456'),
+                make_inline_twitter_preview(
+                    'http://twitter.com/wdaher/status/287977969287315456', normal_tweet_html
+                ),
+            ),
+        )
 
     def test_fetch_tweet_data_settings_validation(self) -> None:
         with self.settings(TEST_SUITE=False, TWITTER_CONSUMER_KEY=None):
@@ -923,17 +1139,21 @@ class MarkdownTest(ZulipTestCase):
     def test_realm_emoji(self) -> None:
         def emoji_img(name: str, file_name: str, realm_id: int) -> str:
             return '<img alt="{}" class="emoji" src="{}" title="{}">'.format(
-                name, get_emoji_url(file_name, realm_id), name[1:-1].replace("_", " "))
+                name, get_emoji_url(file_name, realm_id), name[1:-1].replace("_", " ")
+            )
 
         realm = get_realm('zulip')
 
         # Needs to mock an actual message because that's how Markdown obtains the realm
         msg = Message(sender=self.example_user('hamlet'))
         converted = markdown_convert(":green_tick:", message_realm=realm, message=msg)
-        realm_emoji = RealmEmoji.objects.filter(realm=realm,
-                                                name='green_tick',
-                                                deactivated=False).get()
-        self.assertEqual(converted, '<p>{}</p>'.format(emoji_img(':green_tick:', realm_emoji.file_name, realm.id)))
+        realm_emoji = RealmEmoji.objects.filter(
+            realm=realm, name='green_tick', deactivated=False
+        ).get()
+        self.assertEqual(
+            converted,
+            '<p>{}</p>'.format(emoji_img(':green_tick:', realm_emoji.file_name, realm.id)),
+        )
 
         # Deactivate realm emoji.
         do_remove_realm_emoji(realm, 'green_tick')
@@ -952,11 +1172,17 @@ class MarkdownTest(ZulipTestCase):
     def test_unicode_emoji(self) -> None:
         msg = '\u2615'  # ☕
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p><span aria-label=\"coffee\" class="emoji emoji-2615" role=\"img\" title="coffee">:coffee:</span></p>')
+        self.assertEqual(
+            converted,
+            '<p><span aria-label=\"coffee\" class="emoji emoji-2615" role=\"img\" title="coffee">:coffee:</span></p>',
+        )
 
         msg = '\u2615\u2615'  # ☕☕
         converted = markdown_convert_wrapper(msg)
-        self.assertEqual(converted, '<p><span aria-label=\"coffee\" class="emoji emoji-2615" role=\"img\" title="coffee">:coffee:</span><span aria-label=\"coffee\" class="emoji emoji-2615" role=\"img\" title="coffee">:coffee:</span></p>')
+        self.assertEqual(
+            converted,
+            '<p><span aria-label=\"coffee\" class="emoji emoji-2615" role=\"img\" title="coffee">:coffee:</span><span aria-label=\"coffee\" class="emoji emoji-2615" role=\"img\" title="coffee">:coffee:</span></p>',
+        )
 
     def test_no_translate_emoticons_if_off(self) -> None:
         user_profile = self.example_user('othello')
@@ -996,20 +1222,25 @@ class MarkdownTest(ZulipTestCase):
         converted_topic = topic_links(realm.id, msg.topic_name())
         self.assertEqual(converted_topic, [])
 
-        msg.set_topic_name("Try out http://ftp.debian.org, https://google.com/ and https://google.in/.")
+        msg.set_topic_name(
+            "Try out http://ftp.debian.org, https://google.com/ and https://google.in/."
+        )
         converted_topic = topic_links(realm.id, msg.topic_name())
-        self.assertEqual(converted_topic, ['http://ftp.debian.org', 'https://google.com/', 'https://google.in/'])
+        self.assertEqual(
+            converted_topic, ['http://ftp.debian.org', 'https://google.com/', 'https://google.in/']
+        )
 
     def test_realm_patterns(self) -> None:
         realm = get_realm('zulip')
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter = RealmFilter(realm=realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         realm_filter.save()
         self.assertEqual(
             realm_filter.__str__(),
-            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>')
+            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>',
+        )
 
         msg = Message(sender=self.example_user('othello'))
         msg.set_topic_name("#444")
@@ -1020,23 +1251,34 @@ class MarkdownTest(ZulipTestCase):
         converted = markdown_convert(content, message_realm=realm, message=msg)
         converted_topic = topic_links(realm.id, msg.topic_name())
 
-        self.assertEqual(converted, '<p>We should fix <a href="https://trac.example.com/ticket/224">#224</a> and <a href="https://trac.example.com/ticket/115">#115</a>, but not issue#124 or #1124z or <a href="https://trac.example.com/ticket/16">trac #15</a> today.</p>')
+        self.assertEqual(
+            converted,
+            '<p>We should fix <a href="https://trac.example.com/ticket/224">#224</a> and <a href="https://trac.example.com/ticket/115">#115</a>, but not issue#124 or #1124z or <a href="https://trac.example.com/ticket/16">trac #15</a> today.</p>',
+        )
         self.assertEqual(converted_topic, ['https://trac.example.com/ticket/444'])
 
         msg.set_topic_name("#444 https://google.com")
         converted_topic = topic_links(realm.id, msg.topic_name())
-        self.assertEqual(converted_topic, ['https://trac.example.com/ticket/444', 'https://google.com'])
+        self.assertEqual(
+            converted_topic, ['https://trac.example.com/ticket/444', 'https://google.com']
+        )
 
-        RealmFilter(realm=realm, pattern=r'#(?P<id>[a-zA-Z]+-[0-9]+)',
-                    url_format_string=r'https://trac.example.com/ticket/%(id)s').save()
+        RealmFilter(
+            realm=realm,
+            pattern=r'#(?P<id>[a-zA-Z]+-[0-9]+)',
+            url_format_string=r'https://trac.example.com/ticket/%(id)s',
+        ).save()
         msg = Message(sender=self.example_user('hamlet'))
 
         content = '#ZUL-123 was fixed and code was deployed to production, also #zul-321 was deployed to staging'
         converted = markdown_convert(content, message_realm=realm, message=msg)
 
-        self.assertEqual(converted, '<p><a href="https://trac.example.com/ticket/ZUL-123">#ZUL-123</a> was fixed and code was deployed to production, also <a href="https://trac.example.com/ticket/zul-321">#zul-321</a> was deployed to staging</p>')
+        self.assertEqual(
+            converted,
+            '<p><a href="https://trac.example.com/ticket/ZUL-123">#ZUL-123</a> was fixed and code was deployed to production, also <a href="https://trac.example.com/ticket/zul-321">#zul-321</a> was deployed to staging</p>',
+        )
 
-        def assert_conversion(content: str, should_have_converted: bool=True) -> None:
+        def assert_conversion(content: str, should_have_converted: bool = True) -> None:
             converted = markdown_convert(content, message_realm=realm, message=msg)
             converted_topic = topic_links(realm.id, content)
             if should_have_converted:
@@ -1046,6 +1288,7 @@ class MarkdownTest(ZulipTestCase):
             else:
                 self.assertTrue('https://trac.example.com' not in converted)
                 self.assertEqual(len(converted_topic), 0)
+
         assert_conversion('Hello #123 World')
         assert_conversion('Hello #123World', False)
         assert_conversion('Hello#123 World', False)
@@ -1065,83 +1308,111 @@ class MarkdownTest(ZulipTestCase):
         assert_conversion('##123', False)
 
         # test nested realm patterns should avoid double matching
-        RealmFilter(realm=realm, pattern=r'hello#(?P<id>[0-9]+)',
-                    url_format_string=r'https://trac.example.com/hello/%(id)s').save()
+        RealmFilter(
+            realm=realm,
+            pattern=r'hello#(?P<id>[0-9]+)',
+            url_format_string=r'https://trac.example.com/hello/%(id)s',
+        ).save()
         converted_topic = topic_links(realm.id, 'hello#123 #234')
-        self.assertEqual(converted_topic, ['https://trac.example.com/ticket/234', 'https://trac.example.com/hello/123'])
+        self.assertEqual(
+            converted_topic,
+            ['https://trac.example.com/ticket/234', 'https://trac.example.com/hello/123'],
+        )
 
     def test_multiple_matching_realm_patterns(self) -> None:
         realm = get_realm('zulip')
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter_1 = RealmFilter(realm=realm,
-                                     pattern=r"(?P<id>ABC\-[0-9]+)(?![A-Z0-9-])",
-                                     url_format_string=url_format_string)
+        realm_filter_1 = RealmFilter(
+            realm=realm,
+            pattern=r"(?P<id>ABC\-[0-9]+)(?![A-Z0-9-])",
+            url_format_string=url_format_string,
+        )
         realm_filter_1.save()
         self.assertEqual(
             realm_filter_1.__str__(),
             r'<RealmFilter(zulip): (?P<id>ABC\-[0-9]+)(?![A-Z0-9-])'
-            ' https://trac.example.com/ticket/%(id)s>')
+            ' https://trac.example.com/ticket/%(id)s>',
+        )
 
         url_format_string = r"https://other-trac.example.com/ticket/%(id)s"
-        realm_filter_2 = RealmFilter(realm=realm,
-                                     pattern=r"(?P<id>[A-Z][A-Z0-9]*\-[0-9]+)(?![A-Z0-9-])",
-                                     url_format_string=url_format_string)
+        realm_filter_2 = RealmFilter(
+            realm=realm,
+            pattern=r"(?P<id>[A-Z][A-Z0-9]*\-[0-9]+)(?![A-Z0-9-])",
+            url_format_string=url_format_string,
+        )
         realm_filter_2.save()
         self.assertEqual(
             realm_filter_2.__str__(),
             r'<RealmFilter(zulip): (?P<id>[A-Z][A-Z0-9]*\-[0-9]+)(?![A-Z0-9-])'
-            ' https://other-trac.example.com/ticket/%(id)s>')
+            ' https://other-trac.example.com/ticket/%(id)s>',
+        )
 
         msg = Message(sender=self.example_user('othello'))
         msg.set_topic_name("ABC-123")
 
         flush_per_request_caches()
 
-        content = "We should fix ABC-123 or [trac ABC-123](https://trac.example.com/ticket/16) today."
+        content = (
+            "We should fix ABC-123 or [trac ABC-123](https://trac.example.com/ticket/16) today."
+        )
         converted = markdown_convert(content, message_realm=realm, message=msg)
         converted_topic = topic_links(realm.id, msg.topic_name())
 
         # The second filter (which was saved later) was ignored as the content was marked AtomicString after first conversion.
         # There was no easy way to support parsing both filters and not run into an infinite loop, hence the second filter is ignored.
-        self.assertEqual(converted, '<p>We should fix <a href="https://trac.example.com/ticket/ABC-123">ABC-123</a> or <a href="https://trac.example.com/ticket/16">trac ABC-123</a> today.</p>')
+        self.assertEqual(
+            converted,
+            '<p>We should fix <a href="https://trac.example.com/ticket/ABC-123">ABC-123</a> or <a href="https://trac.example.com/ticket/16">trac ABC-123</a> today.</p>',
+        )
         # Both the links should be generated in topics.
-        self.assertEqual(converted_topic, ['https://trac.example.com/ticket/ABC-123', 'https://other-trac.example.com/ticket/ABC-123'])
+        self.assertEqual(
+            converted_topic,
+            [
+                'https://trac.example.com/ticket/ABC-123',
+                'https://other-trac.example.com/ticket/ABC-123',
+            ],
+        )
 
     def test_maybe_update_markdown_engines(self) -> None:
         realm = get_realm('zulip')
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter = RealmFilter(realm=realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         realm_filter.save()
 
         import zerver.lib.markdown
+
         zerver.lib.markdown.realm_filter_data = {}
         maybe_update_markdown_engines(None, False)
         all_filters = zerver.lib.markdown.realm_filter_data
         zulip_filters = all_filters[realm.id]
         self.assertEqual(len(zulip_filters), 1)
-        self.assertEqual(zulip_filters[0],
-                         ('#(?P<id>[0-9]{2,8})', 'https://trac.example.com/ticket/%(id)s', realm_filter.id))
+        self.assertEqual(
+            zulip_filters[0],
+            ('#(?P<id>[0-9]{2,8})', 'https://trac.example.com/ticket/%(id)s', realm_filter.id),
+        )
 
     def test_flush_realm_filter(self) -> None:
         realm = get_realm('zulip')
 
         def flush() -> None:
-            '''
+            """
             flush_realm_filter is a post-save hook, so calling it
             directly for testing is kind of awkward
-            '''
+            """
+
             class Instance:
                 realm_id: Optional[int] = None
+
             instance = Instance()
             instance.realm_id = realm.id
             flush_realm_filter(sender=None, instance=instance)
 
         def save_new_realm_filter() -> None:
-            realm_filter = RealmFilter(realm=realm,
-                                       pattern=r"whatever",
-                                       url_format_string='whatever')
+            realm_filter = RealmFilter(
+                realm=realm, pattern=r"whatever", url_format_string='whatever'
+            )
             realm_filter.save()
 
         # start fresh for our realm
@@ -1163,8 +1434,11 @@ class MarkdownTest(ZulipTestCase):
 
     def test_realm_patterns_negative(self) -> None:
         realm = get_realm('zulip')
-        RealmFilter(realm=realm, pattern=r"#(?P<id>[0-9]{2,8})",
-                    url_format_string=r"https://trac.example.com/ticket/%(id)s").save()
+        RealmFilter(
+            realm=realm,
+            pattern=r"#(?P<id>[0-9]{2,8})",
+            url_format_string=r"https://trac.example.com/ticket/%(id)s",
+        ).save()
         boring_msg = Message(sender=self.example_user('othello'))
         boring_msg.set_topic_name("no match here")
         converted_boring_topic = topic_links(realm.id, boring_msg.topic_name())
@@ -1205,9 +1479,9 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = "We have an ALERTWORD day today!"
         self.assertEqual(render(msg, content), "<p>We have an ALERTWORD day today!</p>")
@@ -1220,9 +1494,12 @@ class MarkdownTest(ZulipTestCase):
 
     def test_alert_words_returns_user_ids_with_alert_words(self) -> None:
         alert_words_for_users: Dict[str, List[str]] = {
-            'hamlet': ['how'], 'cordelia': ['this possible'],
-            'iago': ['hello'], 'prospero': ['hello'],
-            'othello': ['how are you'], 'aaron': ['hey'],
+            'hamlet': ['how'],
+            'cordelia': ['this possible'],
+            'iago': ['hello'],
+            'prospero': ['hello'],
+            'othello': ['how are you'],
+            'aaron': ['hey'],
         }
         user_profiles: Dict[str, UserProfile] = {}
         for (username, alert_words) in alert_words_for_users.items():
@@ -1234,15 +1511,18 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(sender_user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = "hello how is this possible how are you doing today"
         render(msg, content)
         expected_user_ids: Set[int] = {
-            user_profiles['hamlet'].id, user_profiles['cordelia'].id, user_profiles['iago'].id,
-            user_profiles['prospero'].id, user_profiles['othello'].id,
+            user_profiles['hamlet'].id,
+            user_profiles['cordelia'].id,
+            user_profiles['iago'].id,
+            user_profiles['prospero'].id,
+            user_profiles['othello'].id,
         }
         # All users except aaron have their alert word appear in the message content
         self.assertEqual(msg.user_ids_with_alert_words, expected_user_ids)
@@ -1251,7 +1531,8 @@ class MarkdownTest(ZulipTestCase):
         alert_words_for_users: Dict[str, List[str]] = {
             'hamlet': ['provisioning', 'Prod deployment'],
             'cordelia': ['test', 'Prod'],
-            'iago': ['prod'], 'prospero': ['deployment'],
+            'iago': ['prod'],
+            'prospero': ['deployment'],
             'othello': ['last'],
         }
         user_profiles: Dict[str, UserProfile] = {}
@@ -1264,9 +1545,9 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(sender_user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = """Hello, everyone. Prod deployment has been completed
         And this is a new line
@@ -1288,7 +1569,8 @@ class MarkdownTest(ZulipTestCase):
         alert_words_for_users: Dict[str, List[str]] = {
             'hamlet': ['réglementaire', 'une politique', 'une merveille'],
             'cordelia': ['énormément', 'Prod'],
-            'iago': ['prod'], 'prospero': ['deployment'],
+            'iago': ['prod'],
+            'prospero': ['deployment'],
             'othello': ['last'],
         }
         user_profiles: Dict[str, UserProfile] = {}
@@ -1301,9 +1583,9 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(sender_user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = """This is to test out alert words work in languages with accented characters too
         bonjour est (énormément) ce a quoi ressemble le français
@@ -1316,8 +1598,12 @@ class MarkdownTest(ZulipTestCase):
 
     def test_alert_words_returns_empty_user_ids_with_alert_words(self) -> None:
         alert_words_for_users: Dict[str, List[str]] = {
-            'hamlet': [], 'cordelia': [], 'iago': [], 'prospero': [],
-            'othello': [], 'aaron': [],
+            'hamlet': [],
+            'cordelia': [],
+            'iago': [],
+            'prospero': [],
+            'othello': [],
+            'aaron': [],
         }
         user_profiles: Dict[str, UserProfile] = {}
         for (username, alert_words) in alert_words_for_users.items():
@@ -1329,9 +1615,9 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(sender_user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = """hello how is this possible how are you doing today
         This is to test that the no user_ids who have alrert wourldword is participating
@@ -1363,9 +1649,9 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(sender_user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = """This is to test a empty alert words i.e. no user has any alert-words set"""
         render(msg, content)
@@ -1390,9 +1676,9 @@ class MarkdownTest(ZulipTestCase):
         realm_alert_words_automaton = get_alert_word_automaton(sender_user_profile.realm)
 
         def render(msg: Message, content: str) -> str:
-            return render_markdown(msg,
-                                   content,
-                                   realm_alert_words_automaton=realm_alert_words_automaton)
+            return render_markdown(
+                msg, content, realm_alert_words_automaton=realm_alert_words_automaton
+            )
 
         content = """The code above will print 10 random values of numbers between 1 and 100.
         The second line, for x in range(10), determines how many values will be printed (when you use
@@ -1442,7 +1728,9 @@ class MarkdownTest(ZulipTestCase):
         msg_without_language_final = markdown_convert_wrapper(text.format(''))
 
         self.assertTrue(msg_with_js == msg_without_language_default_js)
-        self.assertTrue(msg_with_python == msg_with_python_default_js == msg_without_language_default_py)
+        self.assertTrue(
+            msg_with_python == msg_with_python_default_js == msg_without_language_default_py
+        )
         self.assertTrue(msg_with_quote == msg_without_language_default_quote)
         self.assertTrue(msg_with_math == msg_without_language_default_math)
         self.assertTrue(msg_without_language == msg_without_language_final)
@@ -1465,10 +1753,10 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "@**all** test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" data-user-id="*">'
-                         '@all'
-                         '</span> test</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" data-user-id="*">' '@all' '</span> test</p>',
+        )
         self.assertTrue(msg.mentions_wildcard)
 
     def test_mention_everyone(self) -> None:
@@ -1476,10 +1764,10 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "@**everyone** test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" data-user-id="*">'
-                         '@everyone'
-                         '</span> test</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" data-user-id="*">' '@everyone' '</span> test</p>',
+        )
         self.assertTrue(msg.mentions_wildcard)
 
     def test_mention_stream(self) -> None:
@@ -1487,10 +1775,10 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "@**stream** test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" data-user-id="*">'
-                         '@stream'
-                         '</span> test</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" data-user-id="*">' '@stream' '</span> test</p>',
+        )
         self.assertTrue(msg.mentions_wildcard)
 
     def test_mention_at_wildcard(self) -> None:
@@ -1498,8 +1786,7 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "@all test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>@all test</p>')
+        self.assertEqual(render_markdown(msg, content), '<p>@all test</p>')
         self.assertFalse(msg.mentions_wildcard)
         self.assertEqual(msg.mentions_user_ids, set())
 
@@ -1508,8 +1795,7 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "@everyone test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>@everyone test</p>')
+        self.assertEqual(render_markdown(msg, content), '<p>@everyone test</p>')
         self.assertFalse(msg.mentions_wildcard)
         self.assertEqual(msg.mentions_user_ids, set())
 
@@ -1518,8 +1804,7 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "test @alleycat.com test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>test @alleycat.com test</p>')
+        self.assertEqual(render_markdown(msg, content), '<p>test @alleycat.com test</p>')
         self.assertFalse(msg.mentions_wildcard)
         self.assertEqual(msg.mentions_user_ids, set())
 
@@ -1528,8 +1813,7 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=user_profile, sending_client=get_client("test"))
 
         content = "@aaron test"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>@aaron test</p>')
+        self.assertEqual(render_markdown(msg, content), '<p>@aaron test</p>')
         self.assertFalse(msg.mentions_wildcard)
         self.assertEqual(msg.mentions_user_ids, set())
 
@@ -1540,10 +1824,10 @@ class MarkdownTest(ZulipTestCase):
         user_id = user_profile.id
 
         content = "@**King Hamlet**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" '
-                         f'data-user-id="{user_id}">'
-                         '@King Hamlet</span></p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" ' f'data-user-id="{user_id}">' '@King Hamlet</span></p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {user_profile.id})
 
     def test_mention_silent(self) -> None:
@@ -1553,14 +1837,16 @@ class MarkdownTest(ZulipTestCase):
         user_id = user_profile.id
 
         content = "@_**King Hamlet**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention silent" '
-                         f'data-user-id="{user_id}">'
-                         'King Hamlet</span></p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention silent" '
+            f'data-user-id="{user_id}">'
+            'King Hamlet</span></p>',
+        )
         self.assertEqual(msg.mentions_user_ids, set())
 
     def test_possible_mentions(self) -> None:
-        def assert_mentions(content: str, names: Set[str], has_wildcards: bool=False) -> None:
+        def assert_mentions(content: str, names: Set[str], has_wildcards: bool = False) -> None:
             self.assertEqual(possible_mentions(content), (names, has_wildcards))
 
         assert_mentions('', set())
@@ -1570,7 +1856,8 @@ class MarkdownTest(ZulipTestCase):
 
         assert_mentions(
             'Hello @**King Hamlet** and @**Cordelia Lear**\n@**Foo van Barson|1234** @**all**',
-            {'King Hamlet', 'Cordelia Lear', 'Foo van Barson|1234'}, True,
+            {'King Hamlet', 'Cordelia Lear', 'Foo van Barson|1234'},
+            True,
         )
 
     def test_mention_multiple(self) -> None:
@@ -1581,13 +1868,15 @@ class MarkdownTest(ZulipTestCase):
 
         content = "@**King Hamlet** and @**Cordelia Lear**, check this out"
 
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>'
-                         '<span class="user-mention" '
-                         f'data-user-id="{hamlet.id}">@King Hamlet</span> and '
-                         '<span class="user-mention" '
-                         f'data-user-id="{cordelia.id}">@Cordelia Lear</span>, '
-                         'check this out</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p>'
+            '<span class="user-mention" '
+            f'data-user-id="{hamlet.id}">@King Hamlet</span> and '
+            '<span class="user-mention" '
+            f'data-user-id="{cordelia.id}">@Cordelia Lear</span>, '
+            'check this out</p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {hamlet.id, cordelia.id})
 
     def test_mention_in_quotes(self) -> None:
@@ -1597,23 +1886,27 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=othello, sending_client=get_client("test"))
 
         content = "> @**King Hamlet** and @**Othello, the Moor of Venice**\n\n @**King Hamlet** and @**Cordelia Lear**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<blockquote>\n<p>'
-                         f'<span class="user-mention silent" data-user-id="{hamlet.id}">King Hamlet</span>'
-                         ' and '
-                         f'<span class="user-mention silent" data-user-id="{othello.id}">Othello, the Moor of Venice</span>'
-                         '</p>\n</blockquote>\n'
-                         '<p>'
-                         f'<span class="user-mention" data-user-id="{hamlet.id}">@King Hamlet</span>'
-                         ' and '
-                         f'<span class="user-mention" data-user-id="{cordelia.id}">@Cordelia Lear</span>'
-                         '</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<blockquote>\n<p>'
+            f'<span class="user-mention silent" data-user-id="{hamlet.id}">King Hamlet</span>'
+            ' and '
+            f'<span class="user-mention silent" data-user-id="{othello.id}">Othello, the Moor of Venice</span>'
+            '</p>\n</blockquote>\n'
+            '<p>'
+            f'<span class="user-mention" data-user-id="{hamlet.id}">@King Hamlet</span>'
+            ' and '
+            f'<span class="user-mention" data-user-id="{cordelia.id}">@Cordelia Lear</span>'
+            '</p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {hamlet.id, cordelia.id})
 
         # Both fenced quote and > quote should be identical for both silent and regular syntax.
-        expected = ('<blockquote>\n<p>'
-                    f'<span class="user-mention silent" data-user-id="{hamlet.id}">King Hamlet</span>'
-                    '</p>\n</blockquote>')
+        expected = (
+            '<blockquote>\n<p>'
+            f'<span class="user-mention silent" data-user-id="{hamlet.id}">King Hamlet</span>'
+            '</p>\n</blockquote>'
+        )
         content = "```quote\n@**King Hamlet**\n```"
         self.assertEqual(render_markdown(msg, content), expected)
         self.assertEqual(msg.mentions_user_ids, set())
@@ -1644,17 +1937,21 @@ class MarkdownTest(ZulipTestCase):
         cordelia = self.example_user('cordelia')
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
 
-        content = f"@**Mark Twin|{twin1.id}**, @**Mark Twin|{twin2.id}** and @**Cordelia Lear**, hi."
+        content = (
+            f"@**Mark Twin|{twin1.id}**, @**Mark Twin|{twin2.id}** and @**Cordelia Lear**, hi."
+        )
 
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>'
-                         '<span class="user-mention" '
-                         f'data-user-id="{twin1.id}">@Mark Twin</span>, '
-                         '<span class="user-mention" '
-                         f'data-user-id="{twin2.id}">@Mark Twin</span> and '
-                         '<span class="user-mention" '
-                         f'data-user-id="{cordelia.id}">@Cordelia Lear</span>, '
-                         'hi.</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p>'
+            '<span class="user-mention" '
+            f'data-user-id="{twin1.id}">@Mark Twin</span>, '
+            '<span class="user-mention" '
+            f'data-user-id="{twin2.id}">@Mark Twin</span> and '
+            '<span class="user-mention" '
+            f'data-user-id="{cordelia.id}">@Cordelia Lear</span>, '
+            'hi.</p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {twin1.id, twin2.id, cordelia.id})
 
     def test_mention_invalid(self) -> None:
@@ -1662,8 +1959,9 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
 
         content = "Hey @**Nonexistent User**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>Hey @<strong>Nonexistent User</strong></p>')
+        self.assertEqual(
+            render_markdown(msg, content), '<p>Hey @<strong>Nonexistent User</strong></p>'
+        )
         self.assertEqual(msg.mentions_user_ids, set())
 
     def test_user_mention_atomic_string(self) -> None:
@@ -1672,13 +1970,14 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
         # Create a linkifier.
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter = RealmFilter(realm=realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         realm_filter.save()
         self.assertEqual(
             realm_filter.__str__(),
-            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>')
+            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>',
+        )
         # Create a user that potentially interferes with the pattern.
         test_user = create_user(
             email='atomic@example.com',
@@ -1687,16 +1986,20 @@ class MarkdownTest(ZulipTestCase):
             full_name='Atomic #123',
         )
         content = "@**Atomic #123**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" '
-                         f'data-user-id="{test_user.id}">'
-                         '@Atomic #123</span></p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" '
+            f'data-user-id="{test_user.id}">'
+            '@Atomic #123</span></p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {test_user.id})
         content = "@_**Atomic #123**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention silent" '
-                         f'data-user-id="{test_user.id}">'
-                         'Atomic #123</span></p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention silent" '
+            f'data-user-id="{test_user.id}">'
+            'Atomic #123</span></p>',
+        )
         self.assertEqual(msg.mentions_user_ids, set())
 
     def create_user_group_for_test(self, user_group_name: str) -> UserGroup:
@@ -1711,13 +2014,15 @@ class MarkdownTest(ZulipTestCase):
         user_group = self.create_user_group_for_test('support')
 
         content = "@**King Hamlet** @*support*"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" '
-                         f'data-user-id="{user_id}">'
-                         '@King Hamlet</span> '
-                         '<span class="user-group-mention" '
-                         f'data-user-group-id="{user_group.id}">'
-                         '@support</span></p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" '
+            f'data-user-id="{user_id}">'
+            '@King Hamlet</span> '
+            '<span class="user-group-mention" '
+            f'data-user-group-id="{user_group.id}">'
+            '@support</span></p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {user_profile.id})
         self.assertEqual(msg.mentions_user_group_ids, {user_group.id})
 
@@ -1728,25 +2033,28 @@ class MarkdownTest(ZulipTestCase):
         user_profile = self.example_user('hamlet')
         # Create a linkifier.
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter = RealmFilter(realm=realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         realm_filter.save()
         self.assertEqual(
             realm_filter.__str__(),
-            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>')
+            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>',
+        )
         # Create a user-group that potentially interferes with the pattern.
         user_id = user_profile.id
         user_group = self.create_user_group_for_test('support #123')
 
         content = "@**King Hamlet** @*support #123*"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p><span class="user-mention" '
-                         f'data-user-id="{user_id}">'
-                         '@King Hamlet</span> '
-                         '<span class="user-group-mention" '
-                         f'data-user-group-id="{user_group.id}">'
-                         '@support #123</span></p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p><span class="user-mention" '
+            f'data-user-id="{user_id}">'
+            '@King Hamlet</span> '
+            '<span class="user-group-mention" '
+            f'data-user-group-id="{user_group.id}">'
+            '@support #123</span></p>',
+        )
         self.assertEqual(msg.mentions_user_ids, {user_profile.id})
         self.assertEqual(msg.mentions_user_group_ids, {user_group.id})
 
@@ -1761,7 +2069,8 @@ class MarkdownTest(ZulipTestCase):
 
         assert_mentions(
             '@*support* Hello @**King Hamlet** and @**Cordelia Lear**\n'
-            '@**Foo van Barson** @**all**', {'support'},
+            '@**Foo van Barson** @**all**',
+            {'support'},
         )
 
         assert_mentions(
@@ -1776,17 +2085,19 @@ class MarkdownTest(ZulipTestCase):
         backend = self.create_user_group_for_test('backend')
 
         content = "@*support* and @*backend*, check this out"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>'
-                         '<span class="user-group-mention" '
-                         f'data-user-group-id="{support.id}">'
-                         '@support</span> '
-                         'and '
-                         '<span class="user-group-mention" '
-                         f'data-user-group-id="{backend.id}">'
-                         '@backend</span>, '
-                         'check this out'
-                         '</p>')
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p>'
+            '<span class="user-group-mention" '
+            f'data-user-group-id="{support.id}">'
+            '@support</span> '
+            'and '
+            '<span class="user-group-mention" '
+            f'data-user-group-id="{backend.id}">'
+            '@backend</span>, '
+            'check this out'
+            '</p>',
+        )
 
         self.assertEqual(msg.mentions_user_group_ids, {support.id, backend.id})
 
@@ -1796,15 +2107,18 @@ class MarkdownTest(ZulipTestCase):
         self.create_user_group_for_test('support')
         self.login('hamlet')
 
-        msg_id = self.send_stream_message(sender_user_profile,
-                                          "Denmark",
-                                          topic_name="editing",
-                                          content='test')
+        msg_id = self.send_stream_message(
+            sender_user_profile, "Denmark", topic_name="editing", content='test'
+        )
 
         def update_message_and_check_flag(content: str, mentioned: bool) -> None:
-            result = self.client_patch("/json/messages/" + str(msg_id), {
-                'message_id': msg_id, 'content': content,
-            })
+            result = self.client_patch(
+                "/json/messages/" + str(msg_id),
+                {
+                    'message_id': msg_id,
+                    'content': content,
+                },
+            )
             self.assert_json_success(result)
             um = UserMessage.objects.get(
                 user_profile_id=user_profile.id,
@@ -1826,8 +2140,7 @@ class MarkdownTest(ZulipTestCase):
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
 
         content = "Hey @*Nonexistent group*"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>Hey @<em>Nonexistent group</em></p>')
+        self.assertEqual(render_markdown(msg, content), '<p>Hey @<em>Nonexistent group</em></p>')
         self.assertEqual(msg.mentions_user_group_ids, set())
 
     def test_stream_single(self) -> None:
@@ -1839,7 +2152,8 @@ class MarkdownTest(ZulipTestCase):
             render_markdown(msg, content),
             '<p><a class="stream" data-stream-id="{d.id}" href="/#narrow/stream/{d.id}-Denmark">#{d.name}</a></p>'.format(
                 d=denmark,
-            ))
+            ),
+        )
 
     def test_stream_multiple(self) -> None:
         sender_user_profile = self.example_user('othello')
@@ -1848,15 +2162,17 @@ class MarkdownTest(ZulipTestCase):
         denmark = get_stream('Denmark', realm)
         scotland = get_stream('Scotland', realm)
         content = "Look to #**Denmark** and #**Scotland**, there something"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>Look to '
-                         '<a class="stream" '
-                         'data-stream-id="{denmark.id}" '
-                         'href="/#narrow/stream/{denmark.id}-Denmark">#{denmark.name}</a> and '
-                         '<a class="stream" '
-                         'data-stream-id="{scotland.id}" '
-                         'href="/#narrow/stream/{scotland.id}-Scotland">#{scotland.name}</a>, '
-                         'there something</p>'.format(denmark=denmark, scotland=scotland))
+        self.assertEqual(
+            render_markdown(msg, content),
+            '<p>Look to '
+            '<a class="stream" '
+            'data-stream-id="{denmark.id}" '
+            'href="/#narrow/stream/{denmark.id}-Denmark">#{denmark.name}</a> and '
+            '<a class="stream" '
+            'data-stream-id="{scotland.id}" '
+            'href="/#narrow/stream/{scotland.id}-Scotland">#{scotland.name}</a>, '
+            'there something</p>'.format(denmark=denmark, scotland=scotland),
+        )
 
     def test_stream_case_sensitivity(self) -> None:
         realm = get_realm('zulip')
@@ -1868,7 +2184,8 @@ class MarkdownTest(ZulipTestCase):
             render_markdown(msg, content),
             '<p><a class="stream" data-stream-id="{s.id}" href="/#narrow/stream/{s.id}-{s.name}">#{s.name}</a></p>'.format(
                 s=case_sens,
-            ))
+            ),
+        )
 
     def test_stream_case_sensitivity_nonmatching(self) -> None:
         """#StreamName requires the stream be spelled with the correct case
@@ -1879,9 +2196,7 @@ class MarkdownTest(ZulipTestCase):
         sender_user_profile = self.example_user('othello')
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
         content = "#**casesens**"
-        self.assertEqual(
-            render_markdown(msg, content),
-            '<p>#<strong>casesens</strong></p>')
+        self.assertEqual(render_markdown(msg, content), '<p>#<strong>casesens</strong></p>')
 
     def test_topic_single(self) -> None:
         denmark = get_stream('Denmark', get_realm('zulip'))
@@ -1892,20 +2207,22 @@ class MarkdownTest(ZulipTestCase):
             render_markdown(msg, content),
             '<p><a class="stream-topic" data-stream-id="{d.id}" href="/#narrow/stream/{d.id}-Denmark/topic/some.20topic">#{d.name} &gt; some topic</a></p>'.format(
                 d=denmark,
-            ))
+            ),
+        )
 
     def test_topic_atomic_string(self) -> None:
         realm = get_realm('zulip')
         # Create a linkifier.
         sender_user_profile = self.example_user('othello')
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter = RealmFilter(realm=realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         realm_filter.save()
         self.assertEqual(
             realm_filter.__str__(),
-            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>')
+            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>',
+        )
         # Create a topic link that potentially interferes with the pattern.
         denmark = get_stream('Denmark', realm)
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
@@ -1914,7 +2231,8 @@ class MarkdownTest(ZulipTestCase):
             render_markdown(msg, content),
             '<p><a class="stream-topic" data-stream-id="{d.id}" href="/#narrow/stream/{d.id}-Denmark/topic/.231234">#{d.name} &gt; #1234</a></p>'.format(
                 d=denmark,
-            ))
+            ),
+        )
 
     def test_topic_multiple(self) -> None:
         denmark = get_stream('Denmark', get_realm('zulip'))
@@ -1932,7 +2250,8 @@ class MarkdownTest(ZulipTestCase):
             '<a class="stream-topic" data-stream-id="{scotland.id}" '
             'href="/#narrow/stream/{scotland.id}-{scotland.name}/topic/other.20topic">'
             '#{scotland.name} &gt; other topic</a>'
-            '.</p>'.format(denmark=denmark, scotland=scotland))
+            '.</p>'.format(denmark=denmark, scotland=scotland),
+        )
 
     def test_possible_stream_names(self) -> None:
         content = '''#**test here**
@@ -1957,20 +2276,22 @@ class MarkdownTest(ZulipTestCase):
             '<p><a class="stream" data-stream-id="{s.id}" href="{href}">#{s.name}</a></p>'.format(
                 s=uni,
                 href=href,
-            ))
+            ),
+        )
 
     def test_stream_atomic_string(self) -> None:
         realm = get_realm('zulip')
         # Create a linkifier.
         sender_user_profile = self.example_user('othello')
         url_format_string = r"https://trac.example.com/ticket/%(id)s"
-        realm_filter = RealmFilter(realm=realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         realm_filter.save()
         self.assertEqual(
             realm_filter.__str__(),
-            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>')
+            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>',
+        )
         # Create a stream that potentially interferes with the pattern.
         stream = Stream.objects.create(name='Stream #1234', realm=realm)
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
@@ -1981,15 +2302,17 @@ class MarkdownTest(ZulipTestCase):
             '<p><a class="stream" data-stream-id="{s.id}" href="{href}">#{s.name}</a></p>'.format(
                 s=stream,
                 href=href,
-            ))
+            ),
+        )
 
     def test_stream_invalid(self) -> None:
         sender_user_profile = self.example_user('othello')
         msg = Message(sender=sender_user_profile, sending_client=get_client("test"))
 
         content = "There #**Nonexistentstream**"
-        self.assertEqual(render_markdown(msg, content),
-                         '<p>There #<strong>Nonexistentstream</strong></p>')
+        self.assertEqual(
+            render_markdown(msg, content), '<p>There #<strong>Nonexistentstream</strong></p>'
+        )
         self.assertEqual(msg.mentions_user_ids, set())
 
     def test_image_preview_title(self) -> None:
@@ -2014,8 +2337,7 @@ class MarkdownTest(ZulipTestCase):
         msg = "**test**"
         realm = get_realm("zephyr")
         client = get_client("zephyr_mirror")
-        message = Message(sending_client=client,
-                          sender=self.mit_user("sipbtest"))
+        message = Message(sending_client=client, sender=self.mit_user("sipbtest"))
         converted = markdown_convert(msg, message_realm=realm, message=message)
         self.assertEqual(
             converted,
@@ -2043,19 +2365,25 @@ class MarkdownTest(ZulipTestCase):
         )
 
     def test_disabled_code_block_processor(self) -> None:
-        msg = "Hello,\n\n" +  \
-              "    I am writing this message to test something. I am writing this message to test something."
+        msg = (
+            "Hello,\n\n"
+            + "    I am writing this message to test something. I am writing this message to test something."
+        )
         converted = markdown_convert_wrapper(msg)
-        expected_output = '<p>Hello,</p>\n' +   \
-                          '<div class="codehilite"><pre><span></span><code>I am writing this message to test something. I am writing this message to test something.\n' +     \
-                          '</code></pre></div>'
+        expected_output = (
+            '<p>Hello,</p>\n'
+            + '<div class="codehilite"><pre><span></span><code>I am writing this message to test something. I am writing this message to test something.\n'
+            + '</code></pre></div>'
+        )
         self.assertEqual(converted, expected_output)
 
         realm = Realm.objects.create(string_id='code_block_processor_test')
         maybe_update_markdown_engines(realm.id, True)
         converted = markdown_convert(msg, message_realm=realm, email_gateway=True)
-        expected_output = '<p>Hello,</p>\n' +     \
-                          '<p>I am writing this message to test something. I am writing this message to test something.</p>'
+        expected_output = (
+            '<p>Hello,</p>\n'
+            + '<p>I am writing this message to test something. I am writing this message to test something.</p>'
+        )
         self.assertEqual(converted, expected_output)
 
     def test_normal_link(self) -> None:
@@ -2151,6 +2479,7 @@ class MarkdownTest(ZulipTestCase):
         converted = markdown_convert_wrapper(dedent(msg))
         self.assertEqual(converted, dedent(expected_output))
 
+
 class MarkdownApiTests(ZulipTestCase):
     def test_render_message_api(self) -> None:
         content = 'That is a **bold** statement'
@@ -2160,8 +2489,9 @@ class MarkdownApiTests(ZulipTestCase):
             dict(content=content),
         )
         self.assert_json_success(result)
-        self.assertEqual(result.json()['rendered'],
-                         '<p>That is a <strong>bold</strong> statement</p>')
+        self.assertEqual(
+            result.json()['rendered'], '<p>That is a <strong>bold</strong> statement</p>'
+        )
 
     def test_render_mention_stream_api(self) -> None:
         """Determines whether we're correctly passing the realm context"""
@@ -2174,8 +2504,11 @@ class MarkdownApiTests(ZulipTestCase):
         self.assert_json_success(result)
         user_id = self.example_user('hamlet').id
         stream_id = get_stream('Denmark', get_realm('zulip')).id
-        self.assertEqual(result.json()['rendered'],
-                         f'<p>This mentions <a class="stream" data-stream-id="{stream_id}" href="/#narrow/stream/{stream_id}-Denmark">#Denmark</a> and <span class="user-mention" data-user-id="{user_id}">@King Hamlet</span>.</p>')
+        self.assertEqual(
+            result.json()['rendered'],
+            f'<p>This mentions <a class="stream" data-stream-id="{stream_id}" href="/#narrow/stream/{stream_id}-Denmark">#Denmark</a> and <span class="user-mention" data-user-id="{user_id}">@King Hamlet</span>.</p>',
+        )
+
 
 class MarkdownErrorTests(ZulipTestCase):
     def test_markdown_error_handling(self) -> None:
@@ -2197,8 +2530,9 @@ class MarkdownErrorTests(ZulipTestCase):
         throws an exception"""
         msg = 'mock rendered message\n' * MAX_MESSAGE_LENGTH
 
-        with mock.patch('zerver.lib.markdown.timeout', return_value=msg), \
-                mock.patch('zerver.lib.markdown.markdown_logger'):
+        with mock.patch('zerver.lib.markdown.timeout', return_value=msg), mock.patch(
+            'zerver.lib.markdown.markdown_logger'
+        ):
             with self.assertRaises(MarkdownRenderingException):
                 markdown_convert_wrapper(msg)
 
diff --git a/zerver/tests/test_mattermost_importer.py b/zerver/tests/test_mattermost_importer.py
index d692ce55ac..b0c3aa23f8 100644
--- a/zerver/tests/test_mattermost_importer.py
+++ b/zerver/tests/test_mattermost_importer.py
@@ -58,12 +58,16 @@ class MatterMostImporter(ZulipTestCase):
         self.assertEqual(len(mattermost_data["emoji"]), 2)
         self.assertEqual(mattermost_data["emoji"][0]["name"], "peerdium")
 
-        fixture_file_name = self.fixture_file_name("export.json", "mattermost_fixtures/direct_channel")
+        fixture_file_name = self.fixture_file_name(
+            "export.json", "mattermost_fixtures/direct_channel"
+        )
         mattermost_data = mattermost_data_file_to_dict(fixture_file_name)
 
         self.assertEqual(len(mattermost_data["post"]["channel_post"]), 4)
         self.assertEqual(mattermost_data["post"]["channel_post"][0]["team"], "gryffindor")
-        self.assertEqual(mattermost_data["post"]["channel_post"][0]["channel"], "gryffindor-common-room")
+        self.assertEqual(
+            mattermost_data["post"]["channel_post"][0]["channel"], "gryffindor-common-room"
+        )
         self.assertEqual(mattermost_data["post"]["channel_post"][0]["user"], "ron")
         self.assertEqual(mattermost_data["post"]["channel_post"][0]["replies"], None)
 
@@ -71,7 +75,9 @@ class MatterMostImporter(ZulipTestCase):
         self.assertEqual(mattermost_data["post"]["direct_post"][0]["user"], "ron")
         self.assertEqual(mattermost_data["post"]["direct_post"][0]["replies"], None)
         self.assertEqual(mattermost_data["post"]["direct_post"][0]["message"], "hey harry")
-        self.assertEqual(mattermost_data["post"]["direct_post"][0]["channel_members"], ["ron", "harry"])
+        self.assertEqual(
+            mattermost_data["post"]["direct_post"][0]["channel_members"], ["ron", "harry"]
+        )
 
     def test_process_user(self) -> None:
         user_id_mapper = IdMapper()
@@ -134,8 +140,12 @@ class MatterMostImporter(ZulipTestCase):
         self.assertEqual(len(user_handler.get_all_users()), 2)
         self.assertTrue(user_id_mapper.has("harry"))
         self.assertTrue(user_id_mapper.has("ron"))
-        self.assertEqual(user_handler.get_user(user_id_mapper.get("harry"))["full_name"], "Harry Potter")
-        self.assertEqual(user_handler.get_user(user_id_mapper.get("ron"))["full_name"], "Ron Weasley")
+        self.assertEqual(
+            user_handler.get_user(user_id_mapper.get("harry"))["full_name"], "Harry Potter"
+        )
+        self.assertEqual(
+            user_handler.get_user(user_id_mapper.get("ron"))["full_name"], "Ron Weasley"
+        )
 
         team_name = "slytherin"
         user_handler = UserHandler()
@@ -192,19 +202,25 @@ class MatterMostImporter(ZulipTestCase):
 
         self.assertEqual(zerver_stream[0]["name"], "Gryffindor common room")
         self.assertEqual(zerver_stream[0]["invite_only"], False)
-        self.assertEqual(zerver_stream[0]["description"], "A place for talking about Gryffindor common room")
+        self.assertEqual(
+            zerver_stream[0]["description"], "A place for talking about Gryffindor common room"
+        )
         self.assertEqual(zerver_stream[0]["rendered_description"], "")
         self.assertEqual(zerver_stream[0]["realm"], 3)
 
         self.assertEqual(zerver_stream[1]["name"], "Gryffindor quidditch team")
         self.assertEqual(zerver_stream[1]["invite_only"], False)
-        self.assertEqual(zerver_stream[1]["description"], "A place for talking about Gryffindor quidditch team")
+        self.assertEqual(
+            zerver_stream[1]["description"], "A place for talking about Gryffindor quidditch team"
+        )
         self.assertEqual(zerver_stream[1]["rendered_description"], "")
         self.assertEqual(zerver_stream[1]["realm"], 3)
 
         self.assertEqual(zerver_stream[2]["name"], "Dumbledores army")
         self.assertEqual(zerver_stream[2]["invite_only"], True)
-        self.assertEqual(zerver_stream[2]["description"], "A place for talking about Dumbledores army")
+        self.assertEqual(
+            zerver_stream[2]["description"], "A place for talking about Dumbledores army"
+        )
         self.assertEqual(zerver_stream[2]["rendered_description"], "")
         self.assertEqual(zerver_stream[2]["realm"], 3)
 
@@ -216,9 +232,20 @@ class MatterMostImporter(ZulipTestCase):
         ron_id = user_id_mapper.get("ron")
         harry_id = user_id_mapper.get("harry")
         self.assertEqual({ron_id, harry_id}, {1, 2})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("gryffindor-common-room")), {ron_id, harry_id})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("gryffindor-quidditch-team")), {ron_id, harry_id})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("dumbledores-army")), {ron_id, harry_id})
+        self.assertEqual(
+            subscriber_handler.get_users(stream_id=stream_id_mapper.get("gryffindor-common-room")),
+            {ron_id, harry_id},
+        )
+        self.assertEqual(
+            subscriber_handler.get_users(
+                stream_id=stream_id_mapper.get("gryffindor-quidditch-team")
+            ),
+            {ron_id, harry_id},
+        )
+        self.assertEqual(
+            subscriber_handler.get_users(stream_id=stream_id_mapper.get("dumbledores-army")),
+            {ron_id, harry_id},
+        )
 
         # Converting channel data when a user's `teams` value is `null`.
         username_to_user["ron"].update(teams=None)
@@ -233,9 +260,20 @@ class MatterMostImporter(ZulipTestCase):
         )
         harry_id = user_id_mapper.get("harry")
         self.assertIn(harry_id, {1, 2})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("gryffindor-common-room")), {harry_id})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("gryffindor-quidditch-team")), {harry_id})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("dumbledores-army")), {harry_id})
+        self.assertEqual(
+            subscriber_handler.get_users(stream_id=stream_id_mapper.get("gryffindor-common-room")),
+            {harry_id},
+        )
+        self.assertEqual(
+            subscriber_handler.get_users(
+                stream_id=stream_id_mapper.get("gryffindor-quidditch-team")
+            ),
+            {harry_id},
+        )
+        self.assertEqual(
+            subscriber_handler.get_users(stream_id=stream_id_mapper.get("dumbledores-army")),
+            {harry_id},
+        )
 
         team_name = "slytherin"
         zerver_stream = convert_channel_data(
@@ -252,11 +290,21 @@ class MatterMostImporter(ZulipTestCase):
         pansy_id = user_id_mapper.get("pansy")
         snape_id = user_id_mapper.get("snape")
         self.assertEqual({malfoy_id, pansy_id, snape_id}, {3, 4, 5})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("slytherin-common-room")), {malfoy_id, pansy_id, snape_id})
-        self.assertEqual(subscriber_handler.get_users(stream_id=stream_id_mapper.get("slytherin-quidditch-team")), {malfoy_id, pansy_id})
+        self.assertEqual(
+            subscriber_handler.get_users(stream_id=stream_id_mapper.get("slytherin-common-room")),
+            {malfoy_id, pansy_id, snape_id},
+        )
+        self.assertEqual(
+            subscriber_handler.get_users(
+                stream_id=stream_id_mapper.get("slytherin-quidditch-team")
+            ),
+            {malfoy_id, pansy_id},
+        )
 
     def test_convert_huddle_data(self) -> None:
-        fixture_file_name = self.fixture_file_name("export.json", "mattermost_fixtures/direct_channel")
+        fixture_file_name = self.fixture_file_name(
+            "export.json", "mattermost_fixtures/direct_channel"
+        )
         mattermost_data = mattermost_data_file_to_dict(fixture_file_name)
         username_to_user = create_username_to_user_mapping(mattermost_data["user"])
         reset_mirror_dummy_users(username_to_user)
@@ -290,7 +338,9 @@ class MatterMostImporter(ZulipTestCase):
         huddle_name = generate_huddle_name(huddle_members)
 
         self.assertTrue(huddle_id_mapper.has(huddle_name))
-        self.assertEqual(subscriber_handler.get_users(huddle_id=huddle_id_mapper.get(huddle_name)), {1, 2, 3})
+        self.assertEqual(
+            subscriber_handler.get_users(huddle_id=huddle_id_mapper.get(huddle_name)), {1, 2, 3}
+        )
 
     def test_write_emoticon_data(self) -> None:
         fixture_file_name = self.fixture_file_name("export.json", "mattermost_fixtures")
@@ -302,7 +352,7 @@ class MatterMostImporter(ZulipTestCase):
                 realm_id=3,
                 custom_emoji_data=mattermost_data["emoji"],
                 data_dir=self.fixture_file_name("", "mattermost_fixtures"),
-                output_dir = output_dir,
+                output_dir=output_dir,
             )
 
         self.assertEqual(len(zerver_realm_emoji), 2)
@@ -320,12 +370,16 @@ class MatterMostImporter(ZulipTestCase):
 
         self.assertEqual(records_json[0]["file_name"], "peerdium")
         self.assertEqual(records_json[0]["realm_id"], 3)
-        exported_emoji_path = self.fixture_file_name(mattermost_data["emoji"][0]["image"], "mattermost_fixtures")
+        exported_emoji_path = self.fixture_file_name(
+            mattermost_data["emoji"][0]["image"], "mattermost_fixtures"
+        )
         self.assertTrue(filecmp.cmp(records_json[0]["path"], exported_emoji_path))
 
         self.assertEqual(records_json[1]["file_name"], "tick")
         self.assertEqual(records_json[1]["realm_id"], 3)
-        exported_emoji_path = self.fixture_file_name(mattermost_data["emoji"][1]["image"], "mattermost_fixtures")
+        exported_emoji_path = self.fixture_file_name(
+            mattermost_data["emoji"][1]["image"], "mattermost_fixtures"
+        )
         self.assertTrue(filecmp.cmp(records_json[1]["path"], exported_emoji_path))
 
     def test_get_mentioned_user_ids(self) -> None:
@@ -482,10 +536,17 @@ class MatterMostImporter(ZulipTestCase):
         world_map_emoji_code = name_to_codepoint["world_map"]
 
         self.assertEqual(len(total_reactions), 4)
-        self.assertEqual(self.get_set(total_reactions, "reaction_type"), {Reaction.REALM_EMOJI, Reaction.UNICODE_EMOJI})
-        self.assertEqual(self.get_set(total_reactions, "emoji_name"), {"tick", "smile", "world_map"})
-        self.assertEqual(self.get_set(total_reactions, "emoji_code"), {tick_emoji_code, smile_emoji_code,
-                                                                       world_map_emoji_code})
+        self.assertEqual(
+            self.get_set(total_reactions, "reaction_type"),
+            {Reaction.REALM_EMOJI, Reaction.UNICODE_EMOJI},
+        )
+        self.assertEqual(
+            self.get_set(total_reactions, "emoji_name"), {"tick", "smile", "world_map"}
+        )
+        self.assertEqual(
+            self.get_set(total_reactions, "emoji_code"),
+            {tick_emoji_code, smile_emoji_code, world_map_emoji_code},
+        )
         self.assertEqual(self.get_set(total_reactions, "user_profile"), {harry_id, ron_id})
         self.assertEqual(len(self.get_set(total_reactions, "id")), 4)
         self.assertEqual(len(self.get_set(total_reactions, "message")), 1)
@@ -508,36 +569,49 @@ class MatterMostImporter(ZulipTestCase):
                 output_dir=output_dir,
                 masking_content=False,
             )
-        self.assertEqual(mock_print.mock_calls, [
-            call('Generating data for', 'gryffindor'),
-            call('Generating data for', 'slytherin')
-        ])
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
-            'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [call('Generating data for', 'gryffindor'), call('Generating data for', 'slytherin')],
+        )
+        self.assertEqual(
+            warn_log.output,
+            [
+                'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
+                'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
+            ],
+        )
 
         harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
         self.assertEqual(os.path.exists(os.path.join(harry_team_output_dir, 'avatars')), True)
         self.assertEqual(os.path.exists(os.path.join(harry_team_output_dir, 'emoji')), True)
-        self.assertEqual(os.path.exists(os.path.join(harry_team_output_dir, 'attachment.json')), True)
+        self.assertEqual(
+            os.path.exists(os.path.join(harry_team_output_dir, 'attachment.json')), True
+        )
 
         realm = self.read_file(harry_team_output_dir, 'realm.json')
 
-        self.assertEqual('Organization imported from Mattermost!',
-                         realm['zerver_realm'][0]['description'])
+        self.assertEqual(
+            'Organization imported from Mattermost!', realm['zerver_realm'][0]['description']
+        )
 
         exported_user_ids = self.get_set(realm['zerver_userprofile'], 'id')
         exported_user_full_names = self.get_set(realm['zerver_userprofile'], 'full_name')
         self.assertEqual({'Harry Potter', 'Ron Weasley', 'Severus Snape'}, exported_user_full_names)
 
         exported_user_emails = self.get_set(realm['zerver_userprofile'], 'email')
-        self.assertEqual({'harry@zulip.com', 'ron@zulip.com', 'snape@zulip.com'}, exported_user_emails)
+        self.assertEqual(
+            {'harry@zulip.com', 'ron@zulip.com', 'snape@zulip.com'}, exported_user_emails
+        )
 
         self.assertEqual(len(realm['zerver_stream']), 3)
         exported_stream_names = self.get_set(realm['zerver_stream'], 'name')
-        self.assertEqual(exported_stream_names, {'Gryffindor common room', 'Gryffindor quidditch team', 'Dumbledores army'})
-        self.assertEqual(self.get_set(realm['zerver_stream'], 'realm'), {realm['zerver_realm'][0]['id']})
+        self.assertEqual(
+            exported_stream_names,
+            {'Gryffindor common room', 'Gryffindor quidditch team', 'Dumbledores army'},
+        )
+        self.assertEqual(
+            self.get_set(realm['zerver_stream'], 'realm'), {realm['zerver_realm'][0]['id']}
+        )
         self.assertEqual(self.get_set(realm['zerver_stream'], 'deactivated'), {False})
 
         self.assertEqual(len(realm['zerver_defaultstream']), 0)
@@ -549,7 +623,9 @@ class MatterMostImporter(ZulipTestCase):
         exported_recipient_type_ids = self.get_set(realm['zerver_recipient'], 'type_id')
         self.assertEqual(len(exported_recipient_type_ids), 3)
 
-        exported_subscription_userprofile = self.get_set(realm['zerver_subscription'], 'user_profile')
+        exported_subscription_userprofile = self.get_set(
+            realm['zerver_subscription'], 'user_profile'
+        )
         self.assertEqual(len(exported_subscription_userprofile), 3)
         exported_subscription_recipients = self.get_set(realm['zerver_subscription'], 'recipient')
         self.assertEqual(len(exported_subscription_recipients), 6)
@@ -561,7 +637,9 @@ class MatterMostImporter(ZulipTestCase):
         self.assertIn(messages['zerver_message'][0]['recipient'], exported_recipient_ids)
         self.assertIn(messages['zerver_message'][0]['content'], 'harry joined the channel.\n\n')
 
-        exported_usermessage_userprofiles = self.get_set(messages['zerver_usermessage'], 'user_profile')
+        exported_usermessage_userprofiles = self.get_set(
+            messages['zerver_usermessage'], 'user_profile'
+        )
         self.assertEqual(len(exported_usermessage_userprofiles), 3)
         exported_usermessage_messages = self.get_set(messages['zerver_usermessage'], 'message')
         self.assertEqual(exported_usermessage_messages, exported_messages_id)
@@ -592,31 +670,47 @@ class MatterMostImporter(ZulipTestCase):
                 output_dir=output_dir,
                 masking_content=False,
             )
-        self.assertEqual(mock_print.mock_calls, [
-            call('Generating data for', 'gryffindor'),
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [
+                call('Generating data for', 'gryffindor'),
+            ],
+        )
 
         harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
         self.assertEqual(os.path.exists(os.path.join(harry_team_output_dir, 'avatars')), True)
         self.assertEqual(os.path.exists(os.path.join(harry_team_output_dir, 'emoji')), True)
-        self.assertEqual(os.path.exists(os.path.join(harry_team_output_dir, 'attachment.json')), True)
+        self.assertEqual(
+            os.path.exists(os.path.join(harry_team_output_dir, 'attachment.json')), True
+        )
 
         realm = self.read_file(harry_team_output_dir, 'realm.json')
 
-        self.assertEqual('Organization imported from Mattermost!',
-                         realm['zerver_realm'][0]['description'])
+        self.assertEqual(
+            'Organization imported from Mattermost!', realm['zerver_realm'][0]['description']
+        )
 
         exported_user_ids = self.get_set(realm['zerver_userprofile'], 'id')
         exported_user_full_names = self.get_set(realm['zerver_userprofile'], 'full_name')
-        self.assertEqual({'Harry Potter', 'Ron Weasley', 'Ginny Weasley', 'Tom Riddle'}, exported_user_full_names)
+        self.assertEqual(
+            {'Harry Potter', 'Ron Weasley', 'Ginny Weasley', 'Tom Riddle'}, exported_user_full_names
+        )
 
         exported_user_emails = self.get_set(realm['zerver_userprofile'], 'email')
-        self.assertEqual({'harry@zulip.com', 'ron@zulip.com', 'ginny@zulip.com', 'voldemort@zulip.com'}, exported_user_emails)
+        self.assertEqual(
+            {'harry@zulip.com', 'ron@zulip.com', 'ginny@zulip.com', 'voldemort@zulip.com'},
+            exported_user_emails,
+        )
 
         self.assertEqual(len(realm['zerver_stream']), 3)
         exported_stream_names = self.get_set(realm['zerver_stream'], 'name')
-        self.assertEqual(exported_stream_names, {'Gryffindor common room', 'Gryffindor quidditch team', 'Dumbledores army'})
-        self.assertEqual(self.get_set(realm['zerver_stream'], 'realm'), {realm['zerver_realm'][0]['id']})
+        self.assertEqual(
+            exported_stream_names,
+            {'Gryffindor common room', 'Gryffindor quidditch team', 'Dumbledores army'},
+        )
+        self.assertEqual(
+            self.get_set(realm['zerver_stream'], 'realm'), {realm['zerver_realm'][0]['id']}
+        )
         self.assertEqual(self.get_set(realm['zerver_stream'], 'deactivated'), {False})
 
         self.assertEqual(len(realm['zerver_defaultstream']), 0)
@@ -628,7 +722,9 @@ class MatterMostImporter(ZulipTestCase):
         exported_recipient_type_ids = self.get_set(realm['zerver_recipient'], 'type_id')
         self.assertEqual(len(exported_recipient_type_ids), 4)
 
-        exported_subscription_userprofile = self.get_set(realm['zerver_subscription'], 'user_profile')
+        exported_subscription_userprofile = self.get_set(
+            realm['zerver_subscription'], 'user_profile'
+        )
         self.assertEqual(len(exported_subscription_userprofile), 4)
         exported_subscription_recipients = self.get_set(realm['zerver_subscription'], 'recipient')
         self.assertEqual(len(exported_subscription_recipients), 8)
@@ -640,7 +736,9 @@ class MatterMostImporter(ZulipTestCase):
         self.assertIn(messages['zerver_message'][0]['recipient'], exported_recipient_ids)
         self.assertIn(messages['zerver_message'][0]['content'], 'ron joined the channel.\n\n')
 
-        exported_usermessage_userprofiles = self.get_set(messages['zerver_usermessage'], 'user_profile')
+        exported_usermessage_userprofiles = self.get_set(
+            messages['zerver_usermessage'], 'user_profile'
+        )
         self.assertEqual(len(exported_usermessage_userprofiles), 3)
         exported_usermessage_messages = self.get_set(messages['zerver_usermessage'], 'message')
         self.assertEqual(exported_usermessage_messages, exported_messages_id)
@@ -672,7 +770,9 @@ class MatterMostImporter(ZulipTestCase):
         self.assertEqual(huddle_messages[0].sender.email, "ginny@zulip.com")
         self.assertEqual(huddle_messages[0].content, "Who is going to Hogsmeade this weekend?\n\n")
 
-        personal_messages = messages.filter(recipient__type=Recipient.PERSONAL).order_by("date_sent")
+        personal_messages = messages.filter(recipient__type=Recipient.PERSONAL).order_by(
+            "date_sent"
+        )
         personal_recipients = personal_messages.values_list("recipient", flat=True)
         self.assertEqual(len(personal_messages), 4)
         self.assertEqual(len(set(personal_recipients)), 3)
@@ -689,14 +789,17 @@ class MatterMostImporter(ZulipTestCase):
                 output_dir=output_dir,
                 masking_content=True,
             )
-        self.assertEqual(mock_print.mock_calls, [
-            call('Generating data for', 'gryffindor'),
-            call('Generating data for', 'slytherin')
-        ])
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
-            'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [call('Generating data for', 'gryffindor'), call('Generating data for', 'slytherin')],
+        )
+        self.assertEqual(
+            warn_log.output,
+            [
+                'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
+                'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
+            ],
+        )
 
         harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
         messages = self.read_file(harry_team_output_dir, 'messages-000001.json')
@@ -713,14 +816,17 @@ class MatterMostImporter(ZulipTestCase):
                 output_dir=output_dir,
                 masking_content=True,
             )
-        self.assertEqual(mock_print.mock_calls, [
-            call('Generating data for', 'gryffindor'),
-            call('Generating data for', 'slytherin')
-        ])
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
-            'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [call('Generating data for', 'gryffindor'), call('Generating data for', 'slytherin')],
+        )
+        self.assertEqual(
+            warn_log.output,
+            [
+                'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
+                'WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export',
+            ],
+        )
 
         harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
 
diff --git a/zerver/tests/test_message_dict.py b/zerver/tests/test_message_dict.py
index 20232fa28e..4e1f8678d6 100644
--- a/zerver/tests/test_message_dict.py
+++ b/zerver/tests/test_message_dict.py
@@ -26,7 +26,7 @@ from zerver.models import (
 
 class MessageDictTest(ZulipTestCase):
     def test_both_codepaths(self) -> None:
-        '''
+        """
         We have two different codepaths that
         extract a particular shape of dictionary
         for messages to send to clients:
@@ -67,7 +67,7 @@ class MessageDictTest(ZulipTestCase):
 
         This test simply verifies that the two codepaths
         ultimately provide the same result.
-        '''
+        """
 
         def reload_message(msg_id: int) -> Message:
             # Get a clean copy of the message, and
@@ -77,9 +77,8 @@ class MessageDictTest(ZulipTestCase):
             return msg
 
         def get_send_message_payload(
-                msg_id: int,
-                apply_markdown: bool,
-                client_gravatar: bool) -> Dict[str, Any]:
+            msg_id: int, apply_markdown: bool, client_gravatar: bool
+        ) -> Dict[str, Any]:
             msg = reload_message(msg_id)
             wide_dict = MessageDict.wide_dict(msg)
 
@@ -91,9 +90,8 @@ class MessageDictTest(ZulipTestCase):
             return narrow_dict
 
         def get_fetch_payload(
-                msg_id: int,
-                apply_markdown: bool,
-                client_gravatar: bool) -> Dict[str, Any]:
+            msg_id: int, apply_markdown: bool, client_gravatar: bool
+        ) -> Dict[str, Any]:
             msg = reload_message(msg_id)
             unhydrated_dict = MessageDict.to_dict_uncached_helper([msg])[0]
             # The next step mutates the dict in place
@@ -168,8 +166,9 @@ class MessageDictTest(ZulipTestCase):
                 message.save()
                 ids.append(message.id)
 
-                Reaction.objects.create(user_profile=sender, message=message,
-                                        emoji_name='simple_smile')
+                Reaction.objects.create(
+                    user_profile=sender, message=message, emoji_name='simple_smile'
+                )
 
         num_ids = len(ids)
         self.assertTrue(num_ids >= 600)
@@ -178,10 +177,7 @@ class MessageDictTest(ZulipTestCase):
         with queries_captured() as queries:
             rows = list(MessageDict.get_raw_db_rows(ids))
 
-            objs = [
-                MessageDict.build_dict_from_raw_db_row(row)
-                for row in rows
-            ]
+            objs = [MessageDict.build_dict_from_raw_db_row(row) for row in rows]
             MessageDict.post_process_dicts(objs, apply_markdown=False, client_gravatar=False)
 
         self.assert_length(queries, 7)
@@ -238,7 +234,9 @@ class MessageDictTest(ZulipTestCase):
         # because there is an ugly hack we need to cover.  So don't just say "row = message".
         row = MessageDict.get_raw_db_rows([message.id])[0]
         dct = MessageDict.build_dict_from_raw_db_row(row)
-        error_content = '<p>[Zulip note: Sorry, we could not understand the formatting of your message]</p>'
+        error_content = (
+            '<p>[Zulip note: Sorry, we could not understand the formatting of your message]</p>'
+        )
         self.assertEqual(dct['rendered_content'], error_content)
 
     def test_topic_links_use_stream_realm(self) -> None:
@@ -251,16 +249,18 @@ class MessageDictTest(ZulipTestCase):
         url = 'https://trac.example.com/ticket/123'
         topic_name = 'test #123'
 
-        realm_filter = RealmFilter(realm=zulip_realm,
-                                   pattern=r"#(?P<id>[0-9]{2,8})",
-                                   url_format_string=url_format_string)
+        realm_filter = RealmFilter(
+            realm=zulip_realm, pattern=r"#(?P<id>[0-9]{2,8})", url_format_string=url_format_string
+        )
         self.assertEqual(
             realm_filter.__str__(),
-            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>')
+            '<RealmFilter(zulip): #(?P<id>[0-9]{2,8}) https://trac.example.com/ticket/%(id)s>',
+        )
 
         def get_message(sender: UserProfile) -> Message:
-            msg_id = self.send_stream_message(sender, 'Denmark', 'hello world', topic_name,
-                                              zulip_realm)
+            msg_id = self.send_stream_message(
+                sender, 'Denmark', 'hello world', topic_name, zulip_realm
+            )
             return Message.objects.get(id=msg_id)
 
         def assert_topic_links(links: List[str], msg: Message) -> None:
@@ -294,35 +294,39 @@ class MessageDictTest(ZulipTestCase):
         message.save()
 
         reaction = Reaction.objects.create(
-            message=message, user_profile=sender,
-            emoji_name='simple_smile')
+            message=message, user_profile=sender, emoji_name='simple_smile'
+        )
         row = MessageDict.get_raw_db_rows([message.id])[0]
         msg_dict = MessageDict.build_dict_from_raw_db_row(row)
-        self.assertEqual(msg_dict['reactions'][0]['emoji_name'],
-                         reaction.emoji_name)
+        self.assertEqual(msg_dict['reactions'][0]['emoji_name'], reaction.emoji_name)
         self.assertEqual(msg_dict['reactions'][0]['user_id'], sender.id)
-        self.assertEqual(msg_dict['reactions'][0]['user']['id'],
-                         sender.id)
-        self.assertEqual(msg_dict['reactions'][0]['user']['email'],
-                         sender.email)
-        self.assertEqual(msg_dict['reactions'][0]['user']['full_name'],
-                         sender.full_name)
+        self.assertEqual(msg_dict['reactions'][0]['user']['id'], sender.id)
+        self.assertEqual(msg_dict['reactions'][0]['user']['email'], sender.email)
+        self.assertEqual(msg_dict['reactions'][0]['user']['full_name'], sender.full_name)
 
     def test_missing_anchor(self) -> None:
         self.login('hamlet')
         result = self.client_get(
-            "/json/messages", {"use_first_unread_anchor": "false", "num_before": "1", "num_after": "1"})
+            "/json/messages",
+            {"use_first_unread_anchor": "false", "num_before": "1", "num_after": "1"},
+        )
 
-        self.assert_json_error(
-            result, "Missing 'anchor' argument.")
+        self.assert_json_error(result, "Missing 'anchor' argument.")
 
     def test_invalid_anchor(self) -> None:
         self.login('hamlet')
         result = self.client_get(
-            "/json/messages", {"use_first_unread_anchor": "false", "num_before": "1", "num_after": "1", "anchor": "chocolate"})
+            "/json/messages",
+            {
+                "use_first_unread_anchor": "false",
+                "num_before": "1",
+                "num_after": "1",
+                "anchor": "chocolate",
+            },
+        )
+
+        self.assert_json_error(result, "Invalid anchor")
 
-        self.assert_json_error(
-            result, "Invalid anchor")
 
 class MessageHydrationTest(ZulipTestCase):
     def test_hydrate_stream_recipient_info(self) -> None:
@@ -473,9 +477,13 @@ class MessageHydrationTest(ZulipTestCase):
         # Make sure the email is up-to-date.
         self.assertEqual(cordelia_display_recipient['email'], cordelia_new_email)
 
+
 class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
-    def _verify_display_recipient(self, display_recipient: DisplayRecipientT,
-                                  expected_recipient_objects: Union[Stream, List[UserProfile]]) -> None:
+    def _verify_display_recipient(
+        self,
+        display_recipient: DisplayRecipientT,
+        expected_recipient_objects: Union[Stream, List[UserProfile]],
+    ) -> None:
         if isinstance(expected_recipient_objects, Stream):
             self.assertEqual(display_recipient, expected_recipient_objects.name)
 
@@ -526,8 +534,12 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
             allow_edit_history=False,
         )
 
-        self._verify_display_recipient(messages[0]['display_recipient'], get_stream("Verona", cordelia.realm))
-        self._verify_display_recipient(messages[1]['display_recipient'], get_stream("Denmark", cordelia.realm))
+        self._verify_display_recipient(
+            messages[0]['display_recipient'], get_stream("Verona", cordelia.realm)
+        )
+        self._verify_display_recipient(
+            messages[1]['display_recipient'], get_stream("Denmark", cordelia.realm)
+        )
 
     def test_display_recipient_huddle(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -548,8 +560,12 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
             allow_edit_history=False,
         )
 
-        self._verify_display_recipient(messages[0]['display_recipient'], [hamlet, cordelia, othello])
-        self._verify_display_recipient(messages[1]['display_recipient'], [hamlet, cordelia, othello, iago])
+        self._verify_display_recipient(
+            messages[0]['display_recipient'], [hamlet, cordelia, othello]
+        )
+        self._verify_display_recipient(
+            messages[1]['display_recipient'], [hamlet, cordelia, othello, iago]
+        )
 
     def test_display_recipient_various_types(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -574,13 +590,22 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
             allow_edit_history=False,
         )
 
-        self._verify_display_recipient(messages[0]['display_recipient'], [hamlet, cordelia, othello])
-        self._verify_display_recipient(messages[1]['display_recipient'], get_stream("Verona", hamlet.realm))
+        self._verify_display_recipient(
+            messages[0]['display_recipient'], [hamlet, cordelia, othello]
+        )
+        self._verify_display_recipient(
+            messages[1]['display_recipient'], get_stream("Verona", hamlet.realm)
+        )
         self._verify_display_recipient(messages[2]['display_recipient'], [hamlet, cordelia])
-        self._verify_display_recipient(messages[3]['display_recipient'], get_stream("Denmark", hamlet.realm))
-        self._verify_display_recipient(messages[4]['display_recipient'], [hamlet, cordelia, othello, iago])
+        self._verify_display_recipient(
+            messages[3]['display_recipient'], get_stream("Denmark", hamlet.realm)
+        )
+        self._verify_display_recipient(
+            messages[4]['display_recipient'], [hamlet, cordelia, othello, iago]
+        )
         self._verify_display_recipient(messages[5]['display_recipient'], [cordelia, othello])
 
+
 class SewMessageAndReactionTest(ZulipTestCase):
     def test_sew_messages_and_reaction(self) -> None:
         sender = self.example_user('othello')
@@ -606,17 +631,14 @@ class SewMessageAndReactionTest(ZulipTestCase):
                 message.set_topic_name('whatever')
                 message.save()
                 needed_ids.append(message.id)
-                reaction = Reaction(user_profile=sender, message=message,
-                                    emoji_name='simple_smile')
+                reaction = Reaction(user_profile=sender, message=message, emoji_name='simple_smile')
                 reaction.save()
 
-        messages = Message.objects.filter(id__in=needed_ids).values(
-            *['id', 'content'])
+        messages = Message.objects.filter(id__in=needed_ids).values(*['id', 'content'])
         reactions = Reaction.get_raw_db_rows(needed_ids)
         tied_data = sew_messages_and_reactions(messages, reactions)
         for data in tied_data:
             self.assertEqual(len(data['reactions']), 1)
-            self.assertEqual(data['reactions'][0]['emoji_name'],
-                             'simple_smile')
+            self.assertEqual(data['reactions'][0]['emoji_name'], 'simple_smile')
             self.assertTrue(data['id'])
             self.assertTrue(data['content'])
diff --git a/zerver/tests/test_message_edit.py b/zerver/tests/test_message_edit.py
index edc1a68cd7..ce98e6f9c7 100644
--- a/zerver/tests/test_message_edit.py
+++ b/zerver/tests/test_message_edit.py
@@ -21,16 +21,11 @@ from zerver.models import Message, Stream, UserMessage, UserProfile
 
 
 class EditMessageTest(ZulipTestCase):
-    def check_topic(self,
-                    msg_id: int,
-                    topic_name: str) -> None:
+    def check_topic(self, msg_id: int, topic_name: str) -> None:
         msg = Message.objects.get(id=msg_id)
         self.assertEqual(msg.topic_name(), topic_name)
 
-    def check_message(self,
-                      msg_id: int,
-                      topic_name: str,
-                      content: str) -> None:
+    def check_message(self, msg_id: int, topic_name: str, content: str) -> None:
         # Make sure we saved the message correctly to the DB.
         msg = Message.objects.get(id=msg_id)
         self.assertEqual(msg.topic_name(), topic_name)
@@ -46,7 +41,7 @@ class EditMessageTest(ZulipTestCase):
 
         with queries_captured(keep_cache_warm=True) as queries:
             (fetch_message_dict,) = messages_for_ids(
-                message_ids = [msg.id],
+                message_ids=[msg.id],
                 user_message_flags={msg_id: []},
                 search_fields={},
                 apply_markdown=False,
@@ -86,17 +81,17 @@ class EditMessageTest(ZulipTestCase):
         stream_name = "public_stream"
         self.subscribe(user, stream_name)
         message_ids = []
-        message_ids.append(self.send_stream_message(user,
-                                                    stream_name, "Message one"))
+        message_ids.append(self.send_stream_message(user, stream_name, "Message one"))
         user_2 = self.example_user("cordelia")
         self.subscribe(user_2, stream_name)
-        message_ids.append(self.send_stream_message(user_2,
-                                                    stream_name, "Message two"))
+        message_ids.append(self.send_stream_message(user_2, stream_name, "Message two"))
         self.subscribe(self.notification_bot(), stream_name)
-        message_ids.append(self.send_stream_message(self.notification_bot(),
-                                                    stream_name, "Message three"))
-        messages = [Message.objects.select_related().get(id=message_id)
-                    for message_id in message_ids]
+        message_ids.append(
+            self.send_stream_message(self.notification_bot(), stream_name, "Message three")
+        )
+        messages = [
+            Message.objects.select_related().get(id=message_id) for message_id in message_ids
+        ]
 
         # Check number of queries performed
         with queries_captured() as queries:
@@ -116,19 +111,26 @@ class EditMessageTest(ZulipTestCase):
         """This is also tested by a client test, but here we can verify
         the cache against the database"""
         self.login('hamlet')
-        msg_id = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                          topic_name="editing", content="before edit")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': 'after edit',
-        })
+        msg_id = self.send_stream_message(
+            self.example_user("hamlet"), "Scotland", topic_name="editing", content="before edit"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': 'after edit',
+            },
+        )
         self.assert_json_success(result)
         self.check_message(msg_id, topic_name="editing", content="after edit")
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'topic': 'edited',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'topic': 'edited',
+            },
+        )
         self.assert_json_success(result)
         self.check_topic(msg_id, topic_name="edited")
 
@@ -160,8 +162,9 @@ class EditMessageTest(ZulipTestCase):
         self.login_user(user_profile)
         stream = self.make_stream('public_stream')
         self.subscribe(user_profile, stream.name)
-        msg_id = self.send_stream_message(user_profile, stream.name,
-                                          topic_name="test", content="test")
+        msg_id = self.send_stream_message(
+            user_profile, stream.name, topic_name="test", content="test"
+        )
         result = self.client_get('/json/messages/' + str(msg_id))
         self.assert_json_success(result)
 
@@ -175,8 +178,9 @@ class EditMessageTest(ZulipTestCase):
         self.login_user(user_profile)
         stream = self.make_stream('private_stream', invite_only=True)
         self.subscribe(user_profile, stream.name)
-        msg_id = self.send_stream_message(user_profile, stream.name,
-                                          topic_name="test", content="test")
+        msg_id = self.send_stream_message(
+            user_profile, stream.name, topic_name="test", content="test"
+        )
         result = self.client_get('/json/messages/' + str(msg_id))
         self.assert_json_success(result)
         self.login('othello')
@@ -185,43 +189,59 @@ class EditMessageTest(ZulipTestCase):
 
     def test_edit_message_no_permission(self) -> None:
         self.login('hamlet')
-        msg_id = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                          topic_name="editing", content="before edit")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': 'content after edit',
-        })
+        msg_id = self.send_stream_message(
+            self.example_user("iago"), "Scotland", topic_name="editing", content="before edit"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': 'content after edit',
+            },
+        )
         self.assert_json_error(result, "You don't have permission to edit this message")
 
     def test_edit_message_no_changes(self) -> None:
         self.login('hamlet')
-        msg_id = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                          topic_name="editing", content="before edit")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-        })
+        msg_id = self.send_stream_message(
+            self.example_user("hamlet"), "Scotland", topic_name="editing", content="before edit"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+            },
+        )
         self.assert_json_error(result, "Nothing to change")
 
     def test_edit_message_no_topic(self) -> None:
         self.login('hamlet')
-        msg_id = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                          topic_name="editing", content="before edit")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'topic': ' ',
-        })
+        msg_id = self.send_stream_message(
+            self.example_user("hamlet"), "Scotland", topic_name="editing", content="before edit"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'topic': ' ',
+            },
+        )
         self.assert_json_error(result, "Topic can't be empty")
 
     def test_edit_message_no_content(self) -> None:
         self.login('hamlet')
-        msg_id = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                          topic_name="editing", content="before edit")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': ' ',
-        })
+        msg_id = self.send_stream_message(
+            self.example_user("hamlet"), "Scotland", topic_name="editing", content="before edit"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': ' ',
+            },
+        )
         self.assert_json_success(result)
-        content = Message.objects.filter(id=msg_id).values_list('content', flat = True)[0]
+        content = Message.objects.filter(id=msg_id).values_list('content', flat=True)[0]
         self.assertEqual(content, "(deleted)")
 
     def test_edit_message_history_disabled(self) -> None:
@@ -230,25 +250,31 @@ class EditMessageTest(ZulipTestCase):
         self.login('hamlet')
 
         # Single-line edit
-        msg_id_1 = self.send_stream_message(self.example_user("hamlet"),
-                                            "Denmark",
-                                            topic_name="editing",
-                                            content="content before edit")
+        msg_id_1 = self.send_stream_message(
+            self.example_user("hamlet"),
+            "Denmark",
+            topic_name="editing",
+            content="content before edit",
+        )
 
         new_content_1 = 'content after edit'
-        result_1 = self.client_patch("/json/messages/" + str(msg_id_1), {
-            'message_id': msg_id_1, 'content': new_content_1,
-        })
+        result_1 = self.client_patch(
+            "/json/messages/" + str(msg_id_1),
+            {
+                'message_id': msg_id_1,
+                'content': new_content_1,
+            },
+        )
         self.assert_json_success(result_1)
 
-        result = self.client_get(
-            "/json/messages/" + str(msg_id_1) + "/history")
+        result = self.client_get("/json/messages/" + str(msg_id_1) + "/history")
         self.assert_json_error(result, "Message edit history is disabled in this organization")
 
         # Now verify that if we fetch the message directly, there's no
         # edit history data attached.
-        messages_result = self.client_get("/json/messages",
-                                          {"anchor": msg_id_1, "num_before": 0, "num_after": 10})
+        messages_result = self.client_get(
+            "/json/messages", {"anchor": msg_id_1, "num_before": 0, "num_after": 10}
+        )
         self.assert_json_success(messages_result)
         json_messages = orjson.loads(messages_result.content)
         for msg in json_messages['messages']:
@@ -262,63 +288,88 @@ class EditMessageTest(ZulipTestCase):
             self.example_user("hamlet"),
             "Scotland",
             topic_name="editing",
-            content="content before edit")
+            content="content before edit",
+        )
         new_content_1 = 'content after edit'
-        result_1 = self.client_patch("/json/messages/" + str(msg_id_1), {
-            'message_id': msg_id_1, 'content': new_content_1,
-        })
+        result_1 = self.client_patch(
+            "/json/messages/" + str(msg_id_1),
+            {
+                'message_id': msg_id_1,
+                'content': new_content_1,
+            },
+        )
         self.assert_json_success(result_1)
 
-        message_edit_history_1 = self.client_get(
-            "/json/messages/" + str(msg_id_1) + "/history")
+        message_edit_history_1 = self.client_get("/json/messages/" + str(msg_id_1) + "/history")
         json_response_1 = orjson.loads(message_edit_history_1.content)
         message_history_1 = json_response_1['message_history']
 
         # Check content of message after edit.
-        self.assertEqual(message_history_1[0]['rendered_content'],
-                         '<p>content before edit</p>')
-        self.assertEqual(message_history_1[1]['rendered_content'],
-                         '<p>content after edit</p>')
-        self.assertEqual(message_history_1[1]['content_html_diff'],
-                         ('<p>content '
-                          '<span class="highlight_text_inserted">after</span> '
-                          '<span class="highlight_text_deleted">before</span>'
-                          ' edit</p>'))
+        self.assertEqual(message_history_1[0]['rendered_content'], '<p>content before edit</p>')
+        self.assertEqual(message_history_1[1]['rendered_content'], '<p>content after edit</p>')
+        self.assertEqual(
+            message_history_1[1]['content_html_diff'],
+            (
+                '<p>content '
+                '<span class="highlight_text_inserted">after</span> '
+                '<span class="highlight_text_deleted">before</span>'
+                ' edit</p>'
+            ),
+        )
         # Check content of message before edit.
-        self.assertEqual(message_history_1[1]['prev_rendered_content'],
-                         '<p>content before edit</p>')
+        self.assertEqual(
+            message_history_1[1]['prev_rendered_content'], '<p>content before edit</p>'
+        )
 
         # Edits on new lines
         msg_id_2 = self.send_stream_message(
             self.example_user("hamlet"),
             "Scotland",
             topic_name="editing",
-            content='content before edit, line 1\n\ncontent before edit, line 3')
-        new_content_2 = ('content before edit, line 1\n'
-                         'content after edit, line 2\n'
-                         'content before edit, line 3')
-        result_2 = self.client_patch("/json/messages/" + str(msg_id_2), {
-            'message_id': msg_id_2, 'content': new_content_2,
-        })
+            content='content before edit, line 1\n\ncontent before edit, line 3',
+        )
+        new_content_2 = (
+            'content before edit, line 1\n'
+            'content after edit, line 2\n'
+            'content before edit, line 3'
+        )
+        result_2 = self.client_patch(
+            "/json/messages/" + str(msg_id_2),
+            {
+                'message_id': msg_id_2,
+                'content': new_content_2,
+            },
+        )
         self.assert_json_success(result_2)
 
-        message_edit_history_2 = self.client_get(
-            "/json/messages/" + str(msg_id_2) + "/history")
+        message_edit_history_2 = self.client_get("/json/messages/" + str(msg_id_2) + "/history")
         json_response_2 = orjson.loads(message_edit_history_2.content)
         message_history_2 = json_response_2['message_history']
 
-        self.assertEqual(message_history_2[0]['rendered_content'],
-                         '<p>content before edit, line 1</p>\n<p>content before edit, line 3</p>')
-        self.assertEqual(message_history_2[1]['rendered_content'],
-                         ('<p>content before edit, line 1<br>\n'
-                          'content after edit, line 2<br>\n'
-                          'content before edit, line 3</p>'))
-        self.assertEqual(message_history_2[1]['content_html_diff'],
-                         ('<p>content before edit, line 1<br> '
-                          'content <span class="highlight_text_inserted">after edit, line 2<br> '
-                          'content</span> before edit, line 3</p>'))
-        self.assertEqual(message_history_2[1]['prev_rendered_content'],
-                         '<p>content before edit, line 1</p>\n<p>content before edit, line 3</p>')
+        self.assertEqual(
+            message_history_2[0]['rendered_content'],
+            '<p>content before edit, line 1</p>\n<p>content before edit, line 3</p>',
+        )
+        self.assertEqual(
+            message_history_2[1]['rendered_content'],
+            (
+                '<p>content before edit, line 1<br>\n'
+                'content after edit, line 2<br>\n'
+                'content before edit, line 3</p>'
+            ),
+        )
+        self.assertEqual(
+            message_history_2[1]['content_html_diff'],
+            (
+                '<p>content before edit, line 1<br> '
+                'content <span class="highlight_text_inserted">after edit, line 2<br> '
+                'content</span> before edit, line 3</p>'
+            ),
+        )
+        self.assertEqual(
+            message_history_2[1]['prev_rendered_content'],
+            '<p>content before edit, line 1</p>\n<p>content before edit, line 3</p>',
+        )
 
     def test_edit_link(self) -> None:
         # Link editing
@@ -327,31 +378,41 @@ class EditMessageTest(ZulipTestCase):
             self.example_user("hamlet"),
             "Scotland",
             topic_name="editing",
-            content="Here is a link to [zulip](www.zulip.org).")
+            content="Here is a link to [zulip](www.zulip.org).",
+        )
         new_content_1 = 'Here is a link to [zulip](www.zulipchat.com).'
-        result_1 = self.client_patch("/json/messages/" + str(msg_id_1), {
-            'message_id': msg_id_1, 'content': new_content_1,
-        })
+        result_1 = self.client_patch(
+            "/json/messages/" + str(msg_id_1),
+            {
+                'message_id': msg_id_1,
+                'content': new_content_1,
+            },
+        )
         self.assert_json_success(result_1)
 
-        message_edit_history_1 = self.client_get(
-            "/json/messages/" + str(msg_id_1) + "/history")
+        message_edit_history_1 = self.client_get("/json/messages/" + str(msg_id_1) + "/history")
         json_response_1 = orjson.loads(message_edit_history_1.content)
         message_history_1 = json_response_1['message_history']
 
         # Check content of message after edit.
-        self.assertEqual(message_history_1[0]['rendered_content'],
-                         '<p>Here is a link to '
-                         '<a href="http://www.zulip.org">zulip</a>.</p>')
-        self.assertEqual(message_history_1[1]['rendered_content'],
-                         '<p>Here is a link to '
-                         '<a href="http://www.zulipchat.com">zulip</a>.</p>')
-        self.assertEqual(message_history_1[1]['content_html_diff'],
-                         ('<p>Here is a link to <a href="http://www.zulipchat.com"'
-                          '>zulip '
-                          '<span class="highlight_text_inserted"> Link: http://www.zulipchat.com .'
-                          '</span> <span class="highlight_text_deleted"> Link: http://www.zulip.org .'
-                          '</span> </a></p>'))
+        self.assertEqual(
+            message_history_1[0]['rendered_content'],
+            '<p>Here is a link to ' '<a href="http://www.zulip.org">zulip</a>.</p>',
+        )
+        self.assertEqual(
+            message_history_1[1]['rendered_content'],
+            '<p>Here is a link to ' '<a href="http://www.zulipchat.com">zulip</a>.</p>',
+        )
+        self.assertEqual(
+            message_history_1[1]['content_html_diff'],
+            (
+                '<p>Here is a link to <a href="http://www.zulipchat.com"'
+                '>zulip '
+                '<span class="highlight_text_inserted"> Link: http://www.zulipchat.com .'
+                '</span> <span class="highlight_text_deleted"> Link: http://www.zulip.org .'
+                '</span> </a></p>'
+            ),
+        )
 
     def test_edit_history_unedited(self) -> None:
         self.login('hamlet')
@@ -360,7 +421,8 @@ class EditMessageTest(ZulipTestCase):
             self.example_user('hamlet'),
             'Scotland',
             topic_name='editing',
-            content='This message has not been edited.')
+            content='This message has not been edited.',
+        )
 
         result = self.client_get(f'/json/messages/{msg_id}/history')
 
@@ -377,8 +439,7 @@ class EditMessageTest(ZulipTestCase):
         self.subscribe(hamlet, 'Scotland')
         self.subscribe(cordelia, 'Scotland')
 
-        msg_id = self.send_stream_message(hamlet, 'Scotland',
-                                          content='@**Cordelia Lear**')
+        msg_id = self.send_stream_message(hamlet, 'Scotland', content='@**Cordelia Lear**')
 
         user_info = get_user_info_for_message_updates(msg_id)
         message_user_ids = user_info['message_user_ids']
@@ -393,58 +454,89 @@ class EditMessageTest(ZulipTestCase):
         history data structures."""
         self.login('hamlet')
         hamlet = self.example_user('hamlet')
-        msg_id = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                          topic_name="topic 1", content="content 1")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': 'content 2',
-        })
+        msg_id = self.send_stream_message(
+            self.example_user("hamlet"), "Scotland", topic_name="topic 1", content="content 1"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': 'content 2',
+            },
+        )
         self.assert_json_success(result)
         history = orjson.loads(Message.objects.get(id=msg_id).edit_history)
         self.assertEqual(history[0]['prev_content'], 'content 1')
         self.assertEqual(history[0]['user_id'], hamlet.id)
-        self.assertEqual(set(history[0].keys()),
-                         {'timestamp', 'prev_content', 'user_id',
-                          'prev_rendered_content', 'prev_rendered_content_version'})
+        self.assertEqual(
+            set(history[0].keys()),
+            {
+                'timestamp',
+                'prev_content',
+                'user_id',
+                'prev_rendered_content',
+                'prev_rendered_content_version',
+            },
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'topic': 'topic 2',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'topic': 'topic 2',
+            },
+        )
         self.assert_json_success(result)
         history = orjson.loads(Message.objects.get(id=msg_id).edit_history)
         self.assertEqual(history[0][LEGACY_PREV_TOPIC], 'topic 1')
         self.assertEqual(history[0]['user_id'], hamlet.id)
         self.assertEqual(set(history[0].keys()), {'timestamp', LEGACY_PREV_TOPIC, 'user_id'})
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': 'content 3',
-            'topic': 'topic 3',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': 'content 3',
+                'topic': 'topic 3',
+            },
+        )
         self.assert_json_success(result)
         history = orjson.loads(Message.objects.get(id=msg_id).edit_history)
         self.assertEqual(history[0]['prev_content'], 'content 2')
         self.assertEqual(history[0][LEGACY_PREV_TOPIC], 'topic 2')
         self.assertEqual(history[0]['user_id'], hamlet.id)
-        self.assertEqual(set(history[0].keys()),
-                         {'timestamp', LEGACY_PREV_TOPIC, 'prev_content', 'user_id',
-                          'prev_rendered_content', 'prev_rendered_content_version'})
+        self.assertEqual(
+            set(history[0].keys()),
+            {
+                'timestamp',
+                LEGACY_PREV_TOPIC,
+                'prev_content',
+                'user_id',
+                'prev_rendered_content',
+                'prev_rendered_content_version',
+            },
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': 'content 4',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': 'content 4',
+            },
+        )
         self.assert_json_success(result)
         history = orjson.loads(Message.objects.get(id=msg_id).edit_history)
         self.assertEqual(history[0]['prev_content'], 'content 3')
         self.assertEqual(history[0]['user_id'], hamlet.id)
 
         self.login('iago')
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'topic': 'topic 4',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'topic': 'topic 4',
+            },
+        )
         self.assert_json_success(result)
         history = orjson.loads(Message.objects.get(id=msg_id).edit_history)
         self.assertEqual(history[0][LEGACY_PREV_TOPIC], 'topic 3')
@@ -500,17 +592,26 @@ class EditMessageTest(ZulipTestCase):
         self.assertEqual(message_history[5]['topic'], 'topic 1')
 
     def test_edit_message_content_limit(self) -> None:
-        def set_message_editing_params(allow_message_editing: bool,
-                                       message_content_edit_limit_seconds: int,
-                                       allow_community_topic_editing: bool) -> None:
-            result = self.client_patch("/json/realm", {
-                'allow_message_editing': orjson.dumps(allow_message_editing).decode(),
-                'message_content_edit_limit_seconds': message_content_edit_limit_seconds,
-                'allow_community_topic_editing': orjson.dumps(allow_community_topic_editing).decode(),
-            })
+        def set_message_editing_params(
+            allow_message_editing: bool,
+            message_content_edit_limit_seconds: int,
+            allow_community_topic_editing: bool,
+        ) -> None:
+            result = self.client_patch(
+                "/json/realm",
+                {
+                    'allow_message_editing': orjson.dumps(allow_message_editing).decode(),
+                    'message_content_edit_limit_seconds': message_content_edit_limit_seconds,
+                    'allow_community_topic_editing': orjson.dumps(
+                        allow_community_topic_editing
+                    ).decode(),
+                },
+            )
             self.assert_json_success(result)
 
-        def do_edit_message_assert_success(id_: int, unique_str: str, topic_only: bool=False) -> None:
+        def do_edit_message_assert_success(
+            id_: int, unique_str: str, topic_only: bool = False
+        ) -> None:
             new_topic = 'topic' + unique_str
             new_content = 'content' + unique_str
             params_dict = {'message_id': id_, 'topic': new_topic}
@@ -523,8 +624,9 @@ class EditMessageTest(ZulipTestCase):
             else:
                 self.check_message(id_, topic_name=new_topic, content=new_content)
 
-        def do_edit_message_assert_error(id_: int, unique_str: str, error: str,
-                                         topic_only: bool=False) -> None:
+        def do_edit_message_assert_error(
+            id_: int, unique_str: str, error: str, topic_only: bool = False
+        ) -> None:
             message = Message.objects.get(id=id_)
             old_topic = message.topic_name()
             old_content = message.content
@@ -543,8 +645,9 @@ class EditMessageTest(ZulipTestCase):
 
         self.login('iago')
         # send a message in the past
-        id_ = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       content="content", topic_name="topic")
+        id_ = self.send_stream_message(
+            self.example_user("iago"), "Scotland", content="content", topic_name="topic"
+        )
         message = Message.objects.get(id=id_)
         message.date_sent = message.date_sent - datetime.timedelta(seconds=180)
         message.save()
@@ -565,21 +668,34 @@ class EditMessageTest(ZulipTestCase):
 
         # without allow_message_editing, nothing is allowed
         set_message_editing_params(False, 240, False)
-        do_edit_message_assert_error(id_, 'E', "Your organization has turned off message editing", True)
+        do_edit_message_assert_error(
+            id_, 'E', "Your organization has turned off message editing", True
+        )
         set_message_editing_params(False, 120, False)
-        do_edit_message_assert_error(id_, 'F', "Your organization has turned off message editing", True)
+        do_edit_message_assert_error(
+            id_, 'F', "Your organization has turned off message editing", True
+        )
         set_message_editing_params(False, 0, False)
-        do_edit_message_assert_error(id_, 'G', "Your organization has turned off message editing", True)
+        do_edit_message_assert_error(
+            id_, 'G', "Your organization has turned off message editing", True
+        )
 
     def test_allow_community_topic_editing(self) -> None:
-        def set_message_editing_params(allow_message_editing: bool,
-                                       message_content_edit_limit_seconds: int,
-                                       allow_community_topic_editing: bool) -> None:
-            result = self.client_patch("/json/realm", {
-                'allow_message_editing': orjson.dumps(allow_message_editing).decode(),
-                'message_content_edit_limit_seconds': message_content_edit_limit_seconds,
-                'allow_community_topic_editing': orjson.dumps(allow_community_topic_editing).decode(),
-            })
+        def set_message_editing_params(
+            allow_message_editing: bool,
+            message_content_edit_limit_seconds: int,
+            allow_community_topic_editing: bool,
+        ) -> None:
+            result = self.client_patch(
+                "/json/realm",
+                {
+                    'allow_message_editing': orjson.dumps(allow_message_editing).decode(),
+                    'message_content_edit_limit_seconds': message_content_edit_limit_seconds,
+                    'allow_community_topic_editing': orjson.dumps(
+                        allow_community_topic_editing
+                    ).decode(),
+                },
+            )
             self.assert_json_success(result)
 
         def do_edit_message_assert_success(id_: int, unique_str: str) -> None:
@@ -604,8 +720,9 @@ class EditMessageTest(ZulipTestCase):
 
         self.login('iago')
         # send a message in the past
-        id_ = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       content="content", topic_name="topic")
+        id_ = self.send_stream_message(
+            self.example_user("hamlet"), "Scotland", content="content", topic_name="topic"
+        )
         message = Message.objects.get(id=id_)
         message.date_sent = message.date_sent - datetime.timedelta(seconds=180)
         message.save()
@@ -658,8 +775,12 @@ class EditMessageTest(ZulipTestCase):
         self.subscribe(cordelia, stream_name)
         message = Message.objects.get(id=message_id)
 
-        def do_update_message_topic_success(user_profile: UserProfile, message: Message,
-                                            topic_name: str, users_to_be_notified: List[Dict[str, Any]]) -> None:
+        def do_update_message_topic_success(
+            user_profile: UserProfile,
+            message: Message,
+            topic_name: str,
+            users_to_be_notified: List[Dict[str, Any]],
+        ) -> None:
             do_update_message(
                 user_profile=user_profile,
                 message=message,
@@ -694,13 +815,17 @@ class EditMessageTest(ZulipTestCase):
 
         users_to_be_notified = list(map(notify, [hamlet.id, cordelia.id]))
         # Edit topic of a message sent before Cordelia subscribed the stream
-        do_update_message_topic_success(cordelia, message, "Othello eats apple", users_to_be_notified)
+        do_update_message_topic_success(
+            cordelia, message, "Othello eats apple", users_to_be_notified
+        )
 
         # If Cordelia is long-term idle, she doesn't get a notification.
         cordelia.long_term_idle = True
         cordelia.save()
         users_to_be_notified = list(map(notify, [hamlet.id]))
-        do_update_message_topic_success(cordelia, message, "Another topic idle", users_to_be_notified)
+        do_update_message_topic_success(
+            cordelia, message, "Another topic idle", users_to_be_notified
+        )
         cordelia.long_term_idle = False
         cordelia.save()
 
@@ -737,10 +862,13 @@ class EditMessageTest(ZulipTestCase):
             }
 
         users_to_be_notified = sorted(map(notify, [cordelia.id, hamlet.id]), key=itemgetter("id"))
-        result = self.client_patch("/json/messages/" + str(message_id), {
-            'message_id': message_id,
-            'content': 'Hello @**everyone**',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(message_id),
+            {
+                'message_id': message_id,
+                'content': 'Hello @**everyone**',
+            },
+        )
         self.assert_json_success(result)
 
         # Extract the send_event call where event type is 'update_message'.
@@ -751,22 +879,19 @@ class EditMessageTest(ZulipTestCase):
             if arg_event['type'] == 'update_message':
                 self.assertEqual(arg_event['type'], 'update_message')
                 self.assertEqual(arg_event['wildcard_mention_user_ids'], [cordelia.id, hamlet.id])
-                self.assertEqual(sorted(arg_notified_users, key=itemgetter("id")), users_to_be_notified)
+                self.assertEqual(
+                    sorted(arg_notified_users, key=itemgetter("id")), users_to_be_notified
+                )
                 called = True
         self.assertTrue(called)
 
     def test_topic_edit_history_saved_in_all_message(self) -> None:
         self.login('hamlet')
-        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic1")
-        id2 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="topic1")
-        id3 = self.send_stream_message(self.example_user("iago"), "Rome",
-                                       topic_name="topic1")
-        id4 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic2")
-        id5 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="topic1")
+        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic1")
+        id2 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="topic1")
+        id3 = self.send_stream_message(self.example_user("iago"), "Rome", topic_name="topic1")
+        id4 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic2")
+        id5 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="topic1")
 
         def verify_edit_history(new_topic: str, len_edit_history: int) -> None:
             for msg_id in [id1, id2, id5]:
@@ -779,56 +904,54 @@ class EditMessageTest(ZulipTestCase):
                 # Since edit history is being generated by do_update_message,
                 # it's contents can vary over time; So, to keep this test
                 # future proof, we only verify it's length.
-                self.assertEqual(
-                    len(orjson.loads(msg.edit_history)),
-                    len_edit_history
-                )
+                self.assertEqual(len(orjson.loads(msg.edit_history)), len_edit_history)
 
             for msg_id in [id3, id4]:
                 msg = Message.objects.get(id=msg_id)
-                self.assertEqual(
-                    msg.edit_history,
-                    None
-                )
+                self.assertEqual(msg.edit_history, None)
 
         new_topic = 'edited'
-        result = self.client_patch("/json/messages/" + str(id1), {
-            'message_id': id1,
-            'topic': new_topic,
-            'propagate_mode': 'change_later',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id1),
+            {
+                'message_id': id1,
+                'topic': new_topic,
+                'propagate_mode': 'change_later',
+            },
+        )
 
         self.assert_json_success(result)
         verify_edit_history(new_topic, 1)
 
         new_topic = 'edited2'
-        result = self.client_patch("/json/messages/" + str(id1), {
-            'message_id': id1,
-            'topic': new_topic,
-            'propagate_mode': 'change_later',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id1),
+            {
+                'message_id': id1,
+                'topic': new_topic,
+                'propagate_mode': 'change_later',
+            },
+        )
 
         self.assert_json_success(result)
         verify_edit_history(new_topic, 2)
 
     def test_propagate_topic_forward(self) -> None:
         self.login('hamlet')
-        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic1")
-        id2 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="topic1")
-        id3 = self.send_stream_message(self.example_user("iago"), "Rome",
-                                       topic_name="topic1")
-        id4 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic2")
-        id5 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="topic1")
+        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic1")
+        id2 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="topic1")
+        id3 = self.send_stream_message(self.example_user("iago"), "Rome", topic_name="topic1")
+        id4 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic2")
+        id5 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="topic1")
 
-        result = self.client_patch("/json/messages/" + str(id1), {
-            'message_id': id1,
-            'topic': 'edited',
-            'propagate_mode': 'change_later',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id1),
+            {
+                'message_id': id1,
+                'topic': 'edited',
+                'propagate_mode': 'change_later',
+            },
+        )
         self.assert_json_success(result)
 
         self.check_topic(id1, topic_name="edited")
@@ -839,24 +962,21 @@ class EditMessageTest(ZulipTestCase):
 
     def test_propagate_all_topics(self) -> None:
         self.login('hamlet')
-        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic1")
-        id2 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic1")
-        id3 = self.send_stream_message(self.example_user("iago"), "Rome",
-                                       topic_name="topic1")
-        id4 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic2")
-        id5 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="topic1")
-        id6 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="topic3")
+        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic1")
+        id2 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic1")
+        id3 = self.send_stream_message(self.example_user("iago"), "Rome", topic_name="topic1")
+        id4 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic2")
+        id5 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="topic1")
+        id6 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="topic3")
 
-        result = self.client_patch("/json/messages/" + str(id2), {
-            'message_id': id2,
-            'topic': 'edited',
-            'propagate_mode': 'change_all',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id2),
+            {
+                'message_id': id2,
+                'topic': 'edited',
+                'propagate_mode': 'change_all',
+            },
+        )
         self.assert_json_success(result)
 
         self.check_topic(id1, topic_name="edited")
@@ -868,20 +988,19 @@ class EditMessageTest(ZulipTestCase):
 
     def test_propagate_all_topics_with_different_uppercase_letters(self) -> None:
         self.login('hamlet')
-        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic1")
-        id2 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="Topic1")
-        id3 = self.send_stream_message(self.example_user("iago"), "Rome",
-                                       topic_name="topiC1")
-        id4 = self.send_stream_message(self.example_user("iago"), "Scotland",
-                                       topic_name="toPic1")
+        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic1")
+        id2 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="Topic1")
+        id3 = self.send_stream_message(self.example_user("iago"), "Rome", topic_name="topiC1")
+        id4 = self.send_stream_message(self.example_user("iago"), "Scotland", topic_name="toPic1")
 
-        result = self.client_patch("/json/messages/" + str(id2), {
-            'message_id': id2,
-            'topic': 'edited',
-            'propagate_mode': 'change_all',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id2),
+            {
+                'message_id': id2,
+                'topic': 'edited',
+                'propagate_mode': 'change_all',
+            },
+        )
         self.assert_json_success(result)
 
         self.check_topic(id1, topic_name="edited")
@@ -891,90 +1010,122 @@ class EditMessageTest(ZulipTestCase):
 
     def test_propagate_invalid(self) -> None:
         self.login('hamlet')
-        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland",
-                                       topic_name="topic1")
+        id1 = self.send_stream_message(self.example_user("hamlet"), "Scotland", topic_name="topic1")
 
-        result = self.client_patch("/json/messages/" + str(id1), {
-            'topic': 'edited',
-            'propagate_mode': 'invalid',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id1),
+            {
+                'topic': 'edited',
+                'propagate_mode': 'invalid',
+            },
+        )
         self.assert_json_error(result, 'Invalid propagate_mode')
         self.check_topic(id1, topic_name="topic1")
 
-        result = self.client_patch("/json/messages/" + str(id1), {
-            'content': 'edited',
-            'propagate_mode': 'change_all',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(id1),
+            {
+                'content': 'edited',
+                'propagate_mode': 'change_all',
+            },
+        )
         self.assert_json_error(result, 'Invalid propagate_mode without topic edit')
         self.check_topic(id1, topic_name="topic1")
 
-    def prepare_move_topics(self, user_email: str, old_stream: str, new_stream: str, topic: str) -> Tuple[UserProfile, Stream, Stream, int, int]:
+    def prepare_move_topics(
+        self, user_email: str, old_stream: str, new_stream: str, topic: str
+    ) -> Tuple[UserProfile, Stream, Stream, int, int]:
         user_profile = self.example_user(user_email)
         self.login(user_email)
         stream = self.make_stream(old_stream)
         new_stream = self.make_stream(new_stream)
         self.subscribe(user_profile, stream.name)
         self.subscribe(user_profile, new_stream.name)
-        msg_id = self.send_stream_message(user_profile, stream.name,
-                                          topic_name=topic, content="First")
-        msg_id_lt = self.send_stream_message(user_profile, stream.name,
-                                             topic_name=topic, content="Second")
+        msg_id = self.send_stream_message(
+            user_profile, stream.name, topic_name=topic, content="First"
+        )
+        msg_id_lt = self.send_stream_message(
+            user_profile, stream.name, topic_name=topic, content="Second"
+        )
 
-        self.send_stream_message(user_profile, stream.name,
-                                 topic_name=topic, content="third")
+        self.send_stream_message(user_profile, stream.name, topic_name=topic, content="third")
 
         return (user_profile, stream, new_stream, msg_id, msg_id_lt)
 
     def test_move_message_to_stream(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_lt) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+            },
+        )
 
         self.assert_json_success(result)
 
         messages = get_topic_messages(user_profile, old_stream, "test")
         self.assertEqual(len(messages), 1)
-        self.assertEqual(messages[0].content, f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>test**")
+        self.assertEqual(
+            messages[0].content,
+            f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>test**",
+        )
 
         messages = get_topic_messages(user_profile, new_stream, "test")
         self.assertEqual(len(messages), 4)
-        self.assertEqual(messages[3].content, f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**")
+        self.assertEqual(
+            messages[3].content,
+            f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**",
+        )
 
     def test_move_message_to_stream_change_later(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_later) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id_later), {
-            'message_id': msg_id_later,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_later',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id_later),
+            {
+                'message_id': msg_id_later,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_later',
+            },
+        )
         self.assert_json_success(result)
 
         messages = get_topic_messages(user_profile, old_stream, "test")
         self.assertEqual(len(messages), 2)
         self.assertEqual(messages[0].id, msg_id)
-        self.assertEqual(messages[1].content, f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>test**")
+        self.assertEqual(
+            messages[1].content,
+            f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>test**",
+        )
 
         messages = get_topic_messages(user_profile, new_stream, "test")
         self.assertEqual(len(messages), 3)
         self.assertEqual(messages[0].id, msg_id_later)
-        self.assertEqual(messages[2].content, f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**")
+        self.assertEqual(
+            messages[2].content,
+            f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**",
+        )
 
     def test_move_message_to_stream_no_allowed(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_later) = self.prepare_move_topics(
-            "aaron", "test move stream", "new stream", "test")
+            "aaron", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+            },
+        )
         self.assert_json_error(result, "You don't have permission to move this message")
 
         messages = get_topic_messages(user_profile, old_stream, "test")
@@ -985,14 +1136,18 @@ class EditMessageTest(ZulipTestCase):
 
     def test_move_message_to_stream_with_content(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_later) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-            'content': 'Not allowed',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+                'content': 'Not allowed',
+            },
+        )
         self.assert_json_error(result, "Cannot change message content while changing stream")
 
         messages = get_topic_messages(user_profile, old_stream, "test")
@@ -1003,70 +1158,109 @@ class EditMessageTest(ZulipTestCase):
 
     def test_move_message_to_stream_and_topic(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_later) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
         with queries_captured() as queries, cache_tries_captured() as cache_tries:
-            result = self.client_patch("/json/messages/" + str(msg_id), {
-                'message_id': msg_id,
-                'stream_id': new_stream.id,
-                'propagate_mode': 'change_all',
-                'topic': 'new topic',
-            })
+            result = self.client_patch(
+                "/json/messages/" + str(msg_id),
+                {
+                    'message_id': msg_id,
+                    'stream_id': new_stream.id,
+                    'propagate_mode': 'change_all',
+                    'topic': 'new topic',
+                },
+            )
         self.assertEqual(len(queries), 47)
         self.assertEqual(len(cache_tries), 11)
 
         messages = get_topic_messages(user_profile, old_stream, "test")
         self.assertEqual(len(messages), 1)
-        self.assertEqual(messages[0].content, f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>new topic**")
+        self.assertEqual(
+            messages[0].content,
+            f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>new topic**",
+        )
 
         messages = get_topic_messages(user_profile, new_stream, "new topic")
         self.assertEqual(len(messages), 4)
-        self.assertEqual(messages[3].content, f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**")
+        self.assertEqual(
+            messages[3].content,
+            f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**",
+        )
         self.assert_json_success(result)
 
     def test_inaccessible_msg_after_stream_change(self) -> None:
         """Simulates the case where message is moved to a stream where user is not a subscribed"""
         (user_profile, old_stream, new_stream, msg_id, msg_id_lt) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
         guest_user = self.example_user('polonius')
         non_guest_user = self.example_user('hamlet')
         self.subscribe(guest_user, old_stream.name)
         self.subscribe(non_guest_user, old_stream.name)
 
-        msg_id_to_test_acesss = self.send_stream_message(user_profile, old_stream.name,
-                                                         topic_name='test', content="fourth")
+        msg_id_to_test_acesss = self.send_stream_message(
+            user_profile, old_stream.name, topic_name='test', content="fourth"
+        )
 
-        self.assertEqual(has_message_access(guest_user, Message.objects.get(id=msg_id_to_test_acesss), None), True)
-        self.assertEqual(has_message_access(non_guest_user, Message.objects.get(id=msg_id_to_test_acesss), None), True)
+        self.assertEqual(
+            has_message_access(guest_user, Message.objects.get(id=msg_id_to_test_acesss), None),
+            True,
+        )
+        self.assertEqual(
+            has_message_access(non_guest_user, Message.objects.get(id=msg_id_to_test_acesss), None),
+            True,
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-            'topic': 'new topic'
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+                'topic': 'new topic',
+            },
+        )
         self.assert_json_success(result)
 
-        self.assertEqual(has_message_access(guest_user, Message.objects.get(id=msg_id_to_test_acesss), None), False)
-        self.assertEqual(has_message_access(non_guest_user, Message.objects.get(id=msg_id_to_test_acesss), None), True)
-        self.assertEqual(UserMessage.objects.filter(
-            user_profile_id=non_guest_user.id,
-            message_id=msg_id_to_test_acesss,
-        ).count(), 0)
-        self.assertEqual(has_message_access(self.example_user('iago'), Message.objects.get(id=msg_id_to_test_acesss), None), True)
+        self.assertEqual(
+            has_message_access(guest_user, Message.objects.get(id=msg_id_to_test_acesss), None),
+            False,
+        )
+        self.assertEqual(
+            has_message_access(non_guest_user, Message.objects.get(id=msg_id_to_test_acesss), None),
+            True,
+        )
+        self.assertEqual(
+            UserMessage.objects.filter(
+                user_profile_id=non_guest_user.id,
+                message_id=msg_id_to_test_acesss,
+            ).count(),
+            0,
+        )
+        self.assertEqual(
+            has_message_access(
+                self.example_user('iago'), Message.objects.get(id=msg_id_to_test_acesss), None
+            ),
+            True,
+        )
 
     def test_no_notify_move_message_to_stream(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_lt) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-            'send_notification_to_old_thread': 'false',
-            'send_notification_to_new_thread': 'false',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+                'send_notification_to_old_thread': 'false',
+                'send_notification_to_new_thread': 'false',
+            },
+        )
 
         self.assert_json_success(result)
 
@@ -1078,15 +1272,19 @@ class EditMessageTest(ZulipTestCase):
 
     def test_notify_new_thread_move_message_to_stream(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_lt) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-            'send_notification_to_old_thread': 'false',
-            'send_notification_to_new_thread': 'true',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+                'send_notification_to_old_thread': 'false',
+                'send_notification_to_new_thread': 'true',
+            },
+        )
 
         self.assert_json_success(result)
 
@@ -1095,25 +1293,35 @@ class EditMessageTest(ZulipTestCase):
 
         messages = get_topic_messages(user_profile, new_stream, "test")
         self.assertEqual(len(messages), 4)
-        self.assertEqual(messages[3].content, f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**")
+        self.assertEqual(
+            messages[3].content,
+            f"This topic was moved here from #**test move stream>test** by @_**Iago|{user_profile.id}**",
+        )
 
     def test_notify_old_thread_move_message_to_stream(self) -> None:
         (user_profile, old_stream, new_stream, msg_id, msg_id_lt) = self.prepare_move_topics(
-            "iago", "test move stream", "new stream", "test")
+            "iago", "test move stream", "new stream", "test"
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-            'send_notification_to_old_thread': 'true',
-            'send_notification_to_new_thread': 'false',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+                'send_notification_to_old_thread': 'true',
+                'send_notification_to_new_thread': 'false',
+            },
+        )
 
         self.assert_json_success(result)
 
         messages = get_topic_messages(user_profile, old_stream, "test")
         self.assertEqual(len(messages), 1)
-        self.assertEqual(messages[0].content, f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>test**")
+        self.assertEqual(
+            messages[0].content,
+            f"This topic was moved by @_**Iago|{user_profile.id}** to #**new stream>test**",
+        )
 
         messages = get_topic_messages(user_profile, new_stream, "test")
         self.assertEqual(len(messages), 3)
@@ -1123,7 +1331,7 @@ class EditMessageTest(ZulipTestCase):
         from_invite_only: bool,
         history_public_to_subscribers: bool,
         user_messages_created: bool,
-        to_invite_only: bool=True,
+        to_invite_only: bool = True,
     ) -> None:
         admin_user = self.example_user("iago")
         user_losing_access = self.example_user('cordelia')
@@ -1131,7 +1339,11 @@ class EditMessageTest(ZulipTestCase):
 
         self.login("iago")
         old_stream = self.make_stream("test move stream", invite_only=from_invite_only)
-        new_stream = self.make_stream("new stream", invite_only=to_invite_only, history_public_to_subscribers=history_public_to_subscribers)
+        new_stream = self.make_stream(
+            "new stream",
+            invite_only=to_invite_only,
+            history_public_to_subscribers=history_public_to_subscribers,
+        )
 
         self.subscribe(admin_user, old_stream.name)
         self.subscribe(user_losing_access, old_stream.name)
@@ -1139,44 +1351,62 @@ class EditMessageTest(ZulipTestCase):
         self.subscribe(admin_user, new_stream.name)
         self.subscribe(user_gaining_access, new_stream.name)
 
-        msg_id = self.send_stream_message(admin_user, old_stream.name,
-                                          topic_name="test", content="First")
-        self.send_stream_message(admin_user, old_stream.name,
-                                 topic_name="test", content="Second")
+        msg_id = self.send_stream_message(
+            admin_user, old_stream.name, topic_name="test", content="First"
+        )
+        self.send_stream_message(admin_user, old_stream.name, topic_name="test", content="Second")
 
-        self.assertEqual(UserMessage.objects.filter(
-            user_profile_id=user_losing_access.id,
-            message_id=msg_id,
-        ).count(), 1)
-        self.assertEqual(UserMessage.objects.filter(
-            user_profile_id=user_gaining_access.id,
-            message_id=msg_id,
-        ).count(), 0)
+        self.assertEqual(
+            UserMessage.objects.filter(
+                user_profile_id=user_losing_access.id,
+                message_id=msg_id,
+            ).count(),
+            1,
+        )
+        self.assertEqual(
+            UserMessage.objects.filter(
+                user_profile_id=user_gaining_access.id,
+                message_id=msg_id,
+            ).count(),
+            0,
+        )
 
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'stream_id': new_stream.id,
-            'propagate_mode': 'change_all',
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'stream_id': new_stream.id,
+                'propagate_mode': 'change_all',
+            },
+        )
         self.assert_json_success(result)
 
         messages = get_topic_messages(admin_user, old_stream, "test")
         self.assertEqual(len(messages), 1)
-        self.assertEqual(messages[0].content, f"This topic was moved by @_**Iago|{admin_user.id}** to #**new stream>test**")
+        self.assertEqual(
+            messages[0].content,
+            f"This topic was moved by @_**Iago|{admin_user.id}** to #**new stream>test**",
+        )
 
         messages = get_topic_messages(admin_user, new_stream, "test")
         self.assertEqual(len(messages), 3)
 
-        self.assertEqual(UserMessage.objects.filter(
-            user_profile_id=user_losing_access.id,
-            message_id=msg_id,
-        ).count(), 0)
+        self.assertEqual(
+            UserMessage.objects.filter(
+                user_profile_id=user_losing_access.id,
+                message_id=msg_id,
+            ).count(),
+            0,
+        )
         # When the history is shared, UserMessage is not created for the user but the user
         # can see the message.
-        self.assertEqual(UserMessage.objects.filter(
-            user_profile_id=user_gaining_access.id,
-            message_id=msg_id,
-        ).count(), 1 if user_messages_created else 0)
+        self.assertEqual(
+            UserMessage.objects.filter(
+                user_profile_id=user_gaining_access.id,
+                message_id=msg_id,
+            ).count(),
+            1 if user_messages_created else 0,
+        )
 
     def test_move_message_from_public_to_private_stream_not_shared_history(self) -> None:
         self.parameterized_test_move_message_involving_private_stream(
@@ -1214,25 +1444,29 @@ class EditMessageTest(ZulipTestCase):
             to_invite_only=False,
         )
 
+
 class DeleteMessageTest(ZulipTestCase):
     def test_delete_message_invalid_request_format(self) -> None:
         self.login('iago')
         hamlet = self.example_user('hamlet')
         msg_id = self.send_stream_message(hamlet, "Scotland")
-        result = self.client_delete(f'/json/messages/{msg_id + 1}',
-                                    {'message_id': msg_id})
+        result = self.client_delete(f'/json/messages/{msg_id + 1}', {'message_id': msg_id})
         self.assert_json_error(result, "Invalid message(s)")
         result = self.client_delete(f'/json/messages/{msg_id}')
         self.assert_json_success(result)
 
     def test_delete_message_by_user(self) -> None:
-        def set_message_deleting_params(allow_message_deleting: bool,
-                                        message_content_delete_limit_seconds: int) -> None:
+        def set_message_deleting_params(
+            allow_message_deleting: bool, message_content_delete_limit_seconds: int
+        ) -> None:
             self.login('iago')
-            result = self.client_patch("/json/realm", {
-                'allow_message_deleting': orjson.dumps(allow_message_deleting).decode(),
-                'message_content_delete_limit_seconds': message_content_delete_limit_seconds,
-            })
+            result = self.client_patch(
+                "/json/realm",
+                {
+                    'allow_message_deleting': orjson.dumps(allow_message_deleting).decode(),
+                    'message_content_delete_limit_seconds': message_content_delete_limit_seconds,
+                },
+            )
             self.assert_json_success(result)
 
         def test_delete_message_by_admin(msg_id: int) -> HttpResponse:
@@ -1312,9 +1546,9 @@ class DeleteMessageTest(ZulipTestCase):
 
         # Test handling of 500 error caused by multiple delete requests due to latency.
         # see issue #11219.
-        with mock.patch("zerver.views.message_edit.do_delete_messages") as m, \
-                mock.patch("zerver.views.message_edit.validate_can_delete_message", return_value=None), \
-                mock.patch("zerver.views.message_edit.access_message", return_value=(None, None)):
+        with mock.patch("zerver.views.message_edit.do_delete_messages") as m, mock.patch(
+            "zerver.views.message_edit.validate_can_delete_message", return_value=None
+        ), mock.patch("zerver.views.message_edit.access_message", return_value=(None, None)):
             m.side_effect = IntegrityError()
             result = test_delete_message_by_owner(msg_id=msg_id)
             self.assert_json_error(result, "Message already deleted")
diff --git a/zerver/tests/test_message_edit_notifications.py b/zerver/tests/test_message_edit_notifications.py
index 9ad6b4171b..27fd0b577f 100644
--- a/zerver/tests/test_message_edit_notifications.py
+++ b/zerver/tests/test_message_edit_notifications.py
@@ -43,15 +43,16 @@ class EditMessageSideEffectsTest(ZulipTestCase):
             content='now we mention @**Cordelia Lear**',
         )
 
-    def _login_and_send_original_stream_message(self, content: str,
-                                                enable_online_push_notifications: bool=False) -> int:
-        '''
-            Note our conventions here:
+    def _login_and_send_original_stream_message(
+        self, content: str, enable_online_push_notifications: bool = False
+    ) -> int:
+        """
+        Note our conventions here:
 
-                Hamlet is our logged in user (and sender).
-                Cordelia is the receiver we care about.
-                Scotland is the stream we send messages to.
-        '''
+            Hamlet is our logged in user (and sender).
+            Cordelia is the receiver we care about.
+            Scotland is the stream we send messages to.
+        """
         hamlet = self.example_user('hamlet')
         cordelia = self.example_user('cordelia')
 
@@ -70,9 +71,10 @@ class EditMessageSideEffectsTest(ZulipTestCase):
 
         return message_id
 
-    def _get_queued_data_for_message_update(self, message_id: int, content: str,
-                                            expect_short_circuit: bool=False) -> Dict[str, Any]:
-        '''
+    def _get_queued_data_for_message_update(
+        self, message_id: int, content: str, expect_short_circuit: bool = False
+    ) -> Dict[str, Any]:
+        """
         This function updates a message with a post to
         /json/messages/(message_id).
 
@@ -88,7 +90,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         Using this helper allows you to construct a test that goes
         pretty deep into the missed-messages codepath, without actually
         queuing the final messages.
-        '''
+        """
         url = '/json/messages/' + str(message_id)
 
         request = dict(
@@ -117,15 +119,17 @@ class EditMessageSideEffectsTest(ZulipTestCase):
 
         queue_messages = []
 
-        def fake_publish(queue_name: str,
-                         event: Union[Mapping[str, Any], str],
-                         *args: Any) -> None:
-            queue_messages.append(dict(
-                queue_name=queue_name,
-                event=event,
-            ))
+        def fake_publish(queue_name: str, event: Union[Mapping[str, Any], str], *args: Any) -> None:
+            queue_messages.append(
+                dict(
+                    queue_name=queue_name,
+                    event=event,
+                )
+            )
 
-        with mock_queue_publish('zerver.tornado.event_queue.queue_json_publish', side_effect=fake_publish) as m:
+        with mock_queue_publish(
+            'zerver.tornado.event_queue.queue_json_publish', side_effect=fake_publish
+        ) as m:
             maybe_enqueue_notifications(**enqueue_kwargs)
 
         self.assert_json_success(result)
@@ -135,11 +139,15 @@ class EditMessageSideEffectsTest(ZulipTestCase):
             queue_messages=queue_messages,
         )
 
-    def _send_and_update_message(self, original_content: str, updated_content: str,
-                                 enable_online_push_notifications: bool=False,
-                                 expect_short_circuit: bool=False,
-                                 connected_to_zulip: bool=False,
-                                 present_on_web: bool=False) -> Dict[str, Any]:
+    def _send_and_update_message(
+        self,
+        original_content: str,
+        updated_content: str,
+        enable_online_push_notifications: bool = False,
+        expect_short_circuit: bool = False,
+        connected_to_zulip: bool = False,
+        present_on_web: bool = False,
+    ) -> Dict[str, Any]:
         message_id = self._login_and_send_original_stream_message(
             content=original_content,
             enable_online_push_notifications=enable_online_push_notifications,
@@ -211,15 +219,14 @@ class EditMessageSideEffectsTest(ZulipTestCase):
     def test_second_mention_is_ignored(self) -> None:
         original_content = 'hello @**Cordelia Lear**'
         updated_content = 're-mention @**Cordelia Lear**'
-        self._send_and_update_message(original_content, updated_content,
-                                      expect_short_circuit=True)
+        self._send_and_update_message(original_content, updated_content, expect_short_circuit=True)
 
     def _turn_on_stream_push_for_cordelia(self) -> None:
-        '''
+        """
         conventions:
             Cordelia is the message receiver we care about.
             Scotland is our stream.
-        '''
+        """
         cordelia = self.example_user('cordelia')
         stream = self.subscribe(cordelia, 'Scotland')
         recipient = stream.recipient
@@ -238,17 +245,16 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         # also did a push.
         original_content = 'no mention'
         updated_content = 'nothing special about updated message'
-        self._send_and_update_message(original_content, updated_content,
-                                      expect_short_circuit=True)
+        self._send_and_update_message(original_content, updated_content, expect_short_circuit=True)
 
     def _cordelia_connected_to_zulip(self) -> Any:
-        '''
+        """
         Right now the easiest way to make Cordelia look
         connected to Zulip is to mock the function below.
 
         This is a bit blunt, as it affects other users too,
         but we only really look at Cordelia's data, anyway.
-        '''
+        """
         return mock.patch(
             'zerver.tornado.event_queue.receiver_is_off_zulip',
             return_value=False,
@@ -264,9 +270,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         # offline notifications due to the her stream push setting.
         original_content = 'no mention'
         updated_content = 'nothing special about updated message'
-        self._send_and_update_message(original_content, updated_content,
-                                      expect_short_circuit=True,
-                                      connected_to_zulip=True)
+        self._send_and_update_message(
+            original_content, updated_content, expect_short_circuit=True, connected_to_zulip=True
+        )
 
     def _make_cordelia_present_on_web(self) -> None:
         cordelia = self.example_user('cordelia')
@@ -285,10 +291,13 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         # browser activity, but also in terms of her client descriptors.
         original_content = 'no mention'
         updated_content = 'nothing special about updated message'
-        self._send_and_update_message(original_content, updated_content,
-                                      expect_short_circuit=True,
-                                      connected_to_zulip=True,
-                                      present_on_web=True)
+        self._send_and_update_message(
+            original_content,
+            updated_content,
+            expect_short_circuit=True,
+            connected_to_zulip=True,
+            present_on_web=True,
+        )
 
     def test_always_push_notify_for_fully_present_mentioned_user(self) -> None:
         cordelia = self.example_user('cordelia')
@@ -298,9 +307,11 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         original_content = 'no mention'
         updated_content = 'newly mention @**Cordelia Lear**'
         notification_message_data = self._send_and_update_message(
-            original_content, updated_content,
+            original_content,
+            updated_content,
             enable_online_push_notifications=True,
-            connected_to_zulip=True, present_on_web=True,
+            connected_to_zulip=True,
+            present_on_web=True,
         )
 
         message_id = notification_message_data['message_id']
@@ -334,9 +345,11 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         original_content = 'no mention'
         updated_content = 'nothing special about updated message'
         notification_message_data = self._send_and_update_message(
-            original_content, updated_content,
+            original_content,
+            updated_content,
             enable_online_push_notifications=True,
-            connected_to_zulip=True, present_on_web=True,
+            connected_to_zulip=True,
+            present_on_web=True,
         )
 
         message_id = notification_message_data['message_id']
@@ -374,7 +387,8 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         original_content = 'no mention'
         updated_content = 'now we mention @**Cordelia Lear**'
         notification_message_data = self._send_and_update_message(
-            original_content, updated_content,
+            original_content,
+            updated_content,
             connected_to_zulip=True,
         )
 
@@ -409,7 +423,8 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         original_content = 'no mention'
         updated_content = 'now we mention @**all**'
         notification_message_data = self._send_and_update_message(
-            original_content, updated_content,
+            original_content,
+            updated_content,
             connected_to_zulip=True,
         )
 
@@ -439,9 +454,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         # user (because wildcard_mention_notify=True), we don't notify
         original_content = 'Mention @**all**'
         updated_content = 'now we mention @**Cordelia Lear**'
-        self._send_and_update_message(original_content, updated_content,
-                                      expect_short_circuit=True,
-                                      connected_to_zulip=True)
+        self._send_and_update_message(
+            original_content, updated_content, expect_short_circuit=True, connected_to_zulip=True
+        )
 
     def test_updates_with_upgrade_wildcard_mention_disabled(self) -> None:
         # If the user has disabled notifications for wildcard
@@ -456,9 +471,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
 
         original_content = 'Mention @**all**'
         updated_content = 'now we mention @**Cordelia Lear**'
-        self._send_and_update_message(original_content, updated_content,
-                                      expect_short_circuit=True,
-                                      connected_to_zulip=True)
+        self._send_and_update_message(
+            original_content, updated_content, expect_short_circuit=True, connected_to_zulip=True
+        )
 
     def test_updates_with_stream_mention_of_fully_present_user(self) -> None:
         cordelia = self.example_user('cordelia')
@@ -468,7 +483,8 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         original_content = 'no mention'
         updated_content = 'now we mention @**Cordelia Lear**'
         notification_message_data = self._send_and_update_message(
-            original_content, updated_content,
+            original_content,
+            updated_content,
             connected_to_zulip=True,
             present_on_web=True,
         )
@@ -500,7 +516,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         self.assertEqual(get_apns_badge_count(mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(mentioned_user), 0)
 
-        with mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True):
+        with mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ):
             message_id = self._login_and_send_original_stream_message(
                 content="@**Iago**",
             )
@@ -508,10 +526,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         self.assertEqual(get_apns_badge_count(mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(mentioned_user), 1)
 
-        self._get_queued_data_for_message_update(
-            message_id=message_id,
-            content="Removed mention"
-        )
+        self._get_queued_data_for_message_update(message_id=message_id, content="Removed mention")
 
         self.assertEqual(get_apns_badge_count(mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(mentioned_user), 0)
@@ -521,7 +536,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         self.assertEqual(get_apns_badge_count(group_mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(group_mentioned_user), 0)
 
-        with mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True):
+        with mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ):
             message_id = self._login_and_send_original_stream_message(
                 content="Hello @*hamletcharacters*",
             )
@@ -546,7 +563,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         self.assertEqual(get_apns_badge_count(mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(mentioned_user), 0)
 
-        with mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True):
+        with mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ):
             message_id = self._login_and_send_original_stream_message(
                 content="@**Iago**",
             )
@@ -554,10 +573,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         self.assertEqual(get_apns_badge_count(mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(mentioned_user), 1)
 
-        self._get_queued_data_for_message_update(
-            message_id=message_id,
-            content="Removed mention"
-        )
+        self._get_queued_data_for_message_update(message_id=message_id, content="Removed mention")
 
         self.assertEqual(get_apns_badge_count(mentioned_user), 0)
         self.assertEqual(get_apns_badge_count_future(mentioned_user), 1)
diff --git a/zerver/tests/test_message_fetch.py b/zerver/tests/test_message_fetch.py
index dd6017ca9d..8e8dd343f8 100644
--- a/zerver/tests/test_message_fetch.py
+++ b/zerver/tests/test_message_fetch.py
@@ -67,15 +67,18 @@ def get_sqlalchemy_sql(query: ClauseElement) -> str:
     comp = query.compile(dialect=dialect)
     return str(comp)
 
+
 def get_sqlalchemy_query_params(query: ClauseElement) -> Dict[str, object]:
     dialect = get_sqlalchemy_connection().dialect
     comp = query.compile(dialect=dialect)
     return comp.params
 
+
 def get_recipient_id_for_stream_name(realm: Realm, stream_name: str) -> str:
     stream = get_stream(stream_name, realm)
     return stream.recipient.id
 
+
 def mute_stream(realm: Realm, user_profile: str, stream_name: str) -> None:
     stream = get_stream(stream_name, realm)
     recipient = stream.recipient
@@ -83,12 +86,14 @@ def mute_stream(realm: Realm, user_profile: str, stream_name: str) -> None:
     subscription.is_muted = True
     subscription.save()
 
+
 def first_visible_id_as(message_id: int) -> Any:
     return mock.patch(
         'zerver.views.message_fetch.get_first_visible_message_id',
         return_value=message_id,
     )
 
+
 class NarrowBuilderTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -112,7 +117,8 @@ class NarrowBuilderTest(ZulipTestCase):
         self._do_add_term_test(term, 'WHERE recipient_id != %(recipient_id_1)s')
 
     def test_add_term_using_stream_operator_and_non_existing_operand_should_raise_error(
-            self) -> None:  # NEGATED
+        self,
+    ) -> None:  # NEGATED
         term = dict(operator='stream', operand='NonExistingStream')
         self.assertRaises(BadNarrowOperator, self._build_query, term)
 
@@ -121,13 +127,17 @@ class NarrowBuilderTest(ZulipTestCase):
         self._do_add_term_test(term, 'WHERE (flags & %(flags_1)s) != %(param_1)s')
 
     def test_add_term_using_streams_operator_and_invalid_operand_should_raise_error(
-            self) -> None:  # NEGATED
+        self,
+    ) -> None:  # NEGATED
         term = dict(operator='streams', operand='invalid_operands')
         self.assertRaises(BadNarrowOperator, self._build_query, term)
 
     def test_add_term_using_streams_operator_and_public_stream_operand(self) -> None:
         term = dict(operator='streams', operand='public')
-        self._do_add_term_test(term, 'WHERE recipient_id IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s)')
+        self._do_add_term_test(
+            term,
+            'WHERE recipient_id IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s)',
+        )
 
         # Add new streams
         stream_dicts: List[StreamDict] = [
@@ -153,11 +163,17 @@ class NarrowBuilderTest(ZulipTestCase):
         self.assertEqual(len(existing), 0)
 
         # Number of recipient ids will increase by 1 and not 3
-        self._do_add_term_test(term, 'WHERE recipient_id IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s, %(recipient_id_6)s)')
+        self._do_add_term_test(
+            term,
+            'WHERE recipient_id IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s, %(recipient_id_6)s)',
+        )
 
     def test_add_term_using_streams_operator_and_public_stream_operand_negated(self) -> None:
         term = dict(operator='streams', operand='public', negated=True)
-        self._do_add_term_test(term, 'WHERE recipient_id NOT IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s)')
+        self._do_add_term_test(
+            term,
+            'WHERE recipient_id NOT IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s)',
+        )
 
         # Add new streams
         stream_dicts: List[StreamDict] = [
@@ -183,10 +199,12 @@ class NarrowBuilderTest(ZulipTestCase):
         self.assertEqual(len(existing), 0)
 
         # Number of recipient ids will increase by 1 and not 3
-        self._do_add_term_test(term, 'WHERE recipient_id NOT IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s, %(recipient_id_6)s)')
+        self._do_add_term_test(
+            term,
+            'WHERE recipient_id NOT IN (%(recipient_id_1)s, %(recipient_id_2)s, %(recipient_id_3)s, %(recipient_id_4)s, %(recipient_id_5)s, %(recipient_id_6)s)',
+        )
 
-    def test_add_term_using_is_operator_private_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_is_operator_private_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='is', operand='private', negated=True)
         self._do_add_term_test(term, 'WHERE (flags & %(flags_1)s) = %(param_1)s')
 
@@ -199,13 +217,11 @@ class NarrowBuilderTest(ZulipTestCase):
         term = dict(operator='is', operand='unread')
         self._do_add_term_test(term, 'WHERE (flags & %(flags_1)s) = %(param_1)s')
 
-    def test_add_term_using_is_operator_and_unread_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_is_operator_and_unread_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='is', operand='unread', negated=True)
         self._do_add_term_test(term, 'WHERE (flags & %(flags_1)s) != %(param_1)s')
 
-    def test_add_term_using_is_operator_non_private_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_is_operator_non_private_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='is', operand='starred', negated=True)
         where_clause = 'WHERE (flags & %(flags_1)s) = %(param_1)s'
         params = dict(
@@ -240,8 +256,7 @@ class NarrowBuilderTest(ZulipTestCase):
         term = dict(operator='topic', operand='lunch')
         self._do_add_term_test(term, 'WHERE upper(subject) = upper(%(param_1)s)')
 
-    def test_add_term_using_topic_operator_lunch_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_topic_operator_lunch_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='topic', operand='lunch', negated=True)
         self._do_add_term_test(term, 'WHERE upper(subject) != upper(%(param_1)s)')
 
@@ -249,8 +264,7 @@ class NarrowBuilderTest(ZulipTestCase):
         term = dict(operator='topic', operand='personal')
         self._do_add_term_test(term, 'WHERE upper(subject) = upper(%(param_1)s)')
 
-    def test_add_term_using_topic_operator_personal_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_topic_operator_personal_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='topic', operand='personal', negated=True)
         self._do_add_term_test(term, 'WHERE upper(subject) != upper(%(param_1)s)')
 
@@ -263,58 +277,88 @@ class NarrowBuilderTest(ZulipTestCase):
         self._do_add_term_test(term, 'WHERE sender_id != %(param_1)s')
 
     def test_add_term_using_sender_operator_with_non_existing_user_as_operand(
-            self) -> None:  # NEGATED
+        self,
+    ) -> None:  # NEGATED
         term = dict(operator='sender', operand='non-existing@zulip.com')
         self.assertRaises(BadNarrowOperator, self._build_query, term)
 
     def test_add_term_using_pm_with_operator_and_not_the_same_user_as_operand(self) -> None:
         term = dict(operator='pm-with', operand=self.othello_email)
-        self._do_add_term_test(term, 'WHERE sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s')
+        self._do_add_term_test(
+            term,
+            'WHERE sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s',
+        )
 
     def test_add_term_using_pm_with_operator_not_the_same_user_as_operand_and_negated(
-            self) -> None:  # NEGATED
+        self,
+    ) -> None:  # NEGATED
         term = dict(operator='pm-with', operand=self.othello_email, negated=True)
-        self._do_add_term_test(term, 'WHERE NOT (sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s)')
+        self._do_add_term_test(
+            term,
+            'WHERE NOT (sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s)',
+        )
 
     def test_add_term_using_pm_with_operator_the_same_user_as_operand(self) -> None:
         term = dict(operator='pm-with', operand=self.hamlet_email)
-        self._do_add_term_test(term, 'WHERE sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s')
+        self._do_add_term_test(
+            term, 'WHERE sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s'
+        )
 
     def test_add_term_using_pm_with_operator_the_same_user_as_operand_and_negated(
-            self) -> None:  # NEGATED
+        self,
+    ) -> None:  # NEGATED
         term = dict(operator='pm-with', operand=self.hamlet_email, negated=True)
-        self._do_add_term_test(term, 'WHERE NOT (sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s)')
+        self._do_add_term_test(
+            term, 'WHERE NOT (sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s)'
+        )
 
     def test_add_term_using_pm_with_operator_and_self_and_user_as_operand(self) -> None:
-        myself_and_other = ','.join([
-            self.example_user('hamlet').email,
-            self.example_user('othello').email,
-        ])
+        myself_and_other = ','.join(
+            [
+                self.example_user('hamlet').email,
+                self.example_user('othello').email,
+            ]
+        )
         term = dict(operator='pm-with', operand=myself_and_other)
-        self._do_add_term_test(term, 'WHERE sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s')
+        self._do_add_term_test(
+            term,
+            'WHERE sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s',
+        )
 
     def test_add_term_using_pm_with_operator_more_than_one_user_as_operand(self) -> None:
-        two_others = ','.join([
-            self.example_user('cordelia').email,
-            self.example_user('othello').email,
-        ])
+        two_others = ','.join(
+            [
+                self.example_user('cordelia').email,
+                self.example_user('othello').email,
+            ]
+        )
         term = dict(operator='pm-with', operand=two_others)
         self._do_add_term_test(term, 'WHERE recipient_id = %(recipient_id_1)s')
 
     def test_add_term_using_pm_with_operator_self_and_user_as_operand_and_negated(
-            self) -> None:  # NEGATED
-        myself_and_other = ','.join([
-            self.example_user('hamlet').email,
-            self.example_user('othello').email,
-        ])
+        self,
+    ) -> None:  # NEGATED
+        myself_and_other = ','.join(
+            [
+                self.example_user('hamlet').email,
+                self.example_user('othello').email,
+            ]
+        )
         term = dict(operator='pm-with', operand=myself_and_other, negated=True)
-        self._do_add_term_test(term, 'WHERE NOT (sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s)')
+        self._do_add_term_test(
+            term,
+            'WHERE NOT (sender_id = %(sender_id_1)s AND recipient_id = %(recipient_id_1)s OR sender_id = %(sender_id_2)s AND recipient_id = %(recipient_id_2)s)',
+        )
 
-    def test_add_term_using_pm_with_operator_more_than_one_user_as_operand_and_negated(self) -> None:
-        two_others = ','.join([
-            self.example_user('cordelia').email,
-            self.example_user('othello').email,
-        ])
+    def test_add_term_using_pm_with_operator_more_than_one_user_as_operand_and_negated(
+        self,
+    ) -> None:
+        two_others = ','.join(
+            [
+                self.example_user('cordelia').email,
+                self.example_user('othello').email,
+            ]
+        )
         term = dict(operator='pm-with', operand=two_others, negated=True)
         self._do_add_term_test(term, 'WHERE recipient_id != %(recipient_id_1)s')
 
@@ -322,7 +366,9 @@ class NarrowBuilderTest(ZulipTestCase):
         term = dict(operator='pm-with', operand=' ,,, ,,, ,')
         self.assertRaises(BadNarrowOperator, self._build_query, term)
 
-    def test_add_term_using_pm_with_operator_with_existing_and_non_existing_user_as_operand(self) -> None:
+    def test_add_term_using_pm_with_operator_with_existing_and_non_existing_user_as_operand(
+        self,
+    ) -> None:
         term = dict(operator='pm-with', operand=self.othello_email + ',non-existing@zulip.com')
         self.assertRaises(BadNarrowOperator, self._build_query, term)
 
@@ -347,14 +393,16 @@ class NarrowBuilderTest(ZulipTestCase):
         self._do_add_term_test(term, 'WHERE 1 != 1')
 
         # Test with at least one such group PM thread existing
-        self.send_huddle_message(self.user_profile, [self.example_user("othello"),
-                                                     self.example_user("cordelia")])
+        self.send_huddle_message(
+            self.user_profile, [self.example_user("othello"), self.example_user("cordelia")]
+        )
 
         term = dict(operator='group-pm-with', operand=self.othello_email)
         self._do_add_term_test(term, 'WHERE recipient_id IN (%(recipient_id_1)s)')
 
     def test_add_term_using_group_pm_operator_not_the_same_user_as_operand_and_negated(
-            self) -> None:  # NEGATED
+        self,
+    ) -> None:  # NEGATED
         term = dict(operator='group-pm-with', operand=self.othello_email, negated=True)
         self._do_add_term_test(term, 'WHERE 1 = 1')
 
@@ -365,13 +413,18 @@ class NarrowBuilderTest(ZulipTestCase):
     @override_settings(USING_PGROONGA=False)
     def test_add_term_using_search_operator(self) -> None:
         term = dict(operator='search', operand='"french fries"')
-        self._do_add_term_test(term, 'WHERE (content ILIKE %(content_1)s OR subject ILIKE %(subject_1)s) AND (search_tsvector @@ plainto_tsquery(%(param_4)s, %(param_5)s))')
+        self._do_add_term_test(
+            term,
+            'WHERE (content ILIKE %(content_1)s OR subject ILIKE %(subject_1)s) AND (search_tsvector @@ plainto_tsquery(%(param_4)s, %(param_5)s))',
+        )
 
     @override_settings(USING_PGROONGA=False)
-    def test_add_term_using_search_operator_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_search_operator_and_negated(self) -> None:  # NEGATED
         term = dict(operator='search', operand='"french fries"', negated=True)
-        self._do_add_term_test(term, 'WHERE NOT (content ILIKE %(content_1)s OR subject ILIKE %(subject_1)s) AND NOT (search_tsvector @@ plainto_tsquery(%(param_4)s, %(param_5)s))')
+        self._do_add_term_test(
+            term,
+            'WHERE NOT (content ILIKE %(content_1)s OR subject ILIKE %(subject_1)s) AND NOT (search_tsvector @@ plainto_tsquery(%(param_4)s, %(param_5)s))',
+        )
 
     @override_settings(USING_PGROONGA=True)
     def test_add_term_using_search_operator_pgroonga(self) -> None:
@@ -379,17 +432,17 @@ class NarrowBuilderTest(ZulipTestCase):
         self._do_add_term_test(term, 'WHERE search_pgroonga &@~ escape_html(%(escape_html_1)s)')
 
     @override_settings(USING_PGROONGA=True)
-    def test_add_term_using_search_operator_and_negated_pgroonga(
-            self) -> None:  # NEGATED
+    def test_add_term_using_search_operator_and_negated_pgroonga(self) -> None:  # NEGATED
         term = dict(operator='search', operand='"french fries"', negated=True)
-        self._do_add_term_test(term, 'WHERE NOT (search_pgroonga &@~ escape_html(%(escape_html_1)s))')
+        self._do_add_term_test(
+            term, 'WHERE NOT (search_pgroonga &@~ escape_html(%(escape_html_1)s))'
+        )
 
     def test_add_term_using_has_operator_and_attachment_operand(self) -> None:
         term = dict(operator='has', operand='attachment')
         self._do_add_term_test(term, 'WHERE has_attachment')
 
-    def test_add_term_using_has_operator_attachment_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_has_operator_attachment_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='has', operand='attachment', negated=True)
         self._do_add_term_test(term, 'WHERE NOT has_attachment')
 
@@ -397,8 +450,7 @@ class NarrowBuilderTest(ZulipTestCase):
         term = dict(operator='has', operand='image')
         self._do_add_term_test(term, 'WHERE has_image')
 
-    def test_add_term_using_has_operator_image_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_has_operator_image_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='has', operand='image', negated=True)
         self._do_add_term_test(term, 'WHERE NOT has_image')
 
@@ -406,8 +458,7 @@ class NarrowBuilderTest(ZulipTestCase):
         term = dict(operator='has', operand='link')
         self._do_add_term_test(term, 'WHERE has_link')
 
-    def test_add_term_using_has_operator_link_operand_and_negated(
-            self) -> None:  # NEGATED
+    def test_add_term_using_has_operator_link_operand_and_negated(self) -> None:  # NEGATED
         term = dict(operator='has', operand='link', negated=True)
         self._do_add_term_test(term, 'WHERE NOT has_link')
 
@@ -458,8 +509,9 @@ class NarrowBuilderTest(ZulipTestCase):
 
         self.assertRaises(BadNarrowOperator, _build_query, term)
 
-    def _do_add_term_test(self, term: Dict[str, Any], where_clause: str,
-                          params: Optional[Dict[str, Any]]=None) -> None:
+    def _do_add_term_test(
+        self, term: Dict[str, Any], where_clause: str, params: Optional[Dict[str, Any]] = None
+    ) -> None:
         query = self._build_query(term)
         if params is not None:
             actual_params = get_sqlalchemy_query_params(query)
@@ -469,10 +521,10 @@ class NarrowBuilderTest(ZulipTestCase):
     def _build_query(self, term: Dict[str, Any]) -> Select:
         return self.builder.add_term(self.raw_query, term)
 
+
 class NarrowLibraryTest(ZulipTestCase):
     def test_build_narrow_filter(self) -> None:
-        fixtures_path = os.path.join(os.path.dirname(__file__),
-                                     'fixtures/narrow.json')
+        fixtures_path = os.path.join(os.path.dirname(__file__), 'fixtures/narrow.json')
         with open(fixtures_path, "rb") as f:
             scenarios = orjson.loads(f.read())
         self.assertTrue(len(scenarios) == 9)
@@ -492,39 +544,40 @@ class NarrowLibraryTest(ZulipTestCase):
 
     def test_is_web_public_compatible(self) -> None:
         self.assertTrue(is_web_public_compatible([]))
-        self.assertTrue(is_web_public_compatible([{"operator": "has",
-                                                   "operand": "attachment"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "has",
-                                                   "operand": "image"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "search",
-                                                   "operand": "magic"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "near",
-                                                   "operand": "15"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "id",
-                                                   "operand": "15"},
-                                                  {"operator": "has",
-                                                   "operand": "attachment"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "sender",
-                                                   "operand": "hamlet@zulip.com"}]))
-        self.assertFalse(is_web_public_compatible([{"operator": "pm-with",
-                                                    "operand": "hamlet@zulip.com"}]))
-        self.assertFalse(is_web_public_compatible([{"operator": "group-pm-with",
-                                                    "operand": "hamlet@zulip.com"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "stream",
-                                                   "operand": "Denmark"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "stream",
-                                                   "operand": "Denmark"},
-                                                  {"operator": "topic",
-                                                   "operand": "logic"}]))
-        self.assertFalse(is_web_public_compatible([{"operator": "is",
-                                                    "operand": "starred"}]))
-        self.assertFalse(is_web_public_compatible([{"operator": "is",
-                                                    "operand": "private"}]))
-        self.assertTrue(is_web_public_compatible([{"operator": "streams",
-                                                   "operand": "public"}]))
+        self.assertTrue(is_web_public_compatible([{"operator": "has", "operand": "attachment"}]))
+        self.assertTrue(is_web_public_compatible([{"operator": "has", "operand": "image"}]))
+        self.assertTrue(is_web_public_compatible([{"operator": "search", "operand": "magic"}]))
+        self.assertTrue(is_web_public_compatible([{"operator": "near", "operand": "15"}]))
+        self.assertTrue(
+            is_web_public_compatible(
+                [{"operator": "id", "operand": "15"}, {"operator": "has", "operand": "attachment"}]
+            )
+        )
+        self.assertTrue(
+            is_web_public_compatible([{"operator": "sender", "operand": "hamlet@zulip.com"}])
+        )
+        self.assertFalse(
+            is_web_public_compatible([{"operator": "pm-with", "operand": "hamlet@zulip.com"}])
+        )
+        self.assertFalse(
+            is_web_public_compatible([{"operator": "group-pm-with", "operand": "hamlet@zulip.com"}])
+        )
+        self.assertTrue(is_web_public_compatible([{"operator": "stream", "operand": "Denmark"}]))
+        self.assertTrue(
+            is_web_public_compatible(
+                [
+                    {"operator": "stream", "operand": "Denmark"},
+                    {"operator": "topic", "operand": "logic"},
+                ]
+            )
+        )
+        self.assertFalse(is_web_public_compatible([{"operator": "is", "operand": "starred"}]))
+        self.assertFalse(is_web_public_compatible([{"operator": "is", "operand": "private"}]))
+        self.assertTrue(is_web_public_compatible([{"operator": "streams", "operand": "public"}]))
         # Malformed input not allowed
         self.assertFalse(is_web_public_compatible([{"operator": "has"}]))
 
+
 class IncludeHistoryTest(ZulipTestCase):
     def test_ok_to_include_history(self) -> None:
         user_profile = self.example_user("hamlet")
@@ -559,8 +612,12 @@ class IncludeHistoryTest(ZulipTestCase):
 
         # Verify that with stream.history_public_to_subscribers, subscribed
         # users can access history.
-        self.make_stream('private_stream_2', realm=user_profile.realm,
-                         invite_only=True, history_public_to_subscribers=True)
+        self.make_stream(
+            'private_stream_2',
+            realm=user_profile.realm,
+            invite_only=True,
+            history_public_to_subscribers=True,
+        )
         subscribed_user_profile = self.example_user("cordelia")
         self.subscribe(subscribed_user_profile, 'private_stream_2')
         narrow = [
@@ -656,20 +713,23 @@ class IncludeHistoryTest(ZulipTestCase):
         self.assertTrue(ok_to_include_history(narrow, guest_user_profile, False))
         self.assertTrue(ok_to_include_history(narrow, subscribed_user_profile, False))
 
+
 class PostProcessTest(ZulipTestCase):
     def test_basics(self) -> None:
-        def verify(in_ids: List[int],
-                   num_before: int,
-                   num_after: int,
-                   first_visible_message_id: int,
-                   anchor: int,
-                   anchored_to_left: bool,
-                   anchored_to_right: bool,
-                   out_ids: List[int],
-                   found_anchor: bool,
-                   found_oldest: bool,
-                   found_newest: bool,
-                   history_limited: bool) -> None:
+        def verify(
+            in_ids: List[int],
+            num_before: int,
+            num_after: int,
+            first_visible_message_id: int,
+            anchor: int,
+            anchored_to_left: bool,
+            anchored_to_right: bool,
+            out_ids: List[int],
+            found_anchor: bool,
+            found_oldest: bool,
+            found_newest: bool,
+            history_limited: bool,
+        ) -> None:
             in_rows = [[row_id] for row_id in in_ids]
             out_rows = [[row_id] for row_id in out_ids]
 
@@ -694,404 +754,597 @@ class PostProcessTest(ZulipTestCase):
         anchor = 10
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[8, 9, 10, 11, 12],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=8,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[8, 9, 10, 11, 12],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=9,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[9, 10, 11, 12],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=10,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[10, 11, 12],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=11,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[11, 12],
-            found_anchor=False, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=12,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[12],
-            found_anchor=False, found_oldest=True,
-            found_newest=True, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=True,
+            history_limited=True,
         )
         verify(
             in_ids=[8, 9, anchor, 11, 12],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=13,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[],
-            found_anchor=False, found_oldest=True,
-            found_newest=True, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=True,
+            history_limited=True,
         )
 
         # typical 2-sided query missing anchor and grabbing an extra row
         anchor = 10
         verify(
             in_ids=[7, 9, 11, 13, 15],
-            num_before=2, num_after=2,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            num_before=2,
+            num_after=2,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             first_visible_message_id=0,
             out_ids=[7, 9, 11, 13],
-            found_anchor=False, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[7, 9, 11, 13, 15],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=10,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[11, 13],
-            found_anchor=False, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
         verify(
             in_ids=[7, 9, 11, 13, 15],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=9,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[9, 11, 13],
-            found_anchor=False, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
 
         # 2-sided query with old anchor
         anchor = 100
         verify(
             in_ids=[50, anchor, 150, 200],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[50, 100, 150, 200],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[50, anchor, 150, 200],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[100, 150, 200],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
 
         # 2-sided query with new anchor
         anchor = 900
         verify(
             in_ids=[700, 800, anchor, 1000],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[700, 800, 900, 1000],
-            found_anchor=True, found_oldest=False,
-            found_newest=True, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=True,
+            history_limited=False,
         )
         verify(
             in_ids=[700, 800, anchor, 1000],
-            num_before=2, num_after=2,
+            num_before=2,
+            num_after=2,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[900, 1000],
-            found_anchor=True, found_oldest=True,
-            found_newest=True, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=True,
+            history_limited=True,
         )
 
         # left-sided query with old anchor
         anchor = 100
         verify(
             in_ids=[50, anchor],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[50, 100],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[50, anchor],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[100],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
 
         # left-sided query with new anchor
         anchor = 900
         verify(
             in_ids=[700, 800, anchor],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[700, 800, 900],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[700, 800, anchor],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[900],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
 
         # left-sided query with new anchor and extra row
         anchor = 900
         verify(
             in_ids=[600, 700, 800, anchor],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[700, 800, 900],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[600, 700, 800, anchor],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[900],
-            found_anchor=True, found_oldest=True,
-            found_newest=False, history_limited=True,
+            found_anchor=True,
+            found_oldest=True,
+            found_newest=False,
+            history_limited=True,
         )
 
         # left-sided query anchored to the right
         anchor = LARGER_THAN_MAX_MESSAGE_ID
         verify(
             in_ids=[900, 1000],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=True,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=True,
             out_ids=[900, 1000],
-            found_anchor=False, found_oldest=False,
-            found_newest=True, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=True,
+            history_limited=False,
         )
         verify(
             in_ids=[900, 1000],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=1000,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=True,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=True,
             out_ids=[1000],
-            found_anchor=False, found_oldest=True,
-            found_newest=True, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=True,
+            history_limited=True,
         )
         verify(
             in_ids=[900, 1000],
-            num_before=2, num_after=0,
+            num_before=2,
+            num_after=0,
             first_visible_message_id=1100,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=True,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=True,
             out_ids=[],
-            found_anchor=False, found_oldest=True,
-            found_newest=True, history_limited=True,
+            found_anchor=False,
+            found_oldest=True,
+            found_newest=True,
+            history_limited=True,
         )
 
         # right-sided query with old anchor
         anchor = 100
         verify(
             in_ids=[anchor, 200, 300, 400],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[100, 200, 300],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[anchor, 200, 300, 400],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[100, 200, 300],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[anchor, 200, 300, 400],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=300,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[300, 400],
-            found_anchor=False, found_oldest=False,
+            found_anchor=False,
+            found_oldest=False,
             # BUG: history_limited should be False here.
-            found_newest=False, history_limited=False,
+            found_newest=False,
+            history_limited=False,
         )
 
         # right-sided query with new anchor
         anchor = 900
         verify(
             in_ids=[anchor, 1000],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[900, 1000],
-            found_anchor=True, found_oldest=False,
-            found_newest=True, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=True,
+            history_limited=False,
         )
         verify(
             in_ids=[anchor, 1000],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[900, 1000],
-            found_anchor=True, found_oldest=False,
-            found_newest=True, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=True,
+            history_limited=False,
         )
 
         # right-sided query with non-matching anchor
         anchor = 903
         verify(
             in_ids=[1000, 1100, 1200],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[1000, 1100],
-            found_anchor=False, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[1000, 1100, 1200],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[1000, 1100],
-            found_anchor=False, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[1000, 1100, 1200],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=1000,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[1000, 1100],
-            found_anchor=False, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[1000, 1100, 1200],
-            num_before=0, num_after=2,
+            num_before=0,
+            num_after=2,
             first_visible_message_id=1100,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[1100, 1200],
-            found_anchor=False, found_oldest=False,
+            found_anchor=False,
+            found_oldest=False,
             # BUG: history_limited should be False here.
-            found_newest=False, history_limited=False,
+            found_newest=False,
+            history_limited=False,
         )
 
         # targeted query that finds row
         anchor = 1000
         verify(
             in_ids=[1000],
-            num_before=0, num_after=0,
+            num_before=0,
+            num_after=0,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[1000],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[1000],
-            num_before=0, num_after=0,
+            num_before=0,
+            num_after=0,
             first_visible_message_id=anchor,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[1000],
-            found_anchor=True, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=True,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
         verify(
             in_ids=[1000],
-            num_before=0, num_after=0,
+            num_before=0,
+            num_after=0,
             first_visible_message_id=1100,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[],
-            found_anchor=False, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
 
         # targeted query that finds nothing
         anchor = 903
         verify(
             in_ids=[],
-            num_before=0, num_after=0,
+            num_before=0,
+            num_after=0,
             first_visible_message_id=0,
-            anchor=anchor, anchored_to_left=False, anchored_to_right=False,
+            anchor=anchor,
+            anchored_to_left=False,
+            anchored_to_right=False,
             out_ids=[],
-            found_anchor=False, found_oldest=False,
-            found_newest=False, history_limited=False,
+            found_anchor=False,
+            found_oldest=False,
+            found_newest=False,
+            history_limited=False,
         )
 
-class GetOldMessagesTest(ZulipTestCase):
 
-    def get_and_check_messages(self,
-                               modified_params: Dict[str, Union[str, int]],
-                               **kwargs: Any) -> Dict[str, Any]:
+class GetOldMessagesTest(ZulipTestCase):
+    def get_and_check_messages(
+        self, modified_params: Dict[str, Union[str, int]], **kwargs: Any
+    ) -> Dict[str, Any]:
         post_params: Dict[str, Union[str, int]] = {"anchor": 1, "num_before": 1, "num_after": 1}
         post_params.update(modified_params)
-        payload = self.client_get("/json/messages", dict(post_params),
-                                  **kwargs)
+        payload = self.client_get("/json/messages", dict(post_params), **kwargs)
         self.assert_json_success(payload)
-        self.assertEqual(set(payload["Cache-Control"].split(", ")),
-                         {"must-revalidate", "no-store", "no-cache", "max-age=0", "private"})
+        self.assertEqual(
+            set(payload["Cache-Control"].split(", ")),
+            {"must-revalidate", "no-store", "no-cache", "max-age=0", "private"},
+        )
 
         result = orjson.loads(payload.content)
 
         self.assertIn("messages", result)
         self.assertIsInstance(result["messages"], list)
         for message in result["messages"]:
-            for field in ("content", "content_type", "display_recipient",
-                          "avatar_url", "recipient_id", "sender_full_name",
-                          "timestamp", "reactions"):
+            for field in (
+                "content",
+                "content_type",
+                "display_recipient",
+                "avatar_url",
+                "recipient_id",
+                "sender_full_name",
+                "timestamp",
+                "reactions",
+            ):
                 self.assertIn(field, message)
         return result
 
-    def message_visibility_test(self, narrow: List[Dict[str, str]],
-                                message_ids: List[int], pivot_index: int) -> None:
+    def message_visibility_test(
+        self, narrow: List[Dict[str, str]], message_ids: List[int], pivot_index: int
+    ) -> None:
         num_before = len(message_ids)
 
-        post_params = dict(narrow=orjson.dumps(narrow).decode(), num_before=num_before,
-                           num_after=0, anchor=LARGER_THAN_MAX_MESSAGE_ID)
+        post_params = dict(
+            narrow=orjson.dumps(narrow).decode(),
+            num_before=num_before,
+            num_after=0,
+            anchor=LARGER_THAN_MAX_MESSAGE_ID,
+        )
         payload = self.client_get("/json/messages", dict(post_params))
         self.assert_json_success(payload)
         result = orjson.loads(payload.content)
 
         self.assertEqual(len(result["messages"]), len(message_ids))
         for message in result["messages"]:
-            assert(message["id"] in message_ids)
+            assert message["id"] in message_ids
 
         post_params.update(num_before=len(message_ids[pivot_index:]))
 
@@ -1103,7 +1356,7 @@ class GetOldMessagesTest(ZulipTestCase):
 
         self.assertEqual(len(result["messages"]), len(message_ids[pivot_index:]))
         for message in result["messages"]:
-            assert(message["id"] in message_ids)
+            assert message["id"] in message_ids
 
     def get_query_ids(self) -> Dict[str, Union[int, str]]:
         hamlet_user = self.example_user('hamlet')
@@ -1117,7 +1370,11 @@ class GetOldMessagesTest(ZulipTestCase):
         query_ids['othello_id'] = othello_user.id
         query_ids['hamlet_recipient'] = hamlet_user.recipient_id
         query_ids['othello_recipient'] = othello_user.recipient_id
-        recipients = get_public_streams_queryset(hamlet_user.realm).values_list("recipient_id", flat=True).order_by('id')
+        recipients = (
+            get_public_streams_queryset(hamlet_user.realm)
+            .values_list("recipient_id", flat=True)
+            .order_by('id')
+        )
         query_ids['public_streams_recipents'] = ", ".join(str(r) for r in recipients)
         return query_ids
 
@@ -1170,10 +1427,9 @@ class GetOldMessagesTest(ZulipTestCase):
             if message['id'] == message_id:
                 message_to_assert = message
                 break
-        assert(message_to_assert is not None)
+        assert message_to_assert is not None
         self.assertEqual(len(message_to_assert['reactions']), 1)
-        self.assertEqual(message_to_assert['reactions'][0]['emoji_name'],
-                         reaction_name)
+        self.assertEqual(message_to_assert['reactions'][0]['emoji_name'], reaction_name)
 
     def test_successful_get_messages(self) -> None:
         """
@@ -1213,8 +1469,7 @@ class GetOldMessagesTest(ZulipTestCase):
 
         with mock.patch('zerver.context_processors.get_realm', side_effect=Realm.DoesNotExist):
             result = self.client_get("/json/messages", dict(post_params))
-            self.assert_json_error(result, "Invalid subdomain",
-                                   status_code=404)
+            self.assert_json_error(result, "Invalid subdomain", status_code=404)
 
     def test_unauthenticated_get_messages_without_web_public(self) -> None:
         """
@@ -1228,8 +1483,9 @@ class GetOldMessagesTest(ZulipTestCase):
             "narrow": orjson.dumps([dict(operator='is', operand="private")]).decode(),
         }
         result = self.client_get("/json/messages", dict(post_params))
-        self.assert_json_error(result, "Not logged in: API authentication or user session required",
-                               status_code=401)
+        self.assert_json_error(
+            result, "Not logged in: API authentication or user session required", status_code=401
+        )
 
         post_params = {
             "anchor": 10000000000000000,
@@ -1237,8 +1493,9 @@ class GetOldMessagesTest(ZulipTestCase):
             "num_after": 1,
         }
         result = self.client_get("/json/messages", dict(post_params))
-        self.assert_json_error(result, "Not logged in: API authentication or user session required",
-                               status_code=401)
+        self.assert_json_error(
+            result, "Not logged in: API authentication or user session required", status_code=401
+        )
 
     def test_unauthenticated_get_messages_with_web_public(self) -> None:
         """
@@ -1250,12 +1507,17 @@ class GetOldMessagesTest(ZulipTestCase):
             "num_before": 1,
             "num_after": 1,
             # "is:private" is not a is_web_public_compatible narrow.
-            "narrow": orjson.dumps([dict(operator="streams", operand="web-public"),
-                                    dict(operator="is", operand="private")]).decode(),
+            "narrow": orjson.dumps(
+                [
+                    dict(operator="streams", operand="web-public"),
+                    dict(operator="is", operand="private"),
+                ]
+            ).decode(),
         }
         result = self.client_get("/json/messages", dict(post_params))
-        self.assert_json_error(result, 'Not logged in: API authentication or user session required',
-                               status_code=401)
+        self.assert_json_error(
+            result, 'Not logged in: API authentication or user session required', status_code=401
+        )
 
     def test_unauthenticated_narrow_to_non_web_public_streams_without_web_public(self) -> None:
         """
@@ -1268,8 +1530,9 @@ class GetOldMessagesTest(ZulipTestCase):
             "narrow": orjson.dumps([dict(operator='stream', operand='Scotland')]).decode(),
         }
         result = self.client_get("/json/messages", dict(post_params))
-        self.assert_json_error(result, "Not logged in: API authentication or user session required",
-                               status_code=401)
+        self.assert_json_error(
+            result, "Not logged in: API authentication or user session required", status_code=401
+        )
 
     def test_unauthenticated_narrow_to_non_web_public_streams_with_web_public(self) -> None:
         """
@@ -1281,14 +1544,19 @@ class GetOldMessagesTest(ZulipTestCase):
             "anchor": 1,
             "num_before": 1,
             "num_after": 1,
-            "narrow": orjson.dumps([dict(operator="streams", operand="web-public"),
-                                    dict(operator='stream', operand='Scotland')]).decode(),
+            "narrow": orjson.dumps(
+                [
+                    dict(operator="streams", operand="web-public"),
+                    dict(operator='stream', operand='Scotland'),
+                ]
+            ).decode(),
         }
         result = self.client_get("/json/messages", dict(post_params))
-        self.assert_json_error(result, 'Invalid narrow operator: unknown web-public stream Scotland',
-                               status_code=400)
+        self.assert_json_error(
+            result, 'Invalid narrow operator: unknown web-public stream Scotland', status_code=400
+        )
 
-    def setup_web_public_test(self, num_web_public_message: int=1) -> None:
+    def setup_web_public_test(self, num_web_public_message: int = 1) -> None:
         """
         Send N+2 messages, N in a web-public stream, then one in a non web-public stream
         and then a private message.
@@ -1301,15 +1569,20 @@ class GetOldMessagesTest(ZulipTestCase):
         self.subscribe(user_profile, non_web_public_stream.name)
 
         for _ in range(num_web_public_message):
-            self.send_stream_message(user_profile, web_public_stream.name,
-                                     content="web-public message")
-        self.send_stream_message(user_profile, non_web_public_stream.name,
-                                 content="non web-public message")
-        self.send_personal_message(user_profile, self.example_user('hamlet'),
-                                   content="private message")
+            self.send_stream_message(
+                user_profile, web_public_stream.name, content="web-public message"
+            )
+        self.send_stream_message(
+            user_profile, non_web_public_stream.name, content="non web-public message"
+        )
+        self.send_personal_message(
+            user_profile, self.example_user('hamlet'), content="private message"
+        )
         self.logout()
 
-    def verify_web_public_query_result_success(self, result: HttpResponse, expected_num_messages: int) -> None:
+    def verify_web_public_query_result_success(
+        self, result: HttpResponse, expected_num_messages: int
+    ) -> None:
         self.assert_json_success(result)
         messages = orjson.loads(result.content)['messages']
         self.assert_length(messages, expected_num_messages)
@@ -1327,8 +1600,12 @@ class GetOldMessagesTest(ZulipTestCase):
             "anchor": 1,
             "num_before": 1,
             "num_after": 1,
-            "narrow": orjson.dumps([dict(operator="streams", operand="web-public"),
-                                    dict(operator='stream', operand='web-public-stream')]).decode(),
+            "narrow": orjson.dumps(
+                [
+                    dict(operator="streams", operand="web-public"),
+                    dict(operator='stream', operand='web-public-stream'),
+                ]
+            ).decode(),
         }
         result = self.client_get("/json/messages", dict(post_params))
         self.verify_web_public_query_result_success(result, 1)
@@ -1361,8 +1638,9 @@ class GetOldMessagesTest(ZulipTestCase):
         hamlet = self.example_user('hamlet')
         self.login_user(hamlet)
 
-        do_set_realm_property(hamlet.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE)
+        do_set_realm_property(
+            hamlet.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE
+        )
 
         self.send_personal_message(hamlet, self.example_user("iago"))
 
@@ -1375,8 +1653,9 @@ class GetOldMessagesTest(ZulipTestCase):
         self.assertEqual(message['avatar_url'], None)
 
         # Now verify client_gravatar doesn't run with EMAIL_ADDRESS_VISIBILITY_ADMINS
-        do_set_realm_property(hamlet.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            hamlet.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
         result = self.get_and_check_messages(dict(client_gravatar=orjson.dumps(True).decode()))
         message = result['messages'][0]
         self.assertIn('gravatar.com', message['avatar_url'])
@@ -1415,8 +1694,9 @@ class GetOldMessagesTest(ZulipTestCase):
         do_deactivate_user(aaron)
         self.assertFalse(aaron.is_active)
 
-        personals = [m for m in get_user_messages(self.example_user('hamlet'))
-                     if not m.is_stream_message()]
+        personals = [
+            m for m in get_user_messages(self.example_user('hamlet')) if not m.is_stream_message()
+        ]
         for personal in personals:
             emails = dr_emails(get_display_recipient(personal.recipient))
             self.login_user(me)
@@ -1632,9 +1912,9 @@ class GetOldMessagesTest(ZulipTestCase):
         self.send_stream_message(user, "\u03bb-stream.d")
 
         narrow = [dict(operator='stream', operand='\u03bb-stream')]
-        result = self.get_and_check_messages(dict(num_after=2,
-                                                  narrow=orjson.dumps(narrow).decode()),
-                                             subdomain="zephyr")
+        result = self.get_and_check_messages(
+            dict(num_after=2, narrow=orjson.dumps(narrow).decode()), subdomain="zephyr"
+        )
 
         messages = get_user_messages(self.mit_user("starnine"))
         stream_messages = [msg for msg in messages if msg.is_stream_message()]
@@ -1664,8 +1944,8 @@ class GetOldMessagesTest(ZulipTestCase):
 
         narrow = [dict(operator='topic', operand='\u03bb-topic')]
         result = self.get_and_check_messages(
-            dict(num_after=100, narrow=orjson.dumps(narrow).decode()),
-            subdomain="zephyr")
+            dict(num_after=100, narrow=orjson.dumps(narrow).decode()), subdomain="zephyr"
+        )
 
         messages = get_user_messages(mit_user_profile)
         stream_messages = [msg for msg in messages if msg.is_stream_message()]
@@ -1697,10 +1977,9 @@ class GetOldMessagesTest(ZulipTestCase):
 
         narrow = [dict(operator='topic', operand='personal.d.d')]
         result = self.get_and_check_messages(
-            dict(num_before=50,
-                 num_after=50,
-                 narrow=orjson.dumps(narrow).decode()),
-            subdomain="zephyr")
+            dict(num_before=50, num_after=50, narrow=orjson.dumps(narrow).decode()),
+            subdomain="zephyr",
+        )
 
         messages = get_user_messages(mit_user_profile)
         stream_messages = [msg for msg in messages if msg.is_stream_message()]
@@ -1742,11 +2021,13 @@ class GetOldMessagesTest(ZulipTestCase):
         # mode).  In production there is an async process which keeps
         # the search index up to date.
         with connection.cursor() as cursor:
-            cursor.execute("""
+            cursor.execute(
+                """
             UPDATE zerver_message SET
             search_tsvector = to_tsvector('zulip.english_us_search',
             subject || rendered_content)
-            """)
+            """
+            )
 
     @override_settings(USING_PGROONGA=False)
     def test_messages_in_narrow(self) -> None:
@@ -1779,8 +2060,10 @@ class GetOldMessagesTest(ZulipTestCase):
         messages = result.json()['messages']
         self.assertEqual(len(list(messages.keys())), 1)
         message = messages[str(good_id)]
-        self.assertEqual(message['match_content'],
-                         '<p><span class="highlight">KEYWORDMATCH</span> and should work</p>')
+        self.assertEqual(
+            message['match_content'],
+            '<p><span class="highlight">KEYWORDMATCH</span> and should work</p>',
+        )
 
     @override_settings(USING_PGROONGA=False)
     def test_get_messages_with_search(self) -> None:
@@ -1817,112 +2100,110 @@ class GetOldMessagesTest(ZulipTestCase):
             dict(operator='sender', operand=cordelia.email),
             dict(operator='search', operand='lunch'),
         ]
-        result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_before=0,
-            num_after=10,
-        ))
+        result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_before=0,
+                num_after=10,
+            )
+        )
         self.assertEqual(len(result['messages']), 2)
         messages = result['messages']
 
         narrow = [dict(operator='search', operand='https://google.com')]
-        link_search_result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_before=0,
-            num_after=10,
-        ))
+        link_search_result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_before=0,
+                num_after=10,
+            )
+        )
         self.assertEqual(len(link_search_result['messages']), 1)
-        self.assertEqual(link_search_result['messages'][0]['match_content'],
-                         '<p><a href="https://google.com">https://<span class="highlight">google.com</span></a></p>')
-
-        (meeting_message,) = [
-            m for m in messages
-            if m[TOPIC_NAME] == 'meetings'
-        ]
         self.assertEqual(
-            meeting_message[MATCH_TOPIC],
-            'meetings')
+            link_search_result['messages'][0]['match_content'],
+            '<p><a href="https://google.com">https://<span class="highlight">google.com</span></a></p>',
+        )
+
+        (meeting_message,) = [m for m in messages if m[TOPIC_NAME] == 'meetings']
+        self.assertEqual(meeting_message[MATCH_TOPIC], 'meetings')
         self.assertEqual(
             meeting_message['match_content'],
-            '<p>discuss <span class="highlight">lunch</span> after ' +
-            '<span class="highlight">lunch</span></p>')
+            '<p>discuss <span class="highlight">lunch</span> after '
+            + '<span class="highlight">lunch</span></p>',
+        )
 
-        (lunch_message,) = [
-            m for m in messages
-            if m[TOPIC_NAME] == 'lunch plans'
-        ]
-        self.assertEqual(
-            lunch_message[MATCH_TOPIC],
-            '<span class="highlight">lunch</span> plans')
-        self.assertEqual(
-            lunch_message['match_content'],
-            '<p>I am hungry!</p>')
+        (lunch_message,) = [m for m in messages if m[TOPIC_NAME] == 'lunch plans']
+        self.assertEqual(lunch_message[MATCH_TOPIC], '<span class="highlight">lunch</span> plans')
+        self.assertEqual(lunch_message['match_content'], '<p>I am hungry!</p>')
 
         # Should not crash when multiple search operands are present
         multi_search_narrow = [
             dict(operator='search', operand='discuss'),
             dict(operator='search', operand='after'),
         ]
-        multi_search_result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(multi_search_narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        multi_search_result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(multi_search_narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(multi_search_result['messages']), 1)
-        self.assertEqual(multi_search_result['messages'][0]['match_content'], '<p><span class="highlight">discuss</span> lunch <span class="highlight">after</span> lunch</p>')
+        self.assertEqual(
+            multi_search_result['messages'][0]['match_content'],
+            '<p><span class="highlight">discuss</span> lunch <span class="highlight">after</span> lunch</p>',
+        )
 
         # Test searching in messages with Unicode characters
         narrow = [
             dict(operator='search', operand='日本'),
         ]
-        result = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        result = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(result['messages']), 4)
         messages = result['messages']
 
-        japanese_message = [
-            m for m in messages
-            if m[TOPIC_NAME] == '日本'][-1]
-        self.assertEqual(
-            japanese_message[MATCH_TOPIC],
-            '<span class="highlight">日本</span>')
+        japanese_message = [m for m in messages if m[TOPIC_NAME] == '日本'][-1]
+        self.assertEqual(japanese_message[MATCH_TOPIC], '<span class="highlight">日本</span>')
         self.assertEqual(
             japanese_message['match_content'],
-            '<p>昨日、<span class="highlight">日本</span>' +
-            ' のお菓子を送りました。</p>')
+            '<p>昨日、<span class="highlight">日本</span>' + ' のお菓子を送りました。</p>',
+        )
 
-        (english_message,) = [
-            m for m in messages
-            if m[TOPIC_NAME] == 'english'
-        ]
-        self.assertEqual(
-            english_message[MATCH_TOPIC],
-            'english')
+        (english_message,) = [m for m in messages if m[TOPIC_NAME] == 'english']
+        self.assertEqual(english_message[MATCH_TOPIC], 'english')
         self.assertIn(
             english_message['match_content'],
-            '<p>I want to go to <span class="highlight">日本</span>!</p>')
+            '<p>I want to go to <span class="highlight">日本</span>!</p>',
+        )
 
         # Multiple search operands with Unicode
         multi_search_narrow = [
             dict(operator='search', operand='ちは'),
             dict(operator='search', operand='今日は'),
         ]
-        multi_search_result = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(multi_search_narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        multi_search_result = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(multi_search_narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(multi_search_result['messages']), 1)
-        self.assertEqual(multi_search_result['messages'][0]['match_content'],
-                         '<p>こんに <span class="highlight">ちは</span> 。 <span class="highlight">今日は</span> いい 天気ですね。</p>')
+        self.assertEqual(
+            multi_search_result['messages'][0]['match_content'],
+            '<p>こんに <span class="highlight">ちは</span> 。 <span class="highlight">今日は</span> いい 天気ですね。</p>',
+        )
 
     @override_settings(USING_PGROONGA=False)
     def test_get_visible_messages_with_search(self) -> None:
@@ -1931,15 +2212,27 @@ class GetOldMessagesTest(ZulipTestCase):
 
         messages_to_search = [
             ("Gryffindor", "Hogwart's house which values courage, bravery, nerve, and chivalry"),
-            ("Hufflepuff", "Hogwart's house which values hard work, patience, justice, and loyalty."),
-            ("Ravenclaw", "Hogwart's house which values intelligence, creativity, learning, and wit"),
-            ("Slytherin", "Hogwart's house which  values ambition, cunning, leadership, and resourcefulness"),
+            (
+                "Hufflepuff",
+                "Hogwart's house which values hard work, patience, justice, and loyalty.",
+            ),
+            (
+                "Ravenclaw",
+                "Hogwart's house which values intelligence, creativity, learning, and wit",
+            ),
+            (
+                "Slytherin",
+                "Hogwart's house which  values ambition, cunning, leadership, and resourcefulness",
+            ),
         ]
 
         message_ids = []
         for topic, content in messages_to_search:
-            message_ids.append(self.send_stream_message(self.example_user("iago"), "Scotland",
-                                                        topic_name=topic, content=content))
+            message_ids.append(
+                self.send_stream_message(
+                    self.example_user("iago"), "Scotland", topic_name=topic, content=content
+                )
+            )
         self._update_tsvector_index()
         narrow = [dict(operator='search', operand="Hogwart's")]
         self.message_visibility_test(narrow, message_ids, 2)
@@ -1962,15 +2255,19 @@ class GetOldMessagesTest(ZulipTestCase):
             dict(operator='search', operand='special'),
             dict(operator='stream', operand='newstream'),
         ]
-        stream_search_result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(stream_search_narrow).decode(),
-            anchor=0,
-            num_after=10,
-            num_before=10,
-        ))
+        stream_search_result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(stream_search_narrow).decode(),
+                anchor=0,
+                num_after=10,
+                num_before=10,
+            )
+        )
         self.assertEqual(len(stream_search_result['messages']), 1)
-        self.assertEqual(stream_search_result['messages'][0]['match_content'],
-                         '<p>Public <span class="highlight">special</span> content!</p>')
+        self.assertEqual(
+            stream_search_result['messages'][0]['match_content'],
+            '<p>Public <span class="highlight">special</span> content!</p>',
+        )
 
     @override_settings(USING_PGROONGA=True)
     def test_get_messages_with_search_pgroonga(self) -> None:
@@ -2001,39 +2298,40 @@ class GetOldMessagesTest(ZulipTestCase):
         # mode).  In production there is an async process which keeps
         # the search index up to date.
         with connection.cursor() as cursor:
-            cursor.execute("""
+            cursor.execute(
+                """
                 UPDATE zerver_message SET
                 search_pgroonga = escape_html(subject) || ' ' || rendered_content
-                """)
+                """
+            )
 
         narrow = [
             dict(operator='search', operand='日本'),
         ]
-        result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(result['messages']), 4)
         messages = result['messages']
 
         japanese_message = [m for m in messages if m[TOPIC_NAME] == '日本語'][-1]
-        self.assertEqual(
-            japanese_message[MATCH_TOPIC],
-            '<span class="highlight">日本</span>語')
+        self.assertEqual(japanese_message[MATCH_TOPIC], '<span class="highlight">日本</span>語')
         self.assertEqual(
             japanese_message['match_content'],
-            '<p>昨日、<span class="highlight">日本</span>の' +
-            'お菓子を送りました。</p>')
+            '<p>昨日、<span class="highlight">日本</span>の' + 'お菓子を送りました。</p>',
+        )
 
         english_message = [m for m in messages if m[TOPIC_NAME] == 'english'][0]
-        self.assertEqual(
-            english_message[MATCH_TOPIC],
-            'english')
+        self.assertEqual(english_message[MATCH_TOPIC], 'english')
         self.assertEqual(
             english_message['match_content'],
-            '<p>I want to go to <span class="highlight">日本</span>!</p>')
+            '<p>I want to go to <span class="highlight">日本</span>!</p>',
+        )
 
         # Should not crash when multiple search operands are present
         multi_search_narrow = [
@@ -2041,70 +2339,92 @@ class GetOldMessagesTest(ZulipTestCase):
             dict(operator='search', operand='speak'),
             dict(operator='search', operand='wiki'),
         ]
-        multi_search_result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(multi_search_narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        multi_search_result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(multi_search_narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(multi_search_result['messages']), 1)
-        self.assertEqual(multi_search_result['messages'][0]['match_content'],
-                         '<p><span class="highlight">Can</span> you <span class="highlight">speak</span> <a href="https://en.wikipedia.org/wiki/Japanese">https://en.<span class="highlight">wiki</span>pedia.org/<span class="highlight">wiki</span>/Japanese</a>?</p>')
+        self.assertEqual(
+            multi_search_result['messages'][0]['match_content'],
+            '<p><span class="highlight">Can</span> you <span class="highlight">speak</span> <a href="https://en.wikipedia.org/wiki/Japanese">https://en.<span class="highlight">wiki</span>pedia.org/<span class="highlight">wiki</span>/Japanese</a>?</p>',
+        )
 
         # Multiple search operands with Unicode
         multi_search_narrow = [
             dict(operator='search', operand='朝は'),
             dict(operator='search', operand='べました'),
         ]
-        multi_search_result = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(multi_search_narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        multi_search_result = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(multi_search_narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(multi_search_result['messages']), 1)
-        self.assertEqual(multi_search_result['messages'][0]['match_content'],
-                         '<p>今<span class="highlight">朝は</span>ごはんを食<span class="highlight">べました</span>。</p>')
+        self.assertEqual(
+            multi_search_result['messages'][0]['match_content'],
+            '<p>今<span class="highlight">朝は</span>ごはんを食<span class="highlight">べました</span>。</p>',
+        )
 
         narrow = [dict(operator='search', operand='https://google.com')]
-        link_search_result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        link_search_result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(link_search_result['messages']), 1)
-        self.assertEqual(link_search_result['messages'][0]['match_content'],
-                         '<p><a href="https://google.com"><span class="highlight">https://google.com</span></a></p>')
+        self.assertEqual(
+            link_search_result['messages'][0]['match_content'],
+            '<p><a href="https://google.com"><span class="highlight">https://google.com</span></a></p>',
+        )
 
         # Search operands with HTML special characters
         special_search_narrow = [
             dict(operator='search', operand='butter'),
         ]
-        special_search_result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(special_search_narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        special_search_result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(special_search_narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(special_search_result['messages']), 1)
-        self.assertEqual(special_search_result['messages'][0][MATCH_TOPIC],
-                         'bread &amp; <span class="highlight">butter</span>')
+        self.assertEqual(
+            special_search_result['messages'][0][MATCH_TOPIC],
+            'bread &amp; <span class="highlight">butter</span>',
+        )
 
         special_search_narrow = [
             dict(operator='search', operand='&'),
         ]
-        special_search_result = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(special_search_narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-            num_before=0,
-        ))
+        special_search_result = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(special_search_narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+                num_before=0,
+            )
+        )
         self.assertEqual(len(special_search_result['messages']), 1)
-        self.assertEqual(special_search_result['messages'][0][MATCH_TOPIC],
-                         'bread <span class="highlight">&amp;</span> butter')
-        self.assertEqual(special_search_result['messages'][0]['match_content'],
-                         '<p>chalk <span class="highlight">&amp;</span> cheese</p>')
+        self.assertEqual(
+            special_search_result['messages'][0][MATCH_TOPIC],
+            'bread <span class="highlight">&amp;</span> butter',
+        )
+        self.assertEqual(
+            special_search_result['messages'][0]['match_content'],
+            '<p>chalk <span class="highlight">&amp;</span> cheese</p>',
+        )
 
     def test_messages_in_narrow_for_non_search(self) -> None:
         user = self.example_user("cordelia")
@@ -2151,24 +2471,27 @@ class GetOldMessagesTest(ZulipTestCase):
         anchor = self.send_stream_message(cordelia, "Verona")
 
         narrow = [dict(operator='sender', operand=cordelia.email)]
-        result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=anchor, num_before=0,
-            num_after=0,
-        ))
+        result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=anchor,
+                num_before=0,
+                num_after=0,
+            )
+        )
         self.assertEqual(len(result['messages']), 1)
 
         narrow = [dict(operator='is', operand='mentioned')]
-        result = self.get_and_check_messages(dict(narrow=orjson.dumps(narrow).decode(),
-                                                  anchor=anchor, num_before=0,
-                                                  num_after=0))
+        result = self.get_and_check_messages(
+            dict(narrow=orjson.dumps(narrow).decode(), anchor=anchor, num_before=0, num_after=0)
+        )
         self.assertEqual(len(result['messages']), 0)
 
     def test_get_visible_messages_with_anchor(self) -> None:
         def messages_matches_ids(messages: List[Dict[str, Any]], message_ids: List[int]) -> None:
             self.assertEqual(len(messages), len(message_ids))
             for message in messages:
-                assert(message["id"] in message_ids)
+                assert message["id"] in message_ids
 
         self.login('hamlet')
 
@@ -2368,7 +2691,9 @@ class GetOldMessagesTest(ZulipTestCase):
 
         # Verify some additional behavior of found_newest.
         with first_visible_id_as(0):
-            data = self.get_messages_response(anchor=LARGER_THAN_MAX_MESSAGE_ID, num_before=5, num_after=0)
+            data = self.get_messages_response(
+                anchor=LARGER_THAN_MAX_MESSAGE_ID, num_before=5, num_after=0
+            )
 
         messages = data['messages']
         self.assert_length(messages, 5)
@@ -2389,8 +2714,9 @@ class GetOldMessagesTest(ZulipTestCase):
         self.assertEqual(data['history_limited'], False)
 
         with first_visible_id_as(0):
-            data = self.get_messages_response(anchor=LARGER_THAN_MAX_MESSAGE_ID + 1,
-                                              num_before=5, num_after=0)
+            data = self.get_messages_response(
+                anchor=LARGER_THAN_MAX_MESSAGE_ID + 1, num_before=5, num_after=0
+            )
 
         messages = data['messages']
         self.assert_length(messages, 5)
@@ -2400,7 +2726,9 @@ class GetOldMessagesTest(ZulipTestCase):
         self.assertEqual(data['history_limited'], False)
 
         with first_visible_id_as(0):
-            data = self.get_messages_response(anchor=LARGER_THAN_MAX_MESSAGE_ID, num_before=20, num_after=0)
+            data = self.get_messages_response(
+                anchor=LARGER_THAN_MAX_MESSAGE_ID, num_before=20, num_after=0
+            )
 
         messages = data['messages']
         self.assert_length(messages, 10)
@@ -2419,10 +2747,9 @@ class GetOldMessagesTest(ZulipTestCase):
         required_args: Tuple[Tuple[str, int], ...] = (("num_before", 1), ("num_after", 1))
 
         for i in range(len(required_args)):
-            post_params = dict(required_args[:i] + required_args[i + 1:])
+            post_params = dict(required_args[:i] + required_args[i + 1 :])
             result = self.client_get("/json/messages", post_params)
-            self.assert_json_error(result,
-                                   f"Missing '{required_args[i][0]}' argument")
+            self.assert_json_error(result, f"Missing '{required_args[i][0]}' argument")
 
     def test_get_messages_limits(self) -> None:
         """
@@ -2455,12 +2782,10 @@ class GetOldMessagesTest(ZulipTestCase):
                 post_params = {
                     **other_params,
                     param: type,
-                    **{other_param: 0 for other_param in
-                       int_params[:idx] + int_params[idx + 1:]},
+                    **{other_param: 0 for other_param in int_params[:idx] + int_params[idx + 1 :]},
                 }
                 result = self.client_get("/json/messages", post_params)
-                self.assert_json_error(result,
-                                       f"Bad value for '{param}': {type}")
+                self.assert_json_error(result, f"Bad value for '{param}': {type}")
 
     def test_bad_narrow_type(self) -> None:
         """
@@ -2471,14 +2796,18 @@ class GetOldMessagesTest(ZulipTestCase):
         other_params = {"anchor": 0, "num_before": 0, "num_after": 0}
 
         bad_types: Tuple[Union[int, str, bool], ...] = (
-            False, 0, '', '{malformed json,',
-            '{foo: 3}', '[1,2]', '[["x","y","z"]]',
+            False,
+            0,
+            '',
+            '{malformed json,',
+            '{foo: 3}',
+            '[1,2]',
+            '[["x","y","z"]]',
         )
         for type in bad_types:
             post_params = {**other_params, "narrow": type}
             result = self.client_get("/json/messages", post_params)
-            self.assert_json_error(result,
-                                   f"Bad value for 'narrow': {type}")
+            self.assert_json_error(result, f"Bad value for 'narrow': {type}")
 
     def test_bad_narrow_operator(self) -> None:
         """
@@ -2489,8 +2818,7 @@ class GetOldMessagesTest(ZulipTestCase):
             narrow = [dict(operator=operator, operand='')]
             params = dict(anchor=0, num_before=0, num_after=0, narrow=orjson.dumps(narrow).decode())
             result = self.client_get("/json/messages", params)
-            self.assert_json_error_contains(result,
-                                            "Invalid narrow operator: unknown operator")
+            self.assert_json_error_contains(result, "Invalid narrow operator: unknown operator")
 
     def test_invalid_narrow_operand_in_dict(self) -> None:
         self.login('hamlet')
@@ -2522,9 +2850,9 @@ class GetOldMessagesTest(ZulipTestCase):
 
     # The exercise_bad_narrow_operand helper method uses legacy tuple format to
     # test bad narrow, this method uses the current dict API format
-    def exercise_bad_narrow_operand_using_dict_api(self, operator: str,
-                                                   operands: Sequence[Any],
-                                                   error_msg: str) -> None:
+    def exercise_bad_narrow_operand_using_dict_api(
+        self, operator: str, operands: Sequence[Any], error_msg: str
+    ) -> None:
 
         for operand in operands:
             narrow = [dict(operator=operator, operand=operand)]
@@ -2532,9 +2860,9 @@ class GetOldMessagesTest(ZulipTestCase):
             result = self.client_get('/json/messages', params)
             self.assert_json_error_contains(result, error_msg)
 
-    def exercise_bad_narrow_operand(self, operator: str,
-                                    operands: Sequence[Any],
-                                    error_msg: str) -> None:
+    def exercise_bad_narrow_operand(
+        self, operator: str, operands: Sequence[Any], error_msg: str
+    ) -> None:
         other_params = {"anchor": "0", "num_before": "0", "num_after": "0"}
         for operand in operands:
             post_params = {**other_params, "narrow": orjson.dumps([[operator, operand]]).decode()}
@@ -2548,8 +2876,7 @@ class GetOldMessagesTest(ZulipTestCase):
         """
         self.login('hamlet')
         bad_stream_content: Tuple[int, List[None], List[str]] = (0, [], ["x", "y"])
-        self.exercise_bad_narrow_operand("stream", bad_stream_content,
-                                         "Bad value for 'narrow'")
+        self.exercise_bad_narrow_operand("stream", bad_stream_content, "Bad value for 'narrow'")
 
     def test_bad_narrow_one_on_one_email_content(self) -> None:
         """
@@ -2558,27 +2885,30 @@ class GetOldMessagesTest(ZulipTestCase):
         """
         self.login('hamlet')
         bad_stream_content: Tuple[int, List[None], List[str]] = (0, [], ["x", "y"])
-        self.exercise_bad_narrow_operand("pm-with", bad_stream_content,
-                                         "Bad value for 'narrow'")
+        self.exercise_bad_narrow_operand("pm-with", bad_stream_content, "Bad value for 'narrow'")
 
     def test_bad_narrow_nonexistent_stream(self) -> None:
         self.login('hamlet')
-        self.exercise_bad_narrow_operand("stream", ['non-existent stream'],
-                                         "Invalid narrow operator: unknown stream")
+        self.exercise_bad_narrow_operand(
+            "stream", ['non-existent stream'], "Invalid narrow operator: unknown stream"
+        )
 
         non_existing_stream_id = 1232891381239
-        self.exercise_bad_narrow_operand_using_dict_api('stream', [non_existing_stream_id],
-                                                        'Invalid narrow operator: unknown stream')
+        self.exercise_bad_narrow_operand_using_dict_api(
+            'stream', [non_existing_stream_id], 'Invalid narrow operator: unknown stream'
+        )
 
     def test_bad_narrow_nonexistent_email(self) -> None:
         self.login('hamlet')
-        self.exercise_bad_narrow_operand("pm-with", ['non-existent-user@zulip.com'],
-                                         "Invalid narrow operator: unknown user")
+        self.exercise_bad_narrow_operand(
+            "pm-with", ['non-existent-user@zulip.com'], "Invalid narrow operator: unknown user"
+        )
 
     def test_bad_narrow_pm_with_id_list(self) -> None:
         self.login('hamlet')
-        self.exercise_bad_narrow_operand('pm-with', [-24],
-                                         "Bad value for 'narrow': [[\"pm-with\",-24]]")
+        self.exercise_bad_narrow_operand(
+            'pm-with', [-24], "Bad value for 'narrow': [[\"pm-with\",-24]]"
+        )
 
     def test_message_without_rendered_content(self) -> None:
         """Older messages may not have rendered_content in the database"""
@@ -2593,7 +2923,9 @@ class GetOldMessagesTest(ZulipTestCase):
         )
         self.assertEqual(final_dict['content'], '<p>test content</p>')
 
-    def common_check_get_messages_query(self, query_params: Dict[str, object], expected: str) -> None:
+    def common_check_get_messages_query(
+        self, query_params: Dict[str, object], expected: str
+    ) -> None:
         user_profile = self.example_user('hamlet')
         request = POSTRequestMock(query_params, user_profile)
         with queries_captured() as queries:
@@ -2786,7 +3118,9 @@ class GetOldMessagesTest(ZulipTestCase):
         self.assertNotIn(f'AND message_id = {LARGER_THAN_MAX_MESSAGE_ID}', sql)
         self.assertIn('ORDER BY message_id ASC', sql)
 
-        cond = f'WHERE user_profile_id = {user_profile.id} AND message_id >= {first_unread_message_id}'
+        cond = (
+            f'WHERE user_profile_id = {user_profile.id} AND message_id >= {first_unread_message_id}'
+        )
         self.assertIn(cond, sql)
         cond = f'WHERE user_profile_id = {user_profile.id} AND message_id <= {first_unread_message_id - 1}'
         self.assertIn(cond, sql)
@@ -2914,8 +3248,7 @@ class GetOldMessagesTest(ZulipTestCase):
         # the `message_id = LARGER_THAN_MAX_MESSAGE_ID` hack.
         queries = [q for q in all_queries if '/* get_messages */' in q['sql']]
         self.assertEqual(len(queries), 1)
-        self.assertIn(f'AND zerver_message.id = {LARGER_THAN_MAX_MESSAGE_ID}',
-                      queries[0]['sql'])
+        self.assertIn(f'AND zerver_message.id = {LARGER_THAN_MAX_MESSAGE_ID}', queries[0]['sql'])
 
     def test_exclude_muting_conditions(self) -> None:
         realm = get_realm('zulip')
@@ -2969,7 +3302,9 @@ WHERE NOT (recipient_id = %(recipient_id_1)s AND upper(subject) = upper(%(param_
         self.assertEqual(get_sqlalchemy_sql(query), expected_query)
         params = get_sqlalchemy_query_params(query)
 
-        self.assertEqual(params['recipient_id_1'], get_recipient_id_for_stream_name(realm, 'Scotland'))
+        self.assertEqual(
+            params['recipient_id_1'], get_recipient_id_for_stream_name(realm, 'Scotland')
+        )
         self.assertEqual(params['param_1'], 'golf')
 
         mute_stream(realm, user_profile, 'Verona')
@@ -2994,10 +3329,16 @@ recipient_id = %(recipient_id_3)s AND upper(subject) = upper(%(param_2)s))\
 '''
         self.assertEqual(get_sqlalchemy_sql(query), expected_query)
         params = get_sqlalchemy_query_params(query)
-        self.assertEqual(params['recipient_id_1'], get_recipient_id_for_stream_name(realm, 'Verona'))
-        self.assertEqual(params['recipient_id_2'], get_recipient_id_for_stream_name(realm, 'Scotland'))
+        self.assertEqual(
+            params['recipient_id_1'], get_recipient_id_for_stream_name(realm, 'Verona')
+        )
+        self.assertEqual(
+            params['recipient_id_2'], get_recipient_id_for_stream_name(realm, 'Scotland')
+        )
         self.assertEqual(params['param_1'], 'golf')
-        self.assertEqual(params['recipient_id_3'], get_recipient_id_for_stream_name(realm, 'web stuff'))
+        self.assertEqual(
+            params['recipient_id_3'], get_recipient_id_for_stream_name(realm, 'web stuff')
+        )
         self.assertEqual(params['param_2'], 'css')
 
     def test_get_messages_queries(self) -> None:
@@ -3025,7 +3366,9 @@ recipient_id = %(recipient_id_3)s AND upper(subject) = upper(%(param_2)s))\
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM ((SELECT message_id, flags \nFROM zerver_usermessage \nWHERE user_profile_id = {hamlet_id} AND message_id <= 99 ORDER BY message_id DESC \n LIMIT 10) UNION ALL (SELECT message_id, flags \nFROM zerver_usermessage \nWHERE user_profile_id = {hamlet_id} AND message_id >= 100 ORDER BY message_id ASC \n LIMIT 11)) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 100, 'num_before': 10, 'num_after': 10}, sql)
+        self.common_check_get_messages_query(
+            {'anchor': 100, 'num_before': 10, 'num_after': 10}, sql
+        )
 
     def test_get_messages_with_narrow_queries(self) -> None:
         query_ids = self.get_query_ids()
@@ -3034,76 +3377,125 @@ recipient_id = %(recipient_id_3)s AND upper(subject) = upper(%(param_2)s))\
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND (sender_id = {othello_id} AND recipient_id = {hamlet_recipient} OR sender_id = {hamlet_id} AND recipient_id = {othello_recipient}) AND message_id = 0) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 0,
-                                              'narrow': f'[["pm-with", "{othello_email}"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 0,
+                'narrow': f'[["pm-with", "{othello_email}"]]',
+            },
+            sql,
+        )
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND (sender_id = {othello_id} AND recipient_id = {hamlet_recipient} OR sender_id = {hamlet_id} AND recipient_id = {othello_recipient}) AND message_id = 0) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 1, 'num_after': 0,
-                                              'narrow': f'[["pm-with", "{othello_email}"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 1,
+                'num_after': 0,
+                'narrow': f'[["pm-with", "{othello_email}"]]',
+            },
+            sql,
+        )
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND (sender_id = {othello_id} AND recipient_id = {hamlet_recipient} OR sender_id = {hamlet_id} AND recipient_id = {othello_recipient}) ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': f'[["pm-with", "{othello_email}"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': f'[["pm-with", "{othello_email}"]]',
+            },
+            sql,
+        )
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND (flags & 2) != 0 ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["is", "starred"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {'anchor': 0, 'num_before': 0, 'num_after': 9, 'narrow': '[["is", "starred"]]'}, sql
+        )
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND sender_id = {othello_id} ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': f'[["sender", "{othello_email}"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': f'[["sender", "{othello_email}"]]',
+            },
+            sql,
+        )
 
         sql_template = 'SELECT anon_1.message_id \nFROM (SELECT id AS message_id \nFROM zerver_message \nWHERE recipient_id = {scotland_recipient} ORDER BY zerver_message.id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["stream", "Scotland"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {'anchor': 0, 'num_before': 0, 'num_after': 9, 'narrow': '[["stream", "Scotland"]]'},
+            sql,
+        )
 
         sql_template = 'SELECT anon_1.message_id \nFROM (SELECT id AS message_id \nFROM zerver_message \nWHERE recipient_id IN ({public_streams_recipents}) ORDER BY zerver_message.id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["streams", "public"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {'anchor': 0, 'num_before': 0, 'num_after': 9, 'narrow': '[["streams", "public"]]'}, sql
+        )
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND recipient_id NOT IN ({public_streams_recipents}) ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[{"operator":"streams", "operand":"public", "negated": true}]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': '[{"operator":"streams", "operand":"public", "negated": true}]',
+            },
+            sql,
+        )
 
         sql_template = "SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND upper(subject) = upper('blah') ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC"
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["topic", "blah"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {'anchor': 0, 'num_before': 0, 'num_after': 9, 'narrow': '[["topic", "blah"]]'}, sql
+        )
 
         sql_template = "SELECT anon_1.message_id \nFROM (SELECT id AS message_id \nFROM zerver_message \nWHERE recipient_id = {scotland_recipient} AND upper(subject) = upper('blah') ORDER BY zerver_message.id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC"
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["stream", "Scotland"], ["topic", "blah"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': '[["stream", "Scotland"], ["topic", "blah"]]',
+            },
+            sql,
+        )
 
         # Narrow to pms with yourself
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND sender_id = {hamlet_id} AND recipient_id = {hamlet_recipient} ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': f'[["pm-with", "{hamlet_email}"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': f'[["pm-with", "{hamlet_email}"]]',
+            },
+            sql,
+        )
 
         sql_template = 'SELECT anon_1.message_id, anon_1.flags \nFROM (SELECT message_id, flags \nFROM zerver_usermessage JOIN zerver_message ON zerver_usermessage.message_id = zerver_message.id \nWHERE user_profile_id = {hamlet_id} AND recipient_id = {scotland_recipient} AND (flags & 2) != 0 ORDER BY message_id ASC \n LIMIT 10) AS anon_1 ORDER BY message_id ASC'
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["stream", "Scotland"], ["is", "starred"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': '[["stream", "Scotland"], ["is", "starred"]]',
+            },
+            sql,
+        )
 
     @override_settings(USING_PGROONGA=False)
     def test_get_messages_with_search_queries(self) -> None:
@@ -3121,9 +3513,9 @@ WHERE user_profile_id = {hamlet_id} AND (search_tsvector @@ plainto_tsquery('zul
  LIMIT 10) AS anon_1 ORDER BY message_id ASC\
 """
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["search", "jumping"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {'anchor': 0, 'num_before': 0, 'num_after': 9, 'narrow': '[["search", "jumping"]]'}, sql
+        )
 
         sql_template = """\
 SELECT anon_1.message_id, anon_1.subject, anon_1.rendered_content, anon_1.content_matches, anon_1.topic_matches \n\
@@ -3137,9 +3529,15 @@ WHERE recipient_id = {scotland_recipient} AND (search_tsvector @@ plainto_tsquer
  LIMIT 10) AS anon_1 ORDER BY message_id ASC\
 """
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["stream", "Scotland"], ["search", "jumping"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': '[["stream", "Scotland"], ["search", "jumping"]]',
+            },
+            sql,
+        )
 
         sql_template = """\
 SELECT anon_1.message_id, anon_1.flags, anon_1.subject, anon_1.rendered_content, anon_1.content_matches, anon_1.topic_matches \n\
@@ -3153,9 +3551,15 @@ WHERE user_profile_id = {hamlet_id} AND (content ILIKE '%jumping%' OR subject IL
  LIMIT 10) AS anon_1 ORDER BY message_id ASC\
 """
         sql = sql_template.format(**query_ids)
-        self.common_check_get_messages_query({'anchor': 0, 'num_before': 0, 'num_after': 9,
-                                              'narrow': '[["search", "\\"jumping\\" quickly"]]'},
-                                             sql)
+        self.common_check_get_messages_query(
+            {
+                'anchor': 0,
+                'num_before': 0,
+                'num_after': 9,
+                'narrow': '[["search", "\\"jumping\\" quickly"]]',
+            },
+            sql,
+        )
 
     @override_settings(USING_PGROONGA=False)
     def test_get_messages_with_search_using_email(self) -> None:
@@ -3184,38 +3588,38 @@ WHERE user_profile_id = {hamlet_id} AND (content ILIKE '%jumping%' OR subject IL
             dict(operator='sender', operand=cordelia.email),
             dict(operator='search', operand=othello.email),
         ]
-        result: Dict[str, Any] = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-        ))
+        result: Dict[str, Any] = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+            )
+        )
         self.assertEqual(len(result['messages']), 0)
 
         narrow = [
             dict(operator='sender', operand=cordelia.email),
             dict(operator='search', operand='othello'),
         ]
-        result = self.get_and_check_messages(dict(
-            narrow=orjson.dumps(narrow).decode(),
-            anchor=next_message_id,
-            num_after=10,
-        ))
+        result = self.get_and_check_messages(
+            dict(
+                narrow=orjson.dumps(narrow).decode(),
+                anchor=next_message_id,
+                num_after=10,
+            )
+        )
         self.assertEqual(len(result['messages']), 1)
         messages = result['messages']
 
-        (hello_message,) = [
-            m for m in messages
-            if m[TOPIC_NAME] == 'say hello'
-        ]
-        self.assertEqual(
-            hello_message[MATCH_TOPIC],
-            'say hello')
+        (hello_message,) = [m for m in messages if m[TOPIC_NAME] == 'say hello']
+        self.assertEqual(hello_message[MATCH_TOPIC], 'say hello')
         self.assertEqual(
             hello_message['match_content'],
             f'<p>How are you doing, <span class="user-mention" data-user-id="{othello.id}">'
             '@<span class="highlight">Othello</span>, the Moor of Venice</span>?</p>',
         )
 
+
 class MessageHasKeywordsTest(ZulipTestCase):
     '''Test for keywords like has_link, has_image, has_attachment.'''
 
@@ -3248,9 +3652,11 @@ class MessageHasKeywordsTest(ZulipTestCase):
 
         # This message should claim attachments 1 only because attachment 2
         # is not being parsed as a link by Markdown.
-        body = (f"Some files here ...[zulip.txt]({dummy_urls[0]})"
-                f"{dummy_urls[1]}.... Some more...."
-                f"{dummy_urls[1]}")
+        body = (
+            f"Some files here ...[zulip.txt]({dummy_urls[0]})"
+            f"{dummy_urls[1]}.... Some more...."
+            f"{dummy_urls[1]}"
+        )
         self.send_stream_message(user_profile, "Denmark", body, "test")
         assert_attachment_claimed(dummy_path_ids[0], True)
         assert_attachment_claimed(dummy_path_ids[1], False)
@@ -3276,8 +3682,11 @@ class MessageHasKeywordsTest(ZulipTestCase):
         msg_ids = []
         msg_contents = ["foo.org", "[bar](baz.gov)", "http://quux.ca"]
         for msg_content in msg_contents:
-            msg_ids.append(self.send_stream_message(self.example_user('hamlet'),
-                                                    'Denmark', content=msg_content))
+            msg_ids.append(
+                self.send_stream_message(
+                    self.example_user('hamlet'), 'Denmark', content=msg_content
+                )
+            )
         msgs = [Message.objects.get(id=id) for id in msg_ids]
         self.assertTrue(all(msg.has_link for msg in msgs))
 
@@ -3285,8 +3694,11 @@ class MessageHasKeywordsTest(ZulipTestCase):
         msg_ids = []
         msg_contents = ["`example.org`", '``example.org```', '$$https://example.org$$', "foo"]
         for msg_content in msg_contents:
-            msg_ids.append(self.send_stream_message(self.example_user('hamlet'),
-                                                    'Denmark', content=msg_content))
+            msg_ids.append(
+                self.send_stream_message(
+                    self.example_user('hamlet'), 'Denmark', content=msg_content
+                )
+            )
         msgs = [Message.objects.get(id=id) for id in msg_ids]
         self.assertFalse(all(msg.has_link for msg in msgs))
 
@@ -3295,8 +3707,20 @@ class MessageHasKeywordsTest(ZulipTestCase):
         realm_id = hamlet.realm.id
         rendered_content = render_markdown(msg, content)
         mention_data = MentionData(realm_id, content)
-        do_update_message(hamlet, msg, None, None, "change_one", False, False, content,
-                          rendered_content, set(), set(), mention_data=mention_data)
+        do_update_message(
+            hamlet,
+            msg,
+            None,
+            None,
+            "change_one",
+            False,
+            False,
+            content,
+            rendered_content,
+            set(),
+            set(),
+            mention_data=mention_data,
+        )
 
     def test_finds_link_after_edit(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -3316,13 +3740,18 @@ class MessageHasKeywordsTest(ZulipTestCase):
 
     def test_has_image(self) -> None:
         msg_ids = []
-        msg_contents = ["Link: foo.org",
-                        "Image: https://www.google.com/images/srpr/logo4w.png",
-                        "Image: https://www.google.com/images/srpr/logo4w.pdf",
-                        "[Google link](https://www.google.com/images/srpr/logo4w.png)"]
+        msg_contents = [
+            "Link: foo.org",
+            "Image: https://www.google.com/images/srpr/logo4w.png",
+            "Image: https://www.google.com/images/srpr/logo4w.pdf",
+            "[Google link](https://www.google.com/images/srpr/logo4w.png)",
+        ]
         for msg_content in msg_contents:
-            msg_ids.append(self.send_stream_message(self.example_user('hamlet'),
-                                                    'Denmark', content=msg_content))
+            msg_ids.append(
+                self.send_stream_message(
+                    self.example_user('hamlet'), 'Denmark', content=msg_content
+                )
+            )
         msgs = [Message.objects.get(id=id) for id in msg_ids]
         self.assertEqual([False, True, False, True], [msg.has_image for msg in msgs])
 
@@ -3337,7 +3766,9 @@ class MessageHasKeywordsTest(ZulipTestCase):
         dummy_urls = [f"http://zulip.testserver/user_uploads/{x}" for x in dummy_path_ids]
         self.subscribe(hamlet, "Denmark")
 
-        body = ("Files ...[zulip.txt]({}) {} {}").format(dummy_urls[0], dummy_urls[1], dummy_urls[2])
+        body = ("Files ...[zulip.txt]({}) {} {}").format(
+            dummy_urls[0], dummy_urls[1], dummy_urls[2]
+        )
 
         msg_id = self.send_stream_message(hamlet, "Denmark", body, "test")
         msg = Message.objects.get(id=msg_id)
@@ -3376,9 +3807,10 @@ class MessageHasKeywordsTest(ZulipTestCase):
         msg_id = self.send_stream_message(hamlet, "Denmark", body, "test")
         msg = Message.objects.get(id=msg_id)
 
-        with mock.patch("zerver.lib.actions.do_claim_attachments",
-                        wraps=do_claim_attachments) as m:
-            self.update_message(msg, f'[link](http://{hamlet.realm.host}/user_uploads/{dummy_path_ids[0]})')
+        with mock.patch("zerver.lib.actions.do_claim_attachments", wraps=do_claim_attachments) as m:
+            self.update_message(
+                msg, f'[link](http://{hamlet.realm.host}/user_uploads/{dummy_path_ids[0]})'
+            )
             self.assertTrue(m.called)
             m.reset_mock()
 
@@ -3399,10 +3831,13 @@ class MessageHasKeywordsTest(ZulipTestCase):
             self.assertFalse(m.called)
             m.reset_mock()
 
+
 class MessageVisibilityTest(ZulipTestCase):
     def test_update_first_visible_message_id(self) -> None:
         Message.objects.all().delete()
-        message_ids = [self.send_stream_message(self.example_user("othello"), "Scotland") for i in range(15)]
+        message_ids = [
+            self.send_stream_message(self.example_user("othello"), "Scotland") for i in range(15)
+        ]
 
         # If message_visibility_limit is None update_first_visible_message_id
         # should set first_visible_message_id to 0
@@ -3438,8 +3873,7 @@ class MessageVisibilityTest(ZulipTestCase):
         end_time = timezone_now() - datetime.timedelta(hours=lookback_hours - 5)
         stat = COUNT_STATS['messages_sent:is_bot:hour']
 
-        RealmCount.objects.create(realm=realm, property=stat.property,
-                                  end_time=end_time, value=5)
+        RealmCount.objects.create(realm=realm, property=stat.property, end_time=end_time, value=5)
         with mock.patch("zerver.lib.message.update_first_visible_message_id") as m:
             maybe_update_first_visible_message_id(realm, lookback_hours)
         m.assert_not_called()
@@ -3451,12 +3885,12 @@ class MessageVisibilityTest(ZulipTestCase):
             maybe_update_first_visible_message_id(realm, lookback_hours)
         m.assert_not_called()
 
-        RealmCount.objects.create(realm=realm, property=stat.property,
-                                  end_time=end_time, value=5)
+        RealmCount.objects.create(realm=realm, property=stat.property, end_time=end_time, value=5)
         with mock.patch("zerver.lib.message.update_first_visible_message_id") as m:
             maybe_update_first_visible_message_id(realm, lookback_hours)
         m.assert_called_once_with(realm)
 
+
 class PersonalMessagesNearTest(ZulipTestCase):
     def test_near_pm_message_url(self) -> None:
         realm = get_realm('zulip')
diff --git a/zerver/tests/test_message_flags.py b/zerver/tests/test_message_flags.py
index b39b72c3dc..9fe971e1f4 100644
--- a/zerver/tests/test_message_flags.py
+++ b/zerver/tests/test_message_flags.py
@@ -31,23 +31,25 @@ from zerver.models import (
 
 
 def check_flags(flags: List[str], expected: Set[str]) -> None:
-    '''
+    """
     The has_alert_word flag can be ignored for most tests.
-    '''
+    """
     assert 'has_alert_word' not in expected
     flag_set = set(flags)
     flag_set.discard('has_alert_word')
     if flag_set != expected:
         raise AssertionError(f'expected flags (ignoring has_alert_word) to be {expected}')
 
+
 class FirstUnreadAnchorTests(ZulipTestCase):
-    '''
+    """
     HISTORICAL NOTE:
 
     The two tests in this class were originally written when
     we had the concept of a "pointer", and they may be a bit
     redundant in what they now check.
-    '''
+    """
+
     def test_use_first_unread_anchor(self) -> None:
         self.login('hamlet')
 
@@ -56,19 +58,20 @@ class FirstUnreadAnchorTests(ZulipTestCase):
         self.assert_json_success(result)
 
         # Send a new message (this will be unread)
-        new_message_id = self.send_stream_message(self.example_user("othello"), "Verona",
-                                                  "test")
+        new_message_id = self.send_stream_message(self.example_user("othello"), "Verona", "test")
 
         # If we call get_messages with use_first_unread_anchor=True, we
         # should get the message we just sent
         messages_response = self.get_messages_response(
-            anchor="first_unread", num_before=0, num_after=1)
+            anchor="first_unread", num_before=0, num_after=1
+        )
         self.assertEqual(messages_response['messages'][0]['id'], new_message_id)
         self.assertEqual(messages_response['anchor'], new_message_id)
 
         # Test with the old way of expressing use_first_unread_anchor=True
         messages_response = self.get_messages_response(
-            anchor=0, num_before=0, num_after=1, use_first_unread_anchor=True)
+            anchor=0, num_before=0, num_after=1, use_first_unread_anchor=True
+        )
         self.assertEqual(messages_response['messages'][0]['id'], new_message_id)
         self.assertEqual(messages_response['anchor'], new_message_id)
 
@@ -76,32 +79,34 @@ class FirstUnreadAnchorTests(ZulipTestCase):
         # call get_messages with use_first_unread_anchor=False and simply
         # save the first message we're returned.
         messages = self.get_messages(
-            anchor=0, num_before=0, num_after=2, use_first_unread_anchor=False)
+            anchor=0, num_before=0, num_after=2, use_first_unread_anchor=False
+        )
         old_message_id = messages[0]['id']
 
         # Verify the message is marked as read
         user_message = UserMessage.objects.get(
-            message_id=old_message_id,
-            user_profile=self.example_user('hamlet'))
+            message_id=old_message_id, user_profile=self.example_user('hamlet')
+        )
         self.assertTrue(user_message.flags.read)
 
         # Let's set this old message to be unread
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([old_message_id]).decode(),
-                                   "op": "remove",
-                                   "flag": "read"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps([old_message_id]).decode(), "op": "remove", "flag": "read"},
+        )
 
         # Verify it's now marked as unread
         user_message = UserMessage.objects.get(
-            message_id=old_message_id,
-            user_profile=self.example_user('hamlet'))
+            message_id=old_message_id, user_profile=self.example_user('hamlet')
+        )
         self.assert_json_success(result)
         self.assertFalse(user_message.flags.read)
 
         # Now if we call get_messages with use_first_unread_anchor=True,
         # we should get the old message we just set to unread
         messages_response = self.get_messages_response(
-            anchor="first_unread", num_before=0, num_after=1)
+            anchor="first_unread", num_before=0, num_after=1
+        )
         self.assertEqual(messages_response['messages'][0]['id'], old_message_id)
         self.assertEqual(messages_response['anchor'], old_message_id)
 
@@ -111,45 +116,55 @@ class FirstUnreadAnchorTests(ZulipTestCase):
         result = self.client_post("/json/mark_all_as_read")
         self.assert_json_success(result)
 
-        new_message_id = self.send_stream_message(self.example_user("othello"), "Verona",
-                                                  "test")
+        new_message_id = self.send_stream_message(self.example_user("othello"), "Verona", "test")
 
         messages_response = self.get_messages_response(
-            anchor="first_unread", num_before=0, num_after=1)
+            anchor="first_unread", num_before=0, num_after=1
+        )
         self.assertEqual(messages_response['messages'][0]['id'], new_message_id)
         self.assertEqual(messages_response['anchor'], new_message_id)
 
-        with mock.patch('zerver.views.message_fetch.get_first_visible_message_id',
-                        return_value=new_message_id):
+        with mock.patch(
+            'zerver.views.message_fetch.get_first_visible_message_id', return_value=new_message_id
+        ):
             messages_response = self.get_messages_response(
-                anchor="first_unread", num_before=0, num_after=1)
+                anchor="first_unread", num_before=0, num_after=1
+            )
         self.assertEqual(messages_response['messages'][0]['id'], new_message_id)
         self.assertEqual(messages_response['anchor'], new_message_id)
 
-        with mock.patch('zerver.views.message_fetch.get_first_visible_message_id',
-                        return_value=new_message_id + 1):
+        with mock.patch(
+            'zerver.views.message_fetch.get_first_visible_message_id',
+            return_value=new_message_id + 1,
+        ):
             messages_reponse = self.get_messages_response(
-                anchor="first_unread", num_before=0, num_after=1)
+                anchor="first_unread", num_before=0, num_after=1
+            )
         self.assert_length(messages_reponse['messages'], 0)
         self.assertIn('anchor', messages_reponse)
 
-        with mock.patch('zerver.views.message_fetch.get_first_visible_message_id',
-                        return_value=new_message_id - 1):
-            messages = self.get_messages(
-                anchor="first_unread", num_before=0, num_after=1)
+        with mock.patch(
+            'zerver.views.message_fetch.get_first_visible_message_id',
+            return_value=new_message_id - 1,
+        ):
+            messages = self.get_messages(anchor="first_unread", num_before=0, num_after=1)
         self.assert_length(messages, 1)
 
 
 class UnreadCountTests(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
-        with mock.patch('zerver.lib.push_notifications.push_notifications_enabled',
-                        return_value = True) as mock_push_notifications_enabled:
+        with mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ) as mock_push_notifications_enabled:
             self.unread_msg_ids = [
                 self.send_personal_message(
-                    self.example_user("iago"), self.example_user("hamlet"), "hello"),
+                    self.example_user("iago"), self.example_user("hamlet"), "hello"
+                ),
                 self.send_personal_message(
-                    self.example_user("iago"), self.example_user("hamlet"), "hello2")]
+                    self.example_user("iago"), self.example_user("hamlet"), "hello2"
+                ),
+            ]
             mock_push_notifications_enabled.assert_called()
 
     # Sending a new message results in unread UserMessages being created
@@ -167,10 +182,10 @@ class UnreadCountTests(ZulipTestCase):
     def test_update_flags(self) -> None:
         self.login('hamlet')
 
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps(self.unread_msg_ids).decode(),
-                                   "op": "add",
-                                   "flag": "read"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps(self.unread_msg_ids).decode(), "op": "add", "flag": "read"},
+        )
         self.assert_json_success(result)
 
         # Ensure we properly set the flags
@@ -181,9 +196,14 @@ class UnreadCountTests(ZulipTestCase):
                 found += 1
         self.assertEqual(found, 2)
 
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([self.unread_msg_ids[1]]).decode(),
-                                   "op": "remove", "flag": "read"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {
+                "messages": orjson.dumps([self.unread_msg_ids[1]]).decode(),
+                "op": "remove",
+                "flag": "read",
+            },
+        )
         self.assert_json_success(result)
 
         # Ensure we properly remove just one flag
@@ -200,23 +220,30 @@ class UnreadCountTests(ZulipTestCase):
         self.subscribe(self.example_user("cordelia"), "test_stream")
 
         message_id = self.send_stream_message(self.example_user("hamlet"), "test_stream", "hello")
-        unrelated_message_id = self.send_stream_message(self.example_user("hamlet"), "Denmark", "hello")
+        unrelated_message_id = self.send_stream_message(
+            self.example_user("hamlet"), "Denmark", "hello"
+        )
 
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            result = self.client_post("/json/mark_stream_as_read", {
-                "stream_id": stream.id,
-            })
+            result = self.client_post(
+                "/json/mark_stream_as_read",
+                {
+                    "stream_id": stream.id,
+                },
+            )
 
         self.assert_json_success(result)
         self.assertTrue(len(events) == 1)
 
         event = events[0]['event']
-        expected = dict(operation='add',
-                        messages=[message_id],
-                        flag='read',
-                        type='update_message_flags',
-                        all=False)
+        expected = dict(
+            operation='add',
+            messages=[message_id],
+            flag='read',
+            type='update_message_flags',
+            all=False,
+        )
 
         differences = [key for key in expected if expected[key] != event[key]]
         self.assertTrue(len(differences) == 0)
@@ -237,18 +264,24 @@ class UnreadCountTests(ZulipTestCase):
     def test_mark_all_in_invalid_stream_read(self) -> None:
         self.login('hamlet')
         invalid_stream_id = "12345678"
-        result = self.client_post("/json/mark_stream_as_read", {
-            "stream_id": invalid_stream_id,
-        })
+        result = self.client_post(
+            "/json/mark_stream_as_read",
+            {
+                "stream_id": invalid_stream_id,
+            },
+        )
         self.assert_json_error(result, 'Invalid stream id')
 
     def test_mark_all_topics_unread_with_invalid_stream_name(self) -> None:
         self.login('hamlet')
         invalid_stream_id = "12345678"
-        result = self.client_post("/json/mark_topic_as_read", {
-            "stream_id": invalid_stream_id,
-            'topic_name': 'whatever',
-        })
+        result = self.client_post(
+            "/json/mark_topic_as_read",
+            {
+                "stream_id": invalid_stream_id,
+                'topic_name': 'whatever',
+            },
+        )
         self.assert_json_error(result, "Invalid stream id")
 
     def test_mark_all_in_stream_topic_read(self) -> None:
@@ -256,24 +289,33 @@ class UnreadCountTests(ZulipTestCase):
         user_profile = self.example_user('hamlet')
         self.subscribe(user_profile, "test_stream")
 
-        message_id = self.send_stream_message(self.example_user("hamlet"), "test_stream", "hello", "test_topic")
-        unrelated_message_id = self.send_stream_message(self.example_user("hamlet"), "Denmark", "hello", "Denmark2")
+        message_id = self.send_stream_message(
+            self.example_user("hamlet"), "test_stream", "hello", "test_topic"
+        )
+        unrelated_message_id = self.send_stream_message(
+            self.example_user("hamlet"), "Denmark", "hello", "Denmark2"
+        )
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            result = self.client_post("/json/mark_topic_as_read", {
-                "stream_id": get_stream("test_stream", user_profile.realm).id,
-                "topic_name": "test_topic",
-            })
+            result = self.client_post(
+                "/json/mark_topic_as_read",
+                {
+                    "stream_id": get_stream("test_stream", user_profile.realm).id,
+                    "topic_name": "test_topic",
+                },
+            )
 
         self.assert_json_success(result)
         self.assertTrue(len(events) == 1)
 
         event = events[0]['event']
-        expected = dict(operation='add',
-                        messages=[message_id],
-                        flag='read',
-                        type='update_message_flags',
-                        all=False)
+        expected = dict(
+            operation='add',
+            messages=[message_id],
+            flag='read',
+            type='update_message_flags',
+            all=False,
+        )
 
         differences = [key for key in expected if expected[key] != event[key]]
         self.assertTrue(len(differences) == 0)
@@ -291,12 +333,16 @@ class UnreadCountTests(ZulipTestCase):
     def test_mark_all_in_invalid_topic_read(self) -> None:
         self.login('hamlet')
         invalid_topic_name = "abc"
-        result = self.client_post("/json/mark_topic_as_read", {
-            "stream_id": get_stream("Denmark", get_realm("zulip")).id,
-            "topic_name": invalid_topic_name,
-        })
+        result = self.client_post(
+            "/json/mark_topic_as_read",
+            {
+                "stream_id": get_stream("Denmark", get_realm("zulip")).id,
+                "topic_name": invalid_topic_name,
+            },
+        )
         self.assert_json_error(result, 'No such topic \'abc\'')
 
+
 class FixUnreadTests(ZulipTestCase):
     def test_fix_unreads(self) -> None:
         user = self.example_user('hamlet')
@@ -304,12 +350,9 @@ class FixUnreadTests(ZulipTestCase):
 
         def send_message(stream_name: str, topic_name: str) -> int:
             msg_id = self.send_stream_message(
-                self.example_user("othello"),
-                stream_name,
-                topic_name=topic_name)
-            um = UserMessage.objects.get(
-                user_profile=user,
-                message_id=msg_id)
+                self.example_user("othello"), stream_name, topic_name=topic_name
+            )
+            um = UserMessage.objects.get(user_profile=user, message_id=msg_id)
             return um.id
 
         def assert_read(user_message_id: int) -> None:
@@ -342,11 +385,11 @@ class FixUnreadTests(ZulipTestCase):
             )
 
         def force_unsubscribe(stream_name: str) -> None:
-            '''
+            """
             We don't want side effects here, since the eventual
             unsubscribe path may mark messages as read, defeating
             the test setup here.
-            '''
+            """
             sub = get_subscription(stream_name, user)
             sub.active = False
             sub.save()
@@ -373,19 +416,24 @@ class FixUnreadTests(ZulipTestCase):
         assert_unread(um_unsubscribed_id)
 
         # fix unsubscribed
-        with connection.cursor() as cursor, \
-                self.assertLogs('zulip.fix_unreads', 'INFO') as info_logs:
+        with connection.cursor() as cursor, self.assertLogs(
+            'zulip.fix_unreads', 'INFO'
+        ) as info_logs:
             fix_unsubscribed(cursor, user)
 
         self.assertEqual(info_logs.output[0], 'INFO:zulip.fix_unreads:get recipients')
         self.assertTrue('INFO:zulip.fix_unreads:[' in info_logs.output[1])
         self.assertTrue('INFO:zulip.fix_unreads:elapsed time:' in info_logs.output[2])
-        self.assertEqual(info_logs.output[3],
-                         'INFO:zulip.fix_unreads:finding unread messages for non-active streams')
+        self.assertEqual(
+            info_logs.output[3],
+            'INFO:zulip.fix_unreads:finding unread messages for non-active streams',
+        )
         self.assertEqual(info_logs.output[4], 'INFO:zulip.fix_unreads:rows found: 1')
         self.assertTrue('INFO:zulip.fix_unreads:elapsed time:' in info_logs.output[5])
-        self.assertEqual(info_logs.output[6],
-                         'INFO:zulip.fix_unreads:fixing unread messages for non-active streams')
+        self.assertEqual(
+            info_logs.output[6],
+            'INFO:zulip.fix_unreads:fixing unread messages for non-active streams',
+        )
         self.assertTrue('INFO:zulip.fix_unreads:elapsed time:' in info_logs.output[7])
 
         # Muted messages don't change.
@@ -404,8 +452,10 @@ class FixUnreadTests(ZulipTestCase):
         self.assertEqual(info_logs.output[1], 'INFO:zulip.fix_unreads:get recipients')
         self.assertTrue('INFO:zulip.fix_unreads:[' in info_logs.output[2])
         self.assertTrue('INFO:zulip.fix_unreads:elapsed time:' in info_logs.output[3])
-        self.assertEqual(info_logs.output[4],
-                         'INFO:zulip.fix_unreads:finding unread messages for non-active streams')
+        self.assertEqual(
+            info_logs.output[4],
+            'INFO:zulip.fix_unreads:finding unread messages for non-active streams',
+        )
         self.assertEqual(info_logs.output[5], 'INFO:zulip.fix_unreads:rows found: 0')
         self.assertTrue('INFO:zulip.fix_unreads:elapsed time:' in info_logs.output[6])
 
@@ -414,16 +464,24 @@ class FixUnreadTests(ZulipTestCase):
         assert_unread(um_muted_stream_id)
         assert_read(um_unsubscribed_id)
 
+
 class PushNotificationMarkReadFlowsTest(ZulipTestCase):
     def get_mobile_push_notification_ids(self, user_profile: UserProfile) -> List[int]:
-        return list(UserMessage.objects.filter(
-            user_profile=user_profile,
-        ).extra(
-            where=[UserMessage.where_active_push_notification()],
-        ).order_by("message_id").values_list("message_id", flat=True))
+        return list(
+            UserMessage.objects.filter(
+                user_profile=user_profile,
+            )
+            .extra(
+                where=[UserMessage.where_active_push_notification()],
+            )
+            .order_by("message_id")
+            .values_list("message_id", flat=True)
+        )
 
     @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True)
-    def test_track_active_mobile_push_notifications(self, mock_push_notifications: mock.MagicMock) -> None:
+    def test_track_active_mobile_push_notifications(
+        self, mock_push_notifications: mock.MagicMock
+    ) -> None:
         mock_push_notifications.return_value = True
         self.login('hamlet')
         user_profile = self.example_user('hamlet')
@@ -431,49 +489,78 @@ class PushNotificationMarkReadFlowsTest(ZulipTestCase):
         second_stream = self.subscribe(user_profile, "second_stream")
 
         property_name = "push_notifications"
-        result = self.api_post(user_profile, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": True,
-                                                                    "stream_id": stream.id}]).decode()})
-        result = self.api_post(user_profile, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": True,
-                                                                    "stream_id": second_stream.id}]).decode()})
+        result = self.api_post(
+            user_profile,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": True, "stream_id": stream.id}]
+                ).decode()
+            },
+        )
+        result = self.api_post(
+            user_profile,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": True, "stream_id": second_stream.id}]
+                ).decode()
+            },
+        )
         self.assert_json_success(result)
         self.assertEqual(self.get_mobile_push_notification_ids(user_profile), [])
 
-        message_id = self.send_stream_message(self.example_user("cordelia"), "test_stream", "hello", "test_topic")
-        second_message_id = self.send_stream_message(self.example_user("cordelia"), "test_stream", "hello", "other_topic")
-        third_message_id = self.send_stream_message(self.example_user("cordelia"), "second_stream", "hello", "test_topic")
+        message_id = self.send_stream_message(
+            self.example_user("cordelia"), "test_stream", "hello", "test_topic"
+        )
+        second_message_id = self.send_stream_message(
+            self.example_user("cordelia"), "test_stream", "hello", "other_topic"
+        )
+        third_message_id = self.send_stream_message(
+            self.example_user("cordelia"), "second_stream", "hello", "test_topic"
+        )
 
-        self.assertEqual(self.get_mobile_push_notification_ids(user_profile),
-                         [message_id, second_message_id, third_message_id])
+        self.assertEqual(
+            self.get_mobile_push_notification_ids(user_profile),
+            [message_id, second_message_id, third_message_id],
+        )
 
-        result = self.client_post("/json/mark_topic_as_read", {
-            "stream_id": str(stream.id),
-            "topic_name": "test_topic",
-        })
+        result = self.client_post(
+            "/json/mark_topic_as_read",
+            {
+                "stream_id": str(stream.id),
+                "topic_name": "test_topic",
+            },
+        )
 
         self.assert_json_success(result)
-        self.assertEqual(self.get_mobile_push_notification_ids(user_profile),
-                         [second_message_id, third_message_id])
+        self.assertEqual(
+            self.get_mobile_push_notification_ids(user_profile),
+            [second_message_id, third_message_id],
+        )
 
-        result = self.client_post("/json/mark_stream_as_read", {
-            "stream_id": str(stream.id),
-            "topic_name": "test_topic",
-        })
-        self.assertEqual(self.get_mobile_push_notification_ids(user_profile),
-                         [third_message_id])
+        result = self.client_post(
+            "/json/mark_stream_as_read",
+            {
+                "stream_id": str(stream.id),
+                "topic_name": "test_topic",
+            },
+        )
+        self.assertEqual(self.get_mobile_push_notification_ids(user_profile), [third_message_id])
 
-        fourth_message_id = self.send_stream_message(self.example_user("cordelia"), "test_stream", "hello", "test_topic")
-        self.assertEqual(self.get_mobile_push_notification_ids(user_profile),
-                         [third_message_id, fourth_message_id])
+        fourth_message_id = self.send_stream_message(
+            self.example_user("cordelia"), "test_stream", "hello", "test_topic"
+        )
+        self.assertEqual(
+            self.get_mobile_push_notification_ids(user_profile),
+            [third_message_id, fourth_message_id],
+        )
 
         result = self.client_post("/json/mark_all_as_read", {})
-        self.assertEqual(self.get_mobile_push_notification_ids(user_profile),
-                         [])
+        self.assertEqual(self.get_mobile_push_notification_ids(user_profile), [])
         mock_push_notifications.assert_called()
 
+
 class GetUnreadMsgsTest(ZulipTestCase):
     def mute_stream(self, user_profile: UserProfile, stream: Stream) -> None:
         recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM)
@@ -484,8 +571,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
         subscription.is_muted = True
         subscription.save()
 
-    def mute_topic(self, user_profile: UserProfile, stream_name: str,
-                   topic_name: str) -> None:
+    def mute_topic(self, user_profile: UserProfile, stream_name: str, topic_name: str) -> None:
         realm = user_profile.realm
         stream = get_stream(stream_name, realm)
         recipient = stream.recipient
@@ -522,7 +608,8 @@ class GetUnreadMsgsTest(ZulipTestCase):
                     sender=cordelia,
                     stream_name=stream_name,
                     topic_name=topic_name,
-                ) for i in range(3)
+                )
+                for i in range(3)
             ]
             all_message_ids |= set(message_ids[topic_name])
 
@@ -597,10 +684,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
             set(huddle1_message_ids) | set(huddle2_message_ids),
         )
 
-        huddle_string = ','.join(
-            str(uid)
-            for uid in sorted([cordelia.id, hamlet.id, othello.id])
-        )
+        huddle_string = ','.join(str(uid) for uid in sorted([cordelia.id, hamlet.id, othello.id]))
 
         self.assertEqual(
             huddle_dict[huddle1_message_ids[0]],
@@ -612,15 +696,9 @@ class GetUnreadMsgsTest(ZulipTestCase):
         othello = self.example_user('othello')
         hamlet = self.example_user('hamlet')
 
-        cordelia_pm_message_ids = [
-            self.send_personal_message(cordelia, hamlet)
-            for i in range(3)
-        ]
+        cordelia_pm_message_ids = [self.send_personal_message(cordelia, hamlet) for i in range(3)]
 
-        othello_pm_message_ids = [
-            self.send_personal_message(othello, hamlet)
-            for i in range(3)
-        ]
+        othello_pm_message_ids = [self.send_personal_message(othello, hamlet) for i in range(3)]
 
         raw_unread_data = get_raw_unread_data(
             user_profile=hamlet,
@@ -801,12 +879,16 @@ class GetUnreadMsgsTest(ZulipTestCase):
         self.assertEqual(unread_stream['sender_ids'], [sender_id])
 
         unread_stream = result['streams'][2]
-        self.assertEqual(unread_stream['stream_id'], get_stream('Muted Stream', user_profile.realm).id)
+        self.assertEqual(
+            unread_stream['stream_id'], get_stream('Muted Stream', user_profile.realm).id
+        )
         self.assertEqual(unread_stream['topic'], 'test')
         self.assertEqual(unread_stream['unread_message_ids'], [muted_stream_message_id])
         self.assertEqual(unread_stream['sender_ids'], [sender_id])
 
-        huddle_string = ','.join(str(uid) for uid in sorted([sender_id, user_profile.id, othello.id]))
+        huddle_string = ','.join(
+            str(uid) for uid in sorted([sender_id, user_profile.id, othello.id])
+        )
 
         unread_huddle = result['huddles'][0]
         self.assertEqual(unread_huddle['user_ids_string'], huddle_string)
@@ -890,6 +972,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
         result = get_unread_data()
         self.assertEqual(result['mentions'], [])
 
+
 class MessageAccessTests(ZulipTestCase):
     def test_update_invalid_flags(self) -> None:
         message = self.send_personal_message(
@@ -899,42 +982,50 @@ class MessageAccessTests(ZulipTestCase):
         )
 
         self.login('hamlet')
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([message]).decode(),
-                                   "op": "add",
-                                   "flag": "invalid"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps([message]).decode(), "op": "add", "flag": "invalid"},
+        )
         self.assert_json_error(result, "Invalid flag: 'invalid'")
 
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([message]).decode(),
-                                   "op": "add",
-                                   "flag": "is_private"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps([message]).decode(), "op": "add", "flag": "is_private"},
+        )
         self.assert_json_error(result, "Invalid flag: 'is_private'")
 
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([message]).decode(),
-                                   "op": "add",
-                                   "flag": "active_mobile_push_notification"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {
+                "messages": orjson.dumps([message]).decode(),
+                "op": "add",
+                "flag": "active_mobile_push_notification",
+            },
+        )
         self.assert_json_error(result, "Invalid flag: 'active_mobile_push_notification'")
 
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([message]).decode(),
-                                   "op": "add",
-                                   "flag": "mentioned"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps([message]).decode(), "op": "add", "flag": "mentioned"},
+        )
         self.assert_json_error(result, "Flag not editable: 'mentioned'")
 
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps([message]).decode(),
-                                   "op": "bogus",
-                                   "flag": "starred"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps([message]).decode(), "op": "bogus", "flag": "starred"},
+        )
         self.assert_json_error(result, "Invalid message flag operation: 'bogus'")
 
-    def change_star(self, messages: List[int], add: bool=True, **kwargs: Any) -> HttpResponse:
-        return self.client_post("/json/messages/flags",
-                                {"messages": orjson.dumps(messages).decode(),
-                                 "op": "add" if add else "remove",
-                                 "flag": "starred"},
-                                **kwargs)
+    def change_star(self, messages: List[int], add: bool = True, **kwargs: Any) -> HttpResponse:
+        return self.client_post(
+            "/json/messages/flags",
+            {
+                "messages": orjson.dumps(messages).decode(),
+                "op": "add" if add else "remove",
+                "flag": "starred",
+            },
+            **kwargs,
+        )
 
     def test_change_star(self) -> None:
         """
@@ -942,9 +1033,11 @@ class MessageAccessTests(ZulipTestCase):
         POST /json/messages/flags.
         """
         self.login('hamlet')
-        message_ids = [self.send_personal_message(self.example_user("hamlet"),
-                                                  self.example_user("hamlet"),
-                                                  "test")]
+        message_ids = [
+            self.send_personal_message(
+                self.example_user("hamlet"), self.example_user("hamlet"), "test"
+            )
+        ]
 
         # Star a message.
         result = self.change_star(message_ids)
@@ -997,16 +1090,16 @@ class MessageAccessTests(ZulipTestCase):
                 "test_read_message",
             ),
         ]
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps(sent_message_ids).decode(),
-                                   "op": "add",
-                                   "flag": "read"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps(sent_message_ids).decode(), "op": "add", "flag": "read"},
+        )
 
         # We can't change flags other than "starred" on historical messages:
-        result = self.client_post("/json/messages/flags",
-                                  {"messages": orjson.dumps(message_ids).decode(),
-                                   "op": "add",
-                                   "flag": "read"})
+        result = self.client_post(
+            "/json/messages/flags",
+            {"messages": orjson.dumps(message_ids).decode(), "op": "add", "flag": "read"},
+        )
         self.assert_json_error(result, 'Invalid message(s)')
 
         # Trying to change a list of more than one historical message fails
@@ -1073,8 +1166,7 @@ class MessageAccessTests(ZulipTestCase):
         self.assert_json_error(result, 'Invalid message(s)')
 
         stream_name = "private_stream_2"
-        self.make_stream(stream_name, invite_only=True,
-                         history_public_to_subscribers=True)
+        self.make_stream(stream_name, invite_only=True, history_public_to_subscribers=True)
         self.subscribe(self.example_user("hamlet"), stream_name)
         self.login('hamlet')
         message_ids = [
@@ -1100,12 +1192,15 @@ class MessageAccessTests(ZulipTestCase):
         sender = self.example_user('hamlet')
         self.login_user(sender)
         content = "Test message for star"
-        self.send_stream_message(sender, "Verona",
-                                 content=content)
+        self.send_stream_message(sender, "Verona", content=content)
 
-        sent_message = UserMessage.objects.filter(
-            user_profile=self.example_user('hamlet'),
-        ).order_by("id").reverse()[0]
+        sent_message = (
+            UserMessage.objects.filter(
+                user_profile=self.example_user('hamlet'),
+            )
+            .order_by("id")
+            .reverse()[0]
+        )
         self.assertEqual(sent_message.message.content, content)
         self.assertFalse(sent_message.flags.starred)
 
@@ -1184,25 +1279,25 @@ class MessageAccessTests(ZulipTestCase):
         self.login_user(user)
 
         stream_name = "private_stream"
-        stream = self.make_stream(stream_name, invite_only=True,
-                                  history_public_to_subscribers=False)
+        stream = self.make_stream(
+            stream_name, invite_only=True, history_public_to_subscribers=False
+        )
 
         self.subscribe(user, stream_name)
         # Send a message before subscribing a new user to stream
-        message_one_id = self.send_stream_message(user,
-                                                  stream_name, "Message one")
+        message_one_id = self.send_stream_message(user, stream_name, "Message one")
 
         later_subscribed_user = self.example_user("cordelia")
         # Subscribe a user to private-protected history stream
         self.subscribe(later_subscribed_user, stream_name)
 
         # Send a message after subscribing a new user to stream
-        message_two_id = self.send_stream_message(user,
-                                                  stream_name, "Message two")
+        message_two_id = self.send_stream_message(user, stream_name, "Message two")
 
         message_ids = [message_one_id, message_two_id]
-        messages = [Message.objects.select_related().get(id=message_id)
-                    for message_id in message_ids]
+        messages = [
+            Message.objects.select_related().get(id=message_id) for message_id in message_ids
+        ]
 
         filtered_messages = bulk_access_messages(later_subscribed_user, messages)
 
@@ -1233,19 +1328,18 @@ class MessageAccessTests(ZulipTestCase):
         # Testing messages accessiblity including a public stream message
         stream_name = "public_stream"
         self.subscribe(user, stream_name)
-        message_one_id = self.send_stream_message(user,
-                                                  stream_name, "Message one")
+        message_one_id = self.send_stream_message(user, stream_name, "Message one")
 
         later_subscribed_user = self.example_user("cordelia")
         self.subscribe(later_subscribed_user, stream_name)
 
         # Send a message after subscribing a new user to stream
-        message_two_id = self.send_stream_message(user,
-                                                  stream_name, "Message two")
+        message_two_id = self.send_stream_message(user, stream_name, "Message two")
 
         message_ids = [message_one_id, message_two_id]
-        messages = [Message.objects.select_related().get(id=message_id)
-                    for message_id in message_ids]
+        messages = [
+            Message.objects.select_related().get(id=message_id) for message_id in message_ids
+        ]
 
         # All public stream messages are always accessible
         filtered_messages = bulk_access_messages(later_subscribed_user, messages)
@@ -1263,9 +1357,9 @@ class PersonalMessagesFlagTest(ZulipTestCase):
         Make sure `is_private` flag is not leaked to the API.
         """
         self.login('hamlet')
-        self.send_personal_message(self.example_user("hamlet"),
-                                   self.example_user("cordelia"),
-                                   "test")
+        self.send_personal_message(
+            self.example_user("hamlet"), self.example_user("cordelia"), "test"
+        )
 
         for msg in self.get_messages():
             self.assertNotIn('is_private', msg['flags'])
diff --git a/zerver/tests/test_message_send.py b/zerver/tests/test_message_send.py
index b2ab3b13e3..49f178eace 100644
--- a/zerver/tests/test_message_send.py
+++ b/zerver/tests/test_message_send.py
@@ -68,8 +68,9 @@ from zerver.views.message_send import InvalidMirrorInput
 
 
 class MessagePOSTTest(ZulipTestCase):
-
-    def _send_and_verify_message(self, user: UserProfile, stream_name: str, error_msg: Optional[str]=None) -> None:
+    def _send_and_verify_message(
+        self, user: UserProfile, stream_name: str, error_msg: Optional[str] = None
+    ) -> None:
         if error_msg is None:
             msg_id = self.send_stream_message(user, stream_name)
             result = self.api_get(user, '/json/messages/' + str(msg_id))
@@ -84,11 +85,16 @@ class MessagePOSTTest(ZulipTestCase):
         successful.
         """
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": "Verona",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": "Test topic"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+            },
+        )
         self.assert_json_success(result)
 
     def test_api_message_to_stream_by_name(self) -> None:
@@ -96,11 +102,17 @@ class MessagePOSTTest(ZulipTestCase):
         Same as above, but for the API view
         """
         user = self.example_user('hamlet')
-        result = self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                          "to": "Verona",
-                                                          "client": "test suite",
-                                                          "content": "Test message",
-                                                          "topic": "Test topic"})
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+            },
+        )
         self.assert_json_success(result)
 
     def test_message_to_stream_with_nonexistent_id(self) -> None:
@@ -110,7 +122,8 @@ class MessagePOSTTest(ZulipTestCase):
             user_profile=cordelia,
         )
         result = self.api_post(
-            bot, "/api/v1/messages",
+            bot,
+            "/api/v1/messages",
             {
                 "type": "stream",
                 "to": orjson.dumps([99999]).decode(),
@@ -122,8 +135,10 @@ class MessagePOSTTest(ZulipTestCase):
         self.assert_json_error(result, "Stream with ID '99999' does not exist")
 
         msg = self.get_last_message()
-        expected = ("Your bot `whatever-bot@zulip.testserver` tried to send a message to "
-                    "stream ID 99999, but there is no stream with that ID.")
+        expected = (
+            "Your bot `whatever-bot@zulip.testserver` tried to send a message to "
+            "stream ID 99999, but there is no stream with that ID."
+        )
         self.assertEqual(msg.content, expected)
 
     def test_message_to_stream_by_id(self) -> None:
@@ -134,11 +149,16 @@ class MessagePOSTTest(ZulipTestCase):
         self.login('hamlet')
         realm = get_realm('zulip')
         stream = get_stream('Verona', realm)
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": orjson.dumps([stream.id]).decode(),
-                                                     "client": "test suite",
-                                                     "content": "Stream message by ID.",
-                                                     "topic": "Test topic for stream ID message"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": orjson.dumps([stream.id]).decode(),
+                "client": "test suite",
+                "content": "Stream message by ID.",
+                "topic": "Test topic for stream ID message",
+            },
+        )
         self.assert_json_success(result)
         sent_message = self.get_last_message()
         self.assertEqual(sent_message.content, "Stream message by ID.")
@@ -167,15 +187,21 @@ class MessagePOSTTest(ZulipTestCase):
         self.login_user(non_admin_profile)
 
         # Non admins and their owned bots cannot send to STREAM_POST_POLICY_ADMINS streams
-        self._send_and_verify_message(non_admin_profile, stream_name,
-                                      "Only organization administrators can send to this stream.")
+        self._send_and_verify_message(
+            non_admin_profile,
+            stream_name,
+            "Only organization administrators can send to this stream.",
+        )
         non_admin_owned_bot = self.create_test_bot(
             short_name='whatever2',
             full_name='whatever2',
             user_profile=non_admin_profile,
         )
-        self._send_and_verify_message(non_admin_owned_bot, stream_name,
-                                      "Only organization administrators can send to this stream.")
+        self._send_and_verify_message(
+            non_admin_owned_bot,
+            stream_name,
+            "Only organization administrators can send to this stream.",
+        )
 
         # Bots without owner (except cross realm bot) cannot send to announcement only streams
         bot_without_owner = do_create_user(
@@ -185,18 +211,24 @@ class MessagePOSTTest(ZulipTestCase):
             full_name='freebot',
             bot_type=UserProfile.DEFAULT_BOT,
         )
-        self._send_and_verify_message(bot_without_owner, stream_name,
-                                      "Only organization administrators can send to this stream.")
+        self._send_and_verify_message(
+            bot_without_owner,
+            stream_name,
+            "Only organization administrators can send to this stream.",
+        )
 
         # Cross realm bots should be allowed
         notification_bot = get_system_bot("notification-bot@zulip.com")
-        internal_send_stream_message(stream.realm, notification_bot, stream,
-                                     'Test topic', 'Test message by notification bot')
+        internal_send_stream_message(
+            stream.realm, notification_bot, stream, 'Test topic', 'Test message by notification bot'
+        )
         self.assertEqual(self.get_last_message().content, 'Test message by notification bot')
 
         guest_profile = self.example_user("polonius")
         # Guests cannot send to non-STREAM_POST_POLICY_EVERYONE streams
-        self._send_and_verify_message(guest_profile, stream_name, "Only organization administrators can send to this stream.")
+        self._send_and_verify_message(
+            guest_profile, stream_name, "Only organization administrators can send to this stream."
+        )
 
     def test_sending_message_as_stream_post_policy_restrict_new_members(self) -> None:
         """
@@ -235,15 +267,17 @@ class MessagePOSTTest(ZulipTestCase):
 
         # Non admins and their owned bots can send to STREAM_POST_POLICY_RESTRICT_NEW_MEMBERS streams,
         # if the user is not a new member
-        self._send_and_verify_message(non_admin_profile, stream_name,
-                                      "New members cannot send to this stream.")
+        self._send_and_verify_message(
+            non_admin_profile, stream_name, "New members cannot send to this stream."
+        )
         non_admin_owned_bot = self.create_test_bot(
             short_name='whatever2',
             full_name='whatever2',
             user_profile=non_admin_profile,
         )
-        self._send_and_verify_message(non_admin_owned_bot, stream_name,
-                                      "New members cannot send to this stream.")
+        self._send_and_verify_message(
+            non_admin_owned_bot, stream_name, "New members cannot send to this stream."
+        )
 
         # Bots without owner (except cross realm bot) cannot send to announcement only stream
         bot_without_owner = do_create_user(
@@ -253,18 +287,22 @@ class MessagePOSTTest(ZulipTestCase):
             full_name='freebot',
             bot_type=UserProfile.DEFAULT_BOT,
         )
-        self._send_and_verify_message(bot_without_owner, stream_name,
-                                      "New members cannot send to this stream.")
+        self._send_and_verify_message(
+            bot_without_owner, stream_name, "New members cannot send to this stream."
+        )
 
         # Cross realm bots should be allowed
         notification_bot = get_system_bot("notification-bot@zulip.com")
-        internal_send_stream_message(stream.realm, notification_bot, stream,
-                                     'Test topic', 'Test message by notification bot')
+        internal_send_stream_message(
+            stream.realm, notification_bot, stream, 'Test topic', 'Test message by notification bot'
+        )
         self.assertEqual(self.get_last_message().content, 'Test message by notification bot')
 
         guest_profile = self.example_user("polonius")
         # Guests cannot send to non-STREAM_POST_POLICY_EVERYONE streams
-        self._send_and_verify_message(guest_profile, stream_name, "Guests cannot send to this stream.")
+        self._send_and_verify_message(
+            guest_profile, stream_name, "Guests cannot send to this stream."
+        )
 
     def test_api_message_with_default_to(self) -> None:
         """
@@ -275,11 +313,17 @@ class MessagePOSTTest(ZulipTestCase):
         user.default_sending_stream_id = get_stream('Verona', user.realm).id
         user.save()
         # The `to` field is required according to OpenAPI specification
-        result = self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                          "client": "test suite",
-                                                          "content": "Test message no to",
-                                                          "topic": "Test topic"},
-                               intentionally_undocumented=True)
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "client": "test suite",
+                "content": "Test message no to",
+                "topic": "Test topic",
+            },
+            intentionally_undocumented=True,
+        )
         self.assert_json_success(result)
 
         sent_message = self.get_last_message()
@@ -291,11 +335,16 @@ class MessagePOSTTest(ZulipTestCase):
         """
         self.login('hamlet')
         self.assertFalse(Stream.objects.filter(name="nonexistent_stream"))
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": "nonexistent_stream",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": "Test topic"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": "nonexistent_stream",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+            },
+        )
         self.assert_json_error(result, "Stream 'nonexistent_stream' does not exist")
 
     def test_message_to_nonexistent_stream_with_bad_characters(self) -> None:
@@ -304,12 +353,19 @@ class MessagePOSTTest(ZulipTestCase):
         """
         self.login('hamlet')
         self.assertFalse(Stream.objects.filter(name="""&<"'><non-existent>"""))
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": """&<"'><non-existent>""",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": "Test topic"})
-        self.assert_json_error(result, "Stream '&amp;&lt;&quot;&#x27;&gt;&lt;non-existent&gt;' does not exist")
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": """&<"'><non-existent>""",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+            },
+        )
+        self.assert_json_error(
+            result, "Stream '&amp;&lt;&quot;&#x27;&gt;&lt;non-existent&gt;' does not exist"
+        )
 
     def test_personal_message(self) -> None:
         """
@@ -318,10 +374,15 @@ class MessagePOSTTest(ZulipTestCase):
         user_profile = self.example_user("hamlet")
         self.login_user(user_profile)
         othello = self.example_user('othello')
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": othello.email})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": othello.email,
+            },
+        )
         self.assert_json_success(result)
         message_id = orjson.loads(result.content)['id']
 
@@ -333,10 +394,15 @@ class MessagePOSTTest(ZulipTestCase):
         self.assertEqual(recent_conversation['max_message_id'], message_id)
 
         # Now send a message to yourself and see how that interacts with the data structure
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": user_profile.email})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": user_profile.email,
+            },
+        )
         self.assert_json_success(result)
         self_message_id = orjson.loads(result.content)['id']
 
@@ -384,18 +450,24 @@ class MessagePOSTTest(ZulipTestCase):
                 "type": "private",
                 "content": "Test message",
                 "client": "test suite",
-                "to": orjson.dumps([self.example_user("othello").id,
-                                    self.example_user("cordelia").id]).decode(),
+                "to": orjson.dumps(
+                    [self.example_user("othello").id, self.example_user("cordelia").id]
+                ).decode(),
             },
         )
         self.assert_json_success(result)
 
         msg = self.get_last_message()
         self.assertEqual("Test message", msg.content)
-        self.assertEqual(msg.recipient_id, get_huddle_recipient(
-            {self.example_user("hamlet").id,
-             self.example_user("othello").id,
-             self.example_user("cordelia").id}).id,
+        self.assertEqual(
+            msg.recipient_id,
+            get_huddle_recipient(
+                {
+                    self.example_user("hamlet").id,
+                    self.example_user("othello").id,
+                    self.example_user("cordelia").id,
+                }
+            ).id,
         )
 
     def test_personal_message_copying_self(self) -> None:
@@ -406,11 +478,15 @@ class MessagePOSTTest(ZulipTestCase):
         hamlet = self.example_user('hamlet')
         othello = self.example_user('othello')
         self.login_user(hamlet)
-        result = self.client_post("/json/messages", {
-            "type": "private",
-            "content": "Test message",
-            "client": "test suite",
-            "to": orjson.dumps([hamlet.id, othello.id]).decode()})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": orjson.dumps([hamlet.id, othello.id]).decode(),
+            },
+        )
         self.assert_json_success(result)
         msg = self.get_last_message()
         # Verify that we're not actually on the "recipient list"
@@ -421,10 +497,15 @@ class MessagePOSTTest(ZulipTestCase):
         Sending a personal message to an invalid email returns error JSON.
         """
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": "nonexistent"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": "nonexistent",
+            },
+        )
         self.assert_json_error(result, "Invalid email 'nonexistent'")
 
     def test_personal_message_to_deactivated_user(self) -> None:
@@ -436,18 +517,26 @@ class MessagePOSTTest(ZulipTestCase):
         do_deactivate_user(othello)
         self.login('hamlet')
 
-        result = self.client_post("/json/messages", {
-            "type": "private",
-            "content": "Test message",
-            "client": "test suite",
-            "to": orjson.dumps([othello.id]).decode()})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": orjson.dumps([othello.id]).decode(),
+            },
+        )
         self.assert_json_error(result, f"'{othello.email}' is no longer using Zulip.")
 
-        result = self.client_post("/json/messages", {
-            "type": "private",
-            "content": "Test message",
-            "client": "test suite",
-            "to": orjson.dumps([othello.id, cordelia.id]).decode()})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "test suite",
+                "to": orjson.dumps([othello.id, cordelia.id]).decode(),
+            },
+        )
         self.assert_json_error(result, f"'{othello.email}' is no longer using Zulip.")
 
     def test_invalid_type(self) -> None:
@@ -456,10 +545,15 @@ class MessagePOSTTest(ZulipTestCase):
         """
         self.login('hamlet')
         othello = self.example_user('othello')
-        result = self.client_post("/json/messages", {"type": "invalid type",
-                                                     "content": "Test message",
-                                                     "client": "test suite",
-                                                     "to": othello.email})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "invalid type",
+                "content": "Test message",
+                "client": "test suite",
+                "to": othello.email,
+            },
+        )
         self.assert_json_error(result, "Invalid message type")
 
     def test_empty_message(self) -> None:
@@ -468,10 +562,10 @@ class MessagePOSTTest(ZulipTestCase):
         """
         self.login('hamlet')
         othello = self.example_user('othello')
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": " ",
-                                                     "client": "test suite",
-                                                     "to": othello.email})
+        result = self.client_post(
+            "/json/messages",
+            {"type": "private", "content": " ", "client": "test suite", "to": othello.email},
+        )
         self.assert_json_error(result, "Message must not be empty")
 
     def test_empty_string_topic(self) -> None:
@@ -479,11 +573,16 @@ class MessagePOSTTest(ZulipTestCase):
         Sending a message that has empty string topic should fail
         """
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": "Verona",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": ""})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "",
+            },
+        )
         self.assert_json_error(result, "Topic can't be empty")
 
     def test_missing_topic(self) -> None:
@@ -491,10 +590,10 @@ class MessagePOSTTest(ZulipTestCase):
         Sending a message without topic should fail
         """
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": "Verona",
-                                                     "client": "test suite",
-                                                     "content": "Test message"})
+        result = self.client_post(
+            "/json/messages",
+            {"type": "stream", "to": "Verona", "client": "test suite", "content": "Test message"},
+        )
         self.assert_json_error(result, "Missing topic")
 
     def test_invalid_message_type(self) -> None:
@@ -502,11 +601,16 @@ class MessagePOSTTest(ZulipTestCase):
         Messages other than the type of "private" or "stream" are considered as invalid
         """
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "invalid",
-                                                     "to": "Verona",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": "Test topic"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "invalid",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+            },
+        )
         self.assert_json_error(result, "Invalid message type")
 
     def test_private_message_without_recipients(self) -> None:
@@ -514,37 +618,48 @@ class MessagePOSTTest(ZulipTestCase):
         Sending private message without recipients should fail
         """
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "private",
-                                                     "content": "Test content",
-                                                     "client": "test suite",
-                                                     "to": ""})
+        result = self.client_post(
+            "/json/messages",
+            {"type": "private", "content": "Test content", "client": "test suite", "to": ""},
+        )
         self.assert_json_error(result, "Message must have recipients")
 
     def test_mirrored_huddle(self) -> None:
         """
         Sending a mirrored huddle message works
         """
-        result = self.api_post(self.mit_user("starnine"),
-                               "/json/messages", {"type": "private",
-                                                  "sender": self.mit_email("sipbtest"),
-                                                  "content": "Test message",
-                                                  "client": "zephyr_mirror",
-                                                  "to": orjson.dumps([self.mit_email("starnine"),
-                                                                      self.mit_email("espuser")]).decode()},
-                               subdomain="zephyr")
+        result = self.api_post(
+            self.mit_user("starnine"),
+            "/json/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": orjson.dumps(
+                    [self.mit_email("starnine"), self.mit_email("espuser")]
+                ).decode(),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_success(result)
 
     def test_mirrored_personal(self) -> None:
         """
         Sending a mirrored personal message works
         """
-        result = self.api_post(self.mit_user("starnine"),
-                               "/json/messages", {"type": "private",
-                                                  "sender": self.mit_email("sipbtest"),
-                                                  "content": "Test message",
-                                                  "client": "zephyr_mirror",
-                                                  "to": self.mit_email("starnine")},
-                               subdomain="zephyr")
+        result = self.api_post(
+            self.mit_user("starnine"),
+            "/json/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": self.mit_email("starnine"),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_success(result)
 
     def test_mirrored_personal_browser(self) -> None:
@@ -553,59 +668,83 @@ class MessagePOSTTest(ZulipTestCase):
         """
         user = self.mit_user('starnine')
         self.login_user(user)
-        result = self.client_post("/json/messages",
-                                  {"type": "private",
-                                   "sender": self.mit_email("sipbtest"),
-                                   "content": "Test message",
-                                   "client": "zephyr_mirror",
-                                   "to": self.mit_email("starnine")},
-                                  subdomain="zephyr")
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": self.mit_email("starnine"),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "Invalid mirrored message")
 
     def test_mirrored_personal_to_someone_else(self) -> None:
         """
         Sending a mirrored personal message to someone else is not allowed.
         """
-        result = self.api_post(self.mit_user("starnine"), "/api/v1/messages",
-                               {"type": "private",
-                                "sender": self.mit_email("sipbtest"),
-                                "content": "Test message",
-                                "client": "zephyr_mirror",
-                                "to": self.mit_email("espuser")},
-                               subdomain="zephyr")
+        result = self.api_post(
+            self.mit_user("starnine"),
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": self.mit_email("espuser"),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "User not authorized for this query")
 
     def test_duplicated_mirrored_huddle(self) -> None:
         """
         Sending two mirrored huddles in the row return the same ID
         """
-        msg = {"type": "private",
-               "sender": self.mit_email("sipbtest"),
-               "content": "Test message",
-               "client": "zephyr_mirror",
-               "to": orjson.dumps([self.mit_email("espuser"),
-                                   self.mit_email("starnine")]).decode()}
+        msg = {
+            "type": "private",
+            "sender": self.mit_email("sipbtest"),
+            "content": "Test message",
+            "client": "zephyr_mirror",
+            "to": orjson.dumps([self.mit_email("espuser"), self.mit_email("starnine")]).decode(),
+        }
 
-        with mock.patch('DNS.dnslookup', return_value=[['starnine:*:84233:101:Athena Consulting Exchange User,,,:/mit/starnine:/bin/bash']]):
-            result1 = self.api_post(self.mit_user("starnine"), "/api/v1/messages", msg,
-                                    subdomain="zephyr")
+        with mock.patch(
+            'DNS.dnslookup',
+            return_value=[
+                ['starnine:*:84233:101:Athena Consulting Exchange User,,,:/mit/starnine:/bin/bash']
+            ],
+        ):
+            result1 = self.api_post(
+                self.mit_user("starnine"), "/api/v1/messages", msg, subdomain="zephyr"
+            )
             self.assert_json_success(result1)
 
-        with mock.patch('DNS.dnslookup', return_value=[['espuser:*:95494:101:Esp Classroom,,,:/mit/espuser:/bin/athena/bash']]):
-            result2 = self.api_post(self.mit_user("espuser"), "/api/v1/messages", msg,
-                                    subdomain="zephyr")
+        with mock.patch(
+            'DNS.dnslookup',
+            return_value=[['espuser:*:95494:101:Esp Classroom,,,:/mit/espuser:/bin/athena/bash']],
+        ):
+            result2 = self.api_post(
+                self.mit_user("espuser"), "/api/v1/messages", msg, subdomain="zephyr"
+            )
             self.assert_json_success(result2)
 
-        self.assertEqual(orjson.loads(result1.content)['id'],
-                         orjson.loads(result2.content)['id'])
+        self.assertEqual(orjson.loads(result1.content)['id'], orjson.loads(result2.content)['id'])
 
     def test_message_with_null_bytes(self) -> None:
         """
         A message with null bytes in it is handled.
         """
         self.login('hamlet')
-        post_data = {"type": "stream", "to": "Verona", "client": "test suite",
-                     "content": "  I like null bytes \x00 in my content", "topic": "Test topic"}
+        post_data = {
+            "type": "stream",
+            "to": "Verona",
+            "client": "test suite",
+            "content": "  I like null bytes \x00 in my content",
+            "topic": "Test topic",
+        }
         result = self.client_post("/json/messages", post_data)
         self.assert_json_error(result, "Message must not contain null bytes")
 
@@ -614,8 +753,13 @@ class MessagePOSTTest(ZulipTestCase):
         A message with mixed whitespace at the end is cleaned up.
         """
         self.login('hamlet')
-        post_data = {"type": "stream", "to": "Verona", "client": "test suite",
-                     "content": "  I like whitespace at the end! \n\n \n", "topic": "Test topic"}
+        post_data = {
+            "type": "stream",
+            "to": "Verona",
+            "client": "test suite",
+            "content": "  I like whitespace at the end! \n\n \n",
+            "topic": "Test topic",
+        }
         result = self.client_post("/json/messages", post_data)
         self.assert_json_success(result)
         sent_message = self.get_last_message()
@@ -628,14 +772,20 @@ class MessagePOSTTest(ZulipTestCase):
         """
         self.login('hamlet')
         long_message = "A" * (MAX_MESSAGE_LENGTH + 1)
-        post_data = {"type": "stream", "to": "Verona", "client": "test suite",
-                     "content": long_message, "topic": "Test topic"}
+        post_data = {
+            "type": "stream",
+            "to": "Verona",
+            "client": "test suite",
+            "content": long_message,
+            "topic": "Test topic",
+        }
         result = self.client_post("/json/messages", post_data)
         self.assert_json_success(result)
 
         sent_message = self.get_last_message()
-        self.assertEqual(sent_message.content,
-                         "A" * (MAX_MESSAGE_LENGTH - 20) + "\n[message truncated]")
+        self.assertEqual(
+            sent_message.content, "A" * (MAX_MESSAGE_LENGTH - 20) + "\n[message truncated]"
+        )
 
     def test_long_topic(self) -> None:
         """
@@ -644,33 +794,47 @@ class MessagePOSTTest(ZulipTestCase):
         """
         self.login('hamlet')
         long_topic = "A" * (MAX_TOPIC_NAME_LENGTH + 1)
-        post_data = {"type": "stream", "to": "Verona", "client": "test suite",
-                     "content": "test content", "topic": long_topic}
+        post_data = {
+            "type": "stream",
+            "to": "Verona",
+            "client": "test suite",
+            "content": "test content",
+            "topic": long_topic,
+        }
         result = self.client_post("/json/messages", post_data)
         self.assert_json_success(result)
 
         sent_message = self.get_last_message()
-        self.assertEqual(sent_message.topic_name(),
-                         "A" * (MAX_TOPIC_NAME_LENGTH - 3) + "...")
+        self.assertEqual(sent_message.topic_name(), "A" * (MAX_TOPIC_NAME_LENGTH - 3) + "...")
 
     def test_send_forged_message_as_not_superuser(self) -> None:
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": "Verona",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": "Test topic",
-                                                     "forged": "true"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+                "forged": "true",
+            },
+        )
         self.assert_json_error(result, "User not authorized for this query")
 
     def test_send_message_as_not_superuser_to_different_domain(self) -> None:
         self.login('hamlet')
-        result = self.client_post("/json/messages", {"type": "stream",
-                                                     "to": "Verona",
-                                                     "client": "test suite",
-                                                     "content": "Test message",
-                                                     "topic": "Test topic",
-                                                     "realm_str": "mit"})
+        result = self.client_post(
+            "/json/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+                "realm_str": "mit",
+            },
+        )
         self.assert_json_error(result, "User not authorized for this query")
 
     def test_send_message_as_superuser_to_domain_that_dont_exist(self) -> None:
@@ -679,78 +843,111 @@ class MessagePOSTTest(ZulipTestCase):
         user.set_password(password)
         user.can_forge_sender = True
         user.save()
-        result = self.api_post(user,
-                               "/api/v1/messages", {"type": "stream",
-                                                    "to": "Verona",
-                                                    "client": "test suite",
-                                                    "content": "Test message",
-                                                    "topic": "Test topic",
-                                                    "realm_str": "non-existing"})
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+                "realm_str": "non-existing",
+            },
+        )
         user.can_forge_sender = False
         user.save()
         self.assert_json_error(result, "Unknown organization 'non-existing'")
 
     def test_send_message_when_sender_is_not_set(self) -> None:
-        result = self.api_post(self.mit_user("starnine"), "/api/v1/messages",
-                               {"type": "private",
-                                "content": "Test message",
-                                "client": "zephyr_mirror",
-                                "to": self.mit_email("starnine")},
-                               subdomain="zephyr")
+        result = self.api_post(
+            self.mit_user("starnine"),
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": self.mit_email("starnine"),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "Missing sender")
 
     def test_send_message_as_not_superuser_when_type_is_not_private(self) -> None:
-        result = self.api_post(self.mit_user("starnine"), "/api/v1/messages",
-                               {"type": "not-private",
-                                "sender": self.mit_email("sipbtest"),
-                                "content": "Test message",
-                                "client": "zephyr_mirror",
-                                "to": self.mit_email("starnine")},
-                               subdomain="zephyr")
+        result = self.api_post(
+            self.mit_user("starnine"),
+            "/api/v1/messages",
+            {
+                "type": "not-private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": self.mit_email("starnine"),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "User not authorized for this query")
 
     @mock.patch("zerver.views.message_send.create_mirrored_message_users")
     def test_send_message_create_mirrored_message_user_returns_invalid_input(
-            self, create_mirrored_message_users_mock: Any) -> None:
+        self, create_mirrored_message_users_mock: Any
+    ) -> None:
         create_mirrored_message_users_mock.side_effect = InvalidMirrorInput()
-        result = self.api_post(self.mit_user("starnine"), "/api/v1/messages",
-                               {"type": "private",
-                                "sender": self.mit_email("sipbtest"),
-                                "content": "Test message",
-                                "client": "zephyr_mirror",
-                                "to": self.mit_email("starnine")},
-                               subdomain="zephyr")
+        result = self.api_post(
+            self.mit_user("starnine"),
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": self.mit_email("starnine"),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "Invalid mirrored message")
 
     @mock.patch("zerver.views.message_send.create_mirrored_message_users")
     def test_send_message_when_client_is_zephyr_mirror_but_string_id_is_not_zephyr(
-            self, create_mirrored_message_users_mock: Any) -> None:
+        self, create_mirrored_message_users_mock: Any
+    ) -> None:
         create_mirrored_message_users_mock.return_value = mock.Mock()
         user = self.mit_user("starnine")
         user.realm.string_id = 'notzephyr'
         user.realm.save()
-        result = self.api_post(user, "/api/v1/messages",
-                               {"type": "private",
-                                "sender": self.mit_email("sipbtest"),
-                                "content": "Test message",
-                                "client": "zephyr_mirror",
-                                "to": user.email},
-                               subdomain="notzephyr")
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": user.email,
+            },
+            subdomain="notzephyr",
+        )
         self.assert_json_error(result, "Zephyr mirroring is not allowed in this organization")
 
     @mock.patch("zerver.views.message_send.create_mirrored_message_users")
     def test_send_message_when_client_is_zephyr_mirror_but_recipient_is_user_id(
-            self, create_mirrored_message_users_mock: Any) -> None:
+        self, create_mirrored_message_users_mock: Any
+    ) -> None:
         create_mirrored_message_users_mock.return_value = mock.Mock()
         user = self.mit_user("starnine")
         self.login_user(user)
-        result = self.api_post(user, "/api/v1/messages",
-                               {"type": "private",
-                                "sender": self.mit_email("sipbtest"),
-                                "content": "Test message",
-                                "client": "zephyr_mirror",
-                                "to": orjson.dumps([user.id]).decode()},
-                               subdomain="zephyr")
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "private",
+                "sender": self.mit_email("sipbtest"),
+                "content": "Test message",
+                "client": "zephyr_mirror",
+                "to": orjson.dumps([user.id]).decode(),
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "Mirroring not allowed with recipient user IDs")
 
     def test_send_message_irc_mirror(self) -> None:
@@ -774,14 +971,20 @@ class MessagePOSTTest(ZulipTestCase):
         fake_date_sent = timezone_now() - datetime.timedelta(minutes=37)
         fake_timestamp = datetime_to_timestamp(fake_date_sent)
 
-        result = self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                          "forged": "true",
-                                                          "time": fake_timestamp,
-                                                          "sender": "irc-user@irc.zulip.com",
-                                                          "content": "Test message",
-                                                          "client": "irc_mirror",
-                                                          "topic": "from irc",
-                                                          "to": "IRCLand"})
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "forged": "true",
+                "time": fake_timestamp,
+                "sender": "irc-user@irc.zulip.com",
+                "content": "Test message",
+                "client": "irc_mirror",
+                "topic": "from irc",
+                "to": "IRCLand",
+            },
+        )
         self.assert_json_success(result)
 
         msg = self.get_last_message()
@@ -791,14 +994,20 @@ class MessagePOSTTest(ZulipTestCase):
         fake_date_sent = timezone_now() - datetime.timedelta(minutes=22)
         fake_timestamp = datetime_to_timestamp(fake_date_sent)
 
-        result = self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                          "forged": "yes",
-                                                          "time": fake_timestamp,
-                                                          "sender": "irc-user@irc.zulip.com",
-                                                          "content": "Test message",
-                                                          "client": "irc_mirror",
-                                                          "topic": "from irc",
-                                                          "to": "IRCLand"})
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "forged": "yes",
+                "time": fake_timestamp,
+                "sender": "irc-user@irc.zulip.com",
+                "content": "Test message",
+                "client": "irc_mirror",
+                "topic": "from irc",
+                "to": "IRCLand",
+            },
+        )
         self.assert_json_success(result)
 
         msg = self.get_last_message()
@@ -888,14 +1097,18 @@ class MessagePOSTTest(ZulipTestCase):
         notification_bot = self.notification_bot()
         stream = self.make_stream("notify_channel", get_realm("zulipinternal"))
 
-        result = self.api_post(notification_bot,
-                               "/api/v1/messages",
-                               {"type": "stream",
-                                "to": "notify_channel",
-                                "client": "test suite",
-                                "content": "Test message",
-                                "topic": "Test topic"},
-                               subdomain='zulipinternal')
+        result = self.api_post(
+            notification_bot,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "to": "notify_channel",
+                "client": "test suite",
+                "content": "Test message",
+                "topic": "Test topic",
+            },
+            subdomain='zulipinternal',
+        )
 
         self.assert_json_success(result)
         message = self.get_last_message()
@@ -926,35 +1139,44 @@ class MessagePOSTTest(ZulipTestCase):
         result = self.api_post(sender, "/api/v1/messages", payload)
         self.assert_json_success(result)
 
-class ScheduledMessageTest(ZulipTestCase):
 
+class ScheduledMessageTest(ZulipTestCase):
     def last_scheduled_message(self) -> ScheduledMessage:
         return ScheduledMessage.objects.all().order_by('-id')[0]
 
-    def do_schedule_message(self, msg_type: str, to: str, msg: str,
-                            defer_until: str='', tz_guess: str='',
-                            delivery_type: str='send_later',
-                            realm_str: str='zulip') -> HttpResponse:
+    def do_schedule_message(
+        self,
+        msg_type: str,
+        to: str,
+        msg: str,
+        defer_until: str = '',
+        tz_guess: str = '',
+        delivery_type: str = 'send_later',
+        realm_str: str = 'zulip',
+    ) -> HttpResponse:
         self.login('hamlet')
 
         topic_name = ''
         if msg_type == 'stream':
             topic_name = 'Test topic'
 
-        payload = {"type": msg_type,
-                   "to": to,
-                   "client": "test suite",
-                   "content": msg,
-                   "topic": topic_name,
-                   "realm_str": realm_str,
-                   "delivery_type": delivery_type,
-                   "tz_guess": tz_guess}
+        payload = {
+            "type": msg_type,
+            "to": to,
+            "client": "test suite",
+            "content": msg,
+            "topic": topic_name,
+            "realm_str": realm_str,
+            "delivery_type": delivery_type,
+            "tz_guess": tz_guess,
+        }
         if defer_until:
             payload["deliver_at"] = defer_until
         # `Topic` cannot be empty according to OpenAPI specification.
-        intentionally_undocumented: bool = (topic_name == '')
-        result = self.client_post("/json/messages", payload,
-                                  intentionally_undocumented=intentionally_undocumented)
+        intentionally_undocumented: bool = topic_name == ''
+        result = self.client_post(
+            "/json/messages", payload, intentionally_undocumented=intentionally_undocumented
+        )
         return result
 
     def test_schedule_message(self) -> None:
@@ -963,8 +1185,7 @@ class ScheduledMessageTest(ZulipTestCase):
         defer_until_str = str(defer_until)
 
         # Scheduling a message to a stream you are subscribed is successful.
-        result = self.do_schedule_message('stream', 'Verona',
-                                          content + ' 1', defer_until_str)
+        result = self.do_schedule_message('stream', 'Verona', content + ' 1', defer_until_str)
         message = self.last_scheduled_message()
         self.assert_json_success(result)
         self.assertEqual(message.content, 'Test message 1')
@@ -972,9 +1193,9 @@ class ScheduledMessageTest(ZulipTestCase):
         self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until))
         self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER)
         # Scheduling a message for reminders.
-        result = self.do_schedule_message('stream', 'Verona',
-                                          content + ' 2', defer_until_str,
-                                          delivery_type='remind')
+        result = self.do_schedule_message(
+            'stream', 'Verona', content + ' 2', defer_until_str, delivery_type='remind'
+        )
         message = self.last_scheduled_message()
         self.assert_json_success(result)
         self.assertEqual(message.delivery_type, ScheduledMessage.REMIND)
@@ -982,8 +1203,7 @@ class ScheduledMessageTest(ZulipTestCase):
         # Scheduling a private message is successful.
         othello = self.example_user('othello')
         hamlet = self.example_user('hamlet')
-        result = self.do_schedule_message('private', othello.email,
-                                          content + ' 3', defer_until_str)
+        result = self.do_schedule_message('private', othello.email, content + ' 3', defer_until_str)
         message = self.last_scheduled_message()
         self.assert_json_success(result)
         self.assertEqual(message.content, 'Test message 3')
@@ -991,16 +1211,16 @@ class ScheduledMessageTest(ZulipTestCase):
         self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER)
 
         # Setting a reminder in PM's to other users causes a error.
-        result = self.do_schedule_message('private', othello.email,
-                                          content + ' 4', defer_until_str,
-                                          delivery_type='remind')
+        result = self.do_schedule_message(
+            'private', othello.email, content + ' 4', defer_until_str, delivery_type='remind'
+        )
         self.assert_json_error(result, 'Reminders can only be set for streams.')
 
         # Setting a reminder in PM's to ourself is successful.
         # Required by reminders from message actions popover caret feature.
-        result = self.do_schedule_message('private', hamlet.email,
-                                          content + ' 5', defer_until_str,
-                                          delivery_type='remind')
+        result = self.do_schedule_message(
+            'private', hamlet.email, content + ' 5', defer_until_str, delivery_type='remind'
+        )
         message = self.last_scheduled_message()
         self.assert_json_success(result)
         self.assertEqual(message.content, 'Test message 5')
@@ -1008,15 +1228,15 @@ class ScheduledMessageTest(ZulipTestCase):
 
         # Scheduling a message while guessing timezone.
         tz_guess = 'Asia/Kolkata'
-        result = self.do_schedule_message('stream', 'Verona', content + ' 6',
-                                          defer_until_str, tz_guess=tz_guess)
+        result = self.do_schedule_message(
+            'stream', 'Verona', content + ' 6', defer_until_str, tz_guess=tz_guess
+        )
         message = self.last_scheduled_message()
         self.assert_json_success(result)
         self.assertEqual(message.content, 'Test message 6')
         local_tz = pytz.timezone(tz_guess)
         utz_defer_until = local_tz.normalize(local_tz.localize(defer_until))
-        self.assertEqual(message.scheduled_timestamp,
-                         convert_to_UTC(utz_defer_until))
+        self.assertEqual(message.scheduled_timestamp, convert_to_UTC(utz_defer_until))
         self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER)
 
         # Test with users timezone setting as set to some timezone rather than
@@ -1024,15 +1244,13 @@ class ScheduledMessageTest(ZulipTestCase):
         user = self.example_user("hamlet")
         user.timezone = 'US/Pacific'
         user.save(update_fields=['timezone'])
-        result = self.do_schedule_message('stream', 'Verona',
-                                          content + ' 7', defer_until_str)
+        result = self.do_schedule_message('stream', 'Verona', content + ' 7', defer_until_str)
         message = self.last_scheduled_message()
         self.assert_json_success(result)
         self.assertEqual(message.content, 'Test message 7')
         local_tz = pytz.timezone(user.timezone)
         utz_defer_until = local_tz.normalize(local_tz.localize(defer_until))
-        self.assertEqual(message.scheduled_timestamp,
-                         convert_to_UTC(utz_defer_until))
+        self.assertEqual(message.scheduled_timestamp, convert_to_UTC(utz_defer_until))
         self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER)
 
     def test_scheduling_in_past(self) -> None:
@@ -1041,8 +1259,7 @@ class ScheduledMessageTest(ZulipTestCase):
         defer_until = timezone_now()
         defer_until_str = str(defer_until)
 
-        result = self.do_schedule_message('stream', 'Verona',
-                                          content + ' 1', defer_until_str)
+        result = self.do_schedule_message('stream', 'Verona', content + ' 1', defer_until_str)
         self.assert_json_error(result, 'Time must be in the future.')
 
     def test_invalid_timestamp(self) -> None:
@@ -1051,21 +1268,22 @@ class ScheduledMessageTest(ZulipTestCase):
         content = "Test message"
         defer_until = 'Missed the timestamp'
 
-        result = self.do_schedule_message('stream', 'Verona',
-                                          content + ' 1', defer_until)
+        result = self.do_schedule_message('stream', 'Verona', content + ' 1', defer_until)
         self.assert_json_error(result, 'Invalid time format')
 
     def test_missing_deliver_at(self) -> None:
         content = "Test message"
 
-        result = self.do_schedule_message('stream', 'Verona',
-                                          content + ' 1')
-        self.assert_json_error(result, 'Missing deliver_at in a request for delayed message delivery')
+        result = self.do_schedule_message('stream', 'Verona', content + ' 1')
+        self.assert_json_error(
+            result, 'Missing deliver_at in a request for delayed message delivery'
+        )
+
 
 class StreamMessagesTest(ZulipTestCase):
-
-    def assert_stream_message(self, stream_name: str, topic_name: str="test topic",
-                              content: str="test content") -> None:
+    def assert_stream_message(
+        self, stream_name: str, topic_name: str = "test topic", content: str = "test content"
+    ) -> None:
         """
         Check that messages sent to a stream reach all subscribers to that stream.
         """
@@ -1073,25 +1291,31 @@ class StreamMessagesTest(ZulipTestCase):
         subscribers = self.users_subscribed_to_stream(stream_name, realm)
 
         # Outgoing webhook bots don't store UserMessage rows; they will be processed later.
-        subscribers = [subscriber for subscriber in subscribers
-                       if subscriber.bot_type != UserProfile.OUTGOING_WEBHOOK_BOT]
+        subscribers = [
+            subscriber
+            for subscriber in subscribers
+            if subscriber.bot_type != UserProfile.OUTGOING_WEBHOOK_BOT
+        ]
 
         old_subscriber_messages = []
         for subscriber in subscribers:
             old_subscriber_messages.append(message_stream_count(subscriber))
 
-        non_subscribers = [user_profile for user_profile in UserProfile.objects.all()
-                           if user_profile not in subscribers]
+        non_subscribers = [
+            user_profile
+            for user_profile in UserProfile.objects.all()
+            if user_profile not in subscribers
+        ]
         old_non_subscriber_messages = []
         for non_subscriber in non_subscribers:
             old_non_subscriber_messages.append(message_stream_count(non_subscriber))
 
-        non_bot_subscribers = [user_profile for user_profile in subscribers
-                               if not user_profile.is_bot]
+        non_bot_subscribers = [
+            user_profile for user_profile in subscribers if not user_profile.is_bot
+        ]
         a_subscriber = non_bot_subscribers[0]
         self.login_user(a_subscriber)
-        self.send_stream_message(a_subscriber, stream_name,
-                                 content=content, topic_name=topic_name)
+        self.send_stream_message(a_subscriber, stream_name, content=content, topic_name=topic_name)
 
         # Did all of the subscribers get the message?
         new_subscriber_messages = []
@@ -1107,14 +1331,14 @@ class StreamMessagesTest(ZulipTestCase):
         self.assertEqual(new_subscriber_messages, [elt + 1 for elt in old_subscriber_messages])
 
     def test_performance(self) -> None:
-        '''
+        """
         This test is part of the automated test suite, but
         it is more intended as an aid to measuring the
         performance of do_send_messages() with consistent
         data setup across different commits.  You can modify
         the values below and run just this test, and then
         comment out the print statement toward the bottom.
-        '''
+        """
         num_messages = 2
         num_extra_users = 10
 
@@ -1166,8 +1390,12 @@ class StreamMessagesTest(ZulipTestCase):
         self.assertTrue(ums_created > (num_active_users * num_messages))
 
     def test_not_too_many_queries(self) -> None:
-        recipient_list  = [self.example_user("hamlet"), self.example_user("iago"),
-                           self.example_user("cordelia"), self.example_user("othello")]
+        recipient_list = [
+            self.example_user("hamlet"),
+            self.example_user("iago"),
+            self.example_user("cordelia"),
+            self.example_user("othello"),
+        ]
         for user_profile in recipient_list:
             self.subscribe(user_profile, "Denmark")
 
@@ -1199,8 +1427,9 @@ class StreamMessagesTest(ZulipTestCase):
     def test_stream_message_dict(self) -> None:
         user_profile = self.example_user('iago')
         self.subscribe(user_profile, "Denmark")
-        self.send_stream_message(self.example_user("hamlet"), "Denmark",
-                                 content="whatever", topic_name="my topic")
+        self.send_stream_message(
+            self.example_user("hamlet"), "Denmark", content="whatever", topic_name="my topic"
+        )
         message = most_recent_message(user_profile)
         row = MessageDict.get_raw_db_rows([message.id])[0]
         dct = MessageDict.build_dict_from_raw_db_row(row)
@@ -1214,34 +1443,44 @@ class StreamMessagesTest(ZulipTestCase):
         receiving_user_profile = self.example_user('iago')
         sender = self.example_user('hamlet')
         self.subscribe(receiving_user_profile, "Denmark")
-        self.send_stream_message(sender, "Denmark",
-                                 content="whatever", topic_name="my topic")
+        self.send_stream_message(sender, "Denmark", content="whatever", topic_name="my topic")
         message = most_recent_message(receiving_user_profile)
-        self.assertEqual(str(message),
-                         '<Message: Denmark / my topic / '
-                         '<UserProfile: {} {}>>'.format(sender.email, sender.realm))
+        self.assertEqual(
+            str(message),
+            '<Message: Denmark / my topic / '
+            '<UserProfile: {} {}>>'.format(sender.email, sender.realm),
+        )
 
     def test_message_mentions(self) -> None:
         user_profile = self.example_user('iago')
         self.subscribe(user_profile, "Denmark")
-        self.send_stream_message(self.example_user("hamlet"), "Denmark",
-                                 content="test @**Iago** rules")
+        self.send_stream_message(
+            self.example_user("hamlet"), "Denmark", content="test @**Iago** rules"
+        )
         message = most_recent_message(user_profile)
-        assert(UserMessage.objects.get(user_profile=user_profile, message=message).flags.mentioned.is_set)
+        assert UserMessage.objects.get(
+            user_profile=user_profile, message=message
+        ).flags.mentioned.is_set
 
     def test_is_private_flag(self) -> None:
         user_profile = self.example_user('iago')
         self.subscribe(user_profile, "Denmark")
 
-        self.send_stream_message(self.example_user("hamlet"), "Denmark",
-                                 content="test")
+        self.send_stream_message(self.example_user("hamlet"), "Denmark", content="test")
         message = most_recent_message(user_profile)
-        self.assertFalse(UserMessage.objects.get(user_profile=user_profile, message=message).flags.is_private.is_set)
+        self.assertFalse(
+            UserMessage.objects.get(
+                user_profile=user_profile, message=message
+            ).flags.is_private.is_set
+        )
 
-        self.send_personal_message(self.example_user("hamlet"), user_profile,
-                                   content="test")
+        self.send_personal_message(self.example_user("hamlet"), user_profile, content="test")
         message = most_recent_message(user_profile)
-        self.assertTrue(UserMessage.objects.get(user_profile=user_profile, message=message).flags.is_private.is_set)
+        self.assertTrue(
+            UserMessage.objects.get(
+                user_profile=user_profile, message=message
+            ).flags.is_private.is_set
+        )
 
     def _send_stream_message(self, user: UserProfile, stream_name: str, content: str) -> Set[int]:
         with mock.patch('zerver.lib.actions.send_event') as m:
@@ -1325,23 +1564,22 @@ class StreamMessagesTest(ZulipTestCase):
         self.assertEqual(user_message.message.content, content)
         self.assertTrue(user_message.flags.mentioned)
 
-    def send_and_verify_wildcard_mention_message(self,
-                                                 sender_name: str,
-                                                 test_fails: bool=False,
-                                                 sub_count: int=16) -> None:
+    def send_and_verify_wildcard_mention_message(
+        self, sender_name: str, test_fails: bool = False, sub_count: int = 16
+    ) -> None:
         sender = self.example_user(sender_name)
         content = "@**all** test wildcard mention"
-        with mock.patch(
-            "zerver.lib.message.num_subscribers_for_stream_id", return_value=sub_count
-        ):
+        with mock.patch("zerver.lib.message.num_subscribers_for_stream_id", return_value=sub_count):
             if not test_fails:
                 msg_id = self.send_stream_message(sender, "test_stream", content)
                 result = self.api_get(sender, '/json/messages/' + str(msg_id))
                 self.assert_json_success(result)
 
             else:
-                with self.assertRaisesRegex(JsonableError,
-                                            "You do not have permission to use wildcard mentions in this stream."):
+                with self.assertRaisesRegex(
+                    JsonableError,
+                    "You do not have permission to use wildcard mentions in this stream.",
+                ):
                     self.send_stream_message(sender, "test_stream", content)
 
     def test_wildcard_mention_restrictions(self) -> None:
@@ -1369,9 +1607,7 @@ class StreamMessagesTest(ZulipTestCase):
         self.send_and_verify_wildcard_mention_message("cordelia")
 
         do_set_realm_property(
-            realm,
-            "wildcard_mention_policy",
-            Realm.WILDCARD_MENTION_POLICY_FULL_MEMBERS
+            realm, "wildcard_mention_policy", Realm.WILDCARD_MENTION_POLICY_FULL_MEMBERS
         )
         do_set_realm_property(realm, "waiting_period_threshold", 10)
         iago.date_joined = timezone_now()
@@ -1388,9 +1624,7 @@ class StreamMessagesTest(ZulipTestCase):
         self.send_and_verify_wildcard_mention_message("cordelia")
 
         do_set_realm_property(
-            realm,
-            "wildcard_mention_policy",
-            Realm.WILDCARD_MENTION_POLICY_STREAM_ADMINS
+            realm, "wildcard_mention_policy", Realm.WILDCARD_MENTION_POLICY_STREAM_ADMINS
         )
         # TODO: Change this when we implement stream administrators
         self.send_and_verify_wildcard_mention_message("cordelia", test_fails=True)
@@ -1421,9 +1655,7 @@ class StreamMessagesTest(ZulipTestCase):
         self.subscribe(cordelia, "test_stream")
         do_set_realm_property(cordelia.realm, "wildcard_mention_policy", 10)
         content = "@**all** test wildcard mention"
-        with mock.patch(
-            "zerver.lib.message.num_subscribers_for_stream_id", return_value=16
-        ):
+        with mock.patch("zerver.lib.message.num_subscribers_for_stream_id", return_value=16):
             with self.assertRaisesRegex(AssertionError, "Invalid wildcard mention policy"):
                 self.send_stream_message(cordelia, "test_stream", content)
 
@@ -1432,25 +1664,37 @@ class StreamMessagesTest(ZulipTestCase):
         self.subscribe(user, 'Verona')
 
         do_change_can_forge_sender(user, True)
-        result = self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                          "to": "Verona",
-                                                          "sender": self.mit_email("sipbtest"),
-                                                          "client": "zephyr_mirror",
-                                                          "topic": "announcement",
-                                                          "content": "Everyone knows Iago rules",
-                                                          "forged": "true"},
-                               subdomain="zephyr")
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "sender": self.mit_email("sipbtest"),
+                "client": "zephyr_mirror",
+                "topic": "announcement",
+                "content": "Everyone knows Iago rules",
+                "forged": "true",
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_success(result)
 
         do_change_can_forge_sender(user, False)
-        result = self.api_post(user, "/api/v1/messages", {"type": "stream",
-                                                          "to": "Verona",
-                                                          "sender": self.mit_email("sipbtest"),
-                                                          "client": "zephyr_mirror",
-                                                          "topic": "announcement",
-                                                          "content": "Everyone knows Iago rules",
-                                                          "forged": "true"},
-                               subdomain="zephyr")
+        result = self.api_post(
+            user,
+            "/api/v1/messages",
+            {
+                "type": "stream",
+                "to": "Verona",
+                "sender": self.mit_email("sipbtest"),
+                "client": "zephyr_mirror",
+                "topic": "announcement",
+                "content": "Everyone knows Iago rules",
+                "forged": "true",
+            },
+            subdomain="zephyr",
+        )
         self.assert_json_error(result, "User not authorized for this query")
 
     def test_message_to_stream(self) -> None:
@@ -1471,12 +1715,12 @@ class StreamMessagesTest(ZulipTestCase):
         non_ascii_stream_name = "hümbüǵ"
         realm = get_realm("zulip")
         stream = self.make_stream(non_ascii_stream_name)
-        for user_profile in UserProfile.objects.filter(is_active=True, is_bot=False,
-                                                       realm=realm)[0:3]:
+        for user_profile in UserProfile.objects.filter(is_active=True, is_bot=False, realm=realm)[
+            0:3
+        ]:
             self.subscribe(user_profile, stream.name)
 
-        self.assert_stream_message(non_ascii_stream_name, topic_name="hümbüǵ",
-                                   content="hümbüǵ")
+        self.assert_stream_message(non_ascii_stream_name, topic_name="hümbüǵ", content="hümbüǵ")
 
     def test_get_raw_unread_data_for_huddle_messages(self) -> None:
         users = [
@@ -1502,10 +1746,12 @@ class StreamMessagesTest(ZulipTestCase):
         recent_conversations = get_recent_private_conversations(users[1])
         self.assertEqual(len(recent_conversations), 1)
         recent_conversation = list(recent_conversations.values())[0]
-        self.assertEqual(set(recent_conversation['user_ids']), {user.id for user in users if
-                                                                user != users[1]})
+        self.assertEqual(
+            set(recent_conversation['user_ids']), {user.id for user in users if user != users[1]}
+        )
         self.assertEqual(recent_conversation['max_message_id'], message2_id)
 
+
 class PersonalMessageSendTest(ZulipTestCase):
     def test_personal_to_self(self) -> None:
         """
@@ -1532,7 +1778,9 @@ class PersonalMessageSendTest(ZulipTestCase):
         recipient = Recipient.objects.get(type_id=user_profile.id, type=Recipient.PERSONAL)
         self.assertEqual(most_recent_message(user_profile).recipient, recipient)
 
-    def assert_personal(self, sender: UserProfile, receiver: UserProfile, content: str="testcontent") -> None:
+    def assert_personal(
+        self, sender: UserProfile, receiver: UserProfile, content: str = "testcontent"
+    ) -> None:
         """
         Send a private message from `sender_email` to `receiver_email` and check
         that only those two parties actually received the message.
@@ -1540,8 +1788,7 @@ class PersonalMessageSendTest(ZulipTestCase):
         sender_messages = message_stream_count(sender)
         receiver_messages = message_stream_count(receiver)
 
-        other_user_profiles = UserProfile.objects.filter(~Q(id=sender.id) &
-                                                         ~Q(id=receiver.id))
+        other_user_profiles = UserProfile.objects.filter(~Q(id=sender.id) & ~Q(id=receiver.id))
         old_other_messages = []
         for user_profile in other_user_profiles:
             old_other_messages.append(message_stream_count(user_profile))
@@ -1556,10 +1803,8 @@ class PersonalMessageSendTest(ZulipTestCase):
         self.assertEqual(old_other_messages, new_other_messages)
 
         # The personal message is in the streams of both the sender and receiver.
-        self.assertEqual(message_stream_count(sender),
-                         sender_messages + 1)
-        self.assertEqual(message_stream_count(receiver),
-                         receiver_messages + 1)
+        self.assertEqual(message_stream_count(sender), sender_messages + 1)
+        self.assertEqual(message_stream_count(receiver), receiver_messages + 1)
 
         recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL)
         self.assertEqual(most_recent_message(sender).recipient, recipient)
@@ -1581,8 +1826,9 @@ class PersonalMessageSendTest(ZulipTestCase):
         """
         user_profile = self.example_user("hamlet")
         self.login_user(user_profile)
-        do_set_realm_property(user_profile.realm, "private_message_policy",
-                              Realm.PRIVATE_MESSAGE_POLICY_DISABLED)
+        do_set_realm_property(
+            user_profile.realm, "private_message_policy", Realm.PRIVATE_MESSAGE_POLICY_DISABLED
+        )
         with self.assertRaises(JsonableError):
             self.send_personal_message(user_profile, self.example_user("cordelia"))
 
@@ -1686,7 +1932,9 @@ class ExtractTest(ZulipTestCase):
 
         # Heterogeneous lists are not supported
         mixed = orjson.dumps(['eeshan@example.com', 3, 4]).decode()
-        with self.assertRaisesRegex(JsonableError, 'Recipient lists may contain emails or user IDs, but not both.'):
+        with self.assertRaisesRegex(
+            JsonableError, 'Recipient lists may contain emails or user IDs, but not both.'
+        ):
             extract_private_recipients(mixed)
 
     def test_extract_recipient_ids(self) -> None:
@@ -1702,11 +1950,13 @@ class ExtractTest(ZulipTestCase):
 
         # Heterogeneous lists are not supported
         mixed = orjson.dumps([3, 4, 'eeshan@example.com']).decode()
-        with self.assertRaisesRegex(JsonableError, 'Recipient lists may contain emails or user IDs, but not both.'):
+        with self.assertRaisesRegex(
+            JsonableError, 'Recipient lists may contain emails or user IDs, but not both.'
+        ):
             extract_private_recipients(mixed)
 
-class InternalPrepTest(ZulipTestCase):
 
+class InternalPrepTest(ZulipTestCase):
     def test_returns_for_internal_sends(self) -> None:
         # For our internal_send_* functions we return
         # if the prep stages fail.  This is mostly defensive
@@ -1728,11 +1978,12 @@ class InternalPrepTest(ZulipTestCase):
                 content=bad_content,
             )
 
-        self.assertEqual(m.output[0].split('\n')[0],
-                         "ERROR:root:Error queueing internal message by {}: {}".format(
-                             "cordelia@zulip.com",
-                             "Message must not be empty"
-        ))
+        self.assertEqual(
+            m.output[0].split('\n')[0],
+            "ERROR:root:Error queueing internal message by {}: {}".format(
+                "cordelia@zulip.com", "Message must not be empty"
+            ),
+        )
 
         with self.assertLogs(level="ERROR") as m:
             internal_send_huddle_message(
@@ -1742,11 +1993,12 @@ class InternalPrepTest(ZulipTestCase):
                 content=bad_content,
             )
 
-        self.assertEqual(m.output[0].split('\n')[0],
-                         "ERROR:root:Error queueing internal message by {}: {}".format(
-                             "cordelia@zulip.com",
-                             "Message must not be empty"
-        ))
+        self.assertEqual(
+            m.output[0].split('\n')[0],
+            "ERROR:root:Error queueing internal message by {}: {}".format(
+                "cordelia@zulip.com", "Message must not be empty"
+            ),
+        )
 
         with self.assertLogs(level="ERROR") as m:
             internal_send_stream_message(
@@ -1757,11 +2009,12 @@ class InternalPrepTest(ZulipTestCase):
                 stream=stream,
             )
 
-        self.assertEqual(m.output[0].split('\n')[0],
-                         "ERROR:root:Error queueing internal message by {}: {}".format(
-                             "cordelia@zulip.com",
-                             "Message must not be empty"
-        ))
+        self.assertEqual(
+            m.output[0].split('\n')[0],
+            "ERROR:root:Error queueing internal message by {}: {}".format(
+                "cordelia@zulip.com", "Message must not be empty"
+            ),
+        )
 
         with self.assertLogs(level="ERROR") as m:
             internal_send_stream_message_by_name(
@@ -1772,11 +2025,12 @@ class InternalPrepTest(ZulipTestCase):
                 content=bad_content,
             )
 
-        self.assertEqual(m.output[0].split('\n')[0],
-                         "ERROR:root:Error queueing internal message by {}: {}".format(
-                             "cordelia@zulip.com",
-                             "Message must not be empty"
-        ))
+        self.assertEqual(
+            m.output[0].split('\n')[0],
+            "ERROR:root:Error queueing internal message by {}: {}".format(
+                "cordelia@zulip.com", "Message must not be empty"
+            ),
+        )
 
     def test_error_handling(self) -> None:
         realm = get_realm('zulip')
@@ -1785,10 +2039,8 @@ class InternalPrepTest(ZulipTestCase):
         content = 'x' * 15000
 
         result = internal_prep_private_message(
-            realm=realm,
-            sender=sender,
-            recipient_user=recipient_user,
-            content=content)
+            realm=realm, sender=sender, recipient_user=recipient_user, content=content
+        )
         assert result is not None
         message = result.message
         self.assertIn('message was too long', message.content)
@@ -1798,16 +2050,16 @@ class InternalPrepTest(ZulipTestCase):
         recipient_user = self.mit_user('starnine')
         with self.assertLogs(level="ERROR") as m:
             result = internal_prep_private_message(
-                realm=realm,
-                sender=sender,
-                recipient_user=recipient_user,
-                content=content)
+                realm=realm, sender=sender, recipient_user=recipient_user, content=content
+            )
 
-        self.assertEqual(m.output[0].split('\n')[0],
-                         "ERROR:root:Error queueing internal message by {}: {}".format(
-                             "cordelia@zulip.com",
-                             "You can't send private messages outside of your organization."
-        ))
+        self.assertEqual(
+            m.output[0].split('\n')[0],
+            "ERROR:root:Error queueing internal message by {}: {}".format(
+                "cordelia@zulip.com",
+                "You can't send private messages outside of your organization.",
+            ),
+        )
 
     def test_ensure_stream_gets_called(self) -> None:
         realm = get_realm('zulip')
@@ -1817,16 +2069,14 @@ class InternalPrepTest(ZulipTestCase):
         content = 'hello'
 
         internal_prep_stream_message_by_name(
-            realm=realm,
-            sender=sender,
-            stream_name=stream_name,
-            topic=topic,
-            content=content)
+            realm=realm, sender=sender, stream_name=stream_name, topic=topic, content=content
+        )
 
         # This would throw an error if the stream
         # wasn't automatically created.
         Stream.objects.get(name=stream_name, realm_id=realm.id)
 
+
 class TestCrossRealmPMs(ZulipTestCase):
     def make_realm(self, domain: str) -> Realm:
         realm = Realm.objects.create(string_id=domain, invite_required=False)
@@ -1838,9 +2088,13 @@ class TestCrossRealmPMs(ZulipTestCase):
         self.register(email, 'test', subdomain=subdomain)
         return get_user(email, get_realm(subdomain))
 
-    @override_settings(CROSS_REALM_BOT_EMAILS=['notification-bot@zulip.com',
-                                               'welcome-bot@zulip.com',
-                                               'support@3.example.com'])
+    @override_settings(
+        CROSS_REALM_BOT_EMAILS=[
+            'notification-bot@zulip.com',
+            'welcome-bot@zulip.com',
+            'support@3.example.com',
+        ]
+    )
     def test_realm_scenarios(self) -> None:
         self.make_realm('1.example.com')
         r2 = self.make_realm('2.example.com')
@@ -1851,9 +2105,7 @@ class TestCrossRealmPMs(ZulipTestCase):
             self.assertEqual(messages[-1].sender.id, from_user.id)
 
         def assert_invalid_user() -> Any:
-            return self.assertRaisesRegex(
-                JsonableError,
-                'Invalid user ID ')
+            return self.assertRaisesRegex(JsonableError, 'Invalid user ID ')
 
         user1_email = 'user1@1.example.com'
         user1a_email = 'user1a@1.example.com'
@@ -1867,7 +2119,9 @@ class TestCrossRealmPMs(ZulipTestCase):
         user2 = self.create_user(user2_email)
         user3 = self.create_user(user3_email)
         notification_bot = get_system_bot(notification_bot_email)
-        with self.settings(CROSS_REALM_BOT_EMAILS=['notification-bot@zulip.com', 'welcome-bot@zulip.com']):
+        with self.settings(
+            CROSS_REALM_BOT_EMAILS=['notification-bot@zulip.com', 'welcome-bot@zulip.com']
+        ):
             # HACK: We should probably be creating this "bot" user another
             # way, but since you can't register a user with a
             # cross-realm email, we need to hide this for now.
@@ -1898,7 +2152,7 @@ class TestCrossRealmPMs(ZulipTestCase):
         # Users can PM cross-realm bots on non-zulip realms.
         # (The support bot represents some theoretical bot that we may
         # create in the future that does not have zulip.com as its realm.)
-        self.send_personal_message(user1,  support_bot)
+        self.send_personal_message(user1, support_bot)
         assert_message_received(support_bot, user1)
 
         # Allow sending PMs to two different cross-realm bots simultaneously.
@@ -1935,25 +2189,25 @@ class TestCrossRealmPMs(ZulipTestCase):
         with assert_invalid_user():
             self.send_huddle_message(user1, [user2, user3])
 
+
 class TestAddressee(ZulipTestCase):
     def test_addressee_for_user_ids(self) -> None:
         realm = get_realm('zulip')
-        user_ids = [self.example_user('cordelia').id,
-                    self.example_user('hamlet').id,
-                    self.example_user('othello').id]
+        user_ids = [
+            self.example_user('cordelia').id,
+            self.example_user('hamlet').id,
+            self.example_user('othello').id,
+        ]
 
         result = Addressee.for_user_ids(user_ids=user_ids, realm=realm)
         user_profiles = result.user_profiles()
-        result_user_ids = [user_profiles[0].id, user_profiles[1].id,
-                           user_profiles[2].id]
+        result_user_ids = [user_profiles[0].id, user_profiles[1].id, user_profiles[2].id]
 
         self.assertEqual(set(result_user_ids), set(user_ids))
 
     def test_addressee_for_user_ids_nonexistent_id(self) -> None:
         def assert_invalid_user_id() -> Any:
-            return self.assertRaisesRegex(
-                JsonableError,
-                'Invalid user ID ')
+            return self.assertRaisesRegex(JsonableError, 'Invalid user ID ')
 
         with assert_invalid_user_id():
             Addressee.for_user_ids(user_ids=[779], realm=get_realm('zulip'))
@@ -1961,12 +2215,13 @@ class TestAddressee(ZulipTestCase):
     def test_addressee_legacy_build_for_user_ids(self) -> None:
         realm = get_realm('zulip')
         self.login('hamlet')
-        user_ids = [self.example_user('cordelia').id,
-                    self.example_user('othello').id]
+        user_ids = [self.example_user('cordelia').id, self.example_user('othello').id]
 
         result = Addressee.legacy_build(
-            sender=self.example_user('hamlet'), message_type_name='private',
-            message_to=user_ids, topic_name='random_topic',
+            sender=self.example_user('hamlet'),
+            message_type_name='private',
+            message_to=user_ids,
+            topic_name='random_topic',
             realm=realm,
         )
         user_profiles = result.user_profiles()
@@ -1982,14 +2237,17 @@ class TestAddressee(ZulipTestCase):
         stream = get_stream('Denmark', realm)
 
         result = Addressee.legacy_build(
-            sender=sender, message_type_name='stream',
-            message_to=[stream.id], topic_name='random_topic',
+            sender=sender,
+            message_type_name='stream',
+            message_to=[stream.id],
+            topic_name='random_topic',
             realm=realm,
         )
 
         stream_id = result.stream_id()
         self.assertEqual(stream.id, stream_id)
 
+
 class CheckMessageTest(ZulipTestCase):
     def test_basic_check_message_call(self) -> None:
         sender = self.example_user('othello')
@@ -2062,7 +2320,7 @@ class CheckMessageTest(ZulipTestCase):
         # Try sending to stream that exists with no subscribers longer
         # after; this should send an error to the bot owner that the
         # stream doesn't exist
-        assert(sender.last_reminder is not None)
+        assert sender.last_reminder is not None
         sender.last_reminder = sender.last_reminder - datetime.timedelta(hours=1)
         sender.save(update_fields=["last_reminder"])
         ret = check_message(sender, client, addressee, message_content)
diff --git a/zerver/tests/test_message_topics.py b/zerver/tests/test_message_topics.py
index 6986e0ee5c..fb5465a27f 100644
--- a/zerver/tests/test_message_topics.py
+++ b/zerver/tests/test_message_topics.py
@@ -13,8 +13,7 @@ class TopicHistoryTest(ZulipTestCase):
         # Send a message to this new stream from another user
         self.subscribe(self.mit_user("starnine"), stream_name)
         stream = get_stream(stream_name, user_profile.realm)
-        self.send_stream_message(self.mit_user("starnine"), stream_name,
-                                 topic_name="secret topic")
+        self.send_stream_message(self.mit_user("starnine"), stream_name, topic_name="secret topic")
 
         # Now subscribe this MIT user to the new stream and verify
         # that the new topic is not accessible
@@ -83,17 +82,23 @@ class TopicHistoryTest(ZulipTestCase):
         # the prior fixture data may be unreliable.
         history = history[:3]
 
-        self.assertEqual([topic['name'] for topic in history], [
-            'topic0',
-            'topic1',
-            'topic2',
-        ])
+        self.assertEqual(
+            [topic['name'] for topic in history],
+            [
+                'topic0',
+                'topic1',
+                'topic2',
+            ],
+        )
 
-        self.assertEqual([topic['max_id'] for topic in history], [
-            topic0_msg_id,
-            topic1_msg_id,
-            topic2_msg_id,
-        ])
+        self.assertEqual(
+            [topic['max_id'] for topic in history],
+            [
+                topic0_msg_id,
+                topic1_msg_id,
+                topic2_msg_id,
+            ],
+        )
 
         # Now try as cordelia, who we imagine as a totally new user in
         # that she doesn't have UserMessage rows.  We should see the
@@ -107,18 +112,24 @@ class TopicHistoryTest(ZulipTestCase):
         # the prior fixture data may be unreliable.
         history = history[:3]
 
-        self.assertEqual([topic['name'] for topic in history], [
-            'topic0',
-            'topic1',
-            'topic2',
-        ])
+        self.assertEqual(
+            [topic['name'] for topic in history],
+            [
+                'topic0',
+                'topic1',
+                'topic2',
+            ],
+        )
         self.assertIn('topic0', [topic['name'] for topic in history])
 
-        self.assertEqual([topic['max_id'] for topic in history], [
-            topic0_msg_id,
-            topic1_msg_id,
-            topic2_msg_id,
-        ])
+        self.assertEqual(
+            [topic['max_id'] for topic in history],
+            [
+                topic0_msg_id,
+                topic1_msg_id,
+                topic2_msg_id,
+            ],
+        )
 
         # Now make stream private, but subscribe cordelia
         do_change_stream_invite_only(stream, True)
@@ -164,18 +175,22 @@ class TopicHistoryTest(ZulipTestCase):
     def test_get_topics_web_public_stream_web_public_request(self) -> None:
         stream = self.make_stream('web-public-steram', is_web_public=True)
         for i in range(3):
-            self.send_stream_message(self.example_user('iago'),
-                                     stream.name, topic_name='topic' + str(i))
+            self.send_stream_message(
+                self.example_user('iago'), stream.name, topic_name='topic' + str(i)
+            )
 
         endpoint = f'/json/users/me/{stream.id}/topics'
         result = self.client_get(endpoint)
         self.assert_json_success(result)
         history = result.json()['topics']
-        self.assertEqual([topic['name'] for topic in history], [
-            'topic2',
-            'topic1',
-            'topic0',
-        ])
+        self.assertEqual(
+            [topic['name'] for topic in history],
+            [
+                'topic2',
+                'topic1',
+                'topic0',
+            ],
+        )
 
     def test_get_topics_non_web_public_stream_web_public_request(self) -> None:
         stream = get_stream('Verona', self.example_user('iago').realm)
@@ -189,6 +204,7 @@ class TopicHistoryTest(ZulipTestCase):
         result = self.client_get(endpoint)
         self.assert_json_error(result, 'Invalid stream id', 400)
 
+
 class TopicDeleteTest(ZulipTestCase):
     def test_topic_delete(self) -> None:
         initial_last_msg_id = self.get_last_message().id
@@ -207,15 +223,17 @@ class TopicDeleteTest(ZulipTestCase):
         # Deleting the topic
         self.login_user(user_profile)
         endpoint = '/json/streams/' + str(stream.id) + '/delete_topic'
-        result = self.client_post(endpoint, {
-            "topic_name": topic_name,
-        })
+        result = self.client_post(
+            endpoint,
+            {
+                "topic_name": topic_name,
+            },
+        )
         self.assert_json_error(result, "Must be an organization administrator")
         self.assertEqual(self.get_last_message().id, last_msg_id)
 
         # Make stream private with limited history
-        do_change_stream_invite_only(stream, invite_only=True,
-                                     history_public_to_subscribers=False)
+        do_change_stream_invite_only(stream, invite_only=True, history_public_to_subscribers=False)
 
         # ADMIN USER subscribed now
         user_profile = self.example_user('iago')
@@ -226,33 +244,44 @@ class TopicDeleteTest(ZulipTestCase):
         # Now admin deletes all messages in topic -- which should only
         # delete new_last_msg_id, i.e. the one sent since they joined.
         self.assertEqual(self.get_last_message().id, new_last_msg_id)
-        result = self.client_post(endpoint, {
-            "topic_name": topic_name,
-        })
+        result = self.client_post(
+            endpoint,
+            {
+                "topic_name": topic_name,
+            },
+        )
         self.assert_json_success(result)
         self.assertEqual(self.get_last_message().id, last_msg_id)
 
         # Try to delete all messages in the topic again. There are no messages accessible
         # to the administrator, so this should do nothing.
-        result = self.client_post(endpoint, {
-            "topic_name": topic_name,
-        })
+        result = self.client_post(
+            endpoint,
+            {
+                "topic_name": topic_name,
+            },
+        )
         self.assert_json_success(result)
         self.assertEqual(self.get_last_message().id, last_msg_id)
 
         # Make the stream's history public to subscribers
-        do_change_stream_invite_only(stream, invite_only=True,
-                                     history_public_to_subscribers=True)
+        do_change_stream_invite_only(stream, invite_only=True, history_public_to_subscribers=True)
         # Delete the topic should now remove all messages
-        result = self.client_post(endpoint, {
-            "topic_name": topic_name,
-        })
+        result = self.client_post(
+            endpoint,
+            {
+                "topic_name": topic_name,
+            },
+        )
         self.assert_json_success(result)
         self.assertEqual(self.get_last_message().id, initial_last_msg_id)
 
         # Delete again, to test the edge case of deleting an empty topic.
-        result = self.client_post(endpoint, {
-            "topic_name": topic_name,
-        })
+        result = self.client_post(
+            endpoint,
+            {
+                "topic_name": topic_name,
+            },
+        )
         self.assert_json_success(result)
         self.assertEqual(self.get_last_message().id, initial_last_msg_id)
diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py
index 95b11aee2f..1f7aef3a81 100644
--- a/zerver/tests/test_messages.py
+++ b/zerver/tests/test_messages.py
@@ -61,6 +61,7 @@ class MissedMessageTest(ZulipTestCase):
         message_type = 'private'
         assert_missing([othello.id])
 
+
 class TestBulkGetHuddleUserIds(ZulipTestCase):
     def test_bulk_get_huddle_user_ids(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -78,7 +79,9 @@ class TestBulkGetHuddleUserIds(ZulipTestCase):
         second_huddle_recipient = messages[1].recipient
         second_huddle_user_ids = list(get_huddle_user_ids(second_huddle_recipient))
 
-        huddle_user_ids = bulk_get_huddle_user_ids([first_huddle_recipient, second_huddle_recipient])
+        huddle_user_ids = bulk_get_huddle_user_ids(
+            [first_huddle_recipient, second_huddle_recipient]
+        )
         self.assertEqual(huddle_user_ids[first_huddle_recipient.id], first_huddle_user_ids)
         self.assertEqual(huddle_user_ids[second_huddle_recipient.id], second_huddle_user_ids)
 
diff --git a/zerver/tests/test_middleware.py b/zerver/tests/test_middleware.py
index 51eb680adf..7d2b0c63dc 100644
--- a/zerver/tests/test_middleware.py
+++ b/zerver/tests/test_middleware.py
@@ -12,12 +12,14 @@ from zerver.models import get_realm
 
 class SlowQueryTest(ZulipTestCase):
     SLOW_QUERY_TIME = 10
-    log_data = {'extra': '[transport=websocket]',
-                'time_started': 0,
-                'markdown_requests_start': 0,
-                'markdown_time_start': 0,
-                'remote_cache_time_start': 0,
-                'remote_cache_requests_start': 0}
+    log_data = {
+        'extra': '[transport=websocket]',
+        'time_started': 0,
+        'markdown_requests_start': 0,
+        'markdown_time_start': 0,
+        'remote_cache_time_start': 0,
+        'remote_cache_requests_start': 0,
+    }
 
     def test_is_slow_query(self) -> None:
         self.assertFalse(is_slow_query(1.1, '/some/random/url'))
@@ -33,11 +35,18 @@ class SlowQueryTest(ZulipTestCase):
 
     def test_slow_query_log(self) -> None:
         self.log_data['time_started'] = time.time() - self.SLOW_QUERY_TIME
-        with patch("zerver.middleware.slow_query_logger") as mock_slow_query_logger, \
-                patch("zerver.middleware.logger") as mock_normal_logger:
+        with patch("zerver.middleware.slow_query_logger") as mock_slow_query_logger, patch(
+            "zerver.middleware.logger"
+        ) as mock_normal_logger:
 
-            write_log_line(self.log_data, path='/some/endpoint/', method='GET',
-                           remote_ip='123.456.789.012', requestor_for_logs='unknown', client_name='?')
+            write_log_line(
+                self.log_data,
+                path='/some/endpoint/',
+                method='GET',
+                remote_ip='123.456.789.012',
+                requestor_for_logs='unknown',
+                client_name='?',
+            )
             mock_slow_query_logger.info.assert_called_once()
             mock_normal_logger.info.assert_called_once()
 
@@ -47,11 +56,16 @@ class SlowQueryTest(ZulipTestCase):
                 r"123\.456\.789\.012 GET     200 10\.\ds .* \(unknown via \?\)",
             )
 
+
 class OpenGraphTest(ZulipTestCase):
-    def check_title_and_description(self, path: str, title: str,
-                                    in_description: List[str],
-                                    not_in_description: List[str],
-                                    status_code: int=200) -> None:
+    def check_title_and_description(
+        self,
+        path: str,
+        title: str,
+        in_description: List[str],
+        not_in_description: List[str],
+        status_code: int = 200,
+    ) -> None:
         response = self.client_get(path)
         self.assertEqual(response.status_code, status_code)
         bs = BeautifulSoup(response.content, features='lxml')
@@ -70,11 +84,17 @@ class OpenGraphTest(ZulipTestCase):
         self.check_title_and_description(
             '/help/disable-message-edit-history',
             "Disable message edit history (Zulip Help Center)",
-            ["By default, Zulip displays messages",
-             "users can view the edit history of a message. | To remove the",
-             "best to delete the message entirely. "],
-            ["Disable message edit history", "feature is only available", "Related articles",
-             "Restrict message editing"],
+            [
+                "By default, Zulip displays messages",
+                "users can view the edit history of a message. | To remove the",
+                "best to delete the message entirely. ",
+            ],
+            [
+                "Disable message edit history",
+                "feature is only available",
+                "Related articles",
+                "Restrict message editing",
+            ],
         )
 
     def test_settings_tab(self) -> None:
@@ -83,7 +103,8 @@ class OpenGraphTest(ZulipTestCase):
             '/help/deactivate-your-account',
             "Deactivate your account (Zulip Help Center)",
             ["Any bots that you maintain will be disabled. | Deactivating "],
-            ["Confirm by clicking", "  ", "\n"])
+            ["Confirm by clicking", "  ", "\n"],
+        )
 
     def test_tabs(self) -> None:
         # logging-out starts with {start_tabs}
@@ -91,61 +112,82 @@ class OpenGraphTest(ZulipTestCase):
             '/help/logging-out',
             "Logging out (Zulip Help Center)",
             # Ideally we'd do something better here
-            ["We're here to help! Email us at desdemona+admin@zulip.com with questions, feedback, or " +
-             "feature requests."],
-            ["Click on the gear"])
+            [
+                "We're here to help! Email us at desdemona+admin@zulip.com with questions, feedback, or "
+                + "feature requests."
+            ],
+            ["Click on the gear"],
+        )
 
     def test_index_pages(self) -> None:
         self.check_title_and_description(
             '/help/',
             "Zulip Help Center",
-            [("Zulip is a group chat app. Its most distinctive characteristic is that "
-              "conversation within an organization is divided into “streams” and further ")], [])
+            [
+                (
+                    "Zulip is a group chat app. Its most distinctive characteristic is that "
+                    "conversation within an organization is divided into “streams” and further "
+                )
+            ],
+            [],
+        )
 
         self.check_title_and_description(
             '/api/',
             "Zulip API documentation",
-            [("Zulip's APIs allow you to integrate other services with Zulip. This "
-              "guide should help you find the API you need:")], [])
+            [
+                (
+                    "Zulip's APIs allow you to integrate other services with Zulip. This "
+                    "guide should help you find the API you need:"
+                )
+            ],
+            [],
+        )
 
     def test_nonexistent_page(self) -> None:
         self.check_title_and_description(
             '/help/not-a-real-page',
             # Probably we should make this "Zulip Help Center"
             "No such article. (Zulip Help Center)",
-            ["No such article. | We're here to help!",
-             "Email us at desdemona+admin@zulip.com with questions, feedback, or feature requests."],
+            [
+                "No such article. | We're here to help!",
+                "Email us at desdemona+admin@zulip.com with questions, feedback, or feature requests.",
+            ],
             [],
             # Test that our open graph logic doesn't throw a 500
-            404)
+            404,
+        )
 
     def test_login_page_simple_description(self) -> None:
         name = 'Zulip Dev'
-        description = "The Zulip development environment default organization. It's great for testing!"
+        description = (
+            "The Zulip development environment default organization. It's great for testing!"
+        )
 
-        self.check_title_and_description(
-            '/login/',
-            name,
-            [description],
-            [])
+        self.check_title_and_description('/login/', name, [description], [])
 
     def test_login_page_markdown_description(self) -> None:
         realm = get_realm('zulip')
-        description = ("Welcome to **Clojurians Zulip** - the place where the Clojure community meets.\n\n"
-                       "Before you signup/login:\n\n"
-                       "* note-1\n"
-                       "* note-2\n"
-                       "* note-3\n\n"
-                       "Enjoy!")
+        description = (
+            "Welcome to **Clojurians Zulip** - the place where the Clojure community meets.\n\n"
+            "Before you signup/login:\n\n"
+            "* note-1\n"
+            "* note-2\n"
+            "* note-3\n\n"
+            "Enjoy!"
+        )
         realm.description = description
         realm.save(update_fields=['description'])
 
         self.check_title_and_description(
             '/login/',
             'Zulip Dev',
-            ['Welcome to Clojurians Zulip - the place where the Clojure community meets',
-             '* note-1 * note-2 * note-3 | Enjoy!'],
-            [])
+            [
+                'Welcome to Clojurians Zulip - the place where the Clojure community meets',
+                '* note-1 * note-2 * note-3 | Enjoy!',
+            ],
+            [],
+        )
 
     def test_login_page_realm_icon(self) -> None:
         realm = get_realm('zulip')
@@ -165,7 +207,9 @@ class OpenGraphTest(ZulipTestCase):
         realm.icon_source = 'U'
         realm.save(update_fields=['icon_source'])
         icon_url = f"https://foo.s3.amazonaws.com/{realm.id}/realm/icon.png?version={1}"
-        with patch('zerver.lib.realm_icon.upload_backend.get_realm_icon_url', return_value=icon_url):
+        with patch(
+            'zerver.lib.realm_icon.upload_backend.get_realm_icon_url', return_value=icon_url
+        ):
             response = self.client_get('/login/')
         self.assertEqual(response.status_code, 200)
 
diff --git a/zerver/tests/test_migrations.py b/zerver/tests/test_migrations.py
index a83f190b9a..436655a631 100644
--- a/zerver/tests/test_migrations.py
+++ b/zerver/tests/test_migrations.py
@@ -25,6 +25,7 @@ from zerver.models import get_stream
 # As a result, we generally mark these tests as skipped once they have
 # been tested for a migration being merged.
 
+
 class SubsNotificationSettingsTestCase(MigrationsTestCase):  # nocoverage
     __unittest_skip__ = True
 
@@ -59,7 +60,9 @@ class SubsNotificationSettingsTestCase(MigrationsTestCase):  # nocoverage
         iago_sub.desktop_notifications = False
         iago_sub.audible_notifications = False
         iago_sub.push_notifications = True
-        iago_sub.save(update_fields=['desktop_notifications', 'audible_notifications', 'push_notifications'])
+        iago_sub.save(
+            update_fields=['desktop_notifications', 'audible_notifications', 'push_notifications']
+        )
 
     def test_subs_migrated(self) -> None:
         UserProfile = self.apps.get_model('zerver', 'UserProfile')
diff --git a/zerver/tests/test_mirror_users.py b/zerver/tests/test_mirror_users.py
index c1fd069bcf..21d7826c15 100644
--- a/zerver/tests/test_mirror_users.py
+++ b/zerver/tests/test_mirror_users.py
@@ -33,8 +33,7 @@ class MirroredMessageUsersTest(ZulipTestCase):
         recipients: List[str] = []
 
         Request = namedtuple('Request', ['POST', 'client'])
-        request = Request(POST = dict(sender=sender.email, type='private'),
-                          client = client)
+        request = Request(POST=dict(sender=sender.email, type='private'), client=client)
 
         with self.assertRaises(InvalidMirrorInput):
             create_mirrored_message_users(request, user, recipients)
@@ -52,13 +51,15 @@ class MirroredMessageUsersTest(ZulipTestCase):
         for client_name in ['zephyr_mirror', 'irc_mirror', 'jabber_mirror']:
             client = get_client(name=client_name)
 
-            request = Request(POST = dict(sender=sender.email, type='private'),
-                              client = client)
+            request = Request(POST=dict(sender=sender.email, type='private'), client=client)
 
             with self.assertRaises(InvalidMirrorInput):
                 create_mirrored_message_users(request, user, recipients)
 
-    @mock.patch('DNS.dnslookup', return_value=[['sipbtest:*:20922:101:Fred Sipb,,,:/mit/sipbtest:/bin/athena/tcsh']])
+    @mock.patch(
+        'DNS.dnslookup',
+        return_value=[['sipbtest:*:20922:101:Fred Sipb,,,:/mit/sipbtest:/bin/athena/tcsh']],
+    )
     def test_zephyr_mirror_new_recipient(self, ignored: object) -> None:
         """Test mirror dummy user creation for PM recipients"""
         client = get_client(name='zephyr_mirror')
@@ -72,8 +73,7 @@ class MirroredMessageUsersTest(ZulipTestCase):
 
         # Now make the request.
         Request = namedtuple('Request', ['POST', 'client'])
-        request = Request(POST = dict(sender=sender.email, type='private'),
-                          client = client)
+        request = Request(POST=dict(sender=sender.email, type='private'), client=client)
 
         mirror_sender = create_mirrored_message_users(request, user, recipients)
 
@@ -87,7 +87,10 @@ class MirroredMessageUsersTest(ZulipTestCase):
         bob = get_user(new_user_email, new_user_realm)
         self.assertTrue(bob.is_mirror_dummy)
 
-    @mock.patch('DNS.dnslookup', return_value=[['sipbtest:*:20922:101:Fred Sipb,,,:/mit/sipbtest:/bin/athena/tcsh']])
+    @mock.patch(
+        'DNS.dnslookup',
+        return_value=[['sipbtest:*:20922:101:Fred Sipb,,,:/mit/sipbtest:/bin/athena/tcsh']],
+    )
     def test_zephyr_mirror_new_sender(self, ignored: object) -> None:
         """Test mirror dummy user creation for sender when sending to stream"""
         client = get_client(name='zephyr_mirror')
@@ -99,12 +102,11 @@ class MirroredMessageUsersTest(ZulipTestCase):
 
         # Now make the request.
         Request = namedtuple('Request', ['POST', 'client'])
-        request = Request(POST = dict(sender=sender_email, type='stream'),
-                          client = client)
+        request = Request(POST=dict(sender=sender_email, type='stream'), client=client)
 
         mirror_sender = create_mirrored_message_users(request, user, recipients)
 
-        assert(mirror_sender is not None)
+        assert mirror_sender is not None
         self.assertEqual(mirror_sender.email, sender_email)
         self.assertTrue(mirror_sender.is_mirror_dummy)
 
@@ -114,12 +116,15 @@ class MirroredMessageUsersTest(ZulipTestCase):
 
         sender = self.example_user('hamlet')
 
-        recipients = [self.nonreg_email('alice'), 'bob@irc.zulip.com', self.nonreg_email('cordelia')]
+        recipients = [
+            self.nonreg_email('alice'),
+            'bob@irc.zulip.com',
+            self.nonreg_email('cordelia'),
+        ]
 
         # Now make the request.
         Request = namedtuple('Request', ['POST', 'client'])
-        request = Request(POST = dict(sender=sender.email, type='private'),
-                          client = client)
+        request = Request(POST=dict(sender=sender.email, type='private'), client=client)
 
         mirror_sender = create_mirrored_message_users(request, sender, recipients)
 
@@ -140,12 +145,15 @@ class MirroredMessageUsersTest(ZulipTestCase):
         sender = self.example_user('hamlet')
         user = sender
 
-        recipients = [self.nonreg_email('alice'), self.nonreg_email('bob'), self.nonreg_email('cordelia')]
+        recipients = [
+            self.nonreg_email('alice'),
+            self.nonreg_email('bob'),
+            self.nonreg_email('cordelia'),
+        ]
 
         # Now make the request.
         Request = namedtuple('Request', ['POST', 'client'])
-        request = Request(POST = dict(sender=sender.email, type='private'),
-                          client = client)
+        request = Request(POST=dict(sender=sender.email, type='private'), client=client)
 
         mirror_sender = create_mirrored_message_users(request, user, recipients)
 
@@ -180,8 +188,7 @@ class MirroredMessageUsersTest(ZulipTestCase):
             create_user_profile(**kwargs).save()
             raise IntegrityError()
 
-        with mock.patch('zerver.lib.actions.create_user',
-                        side_effect=create_user) as m:
+        with mock.patch('zerver.lib.actions.create_user', side_effect=create_user) as m:
             mirror_fred_user = create_mirror_user_if_needed(
                 realm,
                 email,
diff --git a/zerver/tests/test_muting.py b/zerver/tests/test_muting.py
index 818f40b788..7d1398bea4 100644
--- a/zerver/tests/test_muting.py
+++ b/zerver/tests/test_muting.py
@@ -18,7 +18,7 @@ from zerver.models import MutedTopic, UserProfile, get_stream
 class MutedTopicsTests(ZulipTestCase):
     def test_user_ids_muting_topic(self) -> None:
         hamlet = self.example_user('hamlet')
-        cordelia  = self.example_user('cordelia')
+        cordelia = self.example_user('cordelia')
         realm = hamlet.realm
         stream = get_stream('Verona', realm)
         recipient = stream.recipient
@@ -68,8 +68,10 @@ class MutedTopicsTests(ZulipTestCase):
 
         mock_date_muted = datetime(2020, 1, 1, tzinfo=timezone.utc).timestamp()
         for data in payloads:
-            with mock.patch('zerver.views.muting.timezone_now',
-                            return_value=datetime(2020, 1, 1, tzinfo=timezone.utc)):
+            with mock.patch(
+                'zerver.views.muting.timezone_now',
+                return_value=datetime(2020, 1, 1, tzinfo=timezone.utc),
+            ):
                 result = self.api_patch(user, url, data)
                 self.assert_json_success(result)
 
diff --git a/zerver/tests/test_new_users.py b/zerver/tests/test_new_users.py
index 071955ace0..6fa4ae8259 100644
--- a/zerver/tests/test_new_users.py
+++ b/zerver/tests/test_new_users.py
@@ -40,14 +40,16 @@ class SendLoginEmailTest(ZulipTestCase):
                 username=user.delivery_email,
                 password=password,
             )
-            firefox_windows = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0"
+            firefox_windows = (
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0"
+            )
             user_tz = pytz.timezone(user.timezone)
             mock_time = datetime.datetime(year=2018, month=1, day=1, tzinfo=datetime.timezone.utc)
             reference_time = mock_time.astimezone(user_tz).strftime('%A, %B %d, %Y at %I:%M%p %Z')
             with mock.patch('zerver.signals.timezone_now', return_value=mock_time):
-                self.client_post("/accounts/login/",
-                                 info=login_info,
-                                 HTTP_USER_AGENT=firefox_windows)
+                self.client_post(
+                    "/accounts/login/", info=login_info, HTTP_USER_AGENT=firefox_windows
+                )
 
             # email is sent and correct subject
             self.assertEqual(len(mail.outbox), 1)
@@ -61,9 +63,9 @@ class SendLoginEmailTest(ZulipTestCase):
             user.twenty_four_hour_time = True
             user.save()
             with mock.patch('zerver.signals.timezone_now', return_value=mock_time):
-                self.client_post("/accounts/login/",
-                                 info=login_info,
-                                 HTTP_USER_AGENT=firefox_windows)
+                self.client_post(
+                    "/accounts/login/", info=login_info, HTTP_USER_AGENT=firefox_windows
+                )
 
             reference_time = mock_time.astimezone(user_tz).strftime('%A, %B %d, %Y at %H:%M %Z')
             self.assertIn(reference_time, mail.outbox[1].body)
@@ -83,7 +85,9 @@ class SendLoginEmailTest(ZulipTestCase):
             self.assertEqual(mail.outbox[0].subject, "Activate your Zulip account")
             self.assertEqual(len(mail.outbox), 1)
 
-    def test_without_path_info_dont_send_login_emails_for_new_user_registration_logins(self) -> None:
+    def test_without_path_info_dont_send_login_emails_for_new_user_registration_logins(
+        self,
+    ) -> None:
         with self.settings(SEND_LOGIN_EMAILS=True):
             self.client_post('/accounts/home/', {'email': "orange@zulip.com"})
             self.submit_reg_form_for_user("orange@zulip.com", "orange", PATH_INFO='')
@@ -115,50 +119,108 @@ class SendLoginEmailTest(ZulipTestCase):
 
 
 class TestBrowserAndOsUserAgentStrings(ZulipTestCase):
-
     def setUp(self) -> None:
         super().setUp()
         self.user_agents = [
-            ('mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) ' +
-                'Chrome/54.0.2840.59 Safari/537.36', 'Chrome', 'Linux'),
-            ('mozilla/5.0 (windows nt 6.1; win64; x64) applewebkit/537.36 (khtml, like gecko) ' +
-                'chrome/56.0.2924.87 safari/537.36', 'Chrome', 'Windows'),
-            ('mozilla/5.0 (windows nt 6.1; wow64; rv:51.0) gecko/20100101 firefox/51.0', 'Firefox', 'Windows'),
-            ('mozilla/5.0 (windows nt 6.1; wow64; trident/7.0; rv:11.0) like gecko', 'Internet Explorer', 'Windows'),
-            ('Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0', 'Firefox', 'Android'),
-            ('Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) '
-             'AppleWebKit/602.1.50 (KHTML, like Gecko) '
-             'CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1', 'Chrome', 'iOS'),
-            ('Mozilla/5.0 (iPad; CPU OS 6_1_3 like Mac OS X) ' +
-                'AppleWebKit/536.26 (KHTML, like Gecko) ' +
-                'Version/6.0 Mobile/10B329 Safari/8536.25', 'Safari', 'iOS'),
-            ('Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_4 like Mac OS X) ' +
-                'AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B350', None, 'iOS'),
-            ('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) ' +
-                'AppleWebKit/537.36 (KHTML, like Gecko) ' +
-                'Chrome/56.0.2924.87 Safari/537.36', 'Chrome', 'macOS'),
-            ('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) ' +
-                'AppleWebKit/602.3.12 (KHTML, like Gecko) ' +
-                'Version/10.0.2 Safari/602.3.12', 'Safari', 'macOS'),
+            (
+                'mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) '
+                + 'Chrome/54.0.2840.59 Safari/537.36',
+                'Chrome',
+                'Linux',
+            ),
+            (
+                'mozilla/5.0 (windows nt 6.1; win64; x64) applewebkit/537.36 (khtml, like gecko) '
+                + 'chrome/56.0.2924.87 safari/537.36',
+                'Chrome',
+                'Windows',
+            ),
+            (
+                'mozilla/5.0 (windows nt 6.1; wow64; rv:51.0) gecko/20100101 firefox/51.0',
+                'Firefox',
+                'Windows',
+            ),
+            (
+                'mozilla/5.0 (windows nt 6.1; wow64; trident/7.0; rv:11.0) like gecko',
+                'Internet Explorer',
+                'Windows',
+            ),
+            (
+                'Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0',
+                'Firefox',
+                'Android',
+            ),
+            (
+                'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) '
+                'AppleWebKit/602.1.50 (KHTML, like Gecko) '
+                'CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1',
+                'Chrome',
+                'iOS',
+            ),
+            (
+                'Mozilla/5.0 (iPad; CPU OS 6_1_3 like Mac OS X) '
+                + 'AppleWebKit/536.26 (KHTML, like Gecko) '
+                + 'Version/6.0 Mobile/10B329 Safari/8536.25',
+                'Safari',
+                'iOS',
+            ),
+            (
+                'Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_4 like Mac OS X) '
+                + 'AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B350',
+                None,
+                'iOS',
+            ),
+            (
+                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) '
+                + 'AppleWebKit/537.36 (KHTML, like Gecko) '
+                + 'Chrome/56.0.2924.87 Safari/537.36',
+                'Chrome',
+                'macOS',
+            ),
+            (
+                'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) '
+                + 'AppleWebKit/602.3.12 (KHTML, like Gecko) '
+                + 'Version/10.0.2 Safari/602.3.12',
+                'Safari',
+                'macOS',
+            ),
             ('ZulipAndroid/1.0', 'Zulip', 'Android'),
             ('ZulipMobile/1.0.12 (Android 7.1.1)', 'Zulip', 'Android'),
             ('ZulipMobile/0.7.1.1 (iOS 10.3.1)', 'Zulip', 'iOS'),
-            ('ZulipElectron/1.1.0-beta Mozilla/5.0 (Windows NT 10.0; Win64; x64) ' +
-             'AppleWebKit/537.36 (KHTML, like Gecko) Zulip/1.1.0-beta ' +
-             'Chrome/56.0.2924.87 Electron/1.6.8 Safari/537.36', 'Zulip', 'Windows'),
-            ('Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.7 (KHTML, '
-             'like Gecko) Ubuntu/11.10 Chromium/16.0.912.77 '
-             'Chrome/16.0.912.77 Safari/535.7', 'Chromium', 'Linux'),
-            ('Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 '
-             '(KHTML, like Gecko) Chrome/28.0.1500.52 Safari/537.36 '
-             'OPR/15.0.1147.100', 'Opera', 'Windows'),
-            ('Mozilla/5.0 (Windows NT 10.0; <64-bit tags>) AppleWebKit/'
-             '<WebKit Rev> (KHTML, like Gecko) Chrome/<Chrome Rev> Safari'
-             '/<WebKit Rev> Edge/<EdgeHTML Rev>.'
-             '<Windows Build>', 'Edge', 'Windows'),
-            ('Mozilla/5.0 (X11; CrOS x86_64 10895.56.0) AppleWebKit/537.36'
-             '(KHTML, like Gecko) Chrome/69.0.3497.95 Safari/537.36',
-             'Chrome', 'ChromeOS'),
+            (
+                'ZulipElectron/1.1.0-beta Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
+                + 'AppleWebKit/537.36 (KHTML, like Gecko) Zulip/1.1.0-beta '
+                + 'Chrome/56.0.2924.87 Electron/1.6.8 Safari/537.36',
+                'Zulip',
+                'Windows',
+            ),
+            (
+                'Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.7 (KHTML, '
+                'like Gecko) Ubuntu/11.10 Chromium/16.0.912.77 '
+                'Chrome/16.0.912.77 Safari/535.7',
+                'Chromium',
+                'Linux',
+            ),
+            (
+                'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 '
+                '(KHTML, like Gecko) Chrome/28.0.1500.52 Safari/537.36 '
+                'OPR/15.0.1147.100',
+                'Opera',
+                'Windows',
+            ),
+            (
+                'Mozilla/5.0 (Windows NT 10.0; <64-bit tags>) AppleWebKit/'
+                '<WebKit Rev> (KHTML, like Gecko) Chrome/<Chrome Rev> Safari'
+                '/<WebKit Rev> Edge/<EdgeHTML Rev>.'
+                '<Windows Build>',
+                'Edge',
+                'Windows',
+            ),
+            (
+                'Mozilla/5.0 (X11; CrOS x86_64 10895.56.0) AppleWebKit/537.36'
+                '(KHTML, like Gecko) Chrome/69.0.3497.95 Safari/537.36',
+                'Chrome',
+                'ChromeOS',
+            ),
             ('', None, None),
         ]
 
@@ -186,4 +248,6 @@ class TestNotifyNewUser(ZulipTestCase):
         self.assertEqual(message.recipient.type, Recipient.STREAM)
         actual_stream = Stream.objects.get(id=message.recipient.type_id)
         self.assertEqual(actual_stream.name, Realm.INITIAL_PRIVATE_STREAM_NAME)
-        self.assertIn(f'@_**Cordelia Lear|{new_user.id}** just signed up for Zulip.', message.content)
+        self.assertIn(
+            f'@_**Cordelia Lear|{new_user.id}** just signed up for Zulip.', message.content
+        )
diff --git a/zerver/tests/test_onboarding.py b/zerver/tests/test_onboarding.py
index ace78fcd29..63016c1f08 100644
--- a/zerver/tests/test_onboarding.py
+++ b/zerver/tests/test_onboarding.py
@@ -5,9 +5,9 @@ from zerver.models import Realm, UserProfile
 
 class TestRealmInternalBotCreation(ZulipTestCase):
     def test_create_if_missing_realm_internal_bots(self) -> None:
-        realm_internal_bots_dict = [{'var_name': 'TEST_BOT',
-                                     'email_template': 'test-bot@%s',
-                                     'name': 'Test Bot'}]
+        realm_internal_bots_dict = [
+            {'var_name': 'TEST_BOT', 'email_template': 'test-bot@%s', 'name': 'Test Bot'}
+        ]
 
         def check_test_bot_exists() -> bool:
             all_realms_count = Realm.objects.count()
diff --git a/zerver/tests/test_openapi.py b/zerver/tests/test_openapi.py
index 7a3294c3e2..54302316c2 100644
--- a/zerver/tests/test_openapi.py
+++ b/zerver/tests/test_openapi.py
@@ -59,6 +59,7 @@ VARMAP = {
     'NoneType': type(None),
 }
 
+
 def schema_type(schema: Dict[str, Any]) -> Union[type, Tuple[type, object]]:
     if 'oneOf' in schema:
         # Hack: Just use the type of the first value
@@ -69,6 +70,7 @@ def schema_type(schema: Dict[str, Any]) -> Union[type, Tuple[type, object]]:
     else:
         return VARMAP[schema["type"]]
 
+
 class OpenAPIToolsTest(ZulipTestCase):
     """Make sure that the tools we use to handle our OpenAPI specification
     (located in zerver/openapi/openapi.py) work as expected.
@@ -78,8 +80,7 @@ class OpenAPIToolsTest(ZulipTestCase):
     """
 
     def test_get_openapi_fixture(self) -> None:
-        actual = get_openapi_fixture(TEST_ENDPOINT, TEST_METHOD,
-                                     TEST_RESPONSE_BAD_REQ)
+        actual = get_openapi_fixture(TEST_ENDPOINT, TEST_METHOD, TEST_RESPONSE_BAD_REQ)
         expected = {
             'code': 'BAD_REQUEST',
             'msg': 'You don\'t have permission to edit this message',
@@ -92,57 +93,51 @@ class OpenAPIToolsTest(ZulipTestCase):
         expected_item = {
             'name': 'message_id',
             'in': 'path',
-            'description':
-                'The target message\'s ID.\n',
+            'description': 'The target message\'s ID.\n',
             'example': 42,
             'required': True,
             'schema': {'type': 'integer'},
         }
-        assert(expected_item in actual)
+        assert expected_item in actual
 
     def test_validate_against_openapi_schema(self) -> None:
-        with self.assertRaises(ValidationError,
-                               msg="Additional properties are not allowed ('foo' was unexpected)"):
+        with self.assertRaises(
+            ValidationError, msg="Additional properties are not allowed ('foo' was unexpected)"
+        ):
             bad_content: Dict[str, object] = {
                 'msg': '',
                 'result': 'success',
                 'foo': 'bar',
             }
-            validate_against_openapi_schema(bad_content,
-                                            TEST_ENDPOINT,
-                                            TEST_METHOD,
-                                            TEST_RESPONSE_SUCCESS)
+            validate_against_openapi_schema(
+                bad_content, TEST_ENDPOINT, TEST_METHOD, TEST_RESPONSE_SUCCESS
+            )
 
-        with self.assertRaises(ValidationError,
-                               msg=("42 is not of type string")):
+        with self.assertRaises(ValidationError, msg=("42 is not of type string")):
             bad_content = {
                 'msg': 42,
                 'result': 'success',
             }
-            validate_against_openapi_schema(bad_content,
-                                            TEST_ENDPOINT,
-                                            TEST_METHOD,
-                                            TEST_RESPONSE_SUCCESS)
+            validate_against_openapi_schema(
+                bad_content, TEST_ENDPOINT, TEST_METHOD, TEST_RESPONSE_SUCCESS
+            )
 
-        with self.assertRaises(ValidationError,
-                               msg='Expected to find the "msg" required key'):
+        with self.assertRaises(ValidationError, msg='Expected to find the "msg" required key'):
             bad_content = {
                 'result': 'success',
             }
-            validate_against_openapi_schema(bad_content,
-                                            TEST_ENDPOINT,
-                                            TEST_METHOD,
-                                            TEST_RESPONSE_SUCCESS)
+            validate_against_openapi_schema(
+                bad_content, TEST_ENDPOINT, TEST_METHOD, TEST_RESPONSE_SUCCESS
+            )
 
         # No exceptions should be raised here.
         good_content = {
             'msg': '',
             'result': 'success',
         }
-        validate_against_openapi_schema(good_content,
-                                        TEST_ENDPOINT,
-                                        TEST_METHOD,
-                                        TEST_RESPONSE_SUCCESS)
+        validate_against_openapi_schema(
+            good_content, TEST_ENDPOINT, TEST_METHOD, TEST_RESPONSE_SUCCESS
+        )
 
         # Overwrite the exception list with a mocked one
         test_dict: Dict[str, Any] = {}
@@ -153,22 +148,38 @@ class OpenAPIToolsTest(ZulipTestCase):
         # 'deep' opaque object. Also the parameters are a heterogeneous
         # mix of arrays and objects to verify that our descent logic
         # correctly gets to the the deeply nested objects.
-        with open(os.path.join(os.path.dirname(OPENAPI_SPEC_PATH),
-                  "testing.yaml")) as test_file:
+        with open(os.path.join(os.path.dirname(OPENAPI_SPEC_PATH), "testing.yaml")) as test_file:
             test_dict = yaml.safe_load(test_file)
         openapi_spec.openapi()['paths']['testing'] = test_dict
         try:
-            validate_against_openapi_schema((test_dict['test1']['responses']['200']['content']
-                                            ['application/json']['example']),
-                                            'testing', 'test1', '200')
-            with self.assertRaises(ValidationError, msg = 'Extraneous key "str4" in response\'s content'):
-                validate_against_openapi_schema((test_dict['test2']['responses']['200']
-                                                ['content']['application/json']['example']),
-                                                'testing', 'test2', '200')
-            with self.assertRaises(SchemaError, msg = 'Opaque object "obj"'):
+            validate_against_openapi_schema(
+                (test_dict['test1']['responses']['200']['content']['application/json']['example']),
+                'testing',
+                'test1',
+                '200',
+            )
+            with self.assertRaises(
+                ValidationError, msg='Extraneous key "str4" in response\'s content'
+            ):
+                validate_against_openapi_schema(
+                    (
+                        test_dict['test2']['responses']['200']['content']['application/json'][
+                            'example'
+                        ]
+                    ),
+                    'testing',
+                    'test2',
+                    '200',
+                )
+            with self.assertRaises(SchemaError, msg='Opaque object "obj"'):
                 # Checks for opaque objects
-                validate_schema((test_dict['test3']['responses']['200']
-                                ['content']['application/json']['schema']))
+                validate_schema(
+                    (
+                        test_dict['test3']['responses']['200']['content']['application/json'][
+                            'schema'
+                        ]
+                    )
+                )
         finally:
             openapi_spec.openapi()['paths'].pop('testing', None)
 
@@ -201,6 +212,7 @@ class OpenAPIToolsTest(ZulipTestCase):
         new_openapi = openapi_spec.openapi()
         self.assertIs(old_openapi, new_openapi)
 
+
 class OpenAPIArgumentsTest(ZulipTestCase):
     # This will be filled during test_openapi_arguments:
     checked_endpoints: Set[str] = set()
@@ -212,7 +224,6 @@ class OpenAPIArgumentsTest(ZulipTestCase):
         '/users/me/presence',
         '/users/me/alert_words',
         '/users/me/status',
-
         #### These realm administration settings are valuable to document:
         # Delete a file uploaded by current user.
         '/attachments/{attachment_id}',
@@ -235,16 +246,12 @@ class OpenAPIArgumentsTest(ZulipTestCase):
         # users/me/subscriptions/properties; probably should just be a
         # section of the same page.
         '/users/me/subscriptions/{stream_id}',
-
         # Real-time-events endpoint
         '/real-time',
-
         # Rest error handling endpoint
         '/rest-error-handling',
-
         # Zulip outgoing webhook payload
         '/zulip-outgoing-webhook',
-
         #### Mobile-app only endpoints; important for mobile developers.
         # Mobile interface for fetching API keys
         '/fetch_api_key',
@@ -255,7 +262,6 @@ class OpenAPIArgumentsTest(ZulipTestCase):
         # Registration for iOS/Android mobile push notifications.
         '/users/me/android_gcm_reg_id',
         '/users/me/apns_device_token',
-
         #### These personal settings endpoints have modest value to document:
         '/settings',
         '/users/me/avatar',
@@ -264,12 +270,10 @@ class OpenAPIArgumentsTest(ZulipTestCase):
         '/settings/display',
         # Much more valuable would be an org admin bulk-upload feature.
         '/users/me/profile_data',
-
         #### Should be documented as part of interactive bots documentation
         '/bot_storage',
         '/submessage',
         '/zcommand',
-
         #### These "organization settings" endpoint have modest value to document:
         '/realm',
         '/realm/domains',
@@ -283,7 +287,6 @@ class OpenAPIArgumentsTest(ZulipTestCase):
         '/realm/logo',
         '/realm/deactivate',
         '/realm/subdomain/{subdomain}',
-
         #### Other low value endpoints
         # Used for dead desktop app to test connectivity.  To delete.
         '/generate_204',
@@ -295,17 +298,16 @@ class OpenAPIArgumentsTest(ZulipTestCase):
 
     # Endpoints where the documentation is currently failing our
     # consistency tests.  We aim to keep this list empty.
-    buggy_documentation_endpoints: Set[str] = set([
-    ])
+    buggy_documentation_endpoints: Set[str] = set([])
 
     def convert_regex_to_url_pattern(self, regex_pattern: str) -> str:
-        """ Convert regular expressions style URL patterns to their
-            corresponding OpenAPI style formats. All patterns are
-            expected to start with ^ and end with $.
-            Examples:
-                1. /messages/{message_id} <-> r'^messages/(?P<message_id>[0-9]+)$'
-                2. /events <-> r'^events$'
-                3. '/realm/domains' <-> r'/realm\\/domains$'
+        """Convert regular expressions style URL patterns to their
+        corresponding OpenAPI style formats. All patterns are
+        expected to start with ^ and end with $.
+        Examples:
+            1. /messages/{message_id} <-> r'^messages/(?P<message_id>[0-9]+)$'
+            2. /events <-> r'^events$'
+            3. '/realm/domains' <-> r'/realm\\/domains$'
         """
 
         # Handle the presence-email code which has a non-slashes syntax.
@@ -318,9 +320,9 @@ class OpenAPIArgumentsTest(ZulipTestCase):
         url_pattern = url_pattern.replace('\\', '')
         return url_pattern
 
-    def ensure_no_documentation_if_intentionally_undocumented(self, url_pattern: str,
-                                                              method: str,
-                                                              msg: Optional[str]=None) -> None:
+    def ensure_no_documentation_if_intentionally_undocumented(
+        self, url_pattern: str, method: str, msg: Optional[str] = None
+    ) -> None:
         try:
             get_openapi_parameters(url_pattern, method)
             if not msg:  # nocoverage
@@ -333,12 +335,12 @@ so maybe we shouldn't mark it as intentionally undocumented in the URLs.
             return
 
     def check_for_non_existant_openapi_endpoints(self) -> None:
-        """ Here, we check to see if every endpoint documented in the OpenAPI
+        """Here, we check to see if every endpoint documented in the OpenAPI
         documentation actually exists in urls.py and thus in actual code.
         Note: We define this as a helper called at the end of
         test_openapi_arguments instead of as a separate test to ensure that
         this test is only executed after test_openapi_arguments so that it's
-        results can be used here in the set operations. """
+        results can be used here in the set operations."""
         openapi_paths = set(get_openapi_paths())
         undocumented_paths = openapi_paths - self.checked_endpoints
         undocumented_paths -= self.buggy_documentation_endpoints
@@ -351,7 +353,9 @@ so maybe we shouldn't mark it as intentionally undocumented in the URLs.
                 msg += f"\n + {undocumented_path}"
             raise AssertionError(msg)
 
-    def get_type_by_priority(self, types: Sequence[Union[type, Tuple[type, object]]]) -> Union[type, Tuple[type, object]]:
+    def get_type_by_priority(
+        self, types: Sequence[Union[type, Tuple[type, object]]]
+    ) -> Union[type, Tuple[type, object]]:
         priority = {list: 1, dict: 2, str: 3, int: 4, bool: 5}
         tyiroirp = {1: list, 2: dict, 3: str, 4: int, 5: bool}
         val = 6
@@ -364,7 +368,7 @@ so maybe we shouldn't mark it as intentionally undocumented in the URLs.
         return tyiroirp.get(val, types[0])
 
     def get_standardized_argument_type(self, t: Any) -> Union[type, Tuple[type, object]]:
-        """ Given a type from the typing module such as List[str] or Union[str, int],
+        """Given a type from the typing module such as List[str] or Union[str, int],
         convert it into a corresponding Python type. Unions are mapped to a canonical
         choice among the options.
         E.g. typing.Union[typing.List[typing.Dict[str, typing.Any]], NoneType]
@@ -397,20 +401,24 @@ so maybe we shouldn't mark it as intentionally undocumented in the URLs.
             return dict
         raise AssertionError(f"Unknown origin {origin}")
 
-    def render_openapi_type_exception(self, function:  Callable[..., HttpResponse],
-                                      openapi_params: Set[Tuple[str, Union[type, Tuple[type, object]]]],
-                                      function_params: Set[Tuple[str, Union[type, Tuple[type, object]]]],
-                                      diff: Set[Tuple[str, Union[type, Tuple[type, object]]]]) -> None:  # nocoverage
-        """ Print a *VERY* clear and verbose error message for when the types
-        (between the OpenAPI documentation and the function declaration) don't match. """
+    def render_openapi_type_exception(
+        self,
+        function: Callable[..., HttpResponse],
+        openapi_params: Set[Tuple[str, Union[type, Tuple[type, object]]]],
+        function_params: Set[Tuple[str, Union[type, Tuple[type, object]]]],
+        diff: Set[Tuple[str, Union[type, Tuple[type, object]]]],
+    ) -> None:  # nocoverage
+        """Print a *VERY* clear and verbose error message for when the types
+        (between the OpenAPI documentation and the function declaration) don't match."""
 
         msg = f"""
 The types for the request parameters in zerver/openapi/zulip.yaml
 do not match the types declared in the implementation of {function.__name__}.\n"""
-        msg += '='*65 + '\n'
-        msg += "{:<10s}{:^30s}{:>10s}\n".format("Parameter", "OpenAPI Type",
-                                                "Function Declaration Type")
-        msg += '='*65 + '\n'
+        msg += '=' * 65 + '\n'
+        msg += "{:<10s}{:^30s}{:>10s}\n".format(
+            "Parameter", "OpenAPI Type", "Function Declaration Type"
+        )
+        msg += '=' * 65 + '\n'
         opvtype = None
         fdvtype = None
         for element in diff:
@@ -426,13 +434,14 @@ do not match the types declared in the implementation of {function.__name__}.\n"
         msg += f"{vname:<10s}{str(opvtype):^30s}{str(fdvtype):>10s}\n"
         raise AssertionError(msg)
 
-    def check_argument_types(self, function: Callable[..., HttpResponse],
-                             openapi_parameters: List[Dict[str, Any]]) -> None:
-        """ We construct for both the OpenAPI data and the function's definition a set of
+    def check_argument_types(
+        self, function: Callable[..., HttpResponse], openapi_parameters: List[Dict[str, Any]]
+    ) -> None:
+        """We construct for both the OpenAPI data and the function's definition a set of
         tuples of the form (var_name, type) and then compare those sets to see if the
         OpenAPI data defines a different type than that actually accepted by the function.
         Otherwise, we print out the exact differences for convenient debugging and raise an
-        AssertionError. """
+        AssertionError."""
         openapi_params: Set[Tuple[str, Union[type, Tuple[type, object]]]] = set()
         json_params: Dict[str, Union[type, Tuple[type, object]]] = {}
         for element in openapi_parameters:
@@ -512,7 +521,7 @@ do not match the types declared in the implementation of {function.__name__}.\n"
                 function_params.add((vname, vtype))
 
         # After the above operations `json_params` should be empty.
-        assert(len(json_params) == 0)
+        assert len(json_params) == 0
         diff = openapi_params - function_params
         if diff:  # nocoverage
             self.render_openapi_type_exception(function, openapi_params, function_params, diff)
@@ -593,15 +602,17 @@ do not match the types declared in the implementation of {function.__name__}.\n"
 We found some OpenAPI documentation for {method} {url_pattern},
 so maybe we shouldn't include it in pending_endpoints.
 """
-                    self.ensure_no_documentation_if_intentionally_undocumented(url_pattern,
-                                                                               method, msg)
+                    self.ensure_no_documentation_if_intentionally_undocumented(
+                        url_pattern, method, msg
+                    )
                     continue
 
                 try:
                     # Don't include OpenAPI parameters that live in
                     # the path; these are not extracted by REQ.
-                    openapi_parameters = get_openapi_parameters(url_pattern, method,
-                                                                include_url_parameters=False)
+                    openapi_parameters = get_openapi_parameters(
+                        url_pattern, method, include_url_parameters=False
+                    )
                 except Exception:  # nocoverage
                     raise AssertionError(f"Could not find OpenAPI docs for {method} {url_pattern}")
 
@@ -624,22 +635,18 @@ so maybe we shouldn't include it in pending_endpoints.
                 # argument list matches what actually appears in the
                 # codebase.
 
-                openapi_parameter_names = {
-                    parameter['name'] for parameter in openapi_parameters
-                }
+                openapi_parameter_names = {parameter['name'] for parameter in openapi_parameters}
 
                 if len(accepted_arguments - openapi_parameter_names) > 0:  # nocoverage
-                    print("Undocumented parameters for",
-                          url_pattern, method, function_name)
+                    print("Undocumented parameters for", url_pattern, method, function_name)
                     print(" +", openapi_parameter_names)
                     print(" -", accepted_arguments)
-                    assert(url_pattern in self.buggy_documentation_endpoints)
+                    assert url_pattern in self.buggy_documentation_endpoints
                 elif len(openapi_parameter_names - accepted_arguments) > 0:  # nocoverage
-                    print("Documented invalid parameters for",
-                          url_pattern, method, function_name)
+                    print("Documented invalid parameters for", url_pattern, method, function_name)
                     print(" -", openapi_parameter_names)
                     print(" +", accepted_arguments)
-                    assert(url_pattern in self.buggy_documentation_endpoints)
+                    assert url_pattern in self.buggy_documentation_endpoints
                 else:
                     self.assertEqual(openapi_parameter_names, accepted_arguments)
                     self.check_argument_types(function, openapi_parameters)
@@ -649,7 +656,6 @@ so maybe we shouldn't include it in pending_endpoints.
 
 
 class ModifyExampleGenerationTestCase(ZulipTestCase):
-
     def test_no_mod_argument(self) -> None:
         res = parse_language_and_options("python")
         self.assertEqual(res, ("python", {}))
@@ -686,8 +692,21 @@ class ModifyExampleGenerationTestCase(ZulipTestCase):
         self.assertEqual(res, ("curl", {"exclude": ["param1", "param2"], "special": ["param3"]}))
 
     def test_multiple_mixed_mod_arguments(self) -> None:
-        res = parse_language_and_options("curl, exclude=[\"asdf\", 'sdfg'], other_key='asdf', more_things=\"asdf\", another_list=[1, \"2\"]")
-        self.assertEqual(res, ("curl", {"exclude": ["asdf", "sdfg"], "other_key": "asdf", "more_things": "asdf", "another_list": [1, "2"]}))
+        res = parse_language_and_options(
+            "curl, exclude=[\"asdf\", 'sdfg'], other_key='asdf', more_things=\"asdf\", another_list=[1, \"2\"]"
+        )
+        self.assertEqual(
+            res,
+            (
+                "curl",
+                {
+                    "exclude": ["asdf", "sdfg"],
+                    "other_key": "asdf",
+                    "more_things": "asdf",
+                    "another_list": [1, "2"],
+                },
+            ),
+        )
 
 
 class TestCurlExampleGeneration(ZulipTestCase):
@@ -745,12 +764,10 @@ class TestCurlExampleGeneration(ZulipTestCase):
                             "description": "An object",
                             "content": {
                                 "application/json": {
-                                    "schema": {
-                                        "type": "object"
-                                    },
+                                    "schema": {"type": "object"},
                                     "example": {
                                         "key": "value",
-                                    }
+                                    },
                                 }
                             },
                             "required": True,
@@ -785,12 +802,10 @@ class TestCurlExampleGeneration(ZulipTestCase):
                             "required": True,
                             "content": {
                                 "application/json": {
-                                    "schema": {
-                                        "type": "object"
-                                    },
+                                    "schema": {"type": "object"},
                                     "example": {
                                         "key": "value",
-                                    }
+                                    },
                                 }
                             },
                         },
@@ -845,8 +860,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
     }
 
     def curl_example(self, endpoint: str, method: str, *args: Any, **kwargs: Any) -> List[str]:
-        return generate_curl_example(endpoint, method,
-                                     "http://localhost:9991/api", *args, **kwargs)
+        return generate_curl_example(endpoint, method, "http://localhost:9991/api", *args, **kwargs)
 
     def test_generate_and_render_curl_example(self) -> None:
         generated_curl_example = self.curl_example("/get_stream_id", "GET")
@@ -926,13 +940,17 @@ class TestCurlExampleGeneration(ZulipTestCase):
         self.assertEqual(generated_curl_example, expected_curl_example)
 
     @patch("zerver.openapi.openapi.OpenAPISpec.openapi")
-    def test_generate_and_render_curl_with_object_without_example(self, spec_mock: MagicMock) -> None:
+    def test_generate_and_render_curl_with_object_without_example(
+        self, spec_mock: MagicMock
+    ) -> None:
         spec_mock.return_value = self.spec_mock_using_object_without_example
         with self.assertRaises(ValueError):
             self.curl_example("/endpoint", "GET")
 
     @patch("zerver.openapi.openapi.OpenAPISpec.openapi")
-    def test_generate_and_render_curl_with_array_without_example(self, spec_mock: MagicMock) -> None:
+    def test_generate_and_render_curl_with_array_without_example(
+        self, spec_mock: MagicMock
+    ) -> None:
         spec_mock.return_value = self.spec_mock_using_array_without_example
         with self.assertRaises(ValueError):
             self.curl_example("/endpoint", "GET")
@@ -951,8 +969,9 @@ class TestCurlExampleGeneration(ZulipTestCase):
         self.assertEqual(generated_curl_example, expected_curl_example)
 
     def test_generate_and_render_curl_wrapper(self) -> None:
-        generated_curl_example = render_curl_example("/get_stream_id:GET:email:key",
-                                                     api_url="https://zulip.example.com/api")
+        generated_curl_example = render_curl_example(
+            "/get_stream_id:GET:email:key", api_url="https://zulip.example.com/api"
+        )
         expected_curl_example = [
             "```curl",
             "curl -sSX GET -G https://zulip.example.com/api/v1/get_stream_id \\",
@@ -963,8 +982,9 @@ class TestCurlExampleGeneration(ZulipTestCase):
         self.assertEqual(generated_curl_example, expected_curl_example)
 
     def test_generate_and_render_curl_example_with_excludes(self) -> None:
-        generated_curl_example = self.curl_example("/messages", "GET",
-                                                   exclude=["client_gravatar", "apply_markdown"])
+        generated_curl_example = self.curl_example(
+            "/messages", "GET", exclude=["client_gravatar", "apply_markdown"]
+        )
         expected_curl_example = [
             '```curl',
             'curl -sSX GET -G http://localhost:9991/api/v1/messages \\',
@@ -978,6 +998,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
         ]
         self.assertEqual(generated_curl_example, expected_curl_example)
 
+
 class OpenAPIAttributesTest(ZulipTestCase):
     def test_attributes(self) -> None:
         """
@@ -987,30 +1008,43 @@ class OpenAPIAttributesTest(ZulipTestCase):
         * That no opaque object exists.
         """
         EXCLUDE = ["/real-time", "/register", "/events"]
-        VALID_TAGS = ["users", "server_and_organizations", "authentication",
-                      "real_time_events", "streams", "messages", "users",
-                      "webhooks"]
+        VALID_TAGS = [
+            "users",
+            "server_and_organizations",
+            "authentication",
+            "real_time_events",
+            "streams",
+            "messages",
+            "users",
+            "webhooks",
+        ]
         paths = OpenAPISpec(OPENAPI_SPEC_PATH).openapi()["paths"]
         for path, path_item in paths.items():
             if path in EXCLUDE:
                 continue
             for method, operation in path_item.items():
                 # Check if every file has an operationId
-                assert("operationId" in operation)
-                assert("tags" in operation)
+                assert "operationId" in operation
+                assert "tags" in operation
                 tag = operation["tags"][0]
-                assert(tag in VALID_TAGS)
+                assert tag in VALID_TAGS
                 for status_code, response in operation['responses'].items():
                     schema = response['content']['application/json']['schema']
                     if 'oneOf' in schema:
                         for subschema_index, subschema in enumerate(schema['oneOf']):
                             validate_schema(subschema)
-                            assert(validate_against_openapi_schema(subschema['example'], path,
-                                                                   method, status_code + '_' + str(subschema_index)))
+                            assert validate_against_openapi_schema(
+                                subschema['example'],
+                                path,
+                                method,
+                                status_code + '_' + str(subschema_index),
+                            )
                         continue
                     validate_schema(schema)
-                    assert(validate_against_openapi_schema(schema['example'], path,
-                                                           method, status_code))
+                    assert validate_against_openapi_schema(
+                        schema['example'], path, method, status_code
+                    )
+
 
 class OpenAPIRegexTest(ZulipTestCase):
     def test_regex(self) -> None:
@@ -1020,19 +1054,19 @@ class OpenAPIRegexTest(ZulipTestCase):
         """
         # Some of the undocumentd endpoints which are very similar to
         # some of the documented endpoints.
-        assert(find_openapi_endpoint('/users/me/presence') is None)
-        assert(find_openapi_endpoint('/users/me/subscriptions/23') is None)
-        assert(find_openapi_endpoint('/users/iago/subscriptions/23') is None)
-        assert(find_openapi_endpoint('/messages/matches_narrow') is None)
+        assert find_openapi_endpoint('/users/me/presence') is None
+        assert find_openapi_endpoint('/users/me/subscriptions/23') is None
+        assert find_openapi_endpoint('/users/iago/subscriptions/23') is None
+        assert find_openapi_endpoint('/messages/matches_narrow') is None
         # Making sure documented endpoints are matched correctly.
-        assert(find_openapi_endpoint('/users/23/subscriptions/21') ==
-               '/users/{user_id}/subscriptions/{stream_id}')
-        assert(find_openapi_endpoint('/users/iago@zulip.com/presence') ==
-               '/users/{email}/presence')
-        assert(find_openapi_endpoint('/messages/23') ==
-               '/messages/{message_id}')
-        assert(find_openapi_endpoint('/realm/emoji/realm_emoji_1') ==
-               '/realm/emoji/{emoji_name}')
+        assert (
+            find_openapi_endpoint('/users/23/subscriptions/21')
+            == '/users/{user_id}/subscriptions/{stream_id}'
+        )
+        assert find_openapi_endpoint('/users/iago@zulip.com/presence') == '/users/{email}/presence'
+        assert find_openapi_endpoint('/messages/23') == '/messages/{message_id}'
+        assert find_openapi_endpoint('/realm/emoji/realm_emoji_1') == '/realm/emoji/{emoji_name}'
+
 
 class OpenAPIRequestValidatorTest(ZulipTestCase):
     def test_validator(self) -> None:
@@ -1042,16 +1076,14 @@ class OpenAPIRequestValidatorTest(ZulipTestCase):
         as invalid and making sure invalid requests are markded properly
         """
         # `/users/me/subscriptions` doesn't require any parameters
-        validate_request('/users/me/subscriptions', 'get', {}, {}, False,
-                         '200')
+        validate_request('/users/me/subscriptions', 'get', {}, {}, False, '200')
         with self.assertRaises(SchemaError):
             # `/messages` POST does not work on an empty response
-            validate_request('/messages', 'post', {}, {},
-                             False, '200')
+            validate_request('/messages', 'post', {}, {}, False, '200')
         # 400 responses are allowed to fail validation.
-        validate_request('/messages', 'post', {}, {},
-                         False, '400')
+        validate_request('/messages', 'post', {}, {}, False, '400')
         # `intentionally_undocumented` allows validation errors on
         # 200 responses.
-        validate_request('/dev_fetch_api_key', 'post', {}, {},
-                         False, '200', intentionally_undocumented=True)
+        validate_request(
+            '/dev_fetch_api_key', 'post', {}, {}, False, '200', intentionally_undocumented=True
+        )
diff --git a/zerver/tests/test_outgoing_webhook_interfaces.py b/zerver/tests/test_outgoing_webhook_interfaces.py
index 6c4941b47a..8398d8b591 100644
--- a/zerver/tests/test_outgoing_webhook_interfaces.py
+++ b/zerver/tests/test_outgoing_webhook_interfaces.py
@@ -15,15 +15,14 @@ from zerver.openapi.openapi import validate_against_openapi_schema
 
 
 class TestGenericOutgoingWebhookService(ZulipTestCase):
-
     def setUp(self) -> None:
         super().setUp()
 
         bot_user = get_user("outgoing-webhook@zulip.com", get_realm("zulip"))
         service_class = get_service_interface_class('whatever')  # GenericOutgoingWebhookService
-        self.handler = service_class(service_name='test-service',
-                                     token='abcdef',
-                                     user_profile=bot_user)
+        self.handler = service_class(
+            service_name='test-service', token='abcdef', user_profile=bot_user
+        )
 
     def test_process_success_response(self) -> None:
         class Stub:
@@ -141,8 +140,8 @@ class TestGenericOutgoingWebhookService(ZulipTestCase):
         success_response = self.handler.process_success(response)
         self.assertEqual(success_response, None)
 
-class TestSlackOutgoingWebhookService(ZulipTestCase):
 
+class TestSlackOutgoingWebhookService(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.stream_message_event = {
@@ -182,9 +181,7 @@ class TestSlackOutgoingWebhookService(ZulipTestCase):
         }
 
         service_class = get_service_interface_class(SLACK_INTERFACE)
-        self.handler = service_class(token="abcdef",
-                                     user_profile=None,
-                                     service_name='test-service')
+        self.handler = service_class(token="abcdef", user_profile=None, service_name='test-service')
 
     def test_build_bot_request_stream_message(self) -> None:
         request_data = self.handler.build_bot_request(self.stream_message_event)
diff --git a/zerver/tests/test_outgoing_webhook_system.py b/zerver/tests/test_outgoing_webhook_system.py
index 3b06a727ec..96fdeb8c61 100644
--- a/zerver/tests/test_outgoing_webhook_system.py
+++ b/zerver/tests/test_outgoing_webhook_system.py
@@ -18,20 +18,26 @@ from zerver.models import Recipient, Service, UserProfile, get_display_recipient
 
 
 class ResponseMock:
-    def __init__(self, status_code: int, content: bytes=b"") -> None:
+    def __init__(self, status_code: int, content: bytes = b"") -> None:
         self.status_code = status_code
         self.content = content
         self.text = content.decode()
 
-def request_exception_error(http_method: Any, final_url: Any, data: Any, **request_kwargs: Any) -> Any:
+
+def request_exception_error(
+    http_method: Any, final_url: Any, data: Any, **request_kwargs: Any
+) -> Any:
     raise requests.exceptions.RequestException("I'm a generic exception :(")
 
+
 def timeout_error(http_method: Any, final_url: Any, data: Any, **request_kwargs: Any) -> Any:
     raise requests.exceptions.Timeout("Time is up!")
 
+
 def connection_error(http_method: Any, final_url: Any, data: Any, **request_kwargs: Any) -> Any:
     raise requests.exceptions.ConnectionError()
 
+
 class DoRestCallTests(ZulipTestCase):
     def mock_event(self, bot_user: UserProfile) -> Dict[str, Any]:
         return {
@@ -39,14 +45,17 @@ class DoRestCallTests(ZulipTestCase):
             # Therefore, we need to emulate `retry_event` in the last stage when the maximum
             # retries have been exceeded.
             'failed_tries': 3,
-            'message': {'display_recipient': 'Verona',
-                        'stream_id': 999,
-                        TOPIC_NAME: 'Foo',
-                        'id': '',
-                        'type': 'stream'},
+            'message': {
+                'display_recipient': 'Verona',
+                'stream_id': 999,
+                TOPIC_NAME: 'Foo',
+                'id': '',
+                'type': 'stream',
+            },
             'user_profile_id': bot_user.id,
             'command': '',
-            'service_name': ''}
+            'service_name': '',
+        }
 
     def test_successful_request(self) -> None:
         bot_user = self.example_user('outgoing_webhook_bot')
@@ -75,15 +84,24 @@ class DoRestCallTests(ZulipTestCase):
         service_handler = GenericOutgoingWebhookService("token", bot_user, "service")
 
         response = ResponseMock(500)
-        with mock.patch('requests.request', return_value=response), self.assertLogs(level="WARNING") as m:
-            final_response = do_rest_call('',  None, mock_event, service_handler)
+        with mock.patch('requests.request', return_value=response), self.assertLogs(
+            level="WARNING"
+        ) as m:
+            final_response = do_rest_call('', None, mock_event, service_handler)
             assert final_response is not None
 
-            self.assertEqual(m.output, [f"WARNING:root:Message http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/ triggered an outgoing webhook, returning status code 500.\n Content of response (in quotes): \"{final_response.text}\""])
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:Message http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/ triggered an outgoing webhook, returning status code 500.\n Content of response (in quotes): \"{final_response.text}\""
+                ],
+            )
         bot_owner_notification = self.get_last_message()
-        self.assertEqual(bot_owner_notification.content,
-                         '''[A message](http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/) triggered an outgoing webhook.
-The webhook got a response with status code *500*.''')
+        self.assertEqual(
+            bot_owner_notification.content,
+            '''[A message](http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/) triggered an outgoing webhook.
+The webhook got a response with status code *500*.''',
+        )
 
         assert bot_user.bot_owner is not None
         self.assertEqual(bot_owner_notification.recipient_id, bot_user.bot_owner.recipient_id)
@@ -101,14 +119,21 @@ The webhook got a response with status code *500*.''')
             final_response = do_rest_call('', None, mock_event, service_handler)
             assert final_response is not None
 
-            self.assertEqual(m.output, [f"WARNING:root:Message http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/ triggered an outgoing webhook, returning status code 400.\n Content of response (in quotes): \"{final_response.text}\""])
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:Message http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/ triggered an outgoing webhook, returning status code 400.\n Content of response (in quotes): \"{final_response.text}\""
+                ],
+            )
 
         self.assertTrue(mock_fail.called)
 
         bot_owner_notification = self.get_last_message()
-        self.assertEqual(bot_owner_notification.content,
-                         '''[A message](http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/) triggered an outgoing webhook.
-The webhook got a response with status code *400*.''')
+        self.assertEqual(
+            bot_owner_notification.content,
+            '''[A message](http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/) triggered an outgoing webhook.
+The webhook got a response with status code *400*.''',
+        )
 
         assert bot_user.bot_owner is not None
         self.assertEqual(bot_owner_notification.recipient_id, bot_user.bot_owner.recipient_id)
@@ -122,7 +147,12 @@ The webhook got a response with status code *400*.''')
             final_response = do_rest_call('', 'payload-stub', mock_event, service_handler)
             assert final_response is not None
 
-            self.assertEqual(m.output, [f"WARNING:root:Message http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/ triggered an outgoing webhook, returning status code {final_response.status_code}.\n Content of response (in quotes): \"{final_response.text}\""])
+            self.assertEqual(
+                m.output,
+                [
+                    f"WARNING:root:Message http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/ triggered an outgoing webhook, returning status code {final_response.status_code}.\n Content of response (in quotes): \"{final_response.text}\""
+                ],
+            )
 
         kwargs = mock_request.call_args[1]
         self.assertEqual(kwargs['data'], 'payload-stub')
@@ -159,7 +189,7 @@ The webhook got a response with status code *400*.''')
                 f"INFO:root:Trigger event {mock_event['command']} on {mock_event['service_name']} timed out. Retrying",
                 f"WARNING:root:Maximum retries exceeded for trigger:{bot_user_email} event:{mock_event['command']}",
                 f"INFO:root:Trigger event {mock_event['command']} on {mock_event['service_name']} resulted in a connection error. Retrying",
-                f"WARNING:root:Maximum retries exceeded for trigger:{bot_user_email} event:{mock_event['command']}"
+                f"WARNING:root:Maximum retries exceeded for trigger:{bot_user_email} event:{mock_event['command']}",
             ]
 
             self.assertEqual(i.output, log_output)
@@ -169,7 +199,9 @@ The webhook got a response with status code *400*.''')
         mock_event = self.mock_event(bot_user)
         service_handler = GenericOutgoingWebhookService("token", bot_user, "service")
 
-        expect_request_exception = mock.patch("requests.request", side_effect=request_exception_error)
+        expect_request_exception = mock.patch(
+            "requests.request", side_effect=request_exception_error
+        )
         expect_logging_exception = self.assertLogs(level="ERROR")
         expect_fail = mock.patch("zerver.lib.outgoing_webhook.fail_with_message")
 
@@ -181,15 +213,18 @@ The webhook got a response with status code *400*.''')
         self.assertTrue(mock_fail.called)
 
         bot_owner_notification = self.get_last_message()
-        self.assertEqual(bot_owner_notification.content,
-                         '''[A message](http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/) triggered an outgoing webhook.
+        self.assertEqual(
+            bot_owner_notification.content,
+            '''[A message](http://zulip.testserver/#narrow/stream/999-Verona/topic/Foo/near/) triggered an outgoing webhook.
 When trying to send a request to the webhook service, an exception of type RequestException occurred:
 ```
 I'm a generic exception :(
-```''')
+```''',
+        )
         assert bot_user.bot_owner is not None
         self.assertEqual(bot_owner_notification.recipient_id, bot_user.bot_owner.recipient_id)
 
+
 class TestOutgoingWebhookMessaging(ZulipTestCase):
     def create_outgoing_bot(self, bot_owner: UserProfile) -> UserProfile:
         return self.create_test_bot(
@@ -256,14 +291,18 @@ class TestOutgoingWebhookMessaging(ZulipTestCase):
             },
         )
 
-    @mock.patch('requests.request', return_value=ResponseMock(200, orjson.dumps({"response_string": "Hidley ho, I'm a webhook responding!"})))
+    @mock.patch(
+        'requests.request',
+        return_value=ResponseMock(
+            200, orjson.dumps({"response_string": "Hidley ho, I'm a webhook responding!"})
+        ),
+    )
     def test_pm_to_outgoing_webhook_bot(self, mock_requests_request: mock.Mock) -> None:
         bot_owner = self.example_user("othello")
         bot = self.create_outgoing_bot(bot_owner)
         sender = self.example_user("hamlet")
 
-        self.send_personal_message(sender, bot,
-                                   content="foo")
+        self.send_personal_message(sender, bot, content="foo")
         last_message = self.get_last_message()
         self.assertEqual(last_message.content, "Hidley ho, I'm a webhook responding!")
         self.assertEqual(last_message.sender_id, bot.id)
@@ -276,14 +315,19 @@ class TestOutgoingWebhookMessaging(ZulipTestCase):
             Recipient.PERSONAL,
         )
 
-    @mock.patch('requests.request', return_value=ResponseMock(200, orjson.dumps({"response_string": "Hidley ho, I'm a webhook responding!"})))
+    @mock.patch(
+        'requests.request',
+        return_value=ResponseMock(
+            200, orjson.dumps({"response_string": "Hidley ho, I'm a webhook responding!"})
+        ),
+    )
     def test_stream_message_to_outgoing_webhook_bot(self, mock_requests_request: mock.Mock) -> None:
         bot_owner = self.example_user("othello")
         bot = self.create_outgoing_bot(bot_owner)
 
-        self.send_stream_message(bot_owner, "Denmark",
-                                 content=f"@**{bot.full_name}** foo",
-                                 topic_name="bar")
+        self.send_stream_message(
+            bot_owner, "Denmark", content=f"@**{bot.full_name}** foo", topic_name="bar"
+        )
         last_message = self.get_last_message()
         self.assertEqual(last_message.content, "Hidley ho, I'm a webhook responding!")
         self.assertEqual(last_message.sender_id, bot.id)
diff --git a/zerver/tests/test_populate_db.py b/zerver/tests/test_populate_db.py
index 1111d73858..ee050cf398 100644
--- a/zerver/tests/test_populate_db.py
+++ b/zerver/tests/test_populate_db.py
@@ -13,9 +13,12 @@ class TestChoosePubDate(ZulipTestCase):
         """
         tot_messages = 1000000
         datetimes_list = [
-            choose_date_sent(i, tot_messages, 1) for i in range(1, tot_messages, tot_messages // 100)
+            choose_date_sent(i, tot_messages, 1)
+            for i in range(1, tot_messages, tot_messages // 100)
         ]
 
         # Verify there is a meaningful difference between elements.
         for i in range(1, len(datetimes_list)):
-            self.assertTrue(datetimes_list[i] - datetimes_list[i-1] > timezone_timedelta(minutes=5))
+            self.assertTrue(
+                datetimes_list[i] - datetimes_list[i - 1] > timezone_timedelta(minutes=5)
+            )
diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py
index 2f19235877..6c63902428 100644
--- a/zerver/tests/test_presence.py
+++ b/zerver/tests/test_presence.py
@@ -68,14 +68,16 @@ class ActivityTest(ZulipTestCase):
 
         self.assert_length(queries, 4)
 
+
 class TestClientModel(ZulipTestCase):
     def test_client_stringification(self) -> None:
-        '''
+        """
         This test is designed to cover __str__ method for Client.
-        '''
+        """
         client = make_client('some_client')
         self.assertEqual(str(client), '<Client: some_client>')
 
+
 class UserPresenceModelTests(ZulipTestCase):
     def test_date_logic(self) -> None:
         UserPresence.objects.all().delete()
@@ -143,6 +145,7 @@ class UserPresenceModelTests(ZulipTestCase):
         )
         self.assertTrue(pushable())
 
+
 class UserPresenceTests(ZulipTestCase):
     def test_invalid_presence(self) -> None:
         user = self.example_user("hamlet")
@@ -254,8 +257,9 @@ class UserPresenceTests(ZulipTestCase):
         self.assertEqual(UserActivityInterval.objects.filter(user_profile=user_profile).count(), 0)
         time_zero = timezone_now().replace(microsecond=0)
         with mock.patch('zerver.views.presence.timezone_now', return_value=time_zero):
-            result = self.client_post("/json/users/me/presence", {'status': 'active',
-                                                                  'new_user_input': 'true'})
+            result = self.client_post(
+                "/json/users/me/presence", {'status': 'active', 'new_user_input': 'true'}
+            )
         self.assert_json_success(result)
         self.assertEqual(UserActivityInterval.objects.filter(user_profile=user_profile).count(), 1)
         interval = UserActivityInterval.objects.get(user_profile=user_profile)
@@ -265,8 +269,9 @@ class UserPresenceTests(ZulipTestCase):
         second_time = time_zero + timedelta(seconds=600)
         # Extent the interval
         with mock.patch('zerver.views.presence.timezone_now', return_value=second_time):
-            result = self.client_post("/json/users/me/presence", {'status': 'active',
-                                                                  'new_user_input': 'true'})
+            result = self.client_post(
+                "/json/users/me/presence", {'status': 'active', 'new_user_input': 'true'}
+            )
         self.assert_json_success(result)
         self.assertEqual(UserActivityInterval.objects.filter(user_profile=user_profile).count(), 1)
         interval = UserActivityInterval.objects.get(user_profile=user_profile)
@@ -275,43 +280,59 @@ class UserPresenceTests(ZulipTestCase):
 
         third_time = time_zero + timedelta(seconds=6000)
         with mock.patch('zerver.views.presence.timezone_now', return_value=third_time):
-            result = self.client_post("/json/users/me/presence", {'status': 'active',
-                                                                  'new_user_input': 'true'})
+            result = self.client_post(
+                "/json/users/me/presence", {'status': 'active', 'new_user_input': 'true'}
+            )
         self.assert_json_success(result)
         self.assertEqual(UserActivityInterval.objects.filter(user_profile=user_profile).count(), 2)
-        interval = UserActivityInterval.objects.filter(user_profile=user_profile).order_by('start')[0]
+        interval = UserActivityInterval.objects.filter(user_profile=user_profile).order_by('start')[
+            0
+        ]
         self.assertEqual(interval.start, time_zero)
         self.assertEqual(interval.end, second_time + UserActivityInterval.MIN_INTERVAL_LENGTH)
-        interval = UserActivityInterval.objects.filter(user_profile=user_profile).order_by('start')[1]
+        interval = UserActivityInterval.objects.filter(user_profile=user_profile).order_by('start')[
+            1
+        ]
         self.assertEqual(interval.start, third_time)
         self.assertEqual(interval.end, third_time + UserActivityInterval.MIN_INTERVAL_LENGTH)
 
         self.assertEqual(
-            seconds_usage_between(
-                user_profile, time_zero, third_time).total_seconds(),
-            1500)
+            seconds_usage_between(user_profile, time_zero, third_time).total_seconds(), 1500
+        )
         self.assertEqual(
             seconds_usage_between(
-                user_profile, time_zero, third_time+timedelta(seconds=10)).total_seconds(),
-            1510)
+                user_profile, time_zero, third_time + timedelta(seconds=10)
+            ).total_seconds(),
+            1510,
+        )
         self.assertEqual(
             seconds_usage_between(
-                user_profile, time_zero, third_time+timedelta(seconds=1000)).total_seconds(),
-            2400)
+                user_profile, time_zero, third_time + timedelta(seconds=1000)
+            ).total_seconds(),
+            2400,
+        )
         self.assertEqual(
             seconds_usage_between(
-                user_profile, time_zero, third_time - timedelta(seconds=100)).total_seconds(),
-            1500)
+                user_profile, time_zero, third_time - timedelta(seconds=100)
+            ).total_seconds(),
+            1500,
+        )
         self.assertEqual(
             seconds_usage_between(
-                user_profile, time_zero + timedelta(seconds=100),
-                third_time - timedelta(seconds=100)).total_seconds(),
-            1400)
+                user_profile,
+                time_zero + timedelta(seconds=100),
+                third_time - timedelta(seconds=100),
+            ).total_seconds(),
+            1400,
+        )
         self.assertEqual(
             seconds_usage_between(
-                user_profile, time_zero + timedelta(seconds=1200),
-                third_time - timedelta(seconds=100)).total_seconds(),
-            300)
+                user_profile,
+                time_zero + timedelta(seconds=1200),
+                third_time - timedelta(seconds=100),
+            ).total_seconds(),
+            300,
+        )
 
         # Now test /activity with actual data
         user_profile.is_staff = True
@@ -322,6 +343,7 @@ class UserPresenceTests(ZulipTestCase):
     def test_filter_presence_idle_user_ids(self) -> None:
         user_profile = self.example_user("hamlet")
         from zerver.lib.actions import filter_presence_idle_user_ids
+
         self.login('hamlet')
 
         self.assertEqual(filter_presence_idle_user_ids({user_profile.id}), [user_profile.id])
@@ -329,8 +351,9 @@ class UserPresenceTests(ZulipTestCase):
         self.assertEqual(filter_presence_idle_user_ids({user_profile.id}), [user_profile.id])
 
         # Active presence from the mobile app doesn't count
-        self.client_post("/json/users/me/presence", {'status': 'active'},
-                         HTTP_USER_AGENT="ZulipMobile/1.0")
+        self.client_post(
+            "/json/users/me/presence", {'status': 'active'}, HTTP_USER_AGENT="ZulipMobile/1.0"
+        )
         self.assertEqual(filter_presence_idle_user_ids({user_profile.id}), [user_profile.id])
 
         self.client_post("/json/users/me/presence", {'status': 'active'})
@@ -340,8 +363,7 @@ class UserPresenceTests(ZulipTestCase):
         """Zephyr mirror realms such as MIT never get a list of users"""
         user = self.mit_user('espuser')
         self.login_user(user)
-        result = self.client_post("/json/users/me/presence", {'status': 'idle'},
-                                  subdomain="zephyr")
+        result = self.client_post("/json/users/me/presence", {'status': 'idle'}, subdomain="zephyr")
         self.assert_json_success(result)
         self.assertEqual(result.json()['presences'], {})
 
@@ -351,8 +373,9 @@ class UserPresenceTests(ZulipTestCase):
         self.login_user(user_profile)
 
         def post_presence() -> Dict[str, Any]:
-            result = self.client_post("/json/users/me/presence", {'status': 'idle'},
-                                      subdomain="zephyr")
+            result = self.client_post(
+                "/json/users/me/presence", {'status': 'idle'}, subdomain="zephyr"
+            )
             self.assert_json_success(result)
             json = result.json()
             return json
@@ -379,8 +402,7 @@ class UserPresenceTests(ZulipTestCase):
     def test_same_realm(self) -> None:
         espuser = self.mit_user('espuser')
         self.login_user(espuser)
-        self.client_post("/json/users/me/presence", {'status': 'idle'},
-                         subdomain="zephyr")
+        self.client_post("/json/users/me/presence", {'status': 'idle'}, subdomain="zephyr")
         self.logout()
 
         # Ensure we don't see hamlet@zulip.com information leakage
@@ -395,6 +417,7 @@ class UserPresenceTests(ZulipTestCase):
             {hamlet.email},
         )
 
+
 class SingleUserPresenceTests(ZulipTestCase):
     def test_email_access(self) -> None:
         user = self.example_user('hamlet')
@@ -423,10 +446,15 @@ class SingleUserPresenceTests(ZulipTestCase):
         user = self.example_user("othello")
         self.login_user(user)
         result = self.client_post("/json/users/me/presence", {'status': 'active'})
-        result = self.client_post("/json/users/me/presence", {'status': 'active'},
-                                  HTTP_USER_AGENT="ZulipDesktop/1.0")
-        result = self.api_post(user, "/api/v1/users/me/presence", {'status': 'idle'},
-                               HTTP_USER_AGENT="ZulipAndroid/1.0")
+        result = self.client_post(
+            "/json/users/me/presence", {'status': 'active'}, HTTP_USER_AGENT="ZulipDesktop/1.0"
+        )
+        result = self.api_post(
+            user,
+            "/api/v1/users/me/presence",
+            {'status': 'idle'},
+            HTTP_USER_AGENT="ZulipAndroid/1.0",
+        )
         self.assert_json_success(result)
 
         # Check some error conditions
@@ -445,8 +473,7 @@ class SingleUserPresenceTests(ZulipTestCase):
 
         sipbtest = self.mit_user('sipbtest')
         self.login_user(sipbtest)
-        result = self.client_get("/json/users/othello@zulip.com/presence",
-                                 subdomain="zephyr")
+        result = self.client_get("/json/users/othello@zulip.com/presence", subdomain="zephyr")
         self.assert_json_error(result, "No such user")
 
         # Then, we check everything works
@@ -454,8 +481,8 @@ class SingleUserPresenceTests(ZulipTestCase):
         result = self.client_get("/json/users/othello@zulip.com/presence")
         result_dict = result.json()
         self.assertEqual(
-            set(result_dict['presence'].keys()),
-            {"ZulipAndroid", "website", "aggregated"})
+            set(result_dict['presence'].keys()), {"ZulipAndroid", "website", "aggregated"}
+        )
         self.assertEqual(set(result_dict['presence']['website'].keys()), {"status", "timestamp"})
 
     def test_ping_only(self) -> None:
@@ -468,19 +495,29 @@ class SingleUserPresenceTests(ZulipTestCase):
         result = self.client_post("/json/users/me/presence", req)
         self.assertEqual(result.json()['msg'], '')
 
+
 class UserPresenceAggregationTests(ZulipTestCase):
-    def _send_presence_for_aggregated_tests(self, user: UserProfile, status: str,
-                                            validate_time: datetime.datetime) -> Dict[str, Dict[str, Any]]:
+    def _send_presence_for_aggregated_tests(
+        self, user: UserProfile, status: str, validate_time: datetime.datetime
+    ) -> Dict[str, Dict[str, Any]]:
         self.login_user(user)
         timezone_util = 'zerver.views.presence.timezone_now'
         with mock.patch(timezone_util, return_value=validate_time - datetime.timedelta(seconds=5)):
             self.client_post("/json/users/me/presence", {'status': status})
         with mock.patch(timezone_util, return_value=validate_time - datetime.timedelta(seconds=2)):
-            self.api_post(user, "/api/v1/users/me/presence", {'status': status},
-                          HTTP_USER_AGENT="ZulipAndroid/1.0")
+            self.api_post(
+                user,
+                "/api/v1/users/me/presence",
+                {'status': status},
+                HTTP_USER_AGENT="ZulipAndroid/1.0",
+            )
         with mock.patch(timezone_util, return_value=validate_time - datetime.timedelta(seconds=7)):
-            latest_result = self.api_post(user, "/api/v1/users/me/presence", {'status': status},
-                                          HTTP_USER_AGENT="ZulipIOS/1.0")
+            latest_result = self.api_post(
+                user,
+                "/api/v1/users/me/presence",
+                {'status': status},
+                HTTP_USER_AGENT="ZulipIOS/1.0",
+            )
         latest_result_dict = latest_result.json()
         self.assertDictEqual(
             latest_result_dict['presences'][user.email]['aggregated'],
@@ -498,10 +535,16 @@ class UserPresenceAggregationTests(ZulipTestCase):
         user = self.example_user("othello")
         validate_time = timezone_now()
         self._send_presence_for_aggregated_tests(user, 'active', validate_time)
-        with mock.patch('zerver.views.presence.timezone_now',
-                        return_value=validate_time - datetime.timedelta(seconds=1)):
-            result = self.api_post(user, "/api/v1/users/me/presence", {'status': 'active'},
-                                   HTTP_USER_AGENT="ZulipTestDev/1.0")
+        with mock.patch(
+            'zerver.views.presence.timezone_now',
+            return_value=validate_time - datetime.timedelta(seconds=1),
+        ):
+            result = self.api_post(
+                user,
+                "/api/v1/users/me/presence",
+                {'status': 'active'},
+                HTTP_USER_AGENT="ZulipTestDev/1.0",
+            )
         result_dict = result.json()
         self.assertDictEqual(
             result_dict['presences'][user.email]['aggregated'],
@@ -515,8 +558,7 @@ class UserPresenceAggregationTests(ZulipTestCase):
     def test_aggregated_presense_active(self) -> None:
         user = self.example_user('othello')
         validate_time = timezone_now()
-        result_dict = self._send_presence_for_aggregated_tests(user, 'active',
-                                                               validate_time)
+        result_dict = self._send_presence_for_aggregated_tests(user, 'active', validate_time)
         self.assertDictEqual(
             result_dict['presence']['aggregated'],
             {
@@ -528,8 +570,7 @@ class UserPresenceAggregationTests(ZulipTestCase):
     def test_aggregated_presense_idle(self) -> None:
         user = self.example_user('othello')
         validate_time = timezone_now()
-        result_dict = self._send_presence_for_aggregated_tests(user, 'idle',
-                                                               validate_time)
+        result_dict = self._send_presence_for_aggregated_tests(user, 'idle', validate_time)
         self.assertDictEqual(
             result_dict['presence']['aggregated'],
             {
@@ -542,10 +583,16 @@ class UserPresenceAggregationTests(ZulipTestCase):
         user = self.example_user("othello")
         self.login_user(user)
         validate_time = timezone_now()
-        with mock.patch('zerver.views.presence.timezone_now',
-                        return_value=validate_time - datetime.timedelta(seconds=3)):
-            self.api_post(user, "/api/v1/users/me/presence", {'status': 'active'},
-                          HTTP_USER_AGENT="ZulipTestDev/1.0")
+        with mock.patch(
+            'zerver.views.presence.timezone_now',
+            return_value=validate_time - datetime.timedelta(seconds=3),
+        ):
+            self.api_post(
+                user,
+                "/api/v1/users/me/presence",
+                {'status': 'active'},
+                HTTP_USER_AGENT="ZulipTestDev/1.0",
+            )
         result_dict = self._send_presence_for_aggregated_tests(user, 'idle', validate_time)
         self.assertDictEqual(
             result_dict['presence']['aggregated'],
@@ -569,26 +616,36 @@ class UserPresenceAggregationTests(ZulipTestCase):
             },
         )
 
+
 class GetRealmStatusesTest(ZulipTestCase):
     def test_get_statuses(self) -> None:
         # Setup the test by simulating users reporting their presence data.
         othello = self.example_user("othello")
         hamlet = self.example_user("hamlet")
 
-        result = self.api_post(othello, "/api/v1/users/me/presence",
-                               dict(status='active'),
-                               HTTP_USER_AGENT="ZulipAndroid/1.0")
+        result = self.api_post(
+            othello,
+            "/api/v1/users/me/presence",
+            dict(status='active'),
+            HTTP_USER_AGENT="ZulipAndroid/1.0",
+        )
 
-        result = self.api_post(hamlet, "/api/v1/users/me/presence",
-                               dict(status='idle'),
-                               HTTP_USER_AGENT="ZulipDesktop/1.0")
+        result = self.api_post(
+            hamlet,
+            "/api/v1/users/me/presence",
+            dict(status='idle'),
+            HTTP_USER_AGENT="ZulipDesktop/1.0",
+        )
         self.assert_json_success(result)
         json = result.json()
         self.assertEqual(set(json['presences'].keys()), {hamlet.email, othello.email})
 
-        result = self.api_post(hamlet, "/api/v1/users/me/presence",
-                               dict(status='active', slim_presence='true'),
-                               HTTP_USER_AGENT="ZulipDesktop/1.0")
+        result = self.api_post(
+            hamlet,
+            "/api/v1/users/me/presence",
+            dict(status='active', slim_presence='true'),
+            HTTP_USER_AGENT="ZulipDesktop/1.0",
+        )
         self.assert_json_success(result)
         json = result.json()
         self.assertEqual(set(json['presences'].keys()), {str(hamlet.id), str(othello.id)})
@@ -609,22 +666,31 @@ class GetRealmStatusesTest(ZulipTestCase):
         othello.save(update_fields=['presence_enabled'])
         hamlet.save(update_fields=['presence_enabled'])
 
-        result = self.api_post(othello, "/api/v1/users/me/presence",
-                               dict(status='active'),
-                               HTTP_USER_AGENT="ZulipAndroid/1.0")
+        result = self.api_post(
+            othello,
+            "/api/v1/users/me/presence",
+            dict(status='active'),
+            HTTP_USER_AGENT="ZulipAndroid/1.0",
+        )
 
-        result = self.api_post(hamlet, "/api/v1/users/me/presence",
-                               dict(status='idle'),
-                               HTTP_USER_AGENT="ZulipDesktop/1.0")
+        result = self.api_post(
+            hamlet,
+            "/api/v1/users/me/presence",
+            dict(status='idle'),
+            HTTP_USER_AGENT="ZulipDesktop/1.0",
+        )
         self.assert_json_success(result)
         json = result.json()
 
         # Othello's presence status is disabled so it won't be reported.
         self.assertEqual(set(json['presences'].keys()), {hamlet.email})
 
-        result = self.api_post(hamlet, "/api/v1/users/me/presence",
-                               dict(status='active', slim_presence='true'),
-                               HTTP_USER_AGENT="ZulipDesktop/1.0")
+        result = self.api_post(
+            hamlet,
+            "/api/v1/users/me/presence",
+            dict(status='active', slim_presence='true'),
+            HTTP_USER_AGENT="ZulipDesktop/1.0",
+        )
         self.assert_json_success(result)
         json = result.json()
         self.assertEqual(set(json['presences'].keys()), {str(hamlet.id)})
diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py
index cbb33a902d..79a5d25697 100644
--- a/zerver/tests/test_push_notifications.py
+++ b/zerver/tests/test_push_notifications.py
@@ -87,14 +87,17 @@ if settings.ZILENCER_ENABLED:
 
 ZERVER_DIR = os.path.dirname(os.path.dirname(__file__))
 
+
 @skipUnless(settings.ZILENCER_ENABLED, "requires zilencer")
 class BouncerTestCase(ZulipTestCase):
     def setUp(self) -> None:
         self.server_uuid = "1234-abcd"
-        server = RemoteZulipServer(uuid=self.server_uuid,
-                                   api_key="magic_secret_api_key",
-                                   hostname="demo.example.com",
-                                   last_updated=now())
+        server = RemoteZulipServer(
+            uuid=self.server_uuid,
+            api_key="magic_secret_api_key",
+            hostname="demo.example.com",
+            last_updated=now(),
+        )
         server.save()
         super().setUp()
 
@@ -109,30 +112,21 @@ class BouncerTestCase(ZulipTestCase):
         # args[0] is method, args[1] is URL.
         local_url = args[1].replace(settings.PUSH_NOTIFICATION_BOUNCER_URL, "")
         if args[0] == "POST":
-            result = self.uuid_post(
-                self.server_uuid,
-                local_url,
-                kwargs['data'],
-                subdomain='')
+            result = self.uuid_post(self.server_uuid, local_url, kwargs['data'], subdomain='')
 
         elif args[0] == "GET":
-            result = self.uuid_get(
-                self.server_uuid,
-                local_url,
-                kwargs['data'],
-                subdomain='')
+            result = self.uuid_get(self.server_uuid, local_url, kwargs['data'], subdomain='')
         else:
             raise AssertionError("Unsupported method for bounce_request")
         return result
 
-    def get_generic_payload(self, method: str='register') -> Dict[str, Any]:
+    def get_generic_payload(self, method: str = 'register') -> Dict[str, Any]:
         user_id = 10
         token = "111222"
         token_kind = PushDeviceToken.GCM
 
-        return {'user_id': user_id,
-                'token': token,
-                'token_kind': token_kind}
+        return {'user_id': user_id, 'token': token, 'token_kind': token_kind}
+
 
 class PushBouncerNotificationTest(BouncerTestCase):
     DEFAULT_SUBDOMAIN = ""
@@ -169,13 +163,19 @@ class PushBouncerNotificationTest(BouncerTestCase):
 
         endpoint = '/api/v1/remotes/push/register'
 
-        result = self.uuid_post(self.server_uuid, endpoint, {'user_id': user_id, 'token_kind': token_kind})
+        result = self.uuid_post(
+            self.server_uuid, endpoint, {'user_id': user_id, 'token_kind': token_kind}
+        )
         self.assert_json_error(result, "Missing 'token' argument")
         result = self.uuid_post(self.server_uuid, endpoint, {'user_id': user_id, 'token': token})
         self.assert_json_error(result, "Missing 'token_kind' argument")
-        result = self.uuid_post(self.server_uuid, endpoint, {'token': token, 'token_kind': token_kind})
+        result = self.uuid_post(
+            self.server_uuid, endpoint, {'token': token, 'token_kind': token_kind}
+        )
         self.assert_json_error(result, "Missing 'user_id' argument")
-        result = self.uuid_post(self.server_uuid, endpoint, {'user_id': user_id, 'token': token, 'token_kind': 17})
+        result = self.uuid_post(
+            self.server_uuid, endpoint, {'user_id': user_id, 'token': token, 'token_kind': 17}
+        )
         self.assert_json_error(result, "Invalid token type")
 
         hamlet = self.example_user('hamlet')
@@ -186,11 +186,15 @@ class PushBouncerNotificationTest(BouncerTestCase):
                 endpoint,
                 dict(user_id=user_id, token_kin=token_kind, token=token),
             )
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:User hamlet@zulip.com (zulip) attempted to access API on wrong subdomain ()'
-        ])
-        self.assert_json_error(result, "Account is not associated with this subdomain",
-                               status_code=401)
+        self.assertEqual(
+            warn_log.output,
+            [
+                'WARNING:root:User hamlet@zulip.com (zulip) attempted to access API on wrong subdomain ()'
+            ],
+        )
+        self.assert_json_error(
+            result, "Account is not associated with this subdomain", status_code=401
+        )
 
         # We need the root ('') subdomain to be in use for this next
         # test, since the push bouncer API is only available there:
@@ -209,30 +213,34 @@ class PushBouncerNotificationTest(BouncerTestCase):
             self.server_uuid,
             endpoint,
             dict(user_id=user_id, token_kind=token_kind, token=token),
-            subdomain="zulip")
-        self.assert_json_error(result, "Invalid subdomain for push notifications bouncer",
-                               status_code=401)
+            subdomain="zulip",
+        )
+        self.assert_json_error(
+            result, "Invalid subdomain for push notifications bouncer", status_code=401
+        )
 
         # We do a bit of hackery here to the API_KEYS cache just to
         # make the code simple for sending an incorrect API key.
         self.API_KEYS[self.server_uuid] = 'invalid'
         result = self.uuid_post(
-            self.server_uuid,
-            endpoint,
-            dict(user_id=user_id, token_kind=token_kind, token=token))
-        self.assert_json_error(result, "Zulip server auth failure: key does not match role 1234-abcd",
-                               status_code=401)
+            self.server_uuid, endpoint, dict(user_id=user_id, token_kind=token_kind, token=token)
+        )
+        self.assert_json_error(
+            result, "Zulip server auth failure: key does not match role 1234-abcd", status_code=401
+        )
 
         del self.API_KEYS[self.server_uuid]
 
         credentials = "{}:{}".format("5678-efgh", 'invalid')
         api_auth = 'Basic ' + base64.b64encode(credentials.encode('utf-8')).decode('utf-8')
-        result = self.client_post(endpoint, {'user_id': user_id,
-                                             'token_kind': token_kind,
-                                             'token': token},
-                                  HTTP_AUTHORIZATION = api_auth)
-        self.assert_json_error(result, "Zulip server auth failure: 5678-efgh is not registered",
-                               status_code=401)
+        result = self.client_post(
+            endpoint,
+            {'user_id': user_id, 'token_kind': token_kind, 'token': token},
+            HTTP_AUTHORIZATION=api_auth,
+        )
+        self.assert_json_error(
+            result, "Zulip server auth failure: 5678-efgh is not registered", status_code=401
+        )
 
     def test_remote_push_user_endpoints(self) -> None:
         endpoints = [
@@ -261,15 +269,14 @@ class PushBouncerNotificationTest(BouncerTestCase):
         payload = self.get_generic_payload('register')
 
         # Verify correct results are success
-        result = self.uuid_post(self.server_uuid,
-                                '/api/v1/remotes/push/register', payload)
+        result = self.uuid_post(self.server_uuid, '/api/v1/remotes/push/register', payload)
         self.assert_json_success(result)
 
         remote_tokens = RemotePushDeviceToken.objects.filter(token=payload['token'])
         self.assertEqual(len(remote_tokens), 1)
-        result = self.uuid_post(self.server_uuid,
-                                '/api/v1/remotes/push/unregister/all',
-                                dict(user_id=10))
+        result = self.uuid_post(
+            self.server_uuid, '/api/v1/remotes/push/unregister/all', dict(user_id=10)
+        )
         self.assert_json_success(result)
 
         remote_tokens = RemotePushDeviceToken.objects.filter(token=payload['token'])
@@ -309,101 +316,107 @@ class PushBouncerNotificationTest(BouncerTestCase):
         for endpoint, token, kind in endpoints:
             # Try adding/removing tokens that are too big...
             broken_token = "a" * 5000  # too big
-            result = self.client_post(endpoint, {'token': broken_token,
-                                                 'token_kind': kind},
-                                      subdomain="zulip")
+            result = self.client_post(
+                endpoint, {'token': broken_token, 'token_kind': kind}, subdomain="zulip"
+            )
             self.assert_json_error(result, 'Empty or invalid length token')
 
-            result = self.client_delete(endpoint, {'token': broken_token,
-                                                   'token_kind': kind},
-                                        subdomain="zulip")
+            result = self.client_delete(
+                endpoint, {'token': broken_token, 'token_kind': kind}, subdomain="zulip"
+            )
             self.assert_json_error(result, 'Empty or invalid length token')
 
             # Try to remove a non-existent token...
-            result = self.client_delete(endpoint, {'token': 'abcd1234',
-                                                   'token_kind': kind},
-                                        subdomain="zulip")
+            result = self.client_delete(
+                endpoint, {'token': 'abcd1234', 'token_kind': kind}, subdomain="zulip"
+            )
             self.assert_json_error(result, 'Token does not exist')
 
-            with mock.patch('zerver.lib.remote_server.requests.request',
-                            side_effect=requests.ConnectionError), self.assertLogs(level="ERROR") as error_log:
-                result = self.client_post(endpoint, {'token': token},
-                                          subdomain="zulip")
+            with mock.patch(
+                'zerver.lib.remote_server.requests.request', side_effect=requests.ConnectionError
+            ), self.assertLogs(level="ERROR") as error_log:
+                result = self.client_post(endpoint, {'token': token}, subdomain="zulip")
                 self.assert_json_error(
-                    result, "ConnectionError while trying to connect to push notification bouncer", 502)
-                self.assertEqual(error_log.output, [
-                    f'ERROR:django.request:Bad Gateway: {endpoint}',
-                ])
+                    result,
+                    "ConnectionError while trying to connect to push notification bouncer",
+                    502,
+                )
+                self.assertEqual(
+                    error_log.output,
+                    [
+                        f'ERROR:django.request:Bad Gateway: {endpoint}',
+                    ],
+                )
 
-            with mock.patch('zerver.lib.remote_server.requests.request',
-                            return_value=Result(status=500)), self.assertLogs(level="WARNING") as warn_log:
-                result = self.client_post(endpoint, {'token': token},
-                                          subdomain="zulip")
+            with mock.patch(
+                'zerver.lib.remote_server.requests.request', return_value=Result(status=500)
+            ), self.assertLogs(level="WARNING") as warn_log:
+                result = self.client_post(endpoint, {'token': token}, subdomain="zulip")
                 self.assert_json_error(result, "Received 500 from push notification bouncer", 502)
-                self.assertEqual(warn_log.output, [
-                    'WARNING:root:Received 500 from push notification bouncer',
-                    f'ERROR:django.request:Bad Gateway: {endpoint}',
-                ])
+                self.assertEqual(
+                    warn_log.output,
+                    [
+                        'WARNING:root:Received 500 from push notification bouncer',
+                        f'ERROR:django.request:Bad Gateway: {endpoint}',
+                    ],
+                )
 
         # Add tokens
         for endpoint, token, kind in endpoints:
             # Test that we can push twice
-            result = self.client_post(endpoint, {'token': token},
-                                      subdomain="zulip")
+            result = self.client_post(endpoint, {'token': token}, subdomain="zulip")
             self.assert_json_success(result)
 
-            result = self.client_post(endpoint, {'token': token},
-                                      subdomain="zulip")
+            result = self.client_post(endpoint, {'token': token}, subdomain="zulip")
             self.assert_json_success(result)
 
-            tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, token=token,
-                                                               server=server))
+            tokens = list(
+                RemotePushDeviceToken.objects.filter(user_id=user.id, token=token, server=server)
+            )
             self.assertEqual(len(tokens), 1)
             self.assertEqual(tokens[0].token, token)
 
         # User should have tokens for both devices now.
-        tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id,
-                                                           server=server))
+        tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, server=server))
         self.assertEqual(len(tokens), 2)
 
         # Remove tokens
         for endpoint, token, kind in endpoints:
-            result = self.client_delete(endpoint, {'token': token,
-                                                   'token_kind': kind},
-                                        subdomain="zulip")
+            result = self.client_delete(
+                endpoint, {'token': token, 'token_kind': kind}, subdomain="zulip"
+            )
             self.assert_json_success(result)
-            tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, token=token,
-                                                               server=server))
+            tokens = list(
+                RemotePushDeviceToken.objects.filter(user_id=user.id, token=token, server=server)
+            )
             self.assertEqual(len(tokens), 0)
 
         # Re-add copies of those tokens
         for endpoint, token, kind in endpoints:
-            result = self.client_post(endpoint, {'token': token},
-                                      subdomain="zulip")
+            result = self.client_post(endpoint, {'token': token}, subdomain="zulip")
             self.assert_json_success(result)
-        tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id,
-                                                           server=server))
+        tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, server=server))
         self.assertEqual(len(tokens), 2)
 
         # Now we want to remove them using the bouncer after an API key change.
         # First we test error handling in case of issues with the bouncer:
-        with mock.patch('zerver.worker.queue_processors.clear_push_device_tokens',
-                        side_effect=PushNotificationBouncerRetryLaterError("test")), \
-                mock.patch('zerver.worker.queue_processors.retry_event') as mock_retry:
+        with mock.patch(
+            'zerver.worker.queue_processors.clear_push_device_tokens',
+            side_effect=PushNotificationBouncerRetryLaterError("test"),
+        ), mock.patch('zerver.worker.queue_processors.retry_event') as mock_retry:
             do_regenerate_api_key(user, user)
             mock_retry.assert_called()
 
             # We didn't manage to communicate with the bouncer, to the tokens are still there:
-            tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id,
-                                                               server=server))
+            tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, server=server))
             self.assertEqual(len(tokens), 2)
 
         # Now we successfully remove them:
         do_regenerate_api_key(user, user)
-        tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id,
-                                                           server=server))
+        tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, server=server))
         self.assertEqual(len(tokens), 0)
 
+
 class AnalyticsBouncerTest(BouncerTestCase):
     TIME_ZERO = datetime.datetime(1988, 3, 14, tzinfo=datetime.timezone.utc)
 
@@ -417,12 +430,13 @@ class AnalyticsBouncerTest(BouncerTestCase):
         user = self.example_user('hamlet')
         end_time = self.TIME_ZERO
 
-        with mock.patch('zerver.lib.remote_server.requests.request',
-                        side_effect=requests.ConnectionError), \
-                mock.patch('zerver.lib.remote_server.logging.warning') as mock_warning:
+        with mock.patch(
+            'zerver.lib.remote_server.requests.request', side_effect=requests.ConnectionError
+        ), mock.patch('zerver.lib.remote_server.logging.warning') as mock_warning:
             send_analytics_to_remote_server()
             mock_warning.assert_called_once_with(
-                "ConnectionError while trying to connect to push notification bouncer")
+                "ConnectionError while trying to connect to push notification bouncer"
+            )
 
         # Send any existing data over, so that we can start the test with a "clean" slate
         audit_log_max_id = RealmAuditLog.objects.all().order_by('id').last().id
@@ -432,31 +446,48 @@ class AnalyticsBouncerTest(BouncerTestCase):
         self.assertEqual(RemoteRealmCount.objects.count(), 0)
         self.assertEqual(RemoteInstallationCount.objects.count(), 0)
 
-        def check_counts(mock_request_call_count: int, remote_realm_count: int,
-                         remote_installation_count: int, remote_realm_audit_log: int) -> None:
+        def check_counts(
+            mock_request_call_count: int,
+            remote_realm_count: int,
+            remote_installation_count: int,
+            remote_realm_audit_log: int,
+        ) -> None:
             self.assertEqual(mock_request.call_count, mock_request_call_count)
             self.assertEqual(RemoteRealmCount.objects.count(), remote_realm_count)
             self.assertEqual(RemoteInstallationCount.objects.count(), remote_installation_count)
-            self.assertEqual(RemoteRealmAuditLog.objects.count(),
-                             remote_audit_log_count + remote_realm_audit_log)
+            self.assertEqual(
+                RemoteRealmAuditLog.objects.count(), remote_audit_log_count + remote_realm_audit_log
+            )
 
         # Create some rows we'll send to remote server
         realm_stat = LoggingCountStat('invites_sent::day', RealmCount, CountStat.DAY)
         RealmCount.objects.create(
-            realm=user.realm, property=realm_stat.property, end_time=end_time, value=5)
+            realm=user.realm, property=realm_stat.property, end_time=end_time, value=5
+        )
         InstallationCount.objects.create(
-            property=realm_stat.property, end_time=end_time, value=5,
+            property=realm_stat.property,
+            end_time=end_time,
+            value=5,
             # We set a subgroup here to work around:
             # https://github.com/zulip/zulip/issues/12362
-            subgroup="test_subgroup")
+            subgroup="test_subgroup",
+        )
         # Event type in SYNCED_BILLING_EVENTS -- should be included
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=RealmAuditLog.USER_CREATED,
-            event_time=end_time, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.USER_CREATED,
+            event_time=end_time,
+            extra_data='data',
+        )
         # Event type not in SYNCED_BILLING_EVENTS -- should not be included
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=RealmAuditLog.REALM_LOGO_CHANGED,
-            event_time=end_time, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.REALM_LOGO_CHANGED,
+            event_time=end_time,
+            extra_data='data',
+        )
         self.assertEqual(RealmCount.objects.count(), 1)
         self.assertEqual(InstallationCount.objects.count(), 1)
         self.assertEqual(RealmAuditLog.objects.filter(id__gt=audit_log_max_id).count(), 2)
@@ -470,47 +501,67 @@ class AnalyticsBouncerTest(BouncerTestCase):
 
         # Test only having new RealmCount rows
         RealmCount.objects.create(
-            realm=user.realm, property=realm_stat.property, end_time=end_time + datetime.timedelta(days=1), value=6)
+            realm=user.realm,
+            property=realm_stat.property,
+            end_time=end_time + datetime.timedelta(days=1),
+            value=6,
+        )
         RealmCount.objects.create(
-            realm=user.realm, property=realm_stat.property, end_time=end_time + datetime.timedelta(days=2), value=9)
+            realm=user.realm,
+            property=realm_stat.property,
+            end_time=end_time + datetime.timedelta(days=2),
+            value=9,
+        )
         send_analytics_to_remote_server()
         check_counts(7, 3, 1, 1)
 
         # Test only having new InstallationCount rows
         InstallationCount.objects.create(
-            property=realm_stat.property, end_time=end_time + datetime.timedelta(days=1), value=6)
+            property=realm_stat.property, end_time=end_time + datetime.timedelta(days=1), value=6
+        )
         send_analytics_to_remote_server()
         check_counts(9, 3, 2, 1)
 
         # Test only having new RealmAuditLog rows
         # Non-synced event
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=RealmAuditLog.REALM_LOGO_CHANGED,
-            event_time=end_time, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.REALM_LOGO_CHANGED,
+            event_time=end_time,
+            extra_data='data',
+        )
         send_analytics_to_remote_server()
         check_counts(10, 3, 2, 1)
         # Synced event
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=RealmAuditLog.USER_REACTIVATED,
-            event_time=end_time, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.USER_REACTIVATED,
+            event_time=end_time,
+            extra_data='data',
+        )
         send_analytics_to_remote_server()
         check_counts(12, 3, 2, 2)
 
-        (realm_count_data,
-         installation_count_data,
-         realmauditlog_data) = build_analytics_data(RealmCount.objects.all(),
-                                                    InstallationCount.objects.all(),
-                                                    RealmAuditLog.objects.all())
+        (realm_count_data, installation_count_data, realmauditlog_data) = build_analytics_data(
+            RealmCount.objects.all(), InstallationCount.objects.all(), RealmAuditLog.objects.all()
+        )
         result = self.uuid_post(
             self.server_uuid,
             '/api/v1/remotes/server/analytics',
-            {'realm_counts': orjson.dumps(realm_count_data).decode(),
-             'installation_counts': orjson.dumps(installation_count_data).decode(),
-             'realmauditlog_rows': orjson.dumps(realmauditlog_data).decode()},
-            subdomain="")
+            {
+                'realm_counts': orjson.dumps(realm_count_data).decode(),
+                'installation_counts': orjson.dumps(installation_count_data).decode(),
+                'realmauditlog_rows': orjson.dumps(realmauditlog_data).decode(),
+            },
+            subdomain="",
+        )
         self.assert_json_error(result, "Data is out of order.")
 
-        with mock.patch("zilencer.views.validate_incoming_table_data"), self.assertLogs(level='WARNING') as warn_log:
+        with mock.patch("zilencer.views.validate_incoming_table_data"), self.assertLogs(
+            level='WARNING'
+        ) as warn_log:
             # We need to wrap a transaction here to avoid the
             # IntegrityError that will be thrown in here from breaking
             # the unittest transaction.
@@ -518,14 +569,20 @@ class AnalyticsBouncerTest(BouncerTestCase):
                 result = self.uuid_post(
                     self.server_uuid,
                     '/api/v1/remotes/server/analytics',
-                    {'realm_counts': orjson.dumps(realm_count_data).decode(),
-                     'installation_counts': orjson.dumps(installation_count_data).decode(),
-                     'realmauditlog_rows': orjson.dumps(realmauditlog_data).decode()},
-                    subdomain="")
+                    {
+                        'realm_counts': orjson.dumps(realm_count_data).decode(),
+                        'installation_counts': orjson.dumps(installation_count_data).decode(),
+                        'realmauditlog_rows': orjson.dumps(realmauditlog_data).decode(),
+                    },
+                    subdomain="",
+                )
             self.assert_json_error(result, "Invalid data.")
-            self.assertEqual(warn_log.output, [
-                'WARNING:root:Invalid data saving zilencer_remoteinstallationcount for server demo.example.com/1234-abcd'
-            ])
+            self.assertEqual(
+                warn_log.output,
+                [
+                    'WARNING:root:Invalid data saving zilencer_remoteinstallationcount for server demo.example.com/1234-abcd'
+                ],
+            )
 
     @override_settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com')
     @mock.patch('zerver.lib.remote_server.requests.request')
@@ -539,7 +596,8 @@ class AnalyticsBouncerTest(BouncerTestCase):
 
         realm_stat = LoggingCountStat('invalid count stat', RealmCount, CountStat.DAY)
         RealmCount.objects.create(
-            realm=user.realm, property=realm_stat.property, end_time=end_time, value=5)
+            realm=user.realm, property=realm_stat.property, end_time=end_time, value=5
+        )
 
         self.assertEqual(RealmCount.objects.count(), 1)
 
@@ -556,10 +614,15 @@ class AnalyticsBouncerTest(BouncerTestCase):
     def test_old_two_table_format(self, mock_request: Any) -> None:
         mock_request.side_effect = self.bounce_request
         # Send fixture generated with Zulip 2.0 code
-        send_to_push_bouncer('POST', 'server/analytics', {
-            'realm_counts': '[{"id":1,"property":"invites_sent::day","subgroup":null,"end_time":574300800.0,"value":5,"realm":2}]',
-            'installation_counts': '[]',
-            'version': '"2.0.6+git"'})
+        send_to_push_bouncer(
+            'POST',
+            'server/analytics',
+            {
+                'realm_counts': '[{"id":1,"property":"invites_sent::day","subgroup":null,"end_time":574300800.0,"value":5,"realm":2}]',
+                'installation_counts': '[]',
+                'version': '"2.0.6+git"',
+            },
+        )
         self.assertEqual(mock_request.call_count, 1)
         self.assertEqual(RemoteRealmCount.objects.count(), 1)
         self.assertEqual(RemoteInstallationCount.objects.count(), 0)
@@ -573,12 +636,20 @@ class AnalyticsBouncerTest(BouncerTestCase):
         user = self.example_user('hamlet')
         # Event type in SYNCED_BILLING_EVENTS -- should be included
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=RealmAuditLog.USER_REACTIVATED,
-            event_time=self.TIME_ZERO, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.USER_REACTIVATED,
+            event_time=self.TIME_ZERO,
+            extra_data='data',
+        )
         # Event type not in SYNCED_BILLING_EVENTS -- should not be included
         RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, event_type=RealmAuditLog.REALM_LOGO_CHANGED,
-            event_time=self.TIME_ZERO, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            event_type=RealmAuditLog.REALM_LOGO_CHANGED,
+            event_time=self.TIME_ZERO,
+            extra_data='data',
+        )
 
         # send_analytics_to_remote_server calls send_to_push_bouncer twice.
         # We need to distinguish the first and second calls.
@@ -597,8 +668,9 @@ class AnalyticsBouncerTest(BouncerTestCase):
                 self.assertNotIn('modified_user', str(args))
             return send_to_push_bouncer(*args)
 
-        with mock.patch('zerver.lib.remote_server.send_to_push_bouncer',
-                        side_effect=check_for_unwanted_data):
+        with mock.patch(
+            'zerver.lib.remote_server.send_to_push_bouncer', side_effect=check_for_unwanted_data
+        ):
             send_analytics_to_remote_server()
 
     @override_settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com')
@@ -607,8 +679,13 @@ class AnalyticsBouncerTest(BouncerTestCase):
         mock_request.side_effect = self.bounce_request
         user = self.example_user('hamlet')
         log_entry = RealmAuditLog.objects.create(
-            realm=user.realm, modified_user=user, backfilled=True,
-            event_type=RealmAuditLog.USER_REACTIVATED, event_time=self.TIME_ZERO, extra_data='data')
+            realm=user.realm,
+            modified_user=user,
+            backfilled=True,
+            event_type=RealmAuditLog.USER_REACTIVATED,
+            event_time=self.TIME_ZERO,
+            extra_data='data',
+        )
         send_analytics_to_remote_server()
         remote_log_entry = RemoteRealmAuditLog.objects.order_by('id').last()
         self.assertEqual(remote_log_entry.server.uuid, self.server_uuid)
@@ -618,6 +695,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
         self.assertEqual(remote_log_entry.extra_data, 'data')
         self.assertEqual(remote_log_entry.event_type, RealmAuditLog.USER_REACTIVATED)
 
+
 class PushNotificationTest(BouncerTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -625,7 +703,7 @@ class PushNotificationTest(BouncerTestCase):
         self.sending_client = get_client('test')
         self.sender = self.example_user('hamlet')
 
-    def get_message(self, type: int, type_id: int=100) -> Message:
+    def get_message(self, type: int, type_id: int = 100) -> Message:
         recipient, _ = Recipient.objects.get_or_create(
             type_id=type_id,
             type=type,
@@ -658,7 +736,8 @@ class PushNotificationTest(BouncerTestCase):
                 kind=PushDeviceToken.APNS,
                 token=hex_to_b64(token),
                 user=self.user_profile,
-                ios_app_id=settings.ZULIP_IOS_APP_ID)
+                ios_app_id=settings.ZULIP_IOS_APP_ID,
+            )
 
         self.remote_tokens = ['cccc']
         for token in self.remote_tokens:
@@ -676,7 +755,8 @@ class PushNotificationTest(BouncerTestCase):
                 kind=PushDeviceToken.GCM,
                 token=hex_to_b64(token),
                 user=self.user_profile,
-                ios_app_id=None)
+                ios_app_id=None,
+            )
 
         self.remote_gcm_tokens = ['dddd']
         for token in self.remote_gcm_tokens:
@@ -687,6 +767,7 @@ class PushNotificationTest(BouncerTestCase):
                 server=RemoteZulipServer.objects.get(uuid=self.server_uuid),
             )
 
+
 class HandlePushNotificationTest(PushNotificationTest):
     DEFAULT_SUBDOMAIN = ""
 
@@ -698,10 +779,8 @@ class HandlePushNotificationTest(PushNotificationTest):
         local_url = args[1].replace(settings.PUSH_NOTIFICATION_BOUNCER_URL, "")
         if args[0] == "POST":
             result = self.uuid_post(
-                self.server_uuid,
-                local_url,
-                kwargs['data'],
-                content_type="application/json")
+                self.server_uuid, local_url, kwargs['data'], content_type="application/json"
+            )
         else:
             raise AssertionError("Unsupported method for bounce_request")
         return result
@@ -720,34 +799,35 @@ class HandlePushNotificationTest(PushNotificationTest):
             'message_id': message.id,
             'trigger': 'private_message',
         }
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=''), \
-                mock.patch('zerver.lib.remote_server.requests.request',
-                           side_effect=self.bounce_request), \
-                mock.patch('zerver.lib.push_notifications.gcm_client') as mock_gcm, \
-                self.mock_apns() as mock_apns, \
-                mock.patch('zerver.lib.push_notifications.logger.info') as mock_info, \
-                mock.patch('zerver.lib.push_notifications.logger.warning'):
+        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=''), mock.patch(
+            'zerver.lib.remote_server.requests.request', side_effect=self.bounce_request
+        ), mock.patch(
+            'zerver.lib.push_notifications.gcm_client'
+        ) as mock_gcm, self.mock_apns() as mock_apns, mock.patch(
+            'zerver.lib.push_notifications.logger.info'
+        ) as mock_info, mock.patch(
+            'zerver.lib.push_notifications.logger.warning'
+        ):
             apns_devices = [
                 (b64_to_hex(device.token), device.ios_app_id, device.token)
-                for device in RemotePushDeviceToken.objects.filter(
-                    kind=PushDeviceToken.APNS)
+                for device in RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.APNS)
             ]
             gcm_devices = [
                 (b64_to_hex(device.token), device.ios_app_id, device.token)
-                for device in RemotePushDeviceToken.objects.filter(
-                    kind=PushDeviceToken.GCM)
+                for device in RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.GCM)
             ]
-            mock_gcm.json_request.return_value = {
-                'success': {gcm_devices[0][2]: message.id}}
+            mock_gcm.json_request.return_value = {'success': {gcm_devices[0][2]: message.id}}
             mock_apns.get_notification_result.return_value = 'Success'
             handle_push_notification(self.user_profile.id, missed_message)
             for _, _, token in apns_devices:
                 mock_info.assert_any_call(
-                    "APNs: Success sending for user %d to device %s",
-                    self.user_profile.id, token)
+                    "APNs: Success sending for user %d to device %s", self.user_profile.id, token
+                )
             for _, _, token in gcm_devices:
                 mock_info.assert_any_call(
-                    "GCM: Sent %s as %s", token, message.id,
+                    "GCM: Sent %s as %s",
+                    token,
+                    message.id,
                 )
 
     def test_unregistered_client(self) -> None:
@@ -764,34 +844,36 @@ class HandlePushNotificationTest(PushNotificationTest):
             'message_id': message.id,
             'trigger': 'private_message',
         }
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=''), \
-                mock.patch('zerver.lib.remote_server.requests.request',
-                           side_effect=self.bounce_request), \
-                mock.patch('zerver.lib.push_notifications.gcm_client') as mock_gcm, \
-                self.mock_apns() as mock_apns, \
-                mock.patch('zerver.lib.push_notifications.logger.info') as mock_info, \
-                mock.patch('zerver.lib.push_notifications.logger.warning'):
+        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=''), mock.patch(
+            'zerver.lib.remote_server.requests.request', side_effect=self.bounce_request
+        ), mock.patch(
+            'zerver.lib.push_notifications.gcm_client'
+        ) as mock_gcm, self.mock_apns() as mock_apns, mock.patch(
+            'zerver.lib.push_notifications.logger.info'
+        ) as mock_info, mock.patch(
+            'zerver.lib.push_notifications.logger.warning'
+        ):
             apns_devices = [
                 (b64_to_hex(device.token), device.ios_app_id, device.token)
-                for device in RemotePushDeviceToken.objects.filter(
-                    kind=PushDeviceToken.APNS)
+                for device in RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.APNS)
             ]
             gcm_devices = [
                 (b64_to_hex(device.token), device.ios_app_id, device.token)
-                for device in RemotePushDeviceToken.objects.filter(
-                    kind=PushDeviceToken.GCM)
+                for device in RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.GCM)
             ]
-            mock_gcm.json_request.return_value = {
-                'success': {gcm_devices[0][2]: message.id}}
+            mock_gcm.json_request.return_value = {'success': {gcm_devices[0][2]: message.id}}
 
             mock_apns.get_notification_result.return_value = ('Unregistered', 1234567)
             handle_push_notification(self.user_profile.id, missed_message)
             for _, _, token in apns_devices:
                 mock_info.assert_any_call(
                     "APNs: Removing invalid/expired token %s (%s)",
-                    token, "Unregistered",
+                    token,
+                    "Unregistered",
                 )
-            self.assertEqual(RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.APNS).count(), 0)
+            self.assertEqual(
+                RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.APNS).count(), 0
+            )
 
     def test_connection_error(self) -> None:
         self.setup_apns_tokens()
@@ -808,23 +890,20 @@ class HandlePushNotificationTest(PushNotificationTest):
             'message_id': message.id,
             'trigger': 'private_message',
         }
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=''), \
-                mock.patch('zerver.lib.remote_server.requests.request',
-                           side_effect=self.bounce_request), \
-                mock.patch('zerver.lib.push_notifications.gcm_client') as mock_gcm, \
-                mock.patch('zerver.lib.remote_server.requests.request',
-                           side_effect=requests.ConnectionError):
+        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=''), mock.patch(
+            'zerver.lib.remote_server.requests.request', side_effect=self.bounce_request
+        ), mock.patch('zerver.lib.push_notifications.gcm_client') as mock_gcm, mock.patch(
+            'zerver.lib.remote_server.requests.request', side_effect=requests.ConnectionError
+        ):
             gcm_devices = [
                 (b64_to_hex(device.token), device.ios_app_id, device.token)
-                for device in RemotePushDeviceToken.objects.filter(
-                    kind=PushDeviceToken.GCM)
+                for device in RemotePushDeviceToken.objects.filter(kind=PushDeviceToken.GCM)
             ]
-            mock_gcm.json_request.return_value = {
-                'success': {gcm_devices[0][2]: message.id}}
+            mock_gcm.json_request.return_value = {'success': {gcm_devices[0][2]: message.id}}
             with self.assertRaises(PushNotificationBouncerRetryLaterError):
                 handle_push_notification(self.user_profile.id, missed_message)
 
-    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True)
+    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True)
     def test_disabled_notifications(self, mock_push_notifications: mock.MagicMock) -> None:
         user_profile = self.example_user('hamlet')
         user_profile.enable_online_email_notifications = False
@@ -836,7 +915,7 @@ class HandlePushNotificationTest(PushNotificationTest):
         handle_push_notification(user_profile.id, {})
         mock_push_notifications.assert_called()
 
-    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True)
+    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True)
     def test_read_message(self, mock_push_notifications: mock.MagicMock) -> None:
         user_profile = self.example_user('hamlet')
         message = self.get_message(Recipient.PERSONAL, type_id=1)
@@ -871,9 +950,11 @@ class HandlePushNotificationTest(PushNotificationTest):
 
         # This mock.patch() should be assertNoLogs once that feature
         # is added to Python.
-        with mock.patch('zerver.lib.push_notifications.uses_notification_bouncer') as mock_check, \
-                mock.patch('logging.error') as mock_logging_error, \
-                mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True) as mock_push_notifications:
+        with mock.patch(
+            'zerver.lib.push_notifications.uses_notification_bouncer'
+        ) as mock_check, mock.patch('logging.error') as mock_logging_error, mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ) as mock_push_notifications:
             handle_push_notification(user_profile.id, missed_message)
             mock_push_notifications.assert_called_once()
             # Check we didn't proceed through and didn't log anything.
@@ -897,14 +978,21 @@ class HandlePushNotificationTest(PushNotificationTest):
         message.delete()
 
         # This should log an error
-        with mock.patch('zerver.lib.push_notifications.uses_notification_bouncer') as mock_check, \
-                self.assertLogs(level="INFO") as mock_logging_info, \
-                mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True) as mock_push_notifications:
+        with mock.patch(
+            'zerver.lib.push_notifications.uses_notification_bouncer'
+        ) as mock_check, self.assertLogs(level="INFO") as mock_logging_info, mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ) as mock_push_notifications:
             handle_push_notification(user_profile.id, missed_message)
             mock_push_notifications.assert_called_once()
             # Check we didn't proceed through.
             mock_check.assert_not_called()
-            self.assertEqual(mock_logging_info.output, [f"INFO:root:Unexpected message access failure handling push notifications: {user_profile.id} {missed_message['message_id']}"])
+            self.assertEqual(
+                mock_logging_info.output,
+                [
+                    f"INFO:root:Unexpected message access failure handling push notifications: {user_profile.id} {missed_message['message_id']}"
+                ],
+            )
 
     def test_send_notifications_to_bouncer(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -918,18 +1006,21 @@ class HandlePushNotificationTest(PushNotificationTest):
             'message_id': message.id,
             'trigger': 'private_message',
         }
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=True), \
-                mock.patch('zerver.lib.push_notifications.get_message_payload_apns',
-                           return_value={'apns': True}), \
-                mock.patch('zerver.lib.push_notifications.get_message_payload_gcm',
-                           return_value=({'gcm': True}, {})), \
-                mock.patch('zerver.lib.push_notifications.send_notifications_to_bouncer') as mock_send:
+        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=True), mock.patch(
+            'zerver.lib.push_notifications.get_message_payload_apns', return_value={'apns': True}
+        ), mock.patch(
+            'zerver.lib.push_notifications.get_message_payload_gcm',
+            return_value=({'gcm': True}, {}),
+        ), mock.patch(
+            'zerver.lib.push_notifications.send_notifications_to_bouncer'
+        ) as mock_send:
             handle_push_notification(user_profile.id, missed_message)
-            mock_send.assert_called_with(user_profile.id,
-                                         {'apns': True},
-                                         {'gcm': True},
-                                         {},
-                                         )
+            mock_send.assert_called_with(
+                user_profile.id,
+                {'apns': True},
+                {'gcm': True},
+                {},
+            )
 
     def test_non_bouncer_push(self) -> None:
         self.setup_apns_tokens()
@@ -941,29 +1032,32 @@ class HandlePushNotificationTest(PushNotificationTest):
         )
 
         android_devices = list(
-            PushDeviceToken.objects.filter(user=self.user_profile,
-                                           kind=PushDeviceToken.GCM))
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.GCM)
+        )
 
         apple_devices = list(
-            PushDeviceToken.objects.filter(user=self.user_profile,
-                                           kind=PushDeviceToken.APNS))
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.APNS)
+        )
 
         missed_message = {
             'message_id': message.id,
             'trigger': 'private_message',
         }
-        with mock.patch('zerver.lib.push_notifications.get_message_payload_apns',
-                        return_value={'apns': True}), \
-                mock.patch('zerver.lib.push_notifications.get_message_payload_gcm',
-                           return_value=({'gcm': True}, {})), \
-                mock.patch('zerver.lib.push_notifications.send_apple_push_notification') as mock_send_apple, \
-                mock.patch('zerver.lib.push_notifications.send_android_push_notification') as mock_send_android, \
-                mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True) as mock_push_notifications:
+        with mock.patch(
+            'zerver.lib.push_notifications.get_message_payload_apns', return_value={'apns': True}
+        ), mock.patch(
+            'zerver.lib.push_notifications.get_message_payload_gcm',
+            return_value=({'gcm': True}, {}),
+        ), mock.patch(
+            'zerver.lib.push_notifications.send_apple_push_notification'
+        ) as mock_send_apple, mock.patch(
+            'zerver.lib.push_notifications.send_android_push_notification'
+        ) as mock_send_android, mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ) as mock_push_notifications:
 
             handle_push_notification(self.user_profile.id, missed_message)
-            mock_send_apple.assert_called_with(self.user_profile.id,
-                                               apple_devices,
-                                               {'apns': True})
+            mock_send_apple.assert_called_with(self.user_profile.id, apple_devices, {'apns': True})
             mock_send_android.assert_called_with(android_devices, {'gcm': True}, {})
             mock_push_notifications.assert_called_once()
 
@@ -976,8 +1070,9 @@ class HandlePushNotificationTest(PushNotificationTest):
             flags=UserMessage.flags.active_mobile_push_notification,
         )
 
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=True), \
-                mock.patch('zerver.lib.push_notifications.send_notifications_to_bouncer') as mock_send:
+        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL=True), mock.patch(
+            'zerver.lib.push_notifications.send_notifications_to_bouncer'
+        ) as mock_send:
             handle_remove_push_notification(user_profile.id, [message.id])
             mock_send.assert_called_with(
                 user_profile.id,
@@ -1003,9 +1098,9 @@ class HandlePushNotificationTest(PushNotificationTest):
                     'zulip_message_ids': str(message.id),
                     'zulip_message_id': message.id,
                 },
-                {'priority': 'normal'})
-            user_message = UserMessage.objects.get(user_profile=self.user_profile,
-                                                   message=message)
+                {'priority': 'normal'},
+            )
+            user_message = UserMessage.objects.get(user_profile=self.user_profile, message=message)
             self.assertEqual(user_message.flags.active_mobile_push_notification, False)
 
     def test_non_bouncer_push_remove(self) -> None:
@@ -1019,15 +1114,18 @@ class HandlePushNotificationTest(PushNotificationTest):
         )
 
         android_devices = list(
-            PushDeviceToken.objects.filter(user=self.user_profile,
-                                           kind=PushDeviceToken.GCM))
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.GCM)
+        )
 
         apple_devices = list(
-            PushDeviceToken.objects.filter(user=self.user_profile,
-                                           kind=PushDeviceToken.APNS))
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.APNS)
+        )
 
-        with mock.patch('zerver.lib.push_notifications.send_android_push_notification') as mock_send_android, \
-                mock.patch('zerver.lib.push_notifications.send_apple_push_notification') as mock_send_apple:
+        with mock.patch(
+            'zerver.lib.push_notifications.send_android_push_notification'
+        ) as mock_send_android, mock.patch(
+            'zerver.lib.push_notifications.send_apple_push_notification'
+        ) as mock_send_apple:
             handle_remove_push_notification(self.user_profile.id, [message.id])
             mock_send_android.assert_called_with(
                 android_devices,
@@ -1040,23 +1138,26 @@ class HandlePushNotificationTest(PushNotificationTest):
                     'zulip_message_ids': str(message.id),
                     'zulip_message_id': message.id,
                 },
-                {'priority': 'normal'})
+                {'priority': 'normal'},
+            )
             mock_send_apple.assert_called_with(
                 self.user_profile.id,
                 apple_devices,
-                {'badge': 0,
-                 'custom': {
-                     'zulip': {
-                         'server': 'testserver',
-                         'realm_id': self.sender.realm.id,
-                         'realm_uri': 'http://zulip.testserver',
-                         'user_id': self.user_profile.id,
-                         'event': 'remove',
-                         'zulip_message_ids': str(message.id),
-                     }
-                 }})
-            user_message = UserMessage.objects.get(user_profile=self.user_profile,
-                                                   message=message)
+                {
+                    'badge': 0,
+                    'custom': {
+                        'zulip': {
+                            'server': 'testserver',
+                            'realm_id': self.sender.realm.id,
+                            'realm_uri': 'http://zulip.testserver',
+                            'user_id': self.user_profile.id,
+                            'event': 'remove',
+                            'zulip_message_ids': str(message.id),
+                        }
+                    },
+                },
+            )
+            user_message = UserMessage.objects.get(user_profile=self.user_profile, message=message)
             self.assertEqual(user_message.flags.active_mobile_push_notification, False)
 
     def test_user_message_does_not_exist(self) -> None:
@@ -1067,12 +1168,14 @@ class HandlePushNotificationTest(PushNotificationTest):
         sender = self.example_user('iago')
         message_id = self.send_stream_message(sender, "public_stream", "test")
         missed_message = {'message_id': message_id}
-        with mock.patch('zerver.lib.push_notifications.logger.error') as mock_logger, \
-                mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True) as mock_push_notifications:
+        with mock.patch('zerver.lib.push_notifications.logger.error') as mock_logger, mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ) as mock_push_notifications:
             handle_push_notification(self.user_profile.id, missed_message)
             mock_logger.assert_called_with(
                 "Could not find UserMessage with message_id %s and user_id %s",
-                message_id, self.user_profile.id,
+                message_id,
+                self.user_profile.id,
             )
             mock_push_notifications.assert_called_once()
 
@@ -1087,10 +1190,13 @@ class HandlePushNotificationTest(PushNotificationTest):
         logger_string = "zulip.soft_deactivation"
         with self.assertLogs(logger_string, level='INFO') as info_logs:
             do_soft_deactivate_users([self.user_profile])
-        self.assertEqual(info_logs.output, [
-            f"INFO:{logger_string}:Soft deactivated user {self.user_profile.id}",
-            f"INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process"
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                f"INFO:{logger_string}:Soft deactivated user {self.user_profile.id}",
+                f"INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process",
+            ],
+        )
         sender = self.example_user('iago')
         message_id = self.send_stream_message(sender, "public_stream", "test")
         missed_message = {
@@ -1099,32 +1205,38 @@ class HandlePushNotificationTest(PushNotificationTest):
         }
 
         android_devices = list(
-            PushDeviceToken.objects.filter(user=self.user_profile,
-                                           kind=PushDeviceToken.GCM))
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.GCM)
+        )
 
         apple_devices = list(
-            PushDeviceToken.objects.filter(user=self.user_profile,
-                                           kind=PushDeviceToken.APNS))
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.APNS)
+        )
 
-        with mock.patch('zerver.lib.push_notifications.get_message_payload_apns',
-                        return_value={'apns': True}), \
-                mock.patch('zerver.lib.push_notifications.get_message_payload_gcm',
-                           return_value=({'gcm': True}, {})), \
-                mock.patch('zerver.lib.push_notifications.send_apple_push_notification') as mock_send_apple, \
-                mock.patch('zerver.lib.push_notifications.send_android_push_notification') as mock_send_android, \
-                mock.patch('zerver.lib.push_notifications.logger.error') as mock_logger, \
-                mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True) as mock_push_notifications:
+        with mock.patch(
+            'zerver.lib.push_notifications.get_message_payload_apns', return_value={'apns': True}
+        ), mock.patch(
+            'zerver.lib.push_notifications.get_message_payload_gcm',
+            return_value=({'gcm': True}, {}),
+        ), mock.patch(
+            'zerver.lib.push_notifications.send_apple_push_notification'
+        ) as mock_send_apple, mock.patch(
+            'zerver.lib.push_notifications.send_android_push_notification'
+        ) as mock_send_android, mock.patch(
+            'zerver.lib.push_notifications.logger.error'
+        ) as mock_logger, mock.patch(
+            'zerver.lib.push_notifications.push_notifications_enabled', return_value=True
+        ) as mock_push_notifications:
             handle_push_notification(self.user_profile.id, missed_message)
             mock_logger.assert_not_called()
-            mock_send_apple.assert_called_with(self.user_profile.id,
-                                               apple_devices,
-                                               {'apns': True})
+            mock_send_apple.assert_called_with(self.user_profile.id, apple_devices, {'apns': True})
             mock_send_android.assert_called_with(android_devices, {'gcm': True}, {})
             mock_push_notifications.assert_called_once()
 
     @mock.patch('zerver.lib.push_notifications.logger.info')
-    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True)
-    def test_user_push_notification_already_active(self, mock_push_notifications: mock.MagicMock, mock_info: mock.MagicMock) -> None:
+    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True)
+    def test_user_push_notification_already_active(
+        self, mock_push_notifications: mock.MagicMock, mock_info: mock.MagicMock
+    ) -> None:
         user_profile = self.example_user('hamlet')
         message = self.get_message(Recipient.PERSONAL, type_id=1)
         UserMessage.objects.create(
@@ -1142,17 +1254,19 @@ class HandlePushNotificationTest(PushNotificationTest):
         # Check we didn't proceed ahead and function returned.
         mock_info.assert_not_called()
 
+
 class TestAPNs(PushNotificationTest):
     def devices(self) -> List[DeviceToken]:
-        return list(PushDeviceToken.objects.filter(
-            user=self.user_profile, kind=PushDeviceToken.APNS))
+        return list(
+            PushDeviceToken.objects.filter(user=self.user_profile, kind=PushDeviceToken.APNS)
+        )
 
-    def send(self, devices: Optional[List[PushDeviceToken]]=None,
-             payload_data: Dict[str, Any]={}) -> None:
+    def send(
+        self, devices: Optional[List[PushDeviceToken]] = None, payload_data: Dict[str, Any] = {}
+    ) -> None:
         if devices is None:
             devices = self.devices()
-        send_apple_push_notification(
-            self.user_profile.id, devices, payload_data)
+        send_apple_push_notification(self.user_profile.id, devices, payload_data)
 
     def test_get_apns_client(self) -> None:
         """This test is pretty hacky, and needs to carefully reset the state
@@ -1160,10 +1274,12 @@ class TestAPNs(PushNotificationTest):
         nondeterministic results for other tests.
         """
         import zerver.lib.push_notifications
+
         zerver.lib.push_notifications._apns_client_initialized = False
         try:
-            with self.settings(APNS_CERT_FILE='/foo.pem'), \
-                    mock.patch('apns2.client.APNsClient') as mock_client:
+            with self.settings(APNS_CERT_FILE='/foo.pem'), mock.patch(
+                'apns2.client.APNsClient'
+            ) as mock_client:
                 client = get_apns_client()
                 self.assertEqual(mock_client.return_value, client)
         finally:
@@ -1174,70 +1290,92 @@ class TestAPNs(PushNotificationTest):
 
     def test_not_configured(self) -> None:
         self.setup_apns_tokens()
-        with mock.patch('zerver.lib.push_notifications.get_apns_client') as mock_get, \
-                mock.patch('zerver.lib.push_notifications.logger') as mock_logging:
+        with mock.patch('zerver.lib.push_notifications.get_apns_client') as mock_get, mock.patch(
+            'zerver.lib.push_notifications.logger'
+        ) as mock_logging:
             mock_get.return_value = None
             self.send()
             mock_logging.debug.assert_called_once_with(
                 "APNs: Dropping a notification because nothing configured.  "
-                "Set PUSH_NOTIFICATION_BOUNCER_URL (or APNS_CERT_FILE).")
+                "Set PUSH_NOTIFICATION_BOUNCER_URL (or APNS_CERT_FILE)."
+            )
             mock_logging.warning.assert_not_called()
             from zerver.lib.push_notifications import initialize_push_notifications
+
             initialize_push_notifications()
             mock_logging.warning.assert_called_once_with(
                 "Mobile push notifications are not configured.\n  "
-                "See https://zulip.readthedocs.io/en/latest/production/mobile-push-notifications.html")
+                "See https://zulip.readthedocs.io/en/latest/production/mobile-push-notifications.html"
+            )
 
     def test_success(self) -> None:
         self.setup_apns_tokens()
-        with self.mock_apns() as mock_apns, \
-                mock.patch('zerver.lib.push_notifications.logger') as mock_logging:
+        with self.mock_apns() as mock_apns, mock.patch(
+            'zerver.lib.push_notifications.logger'
+        ) as mock_logging:
             mock_apns.get_notification_result.return_value = 'Success'
             self.send()
             mock_logging.warning.assert_not_called()
             for device in self.devices():
                 mock_logging.info.assert_any_call(
                     "APNs: Success sending for user %d to device %s",
-                    self.user_profile.id, device.token)
+                    self.user_profile.id,
+                    device.token,
+                )
 
     def test_http_retry(self) -> None:
         import hyper
+
         self.setup_apns_tokens()
-        with self.mock_apns() as mock_apns, \
-                mock.patch('zerver.lib.push_notifications.logger') as mock_logging:
+        with self.mock_apns() as mock_apns, mock.patch(
+            'zerver.lib.push_notifications.logger'
+        ) as mock_logging:
             mock_apns.get_notification_result.side_effect = itertools.chain(
-                [hyper.http20.exceptions.StreamResetError()],
-                itertools.repeat('Success'))
+                [hyper.http20.exceptions.StreamResetError()], itertools.repeat('Success')
+            )
             self.send()
             mock_logging.warning.assert_called_once_with(
                 "APNs: HTTP error sending for user %d to device %s: %s",
-                self.user_profile.id, self.devices()[0].token, "StreamResetError")
+                self.user_profile.id,
+                self.devices()[0].token,
+                "StreamResetError",
+            )
             for device in self.devices():
                 mock_logging.info.assert_any_call(
                     "APNs: Success sending for user %d to device %s",
-                    self.user_profile.id, device.token)
+                    self.user_profile.id,
+                    device.token,
+                )
 
     def test_http_retry_pipefail(self) -> None:
         self.setup_apns_tokens()
-        with self.mock_apns() as mock_apns, \
-                mock.patch('zerver.lib.push_notifications.logger') as mock_logging:
+        with self.mock_apns() as mock_apns, mock.patch(
+            'zerver.lib.push_notifications.logger'
+        ) as mock_logging:
             mock_apns.get_notification_result.side_effect = itertools.chain(
-                [BrokenPipeError()],
-                itertools.repeat('Success'))
+                [BrokenPipeError()], itertools.repeat('Success')
+            )
             self.send()
             mock_logging.warning.assert_called_once_with(
                 "APNs: BrokenPipeError sending for user %d to device %s: %s",
-                self.user_profile.id, self.devices()[0].token, "BrokenPipeError")
+                self.user_profile.id,
+                self.devices()[0].token,
+                "BrokenPipeError",
+            )
             for device in self.devices():
                 mock_logging.info.assert_any_call(
                     "APNs: Success sending for user %d to device %s",
-                    self.user_profile.id, device.token)
+                    self.user_profile.id,
+                    device.token,
+                )
 
     def test_http_retry_eventually_fails(self) -> None:
         import hyper
+
         self.setup_apns_tokens()
-        with self.mock_apns() as mock_apns, \
-                mock.patch('zerver.lib.push_notifications.logger') as mock_logging:
+        with self.mock_apns() as mock_apns, mock.patch(
+            'zerver.lib.push_notifications.logger'
+        ) as mock_logging:
             mock_apns.get_notification_result.side_effect = itertools.chain(
                 [hyper.http20.exceptions.StreamResetError()],
                 [hyper.http20.exceptions.StreamResetError()],
@@ -1250,40 +1388,45 @@ class TestAPNs(PushNotificationTest):
             self.assertEqual(mock_logging.warning.call_count, 5)
             mock_logging.warning.assert_called_with(
                 'APNs: Failed to send for user %d to device %s: %s',
-                self.user_profile.id, self.devices()[0].token, 'HTTP error, retries exhausted')
+                self.user_profile.id,
+                self.devices()[0].token,
+                'HTTP error, retries exhausted',
+            )
             self.assertEqual(mock_logging.info.call_count, 1)
 
     def test_modernize_apns_payload(self) -> None:
-        payload = {'alert': 'Message from Hamlet',
-                   'badge': 0,
-                   'custom': {'zulip': {'message_ids': [3]}}}
+        payload = {
+            'alert': 'Message from Hamlet',
+            'badge': 0,
+            'custom': {'zulip': {'message_ids': [3]}},
+        }
         self.assertEqual(
             modernize_apns_payload(
-                {'alert': 'Message from Hamlet',
-                 'message_ids': [3],
-                 'badge': 0}),
-            payload)
-        self.assertEqual(
-            modernize_apns_payload(payload),
-            payload)
+                {'alert': 'Message from Hamlet', 'message_ids': [3], 'badge': 0}
+            ),
+            payload,
+        )
+        self.assertEqual(modernize_apns_payload(payload), payload)
 
-    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True)
+    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True)
     def test_apns_badge_count(self, mock_push_notifications: mock.MagicMock) -> None:
 
         user_profile = self.example_user('othello')
         # Test APNs badge count for personal messages.
-        message_ids = [self.send_personal_message(self.sender,
-                                                  user_profile,
-                                                  'Content of message')
-                       for i in range(3)]
+        message_ids = [
+            self.send_personal_message(self.sender, user_profile, 'Content of message')
+            for i in range(3)
+        ]
         self.assertEqual(get_apns_badge_count(user_profile), 0)
         self.assertEqual(get_apns_badge_count_future(user_profile), 3)
         # Similarly, test APNs badge count for stream mention.
         stream = self.subscribe(user_profile, "Denmark")
-        message_ids += [self.send_stream_message(self.sender,
-                                                 stream.name,
-                                                 'Hi, @**Othello, the Moor of Venice**')
-                        for i in range(2)]
+        message_ids += [
+            self.send_stream_message(
+                self.sender, stream.name, 'Hi, @**Othello, the Moor of Venice**'
+            )
+            for i in range(2)
+        ]
         self.assertEqual(get_apns_badge_count(user_profile), 0)
         self.assertEqual(get_apns_badge_count_future(user_profile), 5)
 
@@ -1291,12 +1434,15 @@ class TestAPNs(PushNotificationTest):
         # Mark the messages as read and test whether
         # the count decreases correctly.
         for i, message_id in enumerate(message_ids):
-            do_update_message_flags(user_profile, get_client("website"), 'add', 'read', [message_id])
+            do_update_message_flags(
+                user_profile, get_client("website"), 'add', 'read', [message_id]
+            )
             self.assertEqual(get_apns_badge_count(user_profile), 0)
             self.assertEqual(get_apns_badge_count_future(user_profile), num_messages - i - 1)
 
         mock_push_notifications.assert_called()
 
+
 class TestGetAPNsPayload(PushNotificationTest):
     def test_get_message_payload_apns_personal_message(self) -> None:
         user_profile = self.example_user("othello")
@@ -1331,12 +1477,14 @@ class TestGetAPNsPayload(PushNotificationTest):
         }
         self.assertDictEqual(payload, expected)
 
-    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value = True)
-    def test_get_message_payload_apns_huddle_message(self, mock_push_notifications: mock.MagicMock) -> None:
+    @mock.patch('zerver.lib.push_notifications.push_notifications_enabled', return_value=True)
+    def test_get_message_payload_apns_huddle_message(
+        self, mock_push_notifications: mock.MagicMock
+    ) -> None:
         user_profile = self.example_user("othello")
         message_id = self.send_huddle_message(
-            self.sender,
-            [self.example_user('othello'), self.example_user('cordelia')])
+            self.sender, [self.example_user('othello'), self.example_user('cordelia')]
+        )
         message = Message.objects.get(id=message_id)
         message.trigger = 'private_message'
         payload = get_message_payload_apns(user_profile, message)
@@ -1354,8 +1502,8 @@ class TestGetAPNsPayload(PushNotificationTest):
                     'recipient_type': 'private',
                     'pm_users': ','.join(
                         str(s.user_profile_id)
-                        for s in Subscription.objects.filter(
-                            recipient=message.recipient)),
+                        for s in Subscription.objects.filter(recipient=message.recipient)
+                    ),
                     'sender_email': self.sender.email,
                     'sender_id': self.sender.id,
                     'server': settings.EXTERNAL_HOST,
@@ -1463,12 +1611,12 @@ class TestGetAPNsPayload(PushNotificationTest):
         }
         self.assertDictEqual(payload, expected)
 
-    @override_settings(PUSH_NOTIFICATION_REDACT_CONTENT = True)
+    @override_settings(PUSH_NOTIFICATION_REDACT_CONTENT=True)
     def test_get_message_payload_apns_redacted_content(self) -> None:
         user_profile = self.example_user("othello")
         message_id = self.send_huddle_message(
-            self.sender,
-            [self.example_user('othello'), self.example_user('cordelia')])
+            self.sender, [self.example_user('othello'), self.example_user('cordelia')]
+        )
         message = Message.objects.get(id=message_id)
         message.trigger = 'private_message'
         payload = get_message_payload_apns(user_profile, message)
@@ -1486,8 +1634,8 @@ class TestGetAPNsPayload(PushNotificationTest):
                     'recipient_type': 'private',
                     'pm_users': ','.join(
                         str(s.user_profile_id)
-                        for s in Subscription.objects.filter(
-                            recipient=message.recipient)),
+                        for s in Subscription.objects.filter(recipient=message.recipient)
+                    ),
                     'sender_email': self.sender.email,
                     'sender_id': self.sender.id,
                     'server': settings.EXTERNAL_HOST,
@@ -1499,6 +1647,7 @@ class TestGetAPNsPayload(PushNotificationTest):
         }
         self.assertDictEqual(payload, expected)
 
+
 class TestGetGCMPayload(PushNotificationTest):
     def test_get_message_payload_gcm(self) -> None:
         stream = Stream.objects.filter(name='Verona').get()
@@ -1510,54 +1659,66 @@ class TestGetGCMPayload(PushNotificationTest):
 
         hamlet = self.example_user('hamlet')
         payload, gcm_options = get_message_payload_gcm(hamlet, message)
-        self.assertDictEqual(payload, {
-            "user_id": hamlet.id,
-            "event": "message",
-            "alert": "New mention from King Hamlet",
-            "zulip_message_id": message.id,
-            "time": datetime_to_timestamp(message.date_sent),
-            "content": 'a' * 200 + '…',
-            "content_truncated": True,
-            "server": settings.EXTERNAL_HOST,
-            "realm_id": hamlet.realm.id,
-            "realm_uri": hamlet.realm.uri,
-            "sender_id": hamlet.id,
-            "sender_email": hamlet.email,
-            "sender_full_name": "King Hamlet",
-            "sender_avatar_url": absolute_avatar_url(message.sender),
-            "recipient_type": "stream",
-            "stream": get_display_recipient(message.recipient),
-            "topic": message.topic_name(),
-        })
-        self.assertDictEqual(gcm_options, {
-            "priority": "high",
-        })
+        self.assertDictEqual(
+            payload,
+            {
+                "user_id": hamlet.id,
+                "event": "message",
+                "alert": "New mention from King Hamlet",
+                "zulip_message_id": message.id,
+                "time": datetime_to_timestamp(message.date_sent),
+                "content": 'a' * 200 + '…',
+                "content_truncated": True,
+                "server": settings.EXTERNAL_HOST,
+                "realm_id": hamlet.realm.id,
+                "realm_uri": hamlet.realm.uri,
+                "sender_id": hamlet.id,
+                "sender_email": hamlet.email,
+                "sender_full_name": "King Hamlet",
+                "sender_avatar_url": absolute_avatar_url(message.sender),
+                "recipient_type": "stream",
+                "stream": get_display_recipient(message.recipient),
+                "topic": message.topic_name(),
+            },
+        )
+        self.assertDictEqual(
+            gcm_options,
+            {
+                "priority": "high",
+            },
+        )
 
     def test_get_message_payload_gcm_personal(self) -> None:
         message = self.get_message(Recipient.PERSONAL, 1)
         message.trigger = 'private_message'
         hamlet = self.example_user('hamlet')
         payload, gcm_options = get_message_payload_gcm(hamlet, message)
-        self.assertDictEqual(payload, {
-            "user_id": hamlet.id,
-            "event": "message",
-            "alert": "New private message from King Hamlet",
-            "zulip_message_id": message.id,
-            "time": datetime_to_timestamp(message.date_sent),
-            "content": message.content,
-            "content_truncated": False,
-            "server": settings.EXTERNAL_HOST,
-            "realm_id": hamlet.realm.id,
-            "realm_uri": hamlet.realm.uri,
-            "sender_id": hamlet.id,
-            "sender_email": hamlet.email,
-            "sender_full_name": "King Hamlet",
-            "sender_avatar_url": absolute_avatar_url(message.sender),
-            "recipient_type": "private",
-        })
-        self.assertDictEqual(gcm_options, {
-            "priority": "high",
-        })
+        self.assertDictEqual(
+            payload,
+            {
+                "user_id": hamlet.id,
+                "event": "message",
+                "alert": "New private message from King Hamlet",
+                "zulip_message_id": message.id,
+                "time": datetime_to_timestamp(message.date_sent),
+                "content": message.content,
+                "content_truncated": False,
+                "server": settings.EXTERNAL_HOST,
+                "realm_id": hamlet.realm.id,
+                "realm_uri": hamlet.realm.uri,
+                "sender_id": hamlet.id,
+                "sender_email": hamlet.email,
+                "sender_full_name": "King Hamlet",
+                "sender_avatar_url": absolute_avatar_url(message.sender),
+                "recipient_type": "private",
+            },
+        )
+        self.assertDictEqual(
+            gcm_options,
+            {
+                "priority": "high",
+            },
+        )
 
     def test_get_message_payload_gcm_stream_notifications(self) -> None:
         message = self.get_message(Recipient.STREAM, 1)
@@ -1565,58 +1726,70 @@ class TestGetGCMPayload(PushNotificationTest):
         message.stream_name = 'Denmark'
         hamlet = self.example_user('hamlet')
         payload, gcm_options = get_message_payload_gcm(hamlet, message)
-        self.assertDictEqual(payload, {
-            "user_id": hamlet.id,
-            "event": "message",
-            "alert": "New stream message from King Hamlet in Denmark",
-            "zulip_message_id": message.id,
-            "time": datetime_to_timestamp(message.date_sent),
-            "content": message.content,
-            "content_truncated": False,
-            "server": settings.EXTERNAL_HOST,
-            "realm_id": hamlet.realm.id,
-            "realm_uri": hamlet.realm.uri,
-            "sender_id": hamlet.id,
-            "sender_email": hamlet.email,
-            "sender_full_name": "King Hamlet",
-            "sender_avatar_url": absolute_avatar_url(message.sender),
-            "recipient_type": "stream",
-            "topic": "Test Topic",
-            "stream": "Denmark",
-        })
-        self.assertDictEqual(gcm_options, {
-            "priority": "high",
-        })
+        self.assertDictEqual(
+            payload,
+            {
+                "user_id": hamlet.id,
+                "event": "message",
+                "alert": "New stream message from King Hamlet in Denmark",
+                "zulip_message_id": message.id,
+                "time": datetime_to_timestamp(message.date_sent),
+                "content": message.content,
+                "content_truncated": False,
+                "server": settings.EXTERNAL_HOST,
+                "realm_id": hamlet.realm.id,
+                "realm_uri": hamlet.realm.uri,
+                "sender_id": hamlet.id,
+                "sender_email": hamlet.email,
+                "sender_full_name": "King Hamlet",
+                "sender_avatar_url": absolute_avatar_url(message.sender),
+                "recipient_type": "stream",
+                "topic": "Test Topic",
+                "stream": "Denmark",
+            },
+        )
+        self.assertDictEqual(
+            gcm_options,
+            {
+                "priority": "high",
+            },
+        )
 
-    @override_settings(PUSH_NOTIFICATION_REDACT_CONTENT = True)
+    @override_settings(PUSH_NOTIFICATION_REDACT_CONTENT=True)
     def test_get_message_payload_gcm_redacted_content(self) -> None:
         message = self.get_message(Recipient.STREAM, 1)
         message.trigger = 'stream_push_notify'
         message.stream_name = 'Denmark'
         hamlet = self.example_user('hamlet')
         payload, gcm_options = get_message_payload_gcm(hamlet, message)
-        self.assertDictEqual(payload, {
-            "user_id": hamlet.id,
-            "event": "message",
-            "alert": "New stream message from King Hamlet in Denmark",
-            "zulip_message_id": message.id,
-            "time": datetime_to_timestamp(message.date_sent),
-            "content": "***REDACTED***",
-            "content_truncated": False,
-            "server": settings.EXTERNAL_HOST,
-            "realm_id": hamlet.realm.id,
-            "realm_uri": hamlet.realm.uri,
-            "sender_id": hamlet.id,
-            "sender_email": hamlet.email,
-            "sender_full_name": "King Hamlet",
-            "sender_avatar_url": absolute_avatar_url(message.sender),
-            "recipient_type": "stream",
-            "topic": "Test Topic",
-            "stream": "Denmark",
-        })
-        self.assertDictEqual(gcm_options, {
-            "priority": "high",
-        })
+        self.assertDictEqual(
+            payload,
+            {
+                "user_id": hamlet.id,
+                "event": "message",
+                "alert": "New stream message from King Hamlet in Denmark",
+                "zulip_message_id": message.id,
+                "time": datetime_to_timestamp(message.date_sent),
+                "content": "***REDACTED***",
+                "content_truncated": False,
+                "server": settings.EXTERNAL_HOST,
+                "realm_id": hamlet.realm.id,
+                "realm_uri": hamlet.realm.uri,
+                "sender_id": hamlet.id,
+                "sender_email": hamlet.email,
+                "sender_full_name": "King Hamlet",
+                "sender_avatar_url": absolute_avatar_url(message.sender),
+                "recipient_type": "stream",
+                "topic": "Test Topic",
+                "stream": "Denmark",
+            },
+        )
+        self.assertDictEqual(
+            gcm_options,
+            {
+                "priority": "high",
+            },
+        )
 
 
 class TestSendNotificationsToBouncer(ZulipTestCase):
@@ -1629,17 +1802,20 @@ class TestSendNotificationsToBouncer(ZulipTestCase):
             'gcm_payload': {'gcm': True},
             'gcm_options': {},
         }
-        mock_send.assert_called_with('POST',
-                                     'push/notify',
-                                     orjson.dumps(post_data),
-                                     extra_headers={'Content-type':
-                                                    'application/json'})
+        mock_send.assert_called_with(
+            'POST',
+            'push/notify',
+            orjson.dumps(post_data),
+            extra_headers={'Content-type': 'application/json'},
+        )
+
 
 class Result:
-    def __init__(self, status: int=200, content: bytes=orjson.dumps({'msg': 'error'})) -> None:
+    def __init__(self, status: int = 200, content: bytes = orjson.dumps({'msg': 'error'})) -> None:
         self.status_code = status
         self.content = content
 
+
 class TestSendToPushBouncer(ZulipTestCase):
     @mock.patch('requests.request', return_value=Result(status=500))
     def test_500_error(self, mock_request: mock.MagicMock) -> None:
@@ -1659,14 +1835,17 @@ class TestSendToPushBouncer(ZulipTestCase):
 
         # This is the exception our decorator uses for an invalid Zulip server
         error_obj = InvalidZulipServerError("testRole")
-        with mock.patch('requests.request',
-                        return_value=Result(status=400,
-                                            content=orjson.dumps(error_obj.to_json()))):
+        with mock.patch(
+            'requests.request',
+            return_value=Result(status=400, content=orjson.dumps(error_obj.to_json())),
+        ):
             with self.assertRaises(PushNotificationBouncerException) as exc:
                 send_to_push_bouncer('register', 'register', {'msg': 'true'})
-        self.assertEqual(str(exc.exception),
-                         'Push notifications bouncer error: '
-                         'Zulip server auth failure: testRole is not registered')
+        self.assertEqual(
+            str(exc.exception),
+            'Push notifications bouncer error: '
+            'Zulip server auth failure: testRole is not registered',
+        )
 
     @mock.patch('requests.request', return_value=Result(status=400, content=b'/'))
     def test_400_error_when_content_is_not_serializable(self, mock_request: mock.MagicMock) -> None:
@@ -1677,8 +1856,10 @@ class TestSendToPushBouncer(ZulipTestCase):
     def test_300_error(self, mock_request: mock.MagicMock) -> None:
         with self.assertRaises(PushNotificationBouncerException) as exc:
             send_to_push_bouncer('register', 'register', {'msg': 'true'})
-        self.assertEqual(str(exc.exception),
-                         'Push notification bouncer returned unexpected status code 300')
+        self.assertEqual(
+            str(exc.exception), 'Push notification bouncer returned unexpected status code 300'
+        )
+
 
 class TestNumPushDevicesForUser(PushNotificationTest):
     def test_when_kind_is_none(self) -> None:
@@ -1687,10 +1868,10 @@ class TestNumPushDevicesForUser(PushNotificationTest):
 
     def test_when_kind_is_not_none(self) -> None:
         self.setup_apns_tokens()
-        count = num_push_devices_for_user(self.user_profile,
-                                          kind=PushDeviceToken.APNS)
+        count = num_push_devices_for_user(self.user_profile, kind=PushDeviceToken.APNS)
         self.assertEqual(count, 2)
 
+
 class TestPushApi(BouncerTestCase):
     def test_push_api_error_handling(self) -> None:
         user = self.example_user('cordelia')
@@ -1720,9 +1901,11 @@ class TestPushApi(BouncerTestCase):
             self.assert_json_error(result, 'Token does not exist')
 
             # Use push notification bouncer and try to remove non-existing tokens.
-            with self.settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com'), \
-                mock.patch('zerver.lib.remote_server.requests.request',
-                           side_effect=self.bounce_request) as remote_server_request:
+            with self.settings(
+                PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com'
+            ), mock.patch(
+                'zerver.lib.remote_server.requests.request', side_effect=self.bounce_request
+            ) as remote_server_request:
                 result = self.client_delete(endpoint, {'token': 'abcd1234'})
                 self.assert_json_error(result, 'Token does not exist')
                 remote_server_request.assert_called_once()
@@ -1754,9 +1937,9 @@ class TestPushApi(BouncerTestCase):
             self.assertEqual(len(tokens), 1)
             self.assertEqual(tokens[0].token, token)
 
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com'), \
-            mock.patch('zerver.lib.remote_server.requests.request',
-                       side_effect=self.bounce_request):
+        with self.settings(
+            PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com'
+        ), mock.patch('zerver.lib.remote_server.requests.request', side_effect=self.bounce_request):
             # Enable push notification bouncer and add tokens.
             for endpoint, token in bouncer_requests:
                 # Test that we can push twice.
@@ -1776,7 +1959,9 @@ class TestPushApi(BouncerTestCase):
 
         # PushDeviceToken will include all the device tokens.
         tokens = list(PushDeviceToken.objects.values_list('token', flat=True))
-        self.assertEqual(tokens, ['apple-tokenaa', 'android-token-1', 'apple-tokenbb', 'android-token-2'])
+        self.assertEqual(
+            tokens, ['apple-tokenaa', 'android-token-1', 'apple-tokenbb', 'android-token-2']
+        )
 
         # RemotePushDeviceToken will only include tokens of
         # the devices using push notification bouncer.
@@ -1792,14 +1977,16 @@ class TestPushApi(BouncerTestCase):
 
         # Use push notification bouncer and test removing device tokens.
         # Tokens will be removed both locally and remotely.
-        with self.settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com'), \
-            mock.patch('zerver.lib.remote_server.requests.request',
-                       side_effect=self.bounce_request):
+        with self.settings(
+            PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com'
+        ), mock.patch('zerver.lib.remote_server.requests.request', side_effect=self.bounce_request):
             for endpoint, token in bouncer_requests:
                 result = self.client_delete(endpoint, {'token': token})
                 self.assert_json_success(result)
                 tokens = list(PushDeviceToken.objects.filter(user=user, token=token))
-                remote_tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, token=token))
+                remote_tokens = list(
+                    RemotePushDeviceToken.objects.filter(user_id=user.id, token=token)
+                )
                 self.assertEqual(len(tokens), 0)
                 self.assertEqual(len(remote_tokens), 0)
 
@@ -1807,6 +1994,7 @@ class TestPushApi(BouncerTestCase):
         self.assertEqual(RemotePushDeviceToken.objects.all().count(), 0)
         self.assertEqual(PushDeviceToken.objects.all().count(), 0)
 
+
 class GCMParseOptionsTest(ZulipTestCase):
     def test_invalid_option(self) -> None:
         with self.assertRaises(JsonableError):
@@ -1817,18 +2005,14 @@ class GCMParseOptionsTest(ZulipTestCase):
             parse_gcm_options({"priority": "invalid"}, {})
 
     def test_default_priority(self) -> None:
-        self.assertEqual(
-            "high", parse_gcm_options({}, {"event": "message"}))
-        self.assertEqual(
-            "normal", parse_gcm_options({}, {"event": "remove"}))
-        self.assertEqual(
-            "normal", parse_gcm_options({}, {}))
+        self.assertEqual("high", parse_gcm_options({}, {"event": "message"}))
+        self.assertEqual("normal", parse_gcm_options({}, {"event": "remove"}))
+        self.assertEqual("normal", parse_gcm_options({}, {}))
 
     def test_explicit_priority(self) -> None:
-        self.assertEqual(
-            "normal", parse_gcm_options({"priority": "normal"}, {}))
-        self.assertEqual(
-            "high", parse_gcm_options({"priority": "high"}, {}))
+        self.assertEqual("normal", parse_gcm_options({"priority": "normal"}, {}))
+        self.assertEqual("high", parse_gcm_options({"priority": "high"}, {}))
+
 
 @mock.patch('zerver.lib.push_notifications.gcm_client')
 class GCMSendTest(PushNotificationTest):
@@ -1850,19 +2034,22 @@ class GCMSendTest(PushNotificationTest):
         send_android_push_notification_to_user(self.user_profile, {}, {})
         mock_debug.assert_called_with(
             "Skipping sending a GCM push notification since PUSH_NOTIFICATION_BOUNCER_URL "
-            "and ANDROID_GCM_API_KEY are both unset")
+            "and ANDROID_GCM_API_KEY are both unset"
+        )
 
     @mock.patch('zerver.lib.push_notifications.logger.warning')
-    def test_json_request_raises_ioerror(self, mock_warn: mock.MagicMock,
-                                         mock_gcm: mock.MagicMock) -> None:
+    def test_json_request_raises_ioerror(
+        self, mock_warn: mock.MagicMock, mock_gcm: mock.MagicMock
+    ) -> None:
         mock_gcm.json_request.side_effect = IOError('error')
         send_android_push_notification_to_user(self.user_profile, {}, {})
         mock_warn.assert_called_with("Error while pushing to GCM", exc_info=True)
 
     @mock.patch('zerver.lib.push_notifications.logger.warning')
     @mock.patch('zerver.lib.push_notifications.logger.info')
-    def test_success(self, mock_info: mock.MagicMock, mock_warning: mock.MagicMock,
-                     mock_gcm: mock.MagicMock) -> None:
+    def test_success(
+        self, mock_info: mock.MagicMock, mock_warning: mock.MagicMock, mock_gcm: mock.MagicMock
+    ) -> None:
         res = {}
         res['success'] = {token: ind for ind, token in enumerate(self.gcm_tokens)}
         mock_gcm.json_request.return_value = res
@@ -1884,12 +2071,14 @@ class GCMSendTest(PushNotificationTest):
         data = self.get_gcm_data()
         send_android_push_notification_to_user(self.user_profile, data, {})
         mock_warning.assert_called_once_with(
-            "GCM: Got canonical ref but it already matches our ID %s!", 1,
+            "GCM: Got canonical ref but it already matches our ID %s!",
+            1,
         )
 
     @mock.patch('zerver.lib.push_notifications.logger.warning')
-    def test_canonical_pushdevice_not_present(self, mock_warning: mock.MagicMock,
-                                              mock_gcm: mock.MagicMock) -> None:
+    def test_canonical_pushdevice_not_present(
+        self, mock_warning: mock.MagicMock, mock_gcm: mock.MagicMock
+    ) -> None:
         res = {}
         t1 = hex_to_b64('1111')
         t2 = hex_to_b64('3333')
@@ -1898,8 +2087,7 @@ class GCMSendTest(PushNotificationTest):
 
         def get_count(hex_token: str) -> int:
             token = hex_to_b64(hex_token)
-            return PushDeviceToken.objects.filter(
-                token=token, kind=PushDeviceToken.GCM).count()
+            return PushDeviceToken.objects.filter(token=token, kind=PushDeviceToken.GCM).count()
 
         self.assertEqual(get_count('1111'), 1)
         self.assertEqual(get_count('3333'), 0)
@@ -1913,8 +2101,9 @@ class GCMSendTest(PushNotificationTest):
         self.assertEqual(get_count('3333'), 1)
 
     @mock.patch('zerver.lib.push_notifications.logger.info')
-    def test_canonical_pushdevice_different(self, mock_info: mock.MagicMock,
-                                            mock_gcm: mock.MagicMock) -> None:
+    def test_canonical_pushdevice_different(
+        self, mock_info: mock.MagicMock, mock_gcm: mock.MagicMock
+    ) -> None:
         res = {}
         old_token = hex_to_b64('1111')
         new_token = hex_to_b64('2222')
@@ -1923,8 +2112,7 @@ class GCMSendTest(PushNotificationTest):
 
         def get_count(hex_token: str) -> int:
             token = hex_to_b64(hex_token)
-            return PushDeviceToken.objects.filter(
-                token=token, kind=PushDeviceToken.GCM).count()
+            return PushDeviceToken.objects.filter(token=token, kind=PushDeviceToken.GCM).count()
 
         self.assertEqual(get_count('1111'), 1)
         self.assertEqual(get_count('2222'), 1)
@@ -1932,7 +2120,9 @@ class GCMSendTest(PushNotificationTest):
         data = self.get_gcm_data()
         send_android_push_notification_to_user(self.user_profile, data, {})
         mock_info.assert_called_once_with(
-            "GCM: Got canonical ref %s, dropping %s", new_token, old_token,
+            "GCM: Got canonical ref %s, dropping %s",
+            new_token,
+            old_token,
         )
 
         self.assertEqual(get_count('1111'), 0)
@@ -1947,8 +2137,7 @@ class GCMSendTest(PushNotificationTest):
 
         def get_count(hex_token: str) -> int:
             token = hex_to_b64(hex_token)
-            return PushDeviceToken.objects.filter(
-                token=token, kind=PushDeviceToken.GCM).count()
+            return PushDeviceToken.objects.filter(token=token, kind=PushDeviceToken.GCM).count()
 
         self.assertEqual(get_count('1111'), 1)
 
@@ -1969,6 +2158,7 @@ class GCMSendTest(PushNotificationTest):
         c1 = call("GCM: Delivery to %s failed: %s", token, "Failed")
         mock_warn.assert_has_calls([c1], any_order=True)
 
+
 class TestClearOnRead(ZulipTestCase):
     def test_mark_stream_as_read(self) -> None:
         n_msgs = 3
@@ -1978,16 +2168,14 @@ class TestClearOnRead(ZulipTestCase):
         hamlet.save()
         stream = self.subscribe(hamlet, "Denmark")
 
-        message_ids = [self.send_stream_message(self.example_user("iago"),
-                                                stream.name,
-                                                f"yo {i}")
-                       for i in range(n_msgs)]
+        message_ids = [
+            self.send_stream_message(self.example_user("iago"), stream.name, f"yo {i}")
+            for i in range(n_msgs)
+        ]
         UserMessage.objects.filter(
             user_profile_id=hamlet.id,
             message_id__in=message_ids,
-        ).update(
-            flags=F('flags').bitor(
-                UserMessage.flags.active_mobile_push_notification))
+        ).update(flags=F('flags').bitor(UserMessage.flags.active_mobile_push_notification))
 
         with mock_queue_publish("zerver.lib.actions.queue_json_publish") as mock_publish:
             do_mark_stream_messages_as_read(hamlet, stream.recipient_id)
@@ -1998,6 +2186,7 @@ class TestClearOnRead(ZulipTestCase):
         self.assertEqual(sum(len(g) for g in groups), len(message_ids))
         self.assertEqual({id for g in groups for id in g}, set(message_ids))
 
+
 class TestReceivesNotificationsFunctions(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -2085,6 +2274,7 @@ class TestReceivesNotificationsFunctions(ZulipTestCase):
         self.user.enable_stream_push_notifications = False
         self.assertFalse(receives_stream_notifications(self.user))
 
+
 class TestPushNotificationsContent(ZulipTestCase):
     def test_fixtures(self) -> None:
         fixtures = orjson.loads(self.fixture_data("markdown_test_cases.json"))
@@ -2122,6 +2312,7 @@ class TestPushNotificationsContent(ZulipTestCase):
             actual_output = get_mobile_push_content(test["rendered_content"])
             self.assertEqual(actual_output, test["expected_output"])
 
+
 @skipUnless(settings.ZILENCER_ENABLED, "requires zilencer")
 class PushBouncerSignupTest(ZulipTestCase):
     def test_push_signup_invalid_host(self) -> None:
@@ -2213,4 +2404,6 @@ class PushBouncerSignupTest(ZulipTestCase):
             contact_email="server-admin@example.com",
         )
         result = self.client_post("/api/v1/remotes/server/register", request)
-        self.assert_json_error(result, f"Zulip server auth failure: key does not match role {zulip_org_id}")
+        self.assert_json_error(
+            result, f"Zulip server auth failure: key does not match role {zulip_org_id}"
+        )
diff --git a/zerver/tests/test_queue.py b/zerver/tests/test_queue.py
index 18668d7289..48caf507e3 100644
--- a/zerver/tests/test_queue.py
+++ b/zerver/tests/test_queue.py
@@ -16,7 +16,12 @@ class TestTornadoQueueClient(ZulipTestCase):
             connection = TornadoQueueClient()
             connection.connection.channel.side_effect = ConnectionClosed('500', 'test')
             connection._on_open(mock.MagicMock())
-            self.assertEqual(m.output, ['WARNING:zulip.queue:TornadoQueueClient couldn\'t open channel: connection already closed'])
+            self.assertEqual(
+                m.output,
+                [
+                    'WARNING:zulip.queue:TornadoQueueClient couldn\'t open channel: connection already closed'
+                ],
+            )
 
 
 class TestQueueImplementation(ZulipTestCase):
@@ -73,19 +78,20 @@ class TestQueueImplementation(ZulipTestCase):
 
         self.counter = 0
 
-        def throw_connection_error_once(self_obj: Any, *args: Any,
-                                        **kwargs: Any) -> None:
+        def throw_connection_error_once(self_obj: Any, *args: Any, **kwargs: Any) -> None:
             self.counter += 1
             if self.counter <= 1:
                 raise AMQPConnectionError("test")
             actual_publish(*args, **kwargs)
 
-        with mock.patch("zerver.lib.queue.SimpleQueueClient.publish",
-                        throw_connection_error_once), self.assertLogs('zulip.queue', level='WARN') as warn_logs:
+        with mock.patch(
+            "zerver.lib.queue.SimpleQueueClient.publish", throw_connection_error_once
+        ), self.assertLogs('zulip.queue', level='WARN') as warn_logs:
             queue_json_publish("test_suite", {"event": "my_event"})
-        self.assertEqual(warn_logs.output, [
-            'WARNING:zulip.queue:Failed to send to rabbitmq, trying to reconnect and send again'
-        ])
+        self.assertEqual(
+            warn_logs.output,
+            ['WARNING:zulip.queue:Failed to send to rabbitmq, trying to reconnect and send again'],
+        )
 
         assert queue_client.channel
         (_, _, message) = queue_client.channel.basic_get("test_suite")
diff --git a/zerver/tests/test_queue_worker.py b/zerver/tests/test_queue_worker.py
index 64fa276e62..25d059f7c8 100644
--- a/zerver/tests/test_queue_worker.py
+++ b/zerver/tests/test_queue_worker.py
@@ -32,6 +32,7 @@ from zerver.worker.queue_processors import (
 
 Event = Dict[str, Any]
 
+
 class WorkerTest(ZulipTestCase):
     class FakeClient:
         def __init__(self) -> None:
@@ -40,11 +41,13 @@ class WorkerTest(ZulipTestCase):
         def enqueue(self, queue_name: str, data: Dict[str, Any]) -> None:
             self.queues[queue_name].append(data)
 
-        def start_json_consumer(self,
-                                queue_name: str,
-                                callback: Callable[[List[Dict[str, Any]]], None],
-                                batch_size: int=1,
-                                timeout: Optional[int]=None) -> None:
+        def start_json_consumer(
+            self,
+            queue_name: str,
+            callback: Callable[[List[Dict[str, Any]]], None],
+            batch_size: int = 1,
+            timeout: Optional[int] = None,
+        ) -> None:
             chunk: List[Dict[str, Any]] = []
             queue = self.queues[queue_name]
             while queue:
@@ -61,15 +64,15 @@ class WorkerTest(ZulipTestCase):
 
         user = self.example_user('hamlet')
         UserActivity.objects.filter(
-            user_profile = user.id,
-            client = get_client('ios'),
+            user_profile=user.id,
+            client=get_client('ios'),
         ).delete()
 
         data = dict(
-            user_profile_id = user.id,
-            client_id = get_client('ios').id,
-            time = time.time(),
-            query = 'send_message',
+            user_profile_id=user.id,
+            client_id=get_client('ios').id,
+            time=time.time(),
+            query='send_message',
         )
         fake_client.enqueue('user_activity', data)
 
@@ -78,10 +81,10 @@ class WorkerTest(ZulipTestCase):
         # worker handles it correctly. That compatibility code can
         # be deleted in a later release, and this test should then be cleaned up.
         data_old_format = dict(
-            user_profile_id = user.id,
-            client = 'ios',
-            time = time.time(),
-            query = 'send_message',
+            user_profile_id=user.id,
+            client='ios',
+            time=time.time(),
+            query='send_message',
         )
         fake_client.enqueue('user_activity', data_old_format)
 
@@ -90,8 +93,8 @@ class WorkerTest(ZulipTestCase):
             worker.setup()
             worker.start()
             activity_records = UserActivity.objects.filter(
-                user_profile = user.id,
-                client = get_client('ios'),
+                user_profile=user.id,
+                client=get_client('ios'),
             )
             self.assertEqual(len(activity_records), 1)
             self.assertEqual(activity_records[0].count, 2)
@@ -105,8 +108,8 @@ class WorkerTest(ZulipTestCase):
             worker.setup()
             worker.start()
             activity_records = UserActivity.objects.filter(
-                user_profile = user.id,
-                client = get_client('ios'),
+                user_profile=user.id,
+                client=get_client('ios'),
             )
             self.assertEqual(len(activity_records), 1)
             self.assertEqual(activity_records[0].count, 3)
@@ -152,7 +155,7 @@ class WorkerTest(ZulipTestCase):
 
         mmw = MissedMessageWorker()
 
-        class MockTimer():
+        class MockTimer:
             is_running = False
 
             def is_alive(self) -> bool:
@@ -188,10 +191,13 @@ class WorkerTest(ZulipTestCase):
                 with self.assertLogs(level='INFO') as info_logs:
                     # Now, we actually send the emails.
                     mmw.maybe_send_batched_emails()
-                self.assertEqual(info_logs.output, [
-                    'INFO:root:Batch-processing 3 missedmessage_emails events for user 10',
-                    'INFO:root:Batch-processing 1 missedmessage_emails events for user 12'
-                ])
+                self.assertEqual(
+                    info_logs.output,
+                    [
+                        'INFO:root:Batch-processing 3 missedmessage_emails events for user 10',
+                        'INFO:root:Batch-processing 1 missedmessage_emails events for user 12',
+                    ],
+                )
 
                 self.assertEqual(mmw.timer_event, None)
 
@@ -230,9 +236,9 @@ class WorkerTest(ZulipTestCase):
         """
         fake_client = self.FakeClient()
 
-        def fake_publish(queue_name: str,
-                         event: Dict[str, Any],
-                         processor: Callable[[Any], None]) -> None:
+        def fake_publish(
+            queue_name: str, event: Dict[str, Any], processor: Callable[[Any], None]
+        ) -> None:
             fake_client.enqueue(queue_name, event)
 
         def generate_new_message_notification() -> Dict[str, Any]:
@@ -248,9 +254,13 @@ class WorkerTest(ZulipTestCase):
         with simulated_queue_client(lambda: fake_client):
             worker = queue_processors.PushNotificationsWorker()
             worker.setup()
-            with patch('zerver.worker.queue_processors.handle_push_notification') as mock_handle_new, \
-                    patch('zerver.worker.queue_processors.handle_remove_push_notification') as mock_handle_remove, \
-                    patch('zerver.worker.queue_processors.initialize_push_notifications'):
+            with patch(
+                'zerver.worker.queue_processors.handle_push_notification'
+            ) as mock_handle_new, patch(
+                'zerver.worker.queue_processors.handle_remove_push_notification'
+            ) as mock_handle_remove, patch(
+                'zerver.worker.queue_processors.initialize_push_notifications'
+            ):
                 event_new = generate_new_message_notification()
                 event_remove = generate_remove_notification()
                 fake_client.enqueue('missedmessage_mobile_notifications', event_new)
@@ -258,27 +268,37 @@ class WorkerTest(ZulipTestCase):
 
                 worker.start()
                 mock_handle_new.assert_called_once_with(event_new['user_profile_id'], event_new)
-                mock_handle_remove.assert_called_once_with(event_remove['user_profile_id'],
-                                                           event_remove['message_ids'])
+                mock_handle_remove.assert_called_once_with(
+                    event_remove['user_profile_id'], event_remove['message_ids']
+                )
 
-            with patch('zerver.worker.queue_processors.handle_push_notification',
-                       side_effect=PushNotificationBouncerRetryLaterError("test")) as mock_handle_new, \
-                    patch('zerver.worker.queue_processors.handle_remove_push_notification',
-                          side_effect=PushNotificationBouncerRetryLaterError("test")) as mock_handle_remove, \
-                    patch('zerver.worker.queue_processors.initialize_push_notifications'):
+            with patch(
+                'zerver.worker.queue_processors.handle_push_notification',
+                side_effect=PushNotificationBouncerRetryLaterError("test"),
+            ) as mock_handle_new, patch(
+                'zerver.worker.queue_processors.handle_remove_push_notification',
+                side_effect=PushNotificationBouncerRetryLaterError("test"),
+            ) as mock_handle_remove, patch(
+                'zerver.worker.queue_processors.initialize_push_notifications'
+            ):
                 event_new = generate_new_message_notification()
                 event_remove = generate_remove_notification()
                 fake_client.enqueue('missedmessage_mobile_notifications', event_new)
                 fake_client.enqueue('missedmessage_mobile_notifications', event_remove)
 
-                with mock_queue_publish('zerver.lib.queue.queue_json_publish', side_effect=fake_publish), \
-                        self.assertLogs('zerver.worker.queue_processors', 'WARNING') as warn_logs:
+                with mock_queue_publish(
+                    'zerver.lib.queue.queue_json_publish', side_effect=fake_publish
+                ), self.assertLogs('zerver.worker.queue_processors', 'WARNING') as warn_logs:
                     worker.start()
                     self.assertEqual(mock_handle_new.call_count, 1 + MAX_REQUEST_RETRIES)
                     self.assertEqual(mock_handle_remove.call_count, 1 + MAX_REQUEST_RETRIES)
-                self.assertEqual(warn_logs.output, [
-                    'WARNING:zerver.worker.queue_processors:Maximum retries exceeded for trigger:1 event:push_notification',
-                ] * 2)
+                self.assertEqual(
+                    warn_logs.output,
+                    [
+                        'WARNING:zerver.worker.queue_processors:Maximum retries exceeded for trigger:1 event:push_notification',
+                    ]
+                    * 2,
+                )
 
     @patch('zerver.worker.queue_processors.mirror_email')
     def test_mirror_worker(self, mock_mirror_email: MagicMock) -> None:
@@ -320,8 +340,9 @@ class WorkerTest(ZulipTestCase):
         for element in data:
             fake_client.enqueue('email_mirror', element)
 
-        with simulated_queue_client(lambda: fake_client), \
-                self.assertLogs('zerver.worker.queue_processors', level='WARNING') as warn_logs:
+        with simulated_queue_client(lambda: fake_client), self.assertLogs(
+            'zerver.worker.queue_processors', level='WARNING'
+        ) as warn_logs:
             start_time = time.time()
             with patch('time.time', return_value=start_time):
                 worker = queue_processors.MirrorWorker()
@@ -355,16 +376,27 @@ class WorkerTest(ZulipTestCase):
                 self.assertEqual(mock_mirror_email.call_count, 4)
 
                 # If RateLimiterLockingException is thrown, we rate-limit the new message:
-                with patch('zerver.lib.rate_limiter.RedisRateLimiterBackend.incr_ratelimit',
-                           side_effect=RateLimiterLockingException):
+                with patch(
+                    'zerver.lib.rate_limiter.RedisRateLimiterBackend.incr_ratelimit',
+                    side_effect=RateLimiterLockingException,
+                ):
                     with self.assertLogs('zerver.lib.rate_limiter', 'WARNING') as mock_warn:
                         fake_client.enqueue('email_mirror', data[0])
                         worker.start()
                         self.assertEqual(mock_mirror_email.call_count, 4)
-                        self.assertEqual(mock_warn.output, ['WARNING:zerver.lib.rate_limiter:Deadlock trying to incr_ratelimit for RateLimitedRealmMirror:zulip'])
-        self.assertEqual(warn_logs.output, [
-            'WARNING:zerver.worker.queue_processors:MirrorWorker: Rejecting an email from: None to realm: Zulip Dev - rate limited.'
-        ] * 5)
+                        self.assertEqual(
+                            mock_warn.output,
+                            [
+                                'WARNING:zerver.lib.rate_limiter:Deadlock trying to incr_ratelimit for RateLimitedRealmMirror:zulip'
+                            ],
+                        )
+        self.assertEqual(
+            warn_logs.output,
+            [
+                'WARNING:zerver.worker.queue_processors:MirrorWorker: Rejecting an email from: None to realm: Zulip Dev - rate limited.'
+            ]
+            * 5,
+        )
 
     def test_email_sending_worker_retries(self) -> None:
         """Tests the retry_send_email_failures decorator to make sure it
@@ -380,19 +412,21 @@ class WorkerTest(ZulipTestCase):
         }
         fake_client.enqueue('email_senders', data)
 
-        def fake_publish(queue_name: str,
-                         event: Dict[str, Any],
-                         processor: Optional[Callable[[Any], None]]) -> None:
+        def fake_publish(
+            queue_name: str, event: Dict[str, Any], processor: Optional[Callable[[Any], None]]
+        ) -> None:
             fake_client.enqueue(queue_name, event)
 
         with simulated_queue_client(lambda: fake_client):
             worker = queue_processors.EmailSendingWorker()
             worker.setup()
-            with patch('zerver.lib.send_email.build_email',
-                       side_effect=smtplib.SMTPServerDisconnected), \
-                    mock_queue_publish('zerver.lib.queue.queue_json_publish',
-                                       side_effect=fake_publish), \
-                    self.assertLogs(level="ERROR") as m:
+            with patch(
+                'zerver.lib.send_email.build_email', side_effect=smtplib.SMTPServerDisconnected
+            ), mock_queue_publish(
+                'zerver.lib.queue.queue_json_publish', side_effect=fake_publish
+            ), self.assertLogs(
+                level="ERROR"
+            ) as m:
                 worker.start()
                 self.assertIn("failed due to exception SMTPServerDisconnected", m.output[0])
 
@@ -402,9 +436,11 @@ class WorkerTest(ZulipTestCase):
         fake_client = self.FakeClient()
         inviter = self.example_user('iago')
         prereg_alice = PreregistrationUser.objects.create(
-            email=self.nonreg_email('alice'), referred_by=inviter, realm=inviter.realm)
+            email=self.nonreg_email('alice'), referred_by=inviter, realm=inviter.realm
+        )
         PreregistrationUser.objects.create(
-            email=self.nonreg_email('bob'), referred_by=inviter, realm=inviter.realm)
+            email=self.nonreg_email('bob'), referred_by=inviter, realm=inviter.realm
+        )
         data: List[Dict[str, Any]] = [
             dict(prereg_id=prereg_alice.id, referrer_id=inviter.id, email_body=None),
             # Nonexistent prereg_id, as if the invitation was deleted
@@ -418,9 +454,9 @@ class WorkerTest(ZulipTestCase):
         with simulated_queue_client(lambda: fake_client):
             worker = queue_processors.ConfirmationEmailWorker()
             worker.setup()
-            with patch('zerver.lib.actions.send_email'), \
-                    patch('zerver.worker.queue_processors.send_future_email') \
-                    as send_mock:
+            with patch('zerver.lib.actions.send_email'), patch(
+                'zerver.worker.queue_processors.send_future_email'
+            ) as send_mock:
                 worker.start()
                 self.assertEqual(send_mock.call_count, 2)
 
@@ -449,7 +485,9 @@ class WorkerTest(ZulipTestCase):
             worker.setup()
             with self.assertLogs(level='ERROR') as m:
                 worker.start()
-                self.assertEqual(m.records[0].message, 'Problem handling data on queue unreliable_worker')
+                self.assertEqual(
+                    m.records[0].message, 'Problem handling data on queue unreliable_worker'
+                )
                 self.assertIn(m.records[0].stack_info, m.output[0])
 
         self.assertEqual(processed, ['good', 'fine', 'back to normal'])
@@ -484,7 +522,9 @@ class WorkerTest(ZulipTestCase):
             loopworker.setup()
             with self.assertLogs(level='ERROR') as m:
                 loopworker.start()
-                self.assertEqual(m.records[0].message, 'Problem handling data on queue unreliable_loopworker')
+                self.assertEqual(
+                    m.records[0].message, 'Problem handling data on queue unreliable_loopworker'
+                )
                 self.assertIn(m.records[0].stack_info, m.output[0])
 
         self.assertEqual(processed, ['good', 'fine'])
@@ -493,8 +533,10 @@ class WorkerTest(ZulipTestCase):
         events = orjson.loads(line.split('\t')[1])
         self.assert_length(events, 4)
 
-        self.assertEqual([event["type"] for event in events],
-                         ['good', 'fine', 'unexpected behaviour', 'back to normal'])
+        self.assertEqual(
+            [event["type"] for event in events],
+            ['good', 'fine', 'unexpected behaviour', 'back to normal'],
+        )
 
     def test_timeouts(self) -> None:
         processed = []
@@ -524,7 +566,10 @@ class WorkerTest(ZulipTestCase):
             worker.ENABLE_TIMEOUTS = True
             with self.assertLogs(level='ERROR') as m:
                 worker.start()
-                self.assertEqual(m.records[0].message, 'Timed out after 1 seconds processing 1 events in queue timeout_worker')
+                self.assertEqual(
+                    m.records[0].message,
+                    'Timed out after 1 seconds processing 1 events in queue timeout_worker',
+                )
                 self.assertIn(m.records[0].stack_info, m.output[0])
 
         self.assertEqual(processed, ['good', 'fine', 'back to normal'])
@@ -542,6 +587,7 @@ class WorkerTest(ZulipTestCase):
 
             def consume(self, data: Mapping[str, Any]) -> None:
                 pass  # nocoverage # this is intentionally not called
+
         with self.assertRaises(queue_processors.WorkerDeclarationException):
             TestWorker()
 
@@ -560,5 +606,4 @@ class WorkerTest(ZulipTestCase):
             for queue_class in base.__subclasses__()
             if not isabstract(queue_class)
         }
-        self.assertEqual(set(get_active_worker_queues()),
-                         worker_queue_names - test_queue_names)
+        self.assertEqual(set(get_active_worker_queues()), worker_queue_names - test_queue_names)
diff --git a/zerver/tests/test_rate_limiter.py b/zerver/tests/test_rate_limiter.py
index d0c23be25d..c9d622864b 100644
--- a/zerver/tests/test_rate_limiter.py
+++ b/zerver/tests/test_rate_limiter.py
@@ -16,9 +16,11 @@ from zerver.lib.test_classes import ZulipTestCase
 
 RANDOM_KEY_PREFIX = secrets.token_hex(16)
 
+
 class RateLimitedTestObject(RateLimitedObject):
-    def __init__(self, name: str, rules: List[Tuple[int, int]],
-                 backend: Type[RateLimiterBackend]) -> None:
+    def __init__(
+        self, name: str, rules: List[Tuple[int, int]], backend: Type[RateLimiterBackend]
+    ) -> None:
         self.name = name
         self._rules = rules
         self._rules.sort(key=lambda x: x[0])
@@ -30,6 +32,7 @@ class RateLimitedTestObject(RateLimitedObject):
     def rules(self) -> List[Tuple[int, int]]:
         return self._rules
 
+
 class RateLimiterBackendBase(ZulipTestCase):
     __unittest_skip__ = True
 
@@ -42,8 +45,12 @@ class RateLimiterBackendBase(ZulipTestCase):
 
         return obj
 
-    def make_request(self, obj: RateLimitedTestObject, expect_ratelimited: bool=False,
-                     verify_api_calls_left: bool=True) -> None:
+    def make_request(
+        self,
+        obj: RateLimitedTestObject,
+        expect_ratelimited: bool = False,
+        verify_api_calls_left: bool = True,
+    ) -> None:
         key = obj.key()
         if key not in self.requests_record:
             self.requests_record[key] = []
@@ -76,8 +83,9 @@ class RateLimiterBackendBase(ZulipTestCase):
 
         return self.api_calls_left_from_history(history, max_window, max_calls, now)
 
-    def api_calls_left_from_history(self, history: List[float], max_window: int,
-                                    max_calls: int, now: float) -> Tuple[int, float]:
+    def api_calls_left_from_history(
+        self, history: List[float], max_window: int, max_calls: int, now: float
+    ) -> Tuple[int, float]:
         """
         This depends on the algorithm used in the backend, and should be defined by the test class.
         """
@@ -140,12 +148,14 @@ class RateLimiterBackendBase(ZulipTestCase):
         with mock.patch('time.time', return_value=(start_time + 2.1)):
             self.make_request(obj)
 
+
 class RedisRateLimiterBackendTest(RateLimiterBackendBase):
     __unittest_skip__ = False
     backend = RedisRateLimiterBackend
 
-    def api_calls_left_from_history(self, history: List[float], max_window: int,
-                                    max_calls: int, now: float) -> Tuple[int, float]:
+    def api_calls_left_from_history(
+        self, history: List[float], max_window: int, max_calls: int, now: float
+    ) -> Tuple[int, float]:
         latest_timestamp = history[-1]
         relevant_requests = [t for t in history if (t >= now - max_window)]
         relevant_requests_amount = len(relevant_requests)
@@ -164,12 +174,14 @@ class RedisRateLimiterBackendTest(RateLimiterBackendBase):
         obj.block_access(1)
         self.make_request(obj, expect_ratelimited=True, verify_api_calls_left=False)
 
+
 class TornadoInMemoryRateLimiterBackendTest(RateLimiterBackendBase):
     __unittest_skip__ = False
     backend = TornadoInMemoryRateLimiterBackend
 
-    def api_calls_left_from_history(self, history: List[float], max_window: int,
-                                    max_calls: int, now: float) -> Tuple[int, float]:
+    def api_calls_left_from_history(
+        self, history: List[float], max_window: int, max_calls: int, now: float
+    ) -> Tuple[int, float]:
         reset_time = 0.0
         for timestamp in history:
             reset_time = max(reset_time, timestamp) + (max_window / max_calls)
@@ -200,6 +212,7 @@ class TornadoInMemoryRateLimiterBackendTest(RateLimiterBackendBase):
         with mock.patch('time.time', return_value=(start_time + 1.01)):
             self.make_request(obj, expect_ratelimited=False, verify_api_calls_left=False)
 
+
 class RateLimitedObjectsTest(ZulipTestCase):
     def test_user_rate_limits(self) -> None:
         user_profile = self.example_user("hamlet")
diff --git a/zerver/tests/test_reactions.py b/zerver/tests/test_reactions.py
index 12a3aea697..b034276376 100644
--- a/zerver/tests/test_reactions.py
+++ b/zerver/tests/test_reactions.py
@@ -23,8 +23,7 @@ class ReactionEmojiTest(ZulipTestCase):
             'emoji_name': '',
         }
 
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assertEqual(result.status_code, 400)
 
     def test_add_invalid_emoji(self) -> None:
@@ -36,8 +35,7 @@ class ReactionEmojiTest(ZulipTestCase):
             'emoji_name': 'foo',
         }
 
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_error(result, "Emoji 'foo' does not exist")
 
     def test_add_deactivated_realm_emoji(self) -> None:
@@ -53,8 +51,7 @@ class ReactionEmojiTest(ZulipTestCase):
             'reaction_type': 'realm_emoji',
         }
 
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_error(result, "Emoji 'green_tick' does not exist")
 
     def test_valid_emoji(self) -> None:
@@ -66,18 +63,17 @@ class ReactionEmojiTest(ZulipTestCase):
             'emoji_name': 'smile',
         }
 
-        base_query = Reaction.objects.filter(user_profile=sender,
-                                             message=Message.objects.get(id=1),
-                                             )
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        base_query = Reaction.objects.filter(
+            user_profile=sender,
+            message=Message.objects.get(id=1),
+        )
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
         self.assertTrue(base_query.filter(emoji_name=reaction_info['emoji_name']).exists())
 
         reaction_info['emoji_name'] = 'green_tick'
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
         self.assertTrue(base_query.filter(emoji_name=reaction_info['emoji_name']).exists())
@@ -90,25 +86,26 @@ class ReactionEmojiTest(ZulipTestCase):
         reaction_info = {
             'emoji_name': 'smile',
         }
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
 
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
         key = to_dict_cache_key_id(1)
         message = extract_message_dict(cache_get(key)[0])
 
-        expected_reaction_data = [{
-            'emoji_name': 'smile',
-            'emoji_code': '1f642',
-            'reaction_type': 'unicode_emoji',
-            'user': {
-                'email': 'user10@zulip.testserver',
-                'id': 10,
-                'full_name': 'King Hamlet',
-            },
-            'user_id': 10,
-        }]
+        expected_reaction_data = [
+            {
+                'emoji_name': 'smile',
+                'emoji_code': '1f642',
+                'reaction_type': 'unicode_emoji',
+                'user': {
+                    'email': 'user10@zulip.testserver',
+                    'id': 10,
+                    'full_name': 'King Hamlet',
+                },
+                'user_id': 10,
+            }
+        ]
         self.assertEqual(expected_reaction_data, message['reactions'])
 
     def test_zulip_emoji(self) -> None:
@@ -120,18 +117,17 @@ class ReactionEmojiTest(ZulipTestCase):
             'emoji_name': 'zulip',
             'reaction_type': 'zulip_extra_emoji',
         }
-        base_query = Reaction.objects.filter(user_profile=sender,
-                                             emoji_name=reaction_info['emoji_name'])
+        base_query = Reaction.objects.filter(
+            user_profile=sender, emoji_name=reaction_info['emoji_name']
+        )
 
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
         self.assertTrue(base_query.filter(message=Message.objects.get(id=1)).exists())
 
         reaction_info.pop('reaction_type')
-        result = self.api_post(sender, '/api/v1/messages/2/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/2/reactions', reaction_info)
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
         self.assertTrue(base_query.filter(message=Message.objects.get(id=2)).exists())
@@ -148,16 +144,16 @@ class ReactionEmojiTest(ZulipTestCase):
         sender = user_profile
 
         # Verify that hamlet did not receive the message.
-        self.assertFalse(UserMessage.objects.filter(user_profile=user_profile,
-                                                    message_id=message_id).exists())
+        self.assertFalse(
+            UserMessage.objects.filter(user_profile=user_profile, message_id=message_id).exists()
+        )
 
         # Have hamlet react to the message
         reaction_info = {
             'emoji_name': 'smile',
         }
 
-        result = self.api_post(sender, f'/api/v1/messages/{message_id}/reactions',
-                               reaction_info)
+        result = self.api_post(sender, f'/api/v1/messages/{message_id}/reactions', reaction_info)
         self.assert_json_success(result)
 
         # Fetch the now-created UserMessage object to confirm it exists and is historical
@@ -177,8 +173,7 @@ class ReactionEmojiTest(ZulipTestCase):
             'reaction_type': 'realm_emoji',
         }
 
-        result = self.api_post(sender, '/api/v1/messages/1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_success(result)
 
     def test_emoji_name_to_emoji_code(self) -> None:
@@ -212,7 +207,8 @@ class ReactionEmojiTest(ZulipTestCase):
 
         # Test override Unicode emoji.
         overriding_emoji = RealmEmoji.objects.create(
-            name='astonished', realm=realm, file_name='astonished')
+            name='astonished', realm=realm, file_name='astonished'
+        )
         emoji_code, reaction_type = emoji_name_to_emoji_code(realm, 'astonished')
         self.assertEqual(emoji_code, str(overriding_emoji.id))
         self.assertEqual(reaction_type, 'realm_emoji')
@@ -225,8 +221,7 @@ class ReactionEmojiTest(ZulipTestCase):
         self.assertEqual(reaction_type, 'unicode_emoji')
 
         # Test override `:zulip:` emoji.
-        overriding_emoji = RealmEmoji.objects.create(
-            name='zulip', realm=realm, file_name='zulip')
+        overriding_emoji = RealmEmoji.objects.create(name='zulip', realm=realm, file_name='zulip')
         emoji_code, reaction_type = emoji_name_to_emoji_code(realm, 'zulip')
         self.assertEqual(emoji_code, str(overriding_emoji.id))
         self.assertEqual(reaction_type, 'realm_emoji')
@@ -236,6 +231,7 @@ class ReactionEmojiTest(ZulipTestCase):
             emoji_name_to_emoji_code(realm, 'invalid_emoji')
         self.assertEqual(str(exc.exception), "Emoji 'invalid_emoji' does not exist")
 
+
 class ReactionMessageIDTest(ZulipTestCase):
     def test_missing_message_id(self) -> None:
         """
@@ -246,8 +242,7 @@ class ReactionMessageIDTest(ZulipTestCase):
             'emoji_name': 'smile',
         }
 
-        result = self.api_post(sender, '/api/v1/messages//reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages//reactions', reaction_info)
         self.assertEqual(result.status_code, 404)
 
     def test_invalid_message_id(self) -> None:
@@ -259,8 +254,7 @@ class ReactionMessageIDTest(ZulipTestCase):
             'emoji_name': 'smile',
         }
 
-        result = self.api_post(sender, '/api/v1/messages/-1/reactions',
-                               reaction_info)
+        result = self.api_post(sender, '/api/v1/messages/-1/reactions', reaction_info)
         self.assertEqual(result.status_code, 404)
 
     def test_inaccessible_message_id(self) -> None:
@@ -271,20 +265,23 @@ class ReactionMessageIDTest(ZulipTestCase):
         pm_recipient = self.example_user("othello")
         reaction_sender = self.example_user("iago")
 
-        result = self.api_post(pm_sender,
-                               "/api/v1/messages", {"type": "private",
-                                                    "content": "Test message",
-                                                    "to": pm_recipient.email})
+        result = self.api_post(
+            pm_sender,
+            "/api/v1/messages",
+            {"type": "private", "content": "Test message", "to": pm_recipient.email},
+        )
         self.assert_json_success(result)
         pm_id = result.json()['id']
         reaction_info = {
             'emoji_name': 'smile',
         }
 
-        result = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                               reaction_info)
+        result = self.api_post(
+            reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info
+        )
         self.assert_json_error(result, "Invalid message(s)")
 
+
 class ReactionTest(ZulipTestCase):
     def test_add_existing_reaction(self) -> None:
         """
@@ -294,10 +291,11 @@ class ReactionTest(ZulipTestCase):
         pm_recipient = self.example_user("othello")
         reaction_sender = pm_recipient
 
-        pm = self.api_post(pm_sender,
-                           "/api/v1/messages", {"type": "private",
-                                                "content": "Test message",
-                                                "to": pm_recipient.email})
+        pm = self.api_post(
+            pm_sender,
+            "/api/v1/messages",
+            {"type": "private", "content": "Test message", "to": pm_recipient.email},
+        )
         self.assert_json_success(pm)
         content = orjson.loads(pm.content)
 
@@ -307,12 +305,12 @@ class ReactionTest(ZulipTestCase):
             'emoji_name': 'smile',
         }
 
-        first = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                              reaction_info)
+        first = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info)
         self.assert_json_success(first)
 
-        second = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                               reaction_info)
+        second = self.api_post(
+            reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info
+        )
         self.assert_json_error(second, "Reaction already exists.")
 
     def test_remove_nonexisting_reaction(self) -> None:
@@ -323,10 +321,11 @@ class ReactionTest(ZulipTestCase):
         pm_recipient = self.example_user("othello")
         reaction_sender = pm_recipient
 
-        pm = self.api_post(pm_sender,
-                           "/api/v1/messages", {"type": "private",
-                                                "content": "Test message",
-                                                "to": pm_recipient.email})
+        pm = self.api_post(
+            pm_sender,
+            "/api/v1/messages",
+            {"type": "private", "content": "Test message", "to": pm_recipient.email},
+        )
         self.assert_json_success(pm)
 
         content = orjson.loads(pm.content)
@@ -335,16 +334,17 @@ class ReactionTest(ZulipTestCase):
             'emoji_name': 'smile',
         }
 
-        add = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                            reaction_info)
+        add = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info)
         self.assert_json_success(add)
 
-        first = self.api_delete(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                                reaction_info)
+        first = self.api_delete(
+            reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info
+        )
         self.assert_json_success(first)
 
-        second = self.api_delete(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                                 reaction_info)
+        second = self.api_delete(
+            reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info
+        )
         self.assert_json_error(second, "Reaction doesn't exist.")
 
     def test_remove_existing_reaction_with_renamed_emoji(self) -> None:
@@ -391,6 +391,7 @@ class ReactionTest(ZulipTestCase):
         result = self.api_delete(sender, '/api/v1/messages/1/reactions', reaction_info)
         self.assert_json_success(result)
 
+
 class ReactionEventTest(ZulipTestCase):
     def test_add_event(self) -> None:
         """
@@ -401,10 +402,11 @@ class ReactionEventTest(ZulipTestCase):
         pm_recipient = self.example_user('othello')
         reaction_sender = pm_recipient
 
-        result = self.api_post(pm_sender,
-                               "/api/v1/messages", {"type": "private",
-                                                    "content": "Test message",
-                                                    "to": pm_recipient.email})
+        result = self.api_post(
+            pm_sender,
+            "/api/v1/messages",
+            {"type": "private", "content": "Test message", "to": pm_recipient.email},
+        )
         self.assert_json_success(result)
         pm_id = result.json()['id']
 
@@ -416,8 +418,9 @@ class ReactionEventTest(ZulipTestCase):
 
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            result = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                                   reaction_info)
+            result = self.api_post(
+                reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info
+            )
         self.assert_json_success(result)
         self.assertEqual(len(events), 1)
 
@@ -440,10 +443,11 @@ class ReactionEventTest(ZulipTestCase):
         pm_recipient = self.example_user('othello')
         reaction_sender = pm_recipient
 
-        result = self.api_post(pm_sender,
-                               "/api/v1/messages", {"type": "private",
-                                                    "content": "Test message",
-                                                    "to": pm_recipient.email})
+        result = self.api_post(
+            pm_sender,
+            "/api/v1/messages",
+            {"type": "private", "content": "Test message", "to": pm_recipient.email},
+        )
         self.assert_json_success(result)
         content = result.json()
         pm_id = content['id']
@@ -454,14 +458,14 @@ class ReactionEventTest(ZulipTestCase):
             'emoji_name': 'smile',
         }
 
-        add = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                            reaction_info)
+        add = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info)
         self.assert_json_success(add)
 
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            result = self.api_delete(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
-                                     reaction_info)
+            result = self.api_delete(
+                reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info
+            )
         self.assert_json_success(result)
         self.assertEqual(len(events), 1)
 
@@ -475,6 +479,7 @@ class ReactionEventTest(ZulipTestCase):
         self.assertEqual(event['emoji_name'], 'smile')
         self.assertEqual(event['message_id'], pm_id)
 
+
 class EmojiReactionBase(ZulipTestCase):
     """Reusable testing functions for emoji reactions tests.  Be careful when
     changing this: It's used in test_retention.py as well."""
@@ -486,9 +491,7 @@ class EmojiReactionBase(ZulipTestCase):
         message_id = 1
 
         result = self.api_post(
-            self.example_user('hamlet'),
-            f'/api/v1/messages/{message_id}/reactions',
-            reaction_info
+            self.example_user('hamlet'), f'/api/v1/messages/{message_id}/reactions', reaction_info
         )
         return result
 
@@ -496,9 +499,7 @@ class EmojiReactionBase(ZulipTestCase):
         message_id = 1
 
         result = self.api_post(
-            self.example_user('AARON'),
-            f'/api/v1/messages/{message_id}/reactions',
-            reaction_info
+            self.example_user('AARON'), f'/api/v1/messages/{message_id}/reactions', reaction_info
         )
         return result
 
@@ -506,20 +507,20 @@ class EmojiReactionBase(ZulipTestCase):
         message_id = 1
 
         result = self.api_delete(
-            self.example_user('hamlet'),
-            f'/api/v1/messages/{message_id}/reactions',
-            reaction_info
+            self.example_user('hamlet'), f'/api/v1/messages/{message_id}/reactions', reaction_info
         )
         return result
 
-    def get_message_reactions(self, message_id: int, emoji_code: str,
-                              reaction_type: str) -> List[Reaction]:
+    def get_message_reactions(
+        self, message_id: int, emoji_code: str, reaction_type: str
+    ) -> List[Reaction]:
         message = Message.objects.get(id=message_id)
-        reactions = Reaction.objects.filter(message=message,
-                                            emoji_code=emoji_code,
-                                            reaction_type=reaction_type)
+        reactions = Reaction.objects.filter(
+            message=message, emoji_code=emoji_code, reaction_type=reaction_type
+        )
         return list(reactions)
 
+
 class DefaultEmojiReactionTests(EmojiReactionBase):
     def setUp(self) -> None:
         super().setUp()
@@ -561,12 +562,13 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
     def test_add_to_existing_renamed_default_emoji_reaction(self) -> None:
         hamlet = self.example_user('hamlet')
         message = Message.objects.get(id=1)
-        reaction = Reaction.objects.create(user_profile=hamlet,
-                                           message=message,
-                                           emoji_name='old_name',
-                                           emoji_code='1f603',
-                                           reaction_type='unicode_emoji',
-                                           )
+        reaction = Reaction.objects.create(
+            user_profile=hamlet,
+            message=message,
+            emoji_name='old_name',
+            emoji_code='1f603',
+            reaction_type='unicode_emoji',
+        )
         reaction_info = {
             'reaction_type': 'unicode_emoji',
             'emoji_name': 'smiley',
@@ -598,11 +600,13 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
         hamlet = self.example_user('hamlet')
         message = Message.objects.get(id=1)
         self.assertTrue(
-            Reaction.objects.filter(user_profile=hamlet,
-                                    message=message,
-                                    emoji_name=reaction_info['emoji_name'],
-                                    emoji_code='1f44d',
-                                    reaction_type='unicode_emoji').exists(),
+            Reaction.objects.filter(
+                user_profile=hamlet,
+                message=message,
+                emoji_name=reaction_info['emoji_name'],
+                emoji_code='1f44d',
+                reaction_type='unicode_emoji',
+            ).exists(),
         )
 
     def test_preserve_non_canonical_name(self) -> None:
@@ -646,7 +650,10 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
 
     def test_delete_insufficient_arguments_reaction(self) -> None:
         result = self.delete_reaction({})
-        self.assert_json_error(result, 'At least one of the following arguments must be present: emoji_name, emoji_code')
+        self.assert_json_error(
+            result,
+            'At least one of the following arguments must be present: emoji_name, emoji_code',
+        )
 
     def test_delete_non_existing_emoji_reaction(self) -> None:
         reaction_info = {
@@ -660,12 +667,13 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
     def test_delete_renamed_default_emoji(self) -> None:
         hamlet = self.example_user('hamlet')
         message = Message.objects.get(id=1)
-        Reaction.objects.create(user_profile=hamlet,
-                                message=message,
-                                emoji_name='old_name',
-                                emoji_code='1f44f',
-                                reaction_type='unicode_emoji',
-                                )
+        Reaction.objects.create(
+            user_profile=hamlet,
+            message=message,
+            emoji_name='old_name',
+            emoji_code='1f44f',
+            reaction_type='unicode_emoji',
+        )
 
         reaction_info = {
             'reaction_type': 'unicode_emoji',
@@ -678,12 +686,13 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
     def test_delete_reaction_by_name(self) -> None:
         hamlet = self.example_user('hamlet')
         message = Message.objects.get(id=1)
-        Reaction.objects.create(user_profile=hamlet,
-                                message=message,
-                                emoji_name='+1',
-                                emoji_code='1f44d',
-                                reaction_type='unicode_emoji',
-                                )
+        Reaction.objects.create(
+            user_profile=hamlet,
+            message=message,
+            emoji_name='+1',
+            emoji_code='1f44d',
+            reaction_type='unicode_emoji',
+        )
 
         reaction_info = {
             'reaction_type': 'unicode_emoji',
@@ -692,11 +701,13 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
         result = self.delete_reaction(reaction_info)
         self.assert_json_success(result)
         self.assertFalse(
-            Reaction.objects.filter(user_profile=hamlet,
-                                    message=message,
-                                    emoji_name=reaction_info['emoji_name'],
-                                    emoji_code='1f44d',
-                                    reaction_type='unicode_emoji').exists(),
+            Reaction.objects.filter(
+                user_profile=hamlet,
+                message=message,
+                emoji_name=reaction_info['emoji_name'],
+                emoji_code='1f44d',
+                reaction_type='unicode_emoji',
+            ).exists(),
         )
 
     def test_react_historical(self) -> None:
@@ -710,8 +721,9 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
         user_profile = self.example_user('hamlet')
 
         # Verify that hamlet did not receive the message.
-        self.assertFalse(UserMessage.objects.filter(user_profile=user_profile,
-                                                    message_id=message_id).exists())
+        self.assertFalse(
+            UserMessage.objects.filter(user_profile=user_profile, message_id=message_id).exists()
+        )
 
         # Have hamlet react to the message
         reaction_info = {
@@ -721,9 +733,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
         }
 
         result = self.api_post(
-            user_profile,
-            f'/api/v1/messages/{message_id}/reactions',
-            reaction_info
+            user_profile, f'/api/v1/messages/{message_id}/reactions', reaction_info
         )
         self.assert_json_success(result)
 
@@ -733,6 +743,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
         self.assertTrue(user_message.flags.read)
         self.assertFalse(user_message.flags.starred)
 
+
 class ZulipExtraEmojiReactionTest(EmojiReactionBase):
     def test_add_zulip_emoji_reaction(self) -> None:
         result = self.post_reaction(zulip_reaction_info())
@@ -774,6 +785,7 @@ class ZulipExtraEmojiReactionTest(EmojiReactionBase):
         result = self.delete_reaction(zulip_reaction_info())
         self.assert_json_error(result, "Reaction doesn't exist.")
 
+
 class RealmEmojiReactionTests(EmojiReactionBase):
     def setUp(self) -> None:
         super().setUp()
@@ -826,9 +838,9 @@ class RealmEmojiReactionTests(EmojiReactionBase):
         result = self.post_other_reaction(self.default_reaction_info)
         self.assert_json_success(result)
 
-        reactions = self.get_message_reactions(1,
-                                               self.default_reaction_info['emoji_code'],
-                                               'realm_emoji')
+        reactions = self.get_message_reactions(
+            1, self.default_reaction_info['emoji_code'], 'realm_emoji'
+        )
         self.assertEqual(len(reactions), 2)
 
     def test_remove_realm_emoji_reaction(self) -> None:
@@ -866,10 +878,10 @@ class RealmEmojiReactionTests(EmojiReactionBase):
         }
         sender = self.example_user("hamlet")
         message_id = 1
-        result = self.api_post(sender, f'/api/v1/messages/{message_id}/reactions',
-                               reaction_info)
+        result = self.api_post(sender, f'/api/v1/messages/{message_id}/reactions', reaction_info)
         self.assert_json_error(result, "Invalid emoji type.")
 
+
 class ReactionAPIEventTest(EmojiReactionBase):
     def test_add_event(self) -> None:
         """
@@ -888,11 +900,7 @@ class ReactionAPIEventTest(EmojiReactionBase):
         }
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            self.api_post(
-                reaction_sender,
-                f'/api/v1/messages/{pm_id}/reactions',
-                reaction_info
-            )
+            self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions', reaction_info)
 
         self.assertEqual(len(events), 1)
 
diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py
index e59a2656b2..2ba277ca0a 100644
--- a/zerver/tests/test_realm.py
+++ b/zerver/tests/test_realm.py
@@ -39,19 +39,22 @@ from zerver.models import (
 
 
 class RealmTest(ZulipTestCase):
-    def assert_user_profile_cache_gets_new_name(self, user_profile: UserProfile,
-                                                new_realm_name: str) -> None:
+    def assert_user_profile_cache_gets_new_name(
+        self, user_profile: UserProfile, new_realm_name: str
+    ) -> None:
         self.assertEqual(user_profile.realm.name, new_realm_name)
 
     def test_realm_creation_ensures_internal_realms(self) -> None:
         with mock.patch("zerver.lib.actions.server_initialized", return_value=False):
-            with mock.patch("zerver.lib.actions.create_internal_realm") as mock_create_internal, \
-                    self.assertLogs(level='INFO') as info_logs:
+            with mock.patch(
+                "zerver.lib.actions.create_internal_realm"
+            ) as mock_create_internal, self.assertLogs(level='INFO') as info_logs:
                 do_create_realm("testrealm", "Test Realm")
                 mock_create_internal.assert_called_once()
-            self.assertEqual(info_logs.output, [
-                'INFO:root:Server not yet initialized. Creating the internal realm first.'
-            ])
+            self.assertEqual(
+                info_logs.output,
+                ['INFO:root:Server not yet initialized. Creating the internal realm first.'],
+            )
 
     def test_do_set_realm_name_caching(self) -> None:
         """The main complicated thing about setting realm names is fighting the
@@ -71,12 +74,15 @@ class RealmTest(ZulipTestCase):
         with tornado_redirected_to_list(events):
             do_set_realm_property(realm, 'name', new_name)
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            type='realm',
-            op='update',
-            property='name',
-            value=new_name,
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                type='realm',
+                op='update',
+                property='name',
+                value=new_name,
+            ),
+        )
 
     def test_update_realm_description_events(self) -> None:
         realm = get_realm('zulip')
@@ -85,12 +91,15 @@ class RealmTest(ZulipTestCase):
         with tornado_redirected_to_list(events):
             do_set_realm_property(realm, 'description', new_description)
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            type='realm',
-            op='update',
-            property='description',
-            value=new_description,
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                type='realm',
+                op='update',
+                property='description',
+                value=new_description,
+            ),
+        )
 
     def test_update_realm_description(self) -> None:
         self.login('iago')
@@ -104,12 +113,15 @@ class RealmTest(ZulipTestCase):
             self.assertEqual(realm.description, new_description)
 
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            type='realm',
-            op='update',
-            property='description',
-            value=new_description,
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                type='realm',
+                op='update',
+                property='description',
+                value=new_description,
+            ),
+        )
 
     def test_realm_description_length(self) -> None:
         new_description = 'A' * 1001
@@ -191,8 +203,12 @@ class RealmTest(ZulipTestCase):
 
     def test_do_deactivate_realm_clears_scheduled_jobs(self) -> None:
         user = self.example_user('hamlet')
-        send_future_email('zerver/emails/followup_day1', user.realm,
-                          to_user_ids=[user.id], delay=datetime.timedelta(hours=1))
+        send_future_email(
+            'zerver/emails/followup_day1',
+            user.realm,
+            to_user_ids=[user.id],
+            delay=datetime.timedelta(hours=1),
+        )
         self.assertEqual(ScheduledEmail.objects.count(), 1)
         do_deactivate_realm(user.realm)
         self.assertEqual(ScheduledEmail.objects.count(), 0)
@@ -245,7 +261,9 @@ class RealmTest(ZulipTestCase):
         self.assertTrue(realm.deactivated)
         confirmation_url = create_confirmation_link(realm, Confirmation.REALM_REACTIVATION)
         response = self.client_get(confirmation_url)
-        self.assert_in_success_response(['Your organization has been successfully reactivated'], response)
+        self.assert_in_success_response(
+            ['Your organization has been successfully reactivated'], response
+        )
         realm = get_realm('zulip')
         self.assertFalse(realm.deactivated)
 
@@ -262,6 +280,7 @@ class RealmTest(ZulipTestCase):
         realm = get_realm('zulip')
         do_send_realm_reactivation_email(realm)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 1)
         self.assertRegex(
             outbox[0].from_email,
@@ -272,28 +291,32 @@ class RealmTest(ZulipTestCase):
         admins = realm.get_human_admin_users()
         confirmation_url = self.get_confirmation_url_from_outbox(admins[0].delivery_email)
         response = self.client_get(confirmation_url)
-        self.assert_in_success_response(['Your organization has been successfully reactivated'], response)
+        self.assert_in_success_response(
+            ['Your organization has been successfully reactivated'], response
+        )
         realm = get_realm('zulip')
         self.assertFalse(realm.deactivated)
 
     def test_realm_reactivation_with_random_link(self) -> None:
         random_link = "/reactivate/5e89081eb13984e0f3b130bf7a4121d153f1614b"
         response = self.client_get(random_link)
-        self.assert_in_success_response(['The organization reactivation link has expired or is not valid.'], response)
+        self.assert_in_success_response(
+            ['The organization reactivation link has expired or is not valid.'], response
+        )
 
     def test_change_notifications_stream(self) -> None:
         # We need an admin user.
         self.login('iago')
 
         disabled_notif_stream_id = -1
-        req = dict(notifications_stream_id = orjson.dumps(disabled_notif_stream_id).decode())
+        req = dict(notifications_stream_id=orjson.dumps(disabled_notif_stream_id).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
         realm = get_realm('zulip')
         self.assertEqual(realm.notifications_stream, None)
 
         new_notif_stream_id = 4
-        req = dict(notifications_stream_id = orjson.dumps(new_notif_stream_id).decode())
+        req = dict(notifications_stream_id=orjson.dumps(new_notif_stream_id).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
         realm = get_realm('zulip')
@@ -301,7 +324,7 @@ class RealmTest(ZulipTestCase):
         self.assertEqual(realm.notifications_stream.id, new_notif_stream_id)
 
         invalid_notif_stream_id = 1234
-        req = dict(notifications_stream_id = orjson.dumps(invalid_notif_stream_id).decode())
+        req = dict(notifications_stream_id=orjson.dumps(invalid_notif_stream_id).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid stream id')
         realm = get_realm('zulip')
@@ -325,14 +348,20 @@ class RealmTest(ZulipTestCase):
         self.login('iago')
 
         disabled_signup_notifications_stream_id = -1
-        req = dict(signup_notifications_stream_id = orjson.dumps(disabled_signup_notifications_stream_id).decode())
+        req = dict(
+            signup_notifications_stream_id=orjson.dumps(
+                disabled_signup_notifications_stream_id
+            ).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
         realm = get_realm('zulip')
         self.assertEqual(realm.signup_notifications_stream, None)
 
         new_signup_notifications_stream_id = 4
-        req = dict(signup_notifications_stream_id = orjson.dumps(new_signup_notifications_stream_id).decode())
+        req = dict(
+            signup_notifications_stream_id=orjson.dumps(new_signup_notifications_stream_id).decode()
+        )
 
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
@@ -341,12 +370,18 @@ class RealmTest(ZulipTestCase):
         self.assertEqual(realm.signup_notifications_stream.id, new_signup_notifications_stream_id)
 
         invalid_signup_notifications_stream_id = 1234
-        req = dict(signup_notifications_stream_id = orjson.dumps(invalid_signup_notifications_stream_id).decode())
+        req = dict(
+            signup_notifications_stream_id=orjson.dumps(
+                invalid_signup_notifications_stream_id
+            ).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid stream id')
         realm = get_realm('zulip')
         assert realm.signup_notifications_stream is not None
-        self.assertNotEqual(realm.signup_notifications_stream.id, invalid_signup_notifications_stream_id)
+        self.assertNotEqual(
+            realm.signup_notifications_stream.id, invalid_signup_notifications_stream_id
+        )
 
     def test_get_default_signup_notifications_stream(self) -> None:
         realm = get_realm("zulip")
@@ -406,12 +441,12 @@ class RealmTest(ZulipTestCase):
     def test_change_bot_creation_policy(self) -> None:
         # We need an admin user.
         self.login('iago')
-        req = dict(bot_creation_policy = orjson.dumps(Realm.BOT_CREATION_LIMIT_GENERIC_BOTS).decode())
+        req = dict(bot_creation_policy=orjson.dumps(Realm.BOT_CREATION_LIMIT_GENERIC_BOTS).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         invalid_add_bot_permission = 4
-        req = dict(bot_creation_policy = orjson.dumps(invalid_add_bot_permission).decode())
+        req = dict(bot_creation_policy=orjson.dumps(invalid_add_bot_permission).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid bot_creation_policy')
 
@@ -423,111 +458,121 @@ class RealmTest(ZulipTestCase):
 
         self.login_user(user_profile)
         invalid_value = 12
-        req = dict(email_address_visibility = orjson.dumps(invalid_value).decode())
+        req = dict(email_address_visibility=orjson.dumps(invalid_value).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid email_address_visibility')
 
         reset_emails_in_zulip_realm()
         realm = get_realm("zulip")
 
-        req = dict(email_address_visibility = orjson.dumps(Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS).decode())
+        req = dict(
+            email_address_visibility=orjson.dumps(Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
         realm = get_realm("zulip")
         self.assertEqual(realm.email_address_visibility, Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
 
         edited_user_profile = get_user_profile_by_id(user_profile.id)
-        self.assertEqual(edited_user_profile.email, f"user{edited_user_profile.id}@zulip.testserver")
+        self.assertEqual(
+            edited_user_profile.email, f"user{edited_user_profile.id}@zulip.testserver"
+        )
 
         # Check normal user cannot access email
         result = self.api_get(cordelia, f"/api/v1/users/{hamlet.id}")
         self.assert_json_success(result)
-        self.assertEqual(result.json()['user']['email'],
-                         f'user{hamlet.id}@zulip.testserver')
+        self.assertEqual(result.json()['user']['email'], f'user{hamlet.id}@zulip.testserver')
         self.assertEqual(result.json()['user'].get('delivery_email'), None)
 
         # Check administrator gets delivery_email with EMAIL_ADDRESS_VISIBILITY_ADMINS
         result = self.api_get(user_profile, f"/api/v1/users/{hamlet.id}")
         self.assert_json_success(result)
-        self.assertEqual(result.json()['user']['email'],
-                         f'user{hamlet.id}@zulip.testserver')
-        self.assertEqual(result.json()['user'].get('delivery_email'),
-                         hamlet.delivery_email)
+        self.assertEqual(result.json()['user']['email'], f'user{hamlet.id}@zulip.testserver')
+        self.assertEqual(result.json()['user'].get('delivery_email'), hamlet.delivery_email)
 
-        req = dict(email_address_visibility = orjson.dumps(Realm.EMAIL_ADDRESS_VISIBILITY_NOBODY).decode())
+        req = dict(
+            email_address_visibility=orjson.dumps(Realm.EMAIL_ADDRESS_VISIBILITY_NOBODY).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         realm = get_realm("zulip")
         self.assertEqual(realm.email_address_visibility, Realm.EMAIL_ADDRESS_VISIBILITY_NOBODY)
         edited_user_profile = get_user_profile_by_id(user_profile.id)
-        self.assertEqual(edited_user_profile.email, f"user{edited_user_profile.id}@zulip.testserver")
+        self.assertEqual(
+            edited_user_profile.email, f"user{edited_user_profile.id}@zulip.testserver"
+        )
 
         # Check even administrator doesn't get delivery_email with
         # EMAIL_ADDRESS_VISIBILITY_NOBODY
         result = self.api_get(user_profile, f"/api/v1/users/{hamlet.id}")
         self.assert_json_success(result)
-        self.assertEqual(result.json()['user']['email'],
-                         f'user{hamlet.id}@zulip.testserver')
+        self.assertEqual(result.json()['user']['email'], f'user{hamlet.id}@zulip.testserver')
         self.assertEqual(result.json()['user'].get('delivery_email'), None)
 
     def test_change_stream_creation_policy(self) -> None:
         # We need an admin user.
         self.login('iago')
-        req = dict(create_stream_policy = orjson.dumps(Realm.POLICY_ADMINS_ONLY).decode())
+        req = dict(create_stream_policy=orjson.dumps(Realm.POLICY_ADMINS_ONLY).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         invalid_value = 10
-        req = dict(create_stream_policy = orjson.dumps(invalid_value).decode())
+        req = dict(create_stream_policy=orjson.dumps(invalid_value).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid create_stream_policy')
 
     def test_change_invite_to_stream_policy(self) -> None:
         # We need an admin user.
         self.login('iago')
-        req = dict(invite_to_stream_policy = orjson.dumps(Realm.POLICY_ADMINS_ONLY).decode())
+        req = dict(invite_to_stream_policy=orjson.dumps(Realm.POLICY_ADMINS_ONLY).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         invalid_value = 10
-        req = dict(invite_to_stream_policy = orjson.dumps(invalid_value).decode())
+        req = dict(invite_to_stream_policy=orjson.dumps(invalid_value).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid invite_to_stream_policy')
 
     def test_user_group_edit_policy(self) -> None:
         # We need an admin user.
         self.login('iago')
-        req = dict(user_group_edit_policy = orjson.dumps(Realm.USER_GROUP_EDIT_POLICY_ADMINS).decode())
+        req = dict(
+            user_group_edit_policy=orjson.dumps(Realm.USER_GROUP_EDIT_POLICY_ADMINS).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         invalid_value = 10
-        req = dict(user_group_edit_policy = orjson.dumps(invalid_value).decode())
+        req = dict(user_group_edit_policy=orjson.dumps(invalid_value).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid user_group_edit_policy')
 
     def test_private_message_policy(self) -> None:
         # We need an admin user.
         self.login('iago')
-        req = dict(private_message_policy = orjson.dumps(Realm.PRIVATE_MESSAGE_POLICY_DISABLED).decode())
+        req = dict(
+            private_message_policy=orjson.dumps(Realm.PRIVATE_MESSAGE_POLICY_DISABLED).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         invalid_value = 10
-        req = dict(private_message_policy = orjson.dumps(invalid_value).decode())
+        req = dict(private_message_policy=orjson.dumps(invalid_value).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid private_message_policy')
 
     def test_change_wildcard_mention_policy(self) -> None:
         # We need an admin user.
         self.login('iago')
-        req = dict(wildcard_mention_policy = orjson.dumps(Realm.WILDCARD_MENTION_POLICY_EVERYONE).decode())
+        req = dict(
+            wildcard_mention_policy=orjson.dumps(Realm.WILDCARD_MENTION_POLICY_EVERYONE).decode()
+        )
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
         invalid_value = 10
-        req = dict(wildcard_mention_policy = orjson.dumps(invalid_value).decode())
+        req = dict(wildcard_mention_policy=orjson.dumps(invalid_value).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_error(result, 'Invalid wildcard_mention_policy')
 
@@ -575,46 +620,74 @@ class RealmTest(ZulipTestCase):
         self.assertTrue(msg in possible_messages)
 
     def test_change_video_chat_provider(self) -> None:
-        self.assertEqual(get_realm('zulip').video_chat_provider, Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'])
+        self.assertEqual(
+            get_realm('zulip').video_chat_provider, Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
+        )
         self.login('iago')
 
         invalid_video_chat_provider_value = 10
         req = {"video_chat_provider": orjson.dumps(invalid_video_chat_provider_value).decode()}
         result = self.client_patch('/json/realm', req)
-        self.assert_json_error(result,
-                               ("Invalid video_chat_provider {}").format(invalid_video_chat_provider_value))
+        self.assert_json_error(
+            result, ("Invalid video_chat_provider {}").format(invalid_video_chat_provider_value)
+        )
 
-        req = {"video_chat_provider": orjson.dumps(Realm.VIDEO_CHAT_PROVIDERS['disabled']['id']).decode()}
+        req = {
+            "video_chat_provider": orjson.dumps(
+                Realm.VIDEO_CHAT_PROVIDERS['disabled']['id']
+            ).decode()
+        }
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
-        self.assertEqual(get_realm('zulip').video_chat_provider,
-                         Realm.VIDEO_CHAT_PROVIDERS['disabled']['id'])
+        self.assertEqual(
+            get_realm('zulip').video_chat_provider, Realm.VIDEO_CHAT_PROVIDERS['disabled']['id']
+        )
 
-        req = {"video_chat_provider": orjson.dumps(Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']).decode()}
+        req = {
+            "video_chat_provider": orjson.dumps(
+                Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
+            ).decode()
+        }
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
-        self.assertEqual(get_realm('zulip').video_chat_provider, Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'])
+        self.assertEqual(
+            get_realm('zulip').video_chat_provider, Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
+        )
 
-        req = {"video_chat_provider": orjson.dumps(Realm.VIDEO_CHAT_PROVIDERS['big_blue_button']['id']).decode()}
+        req = {
+            "video_chat_provider": orjson.dumps(
+                Realm.VIDEO_CHAT_PROVIDERS['big_blue_button']['id']
+            ).decode()
+        }
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
-        self.assertEqual(get_realm('zulip').video_chat_provider,
-                         Realm.VIDEO_CHAT_PROVIDERS['big_blue_button']['id'])
+        self.assertEqual(
+            get_realm('zulip').video_chat_provider,
+            Realm.VIDEO_CHAT_PROVIDERS['big_blue_button']['id'],
+        )
 
-        req = {"video_chat_provider": orjson.dumps(Realm.VIDEO_CHAT_PROVIDERS['zoom']['id']).decode()}
+        req = {
+            "video_chat_provider": orjson.dumps(Realm.VIDEO_CHAT_PROVIDERS['zoom']['id']).decode()
+        }
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
     def test_initial_plan_type(self) -> None:
         with self.settings(BILLING_ENABLED=True):
             self.assertEqual(do_create_realm('hosted', 'hosted').plan_type, Realm.LIMITED)
-            self.assertEqual(get_realm("hosted").max_invites, settings.INVITES_DEFAULT_REALM_DAILY_MAX)
-            self.assertEqual(get_realm("hosted").message_visibility_limit, Realm.MESSAGE_VISIBILITY_LIMITED)
+            self.assertEqual(
+                get_realm("hosted").max_invites, settings.INVITES_DEFAULT_REALM_DAILY_MAX
+            )
+            self.assertEqual(
+                get_realm("hosted").message_visibility_limit, Realm.MESSAGE_VISIBILITY_LIMITED
+            )
             self.assertEqual(get_realm("hosted").upload_quota_gb, Realm.UPLOAD_QUOTA_LIMITED)
 
         with self.settings(BILLING_ENABLED=False):
             self.assertEqual(do_create_realm('onpremise', 'onpremise').plan_type, Realm.SELF_HOSTED)
-            self.assertEqual(get_realm('onpremise').max_invites, settings.INVITES_DEFAULT_REALM_DAILY_MAX)
+            self.assertEqual(
+                get_realm('onpremise').max_invites, settings.INVITES_DEFAULT_REALM_DAILY_MAX
+            )
             self.assertEqual(get_realm('onpremise').message_visibility_limit, None)
             self.assertEqual(get_realm("onpremise").upload_quota_gb, None)
 
@@ -671,8 +744,7 @@ class RealmTest(ZulipTestCase):
 
         req = dict(message_retention_days=orjson.dumps(-10).decode())
         result = self.client_patch('/json/realm', req)
-        self.assert_json_error(
-            result, "Bad value for 'message_retention_days': -10")
+        self.assert_json_error(result, "Bad value for 'message_retention_days': -10")
 
         req = dict(message_retention_days=orjson.dumps('invalid').decode())
         result = self.client_patch('/json/realm', req)
@@ -693,16 +765,15 @@ class RealmTest(ZulipTestCase):
         do_change_plan_type(realm, Realm.LIMITED)
         req = dict(message_retention_days=orjson.dumps(10).decode())
         result = self.client_patch('/json/realm', req)
-        self.assert_json_error(
-            result, "Available on Zulip Standard. Upgrade to access.")
+        self.assert_json_error(result, "Available on Zulip Standard. Upgrade to access.")
 
         do_change_plan_type(realm, Realm.STANDARD)
         req = dict(message_retention_days=orjson.dumps(10).decode())
         result = self.client_patch('/json/realm', req)
         self.assert_json_success(result)
 
-class RealmAPITest(ZulipTestCase):
 
+class RealmAPITest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.login('desdemona')
@@ -739,32 +810,46 @@ class RealmAPITest(ZulipTestCase):
             message_retention_days=[10, 20],
             name=['Zulip', 'New Name'],
             waiting_period_threshold=[10, 20],
-            create_stream_policy=[Realm.POLICY_ADMINS_ONLY,
-                                  Realm.POLICY_MEMBERS_ONLY,
-                                  Realm.POLICY_FULL_MEMBERS_ONLY],
-            user_group_edit_policy=[Realm.USER_GROUP_EDIT_POLICY_ADMINS,
-                                    Realm.USER_GROUP_EDIT_POLICY_MEMBERS],
-            private_message_policy=[Realm.PRIVATE_MESSAGE_POLICY_UNLIMITED,
-                                    Realm.PRIVATE_MESSAGE_POLICY_DISABLED],
-            invite_to_stream_policy=[Realm.POLICY_ADMINS_ONLY,
-                                     Realm.POLICY_MEMBERS_ONLY,
-                                     Realm.POLICY_FULL_MEMBERS_ONLY],
-            wildcard_mention_policy=[Realm.WILDCARD_MENTION_POLICY_EVERYONE,
-                                     Realm.WILDCARD_MENTION_POLICY_MEMBERS,
-                                     Realm.WILDCARD_MENTION_POLICY_FULL_MEMBERS,
-                                     Realm.WILDCARD_MENTION_POLICY_STREAM_ADMINS,
-                                     Realm.WILDCARD_MENTION_POLICY_ADMINS,
-                                     Realm.WILDCARD_MENTION_POLICY_NOBODY],
+            create_stream_policy=[
+                Realm.POLICY_ADMINS_ONLY,
+                Realm.POLICY_MEMBERS_ONLY,
+                Realm.POLICY_FULL_MEMBERS_ONLY,
+            ],
+            user_group_edit_policy=[
+                Realm.USER_GROUP_EDIT_POLICY_ADMINS,
+                Realm.USER_GROUP_EDIT_POLICY_MEMBERS,
+            ],
+            private_message_policy=[
+                Realm.PRIVATE_MESSAGE_POLICY_UNLIMITED,
+                Realm.PRIVATE_MESSAGE_POLICY_DISABLED,
+            ],
+            invite_to_stream_policy=[
+                Realm.POLICY_ADMINS_ONLY,
+                Realm.POLICY_MEMBERS_ONLY,
+                Realm.POLICY_FULL_MEMBERS_ONLY,
+            ],
+            wildcard_mention_policy=[
+                Realm.WILDCARD_MENTION_POLICY_EVERYONE,
+                Realm.WILDCARD_MENTION_POLICY_MEMBERS,
+                Realm.WILDCARD_MENTION_POLICY_FULL_MEMBERS,
+                Realm.WILDCARD_MENTION_POLICY_STREAM_ADMINS,
+                Realm.WILDCARD_MENTION_POLICY_ADMINS,
+                Realm.WILDCARD_MENTION_POLICY_NOBODY,
+            ],
             bot_creation_policy=[1, 2],
-            email_address_visibility=[Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE,
-                                      Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS,
-                                      Realm.EMAIL_ADDRESS_VISIBILITY_NOBODY],
+            email_address_visibility=[
+                Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE,
+                Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS,
+                Realm.EMAIL_ADDRESS_VISIBILITY_NOBODY,
+            ],
             video_chat_provider=[
                 dict(
-                    video_chat_provider=orjson.dumps(Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']).decode(),
+                    video_chat_provider=orjson.dumps(
+                        Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']
+                    ).decode(),
                 ),
             ],
-            message_content_delete_limit_seconds=[1000, 1100, 1200]
+            message_content_delete_limit_seconds=[1000, 1100, 1200],
         )
 
         vals = test_values.get(name)
@@ -828,6 +913,7 @@ class RealmAPITest(ZulipTestCase):
         self.assertEqual(realm.allow_message_deleting, True)
         self.assertEqual(realm.message_content_delete_limit_seconds, 600)
 
+
 class ScrubRealmTest(ZulipTestCase):
     def test_scrub_realm(self) -> None:
         zulip = get_realm("zulip")
diff --git a/zerver/tests/test_realm_domains.py b/zerver/tests/test_realm_domains.py
index c9115ac954..eb6641114b 100644
--- a/zerver/tests/test_realm_domains.py
+++ b/zerver/tests/test_realm_domains.py
@@ -27,9 +27,13 @@ class RealmDomainTest(ZulipTestCase):
         result = self.client_get("/json/realm/domains")
         self.assert_json_success(result)
         received = orjson.dumps(result.json()['domains'], option=orjson.OPT_SORT_KEYS)
-        expected = orjson.dumps([{'domain': 'zulip.com', 'allow_subdomains': False},
-                                 {'domain': 'acme.com', 'allow_subdomains': True}],
-                                option=orjson.OPT_SORT_KEYS)
+        expected = orjson.dumps(
+            [
+                {'domain': 'zulip.com', 'allow_subdomains': False},
+                {'domain': 'acme.com', 'allow_subdomains': True},
+            ],
+            option=orjson.OPT_SORT_KEYS,
+        )
         self.assertEqual(received, expected)
 
     def test_not_realm_admin(self) -> None:
@@ -43,8 +47,10 @@ class RealmDomainTest(ZulipTestCase):
 
     def test_create_realm_domain(self) -> None:
         self.login('iago')
-        data = {'domain': orjson.dumps('').decode(),
-                'allow_subdomains': orjson.dumps(True).decode()}
+        data = {
+            'domain': orjson.dumps('').decode(),
+            'allow_subdomains': orjson.dumps(True).decode(),
+        }
         result = self.client_post("/json/realm/domains", info=data)
         self.assert_json_error(result, 'Invalid domain: Domain can\'t be empty.')
 
@@ -52,34 +58,42 @@ class RealmDomainTest(ZulipTestCase):
         result = self.client_post("/json/realm/domains", info=data)
         self.assert_json_success(result)
         realm = get_realm('zulip')
-        self.assertTrue(RealmDomain.objects.filter(realm=realm, domain='acme.com',
-                                                   allow_subdomains=True).exists())
+        self.assertTrue(
+            RealmDomain.objects.filter(
+                realm=realm, domain='acme.com', allow_subdomains=True
+            ).exists()
+        )
 
         result = self.client_post("/json/realm/domains", info=data)
-        self.assert_json_error(result, 'The domain acme.com is already a part of your organization.')
+        self.assert_json_error(
+            result, 'The domain acme.com is already a part of your organization.'
+        )
 
         mit_user_profile = self.mit_user("sipbtest")
         self.login_user(mit_user_profile)
 
         do_change_user_role(mit_user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
 
-        result = self.client_post("/json/realm/domains", info=data,
-                                  HTTP_HOST=mit_user_profile.realm.host)
+        result = self.client_post(
+            "/json/realm/domains", info=data, HTTP_HOST=mit_user_profile.realm.host
+        )
         self.assert_json_success(result)
 
     def test_patch_realm_domain(self) -> None:
         self.login('iago')
         realm = get_realm('zulip')
-        RealmDomain.objects.create(realm=realm, domain='acme.com',
-                                   allow_subdomains=False)
+        RealmDomain.objects.create(realm=realm, domain='acme.com', allow_subdomains=False)
         data = {
             'allow_subdomains': orjson.dumps(True).decode(),
         }
         url = "/json/realm/domains/acme.com"
         result = self.client_patch(url, data)
         self.assert_json_success(result)
-        self.assertTrue(RealmDomain.objects.filter(realm=realm, domain='acme.com',
-                                                   allow_subdomains=True).exists())
+        self.assertTrue(
+            RealmDomain.objects.filter(
+                realm=realm, domain='acme.com', allow_subdomains=True
+            ).exists()
+        )
 
         url = "/json/realm/domains/non-existent.com"
         result = self.client_patch(url, data)
@@ -117,7 +131,9 @@ class RealmDomainTest(ZulipTestCase):
         realm1 = do_create_realm('testrealm1', 'Test Realm 1', emails_restricted_to_domains=True)
         realm2 = do_create_realm('testrealm2', 'Test Realm 2', emails_restricted_to_domains=True)
 
-        realm_domain = RealmDomain.objects.create(realm=realm1, domain='test1.com', allow_subdomains=False)
+        realm_domain = RealmDomain.objects.create(
+            realm=realm1, domain='test1.com', allow_subdomains=False
+        )
         RealmDomain.objects.create(realm=realm2, domain='test2.test1.com', allow_subdomains=True)
 
         email_allowed_for_realm('user@test1.com', realm1)
@@ -140,8 +156,19 @@ class RealmDomainTest(ZulipTestCase):
             RealmDomain.objects.create(realm=realm, domain='zulip.com', allow_subdomains=True)
 
     def test_validate_domain(self) -> None:
-        invalid_domains = ['', 'test', 't.', 'test.', '.com', '-test', 'test...com',
-                           'test-', 'test_domain.com', 'test.-domain.com', 'a' * 255 + ".com"]
+        invalid_domains = [
+            '',
+            'test',
+            't.',
+            'test.',
+            '.com',
+            '-test',
+            'test...com',
+            'test-',
+            'test_domain.com',
+            'test.-domain.com',
+            'a' * 255 + ".com",
+        ]
         for domain in invalid_domains:
             with self.assertRaises(ValidationError):
                 validate_domain(domain)
diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py
index 2651cdac07..868b274c3f 100644
--- a/zerver/tests/test_realm_emoji.py
+++ b/zerver/tests/test_realm_emoji.py
@@ -7,15 +7,13 @@ from zerver.models import Realm, RealmEmoji, UserProfile, get_realm
 
 
 class RealmEmojiTest(ZulipTestCase):
-
     def create_test_emoji(self, name: str, author: UserProfile) -> RealmEmoji:
         with get_test_image_file('img.png') as img_file:
-            realm_emoji = check_add_realm_emoji(realm=author.realm,
-                                                name=name,
-                                                author=author,
-                                                image_file=img_file)
+            realm_emoji = check_add_realm_emoji(
+                realm=author.realm, name=name, author=author, image_file=img_file
+            )
             if realm_emoji is None:
-                raise Exception("Error creating test emoji.")   # nocoverage
+                raise Exception("Error creating test emoji.")  # nocoverage
         return realm_emoji
 
     def create_test_emoji_with_no_author(self, name: str, realm: Realm) -> RealmEmoji:
@@ -78,7 +76,7 @@ class RealmEmojiTest(ZulipTestCase):
         self.assertEqual(len(content["emoji"]), 2)
         test_emoji = content["emoji"][str(realm_emoji.id)]
         self.assertIn('author_id', test_emoji)
-        author = UserProfile.objects.get(id = test_emoji['author_id'])
+        author = UserProfile.objects.get(id=test_emoji['author_id'])
         self.assertEqual(author.email, email)
 
     def test_realm_emoji_repr(self) -> None:
diff --git a/zerver/tests/test_realm_export.py b/zerver/tests/test_realm_export.py
index 84d3e918b6..76cb932fe9 100644
--- a/zerver/tests/test_realm_export.py
+++ b/zerver/tests/test_realm_export.py
@@ -43,10 +43,10 @@ class RealmExportTest(ZulipTestCase):
         tarball_path = create_dummy_file('test-export.tar.gz')
 
         # Test the export logic.
-        with patch('zerver.lib.export.do_export_realm',
-                   return_value=tarball_path) as mock_export:
-            with self.settings(LOCAL_UPLOADS_DIR=None), stdout_suppressed(), \
-                    self.assertLogs(level='INFO') as info_logs:
+        with patch('zerver.lib.export.do_export_realm', return_value=tarball_path) as mock_export:
+            with self.settings(LOCAL_UPLOADS_DIR=None), stdout_suppressed(), self.assertLogs(
+                level='INFO'
+            ) as info_logs:
                 result = self.client_post('/json/export/realm')
             self.assertTrue('INFO:root:Completed data export for zulip in ' in info_logs.output[0])
         self.assert_json_success(result)
@@ -59,7 +59,8 @@ class RealmExportTest(ZulipTestCase):
 
         # Get the entry and test that iago initiated it.
         audit_log_entry = RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.REALM_EXPORTED).first()
+            event_type=RealmAuditLog.REALM_EXPORTED
+        ).first()
         self.assertEqual(audit_log_entry.acting_user_id, admin.id)
 
         # Test that the file is hosted, and the contents are as expected.
@@ -74,13 +75,17 @@ class RealmExportTest(ZulipTestCase):
         # Test that the export we have is the export we created.
         export_dict = result.json()['exports']
         self.assertEqual(export_dict[0]['id'], audit_log_entry.id)
-        self.assertEqual(export_dict[0]['export_url'],
-                         'https://test-avatar-bucket.s3.amazonaws.com' + export_path)
+        self.assertEqual(
+            export_dict[0]['export_url'],
+            'https://test-avatar-bucket.s3.amazonaws.com' + export_path,
+        )
         self.assertEqual(export_dict[0]['acting_user_id'], admin.id)
-        self.assert_length(export_dict,
-                           RealmAuditLog.objects.filter(
-                               realm=admin.realm,
-                               event_type=RealmAuditLog.REALM_EXPORTED).count())
+        self.assert_length(
+            export_dict,
+            RealmAuditLog.objects.filter(
+                realm=admin.realm, event_type=RealmAuditLog.REALM_EXPORTED
+            ).count(),
+        )
 
         # Finally, delete the file.
         result = self.client_delete(f'/json/export/realm/{audit_log_entry.id}')
@@ -105,8 +110,7 @@ class RealmExportTest(ZulipTestCase):
         tarball_path = create_dummy_file('test-export.tar.gz')
 
         # Test the export logic.
-        with patch('zerver.lib.export.do_export_realm',
-                   return_value=tarball_path) as mock_export:
+        with patch('zerver.lib.export.do_export_realm', return_value=tarball_path) as mock_export:
             with stdout_suppressed(), self.assertLogs(level='INFO') as info_logs:
                 result = self.client_post('/json/export/realm')
             self.assertTrue('INFO:root:Completed data export for zulip in ' in info_logs.output[0])
@@ -120,7 +124,8 @@ class RealmExportTest(ZulipTestCase):
 
         # Get the entry and test that iago initiated it.
         audit_log_entry = RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.REALM_EXPORTED).first()
+            event_type=RealmAuditLog.REALM_EXPORTED
+        ).first()
         self.assertEqual(audit_log_entry.acting_user_id, admin.id)
 
         # Test that the file is hosted, and the contents are as expected.
@@ -137,10 +142,12 @@ class RealmExportTest(ZulipTestCase):
         self.assertEqual(export_dict[0]['id'], audit_log_entry.id)
         self.assertEqual(export_dict[0]['export_url'], admin.realm.uri + export_path)
         self.assertEqual(export_dict[0]['acting_user_id'], admin.id)
-        self.assert_length(export_dict,
-                           RealmAuditLog.objects.filter(
-                               realm=admin.realm,
-                               event_type=RealmAuditLog.REALM_EXPORTED).count())
+        self.assert_length(
+            export_dict,
+            RealmAuditLog.objects.filter(
+                realm=admin.realm, event_type=RealmAuditLog.REALM_EXPORTED
+            ).count(),
+        )
 
         # Finally, delete the file.
         result = self.client_delete(f'/json/export/realm/{audit_log_entry.id}')
@@ -163,15 +170,18 @@ class RealmExportTest(ZulipTestCase):
         admin = self.example_user('iago')
         self.login_user(admin)
 
-        current_log = RealmAuditLog.objects.filter(
-            event_type=RealmAuditLog.REALM_EXPORTED)
+        current_log = RealmAuditLog.objects.filter(event_type=RealmAuditLog.REALM_EXPORTED)
         self.assertEqual(len(current_log), 0)
 
         exports = []
         for i in range(0, 5):
-            exports.append(RealmAuditLog(realm=admin.realm,
-                                         event_type=RealmAuditLog.REALM_EXPORTED,
-                                         event_time=timezone_now()))
+            exports.append(
+                RealmAuditLog(
+                    realm=admin.realm,
+                    event_type=RealmAuditLog.REALM_EXPORTED,
+                    event_time=timezone_now(),
+                )
+            )
         RealmAuditLog.objects.bulk_create(exports)
 
         result = export_realm(self.client_post, admin)
@@ -180,15 +190,19 @@ class RealmExportTest(ZulipTestCase):
     def test_upload_and_message_limit(self) -> None:
         admin = self.example_user('iago')
         self.login_user(admin)
-        realm_count = RealmCount.objects.create(realm_id=admin.realm.id,
-                                                end_time=timezone_now(),
-                                                subgroup=1,
-                                                value=0,
-                                                property='messages_sent:client:day')
+        realm_count = RealmCount.objects.create(
+            realm_id=admin.realm.id,
+            end_time=timezone_now(),
+            subgroup=1,
+            value=0,
+            property='messages_sent:client:day',
+        )
 
         # Space limit is set as 10 GiB
-        with patch('zerver.models.Realm.currently_used_upload_space_bytes',
-                   return_value=11 * 1024 * 1024 * 1024):
+        with patch(
+            'zerver.models.Realm.currently_used_upload_space_bytes',
+            return_value=11 * 1024 * 1024 * 1024,
+        ):
             result = self.client_post('/json/export/realm')
         self.assert_json_error(
             result,
diff --git a/zerver/tests/test_realm_filters.py b/zerver/tests/test_realm_filters.py
index a73319eb84..3d444e6c8d 100644
--- a/zerver/tests/test_realm_filters.py
+++ b/zerver/tests/test_realm_filters.py
@@ -6,14 +6,10 @@ from zerver.models import RealmFilter, get_realm
 
 
 class RealmFilterTest(ZulipTestCase):
-
     def test_list(self) -> None:
         self.login('iago')
         realm = get_realm('zulip')
-        do_add_realm_filter(
-            realm,
-            "#(?P<id>[123])",
-            "https://realm.com/my_realm_filter/%(id)s")
+        do_add_realm_filter(realm, "#(?P<id>[123])", "https://realm.com/my_realm_filter/%(id)s")
         result = self.client_get("/json/realm/filters")
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
@@ -27,11 +23,15 @@ class RealmFilterTest(ZulipTestCase):
 
         data['pattern'] = '$a'
         result = self.client_post("/json/realm/filters", info=data)
-        self.assert_json_error(result, 'Invalid filter pattern.  Valid characters are [ a-zA-Z_#=/:+!-].')
+        self.assert_json_error(
+            result, 'Invalid filter pattern.  Valid characters are [ a-zA-Z_#=/:+!-].'
+        )
 
         data['pattern'] = r'ZUL-(?P<id>\d++)'
         result = self.client_post("/json/realm/filters", info=data)
-        self.assert_json_error(result, 'Invalid filter pattern.  Valid characters are [ a-zA-Z_#=/:+!-].')
+        self.assert_json_error(
+            result, 'Invalid filter pattern.  Valid characters are [ a-zA-Z_#=/:+!-].'
+        )
 
         data['pattern'] = r'ZUL-(?P<id>\d+)'
         data['url_format_string'] = '$fgfg'
@@ -61,7 +61,9 @@ class RealmFilterTest(ZulipTestCase):
         self.assertIsNotNone(re.match(data['pattern'], '_code=123abcdZ'))
 
         data['pattern'] = r'PR (?P<id>[0-9]+)'
-        data['url_format_string'] = 'https://example.com/~user/web#view_type=type&model=model&action=12345&id=%(id)s'
+        data[
+            'url_format_string'
+        ] = 'https://example.com/~user/web#view_type=type&model=model&action=12345&id=%(id)s'
         result = self.client_post("/json/realm/filters", info=data)
         self.assert_json_success(result)
         self.assertIsNotNone(re.match(data['pattern'], 'PR 123'))
@@ -79,7 +81,9 @@ class RealmFilterTest(ZulipTestCase):
         self.assertIsNotNone(re.match(data['pattern'], 'lp:123'))
 
         data['pattern'] = r'!(?P<id>[0-9]+)'
-        data['url_format_string'] = 'https://realm.com/index.pl?Action=AgentTicketZoom;TicketNumber=%(id)s'
+        data[
+            'url_format_string'
+        ] = 'https://realm.com/index.pl?Action=AgentTicketZoom;TicketNumber=%(id)s'
         result = self.client_post("/json/realm/filters", info=data)
         self.assert_json_success(result)
         self.assertIsNotNone(re.match(data['pattern'], '!123'))
@@ -104,9 +108,8 @@ class RealmFilterTest(ZulipTestCase):
         self.login('iago')
         realm = get_realm('zulip')
         filter_id = do_add_realm_filter(
-            realm,
-            "#(?P<id>[123])",
-            "https://realm.com/my_realm_filter/%(id)s")
+            realm, "#(?P<id>[123])", "https://realm.com/my_realm_filter/%(id)s"
+        )
         filters_count = RealmFilter.objects.count()
         result = self.client_delete(f"/json/realm/filters/{filter_id + 1}")
         self.assert_json_error(result, 'Filter not found')
diff --git a/zerver/tests/test_redis_utils.py b/zerver/tests/test_redis_utils.py
index 22a1ec1114..477378bd1b 100644
--- a/zerver/tests/test_redis_utils.py
+++ b/zerver/tests/test_redis_utils.py
@@ -25,8 +25,9 @@ class RedisUtilsTest(ZulipTestCase):
             "a": 1,
             "b": "some value",
         }
-        key = put_dict_in_redis(self.redis_client, self.key_format, data,
-                                expiration_seconds=self.expiration_seconds)
+        key = put_dict_in_redis(
+            self.redis_client, self.key_format, data, expiration_seconds=self.expiration_seconds
+        )
         retrieved_data = get_dict_from_redis(self.redis_client, self.key_format, key)
         self.assertEqual(data, retrieved_data)
 
@@ -37,9 +38,13 @@ class RedisUtilsTest(ZulipTestCase):
         }
 
         max_valid_token_length = MAX_KEY_LENGTH - (len(self.key_format) - len('{token}'))
-        key = put_dict_in_redis(self.redis_client, self.key_format, data,
-                                expiration_seconds=self.expiration_seconds,
-                                token_length=max_valid_token_length)
+        key = put_dict_in_redis(
+            self.redis_client,
+            self.key_format,
+            data,
+            expiration_seconds=self.expiration_seconds,
+            token_length=max_valid_token_length,
+        )
         retrieved_data = get_dict_from_redis(self.redis_client, self.key_format, key)
         self.assertEqual(data, retrieved_data)
 
@@ -47,14 +52,20 @@ class RedisUtilsTest(ZulipTestCase):
         # generating the random token.
         with mock.patch("secrets.token_hex") as mock_generate:
             with self.assertRaises(ZulipRedisKeyTooLongError):
-                put_dict_in_redis(self.redis_client, self.key_format, data,
-                                  expiration_seconds=self.expiration_seconds,
-                                  token_length=max_valid_token_length + 1)
+                put_dict_in_redis(
+                    self.redis_client,
+                    self.key_format,
+                    data,
+                    expiration_seconds=self.expiration_seconds,
+                    token_length=max_valid_token_length + 1,
+                )
             mock_generate.assert_not_called()
 
     def test_get_data_key_length_check(self) -> None:
         with self.assertRaises(ZulipRedisKeyTooLongError):
-            get_dict_from_redis(self.redis_client, key_format='{token}', key='A' * (MAX_KEY_LENGTH + 1))
+            get_dict_from_redis(
+                self.redis_client, key_format='{token}', key='A' * (MAX_KEY_LENGTH + 1)
+            )
 
     def test_get_data_key_format_validation(self) -> None:
         with self.assertRaises(ZulipRedisKeyOfWrongFormatError):
diff --git a/zerver/tests/test_report.py b/zerver/tests/test_report.py
index 896d9f4228..2bbbbbe058 100644
--- a/zerver/tests/test_report.py
+++ b/zerver/tests/test_report.py
@@ -15,6 +15,7 @@ def fix_params(raw_params: Dict[str, Any]) -> Dict[str, str]:
     # individual parameters serialized as JSON.
     return {k: orjson.dumps(v).decode() for k, v in raw_params.items()}
 
+
 class StatsMock:
     def __init__(self, settings: Callable[..., Any]) -> None:
         self.settings = settings
@@ -29,6 +30,7 @@ class StatsMock:
 
         return f
 
+
 class TestReport(ZulipTestCase):
     def test_send_time(self) -> None:
         self.login('hamlet')
@@ -137,15 +139,17 @@ class TestReport(ZulipTestCase):
         self.login_user(user)
         self.make_stream('errors', user.realm)
 
-        params = fix_params(dict(
-            message='hello',
-            stacktrace='trace',
-            ui_message=True,
-            user_agent='agent',
-            href='href',
-            log='log',
-            more_info=dict(foo='bar', draft_content="**draft**"),
-        ))
+        params = fix_params(
+            dict(
+                message='hello',
+                stacktrace='trace',
+                ui_message=True,
+                user_agent='agent',
+                href='href',
+                log='log',
+                more_info=dict(foo='bar', draft_content="**draft**"),
+            )
+        )
 
         subprocess_mock = mock.patch(
             'zerver.views.report.subprocess.check_output',
@@ -175,35 +179,38 @@ class TestReport(ZulipTestCase):
         # If js_source_map is present, then the stack trace should be annotated.
         # DEVELOPMENT=False and TEST_SUITE=False are necessary to ensure that
         # js_source_map actually gets instantiated.
-        with \
-                self.settings(DEVELOPMENT=False, TEST_SUITE=False), \
-                mock.patch('zerver.lib.unminify.SourceMap.annotate_stacktrace') as annotate, \
-                self.assertLogs(level='INFO') as info_logs:
+        with self.settings(DEVELOPMENT=False, TEST_SUITE=False), mock.patch(
+            'zerver.lib.unminify.SourceMap.annotate_stacktrace'
+        ) as annotate, self.assertLogs(level='INFO') as info_logs:
             result = self.client_post("/json/report/error", params)
         self.assert_json_success(result)
         # fix_params (see above) adds quotes when JSON encoding.
         annotate.assert_called_once_with('"trace"')
-        self.assertEqual(info_logs.output, [
-            'INFO:root:Processing traceback with type browser for None'
-        ])
+        self.assertEqual(
+            info_logs.output, ['INFO:root:Processing traceback with type browser for None']
+        )
 
         # Now test without authentication.
         self.logout()
-        with \
-                self.settings(DEVELOPMENT=False, TEST_SUITE=False), \
-                mock.patch('zerver.lib.unminify.SourceMap.annotate_stacktrace') as annotate, \
-                self.assertLogs(level='INFO') as info_logs:
+        with self.settings(DEVELOPMENT=False, TEST_SUITE=False), mock.patch(
+            'zerver.lib.unminify.SourceMap.annotate_stacktrace'
+        ) as annotate, self.assertLogs(level='INFO') as info_logs:
             result = self.client_post("/json/report/error", params)
         self.assert_json_success(result)
-        self.assertEqual(info_logs.output, [
-            'INFO:root:Processing traceback with type browser for None'
-        ])
+        self.assertEqual(
+            info_logs.output, ['INFO:root:Processing traceback with type browser for None']
+        )
 
     def test_report_csp_violations(self) -> None:
         fixture_data = self.fixture_data('csp_report.json')
         with self.assertLogs(level='WARNING') as warn_logs:
-            result = self.client_post("/report/csp_violations", fixture_data, content_type="application/json")
+            result = self.client_post(
+                "/report/csp_violations", fixture_data, content_type="application/json"
+            )
         self.assert_json_success(result)
-        self.assertEqual(warn_logs.output, [
-            "WARNING:root:CSP Violation in Document(''). Blocked URI(''), Original Policy(''), Violated Directive(''), Effective Directive(''), Disposition(''), Referrer(''), Status Code(''), Script Sample('')"
-        ])
+        self.assertEqual(
+            warn_logs.output,
+            [
+                "WARNING:root:CSP Violation in Document(''). Blocked URI(''), Original Policy(''), Violated Directive(''), Effective Directive(''), Disposition(''), Referrer(''), Status Code(''), Script Sample('')"
+            ],
+        )
diff --git a/zerver/tests/test_retention.py b/zerver/tests/test_retention.py
index 261dfb6b71..34fb27d624 100644
--- a/zerver/tests/test_retention.py
+++ b/zerver/tests/test_retention.py
@@ -43,12 +43,16 @@ from zerver.tornado.django_api import send_event
 ZULIP_REALM_DAYS = 30
 MIT_REALM_DAYS = 100
 
+
 class RetentionTestingBase(ZulipTestCase):
     def _get_usermessage_ids(self, message_ids: List[int]) -> List[int]:
-        return list(UserMessage.objects.filter(message_id__in=message_ids).values_list('id', flat=True))
+        return list(
+            UserMessage.objects.filter(message_id__in=message_ids).values_list('id', flat=True)
+        )
 
-    def _verify_archive_data(self, expected_message_ids: List[int],
-                             expected_usermessage_ids: List[int]) -> None:
+    def _verify_archive_data(
+        self, expected_message_ids: List[int], expected_usermessage_ids: List[int]
+    ) -> None:
         self.assertEqual(
             set(ArchivedMessage.objects.values_list('id', flat=True)),
             set(expected_message_ids),
@@ -63,8 +67,9 @@ class RetentionTestingBase(ZulipTestCase):
         self.assertEqual(Message.objects.filter(id__in=expected_message_ids).count(), 0)
         self.assertEqual(UserMessage.objects.filter(id__in=expected_usermessage_ids).count(), 0)
 
-    def _verify_restored_data(self, expected_message_ids: List[int],
-                              expected_usermessage_ids: List[int]) -> None:
+    def _verify_restored_data(
+        self, expected_message_ids: List[int], expected_usermessage_ids: List[int]
+    ) -> None:
         # Check that the data was restored:
         self.assertEqual(
             set(Message.objects.filter(id__in=expected_message_ids).values_list('id', flat=True)),
@@ -72,7 +77,11 @@ class RetentionTestingBase(ZulipTestCase):
         )
 
         self.assertEqual(
-            set(UserMessage.objects.filter(id__in=expected_usermessage_ids).values_list('id', flat=True)),
+            set(
+                UserMessage.objects.filter(id__in=expected_usermessage_ids).values_list(
+                    'id', flat=True
+                )
+            ),
             set(expected_usermessage_ids),
         )
 
@@ -87,6 +96,7 @@ class RetentionTestingBase(ZulipTestCase):
             set(expected_usermessage_ids),
         )
 
+
 class ArchiveMessagesTestingBase(RetentionTestingBase):
     def setUp(self) -> None:
         super().setUp()
@@ -103,7 +113,9 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
         realm.message_retention_days = retention_period
         realm.save()
 
-    def _set_stream_message_retention_value(self, stream: Stream, retention_period: Optional[int]) -> None:
+    def _set_stream_message_retention_value(
+        self, stream: Stream, retention_period: Optional[int]
+    ) -> None:
         stream.message_retention_days = retention_period
         stream.save()
 
@@ -114,8 +126,7 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
         # send messages from mit.edu realm and change messages pub date
         sender = self.mit_user('espuser')
         recipient = self.mit_user('starnine')
-        msg_ids = [self.send_personal_message(sender, recipient)
-                   for i in range(message_quantity)]
+        msg_ids = [self.send_personal_message(sender, recipient) for i in range(message_quantity)]
 
         self._change_messages_date_sent(msg_ids, date_sent)
         return msg_ids
@@ -135,11 +146,14 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
         return msg_id
 
     def _make_expired_zulip_messages(self, message_quantity: int) -> List[int]:
-        msg_ids = list(Message.objects.order_by('id').filter(
-                       sender__realm=self.zulip_realm).values_list('id', flat=True)[3:3 + message_quantity])
+        msg_ids = list(
+            Message.objects.order_by('id')
+            .filter(sender__realm=self.zulip_realm)
+            .values_list('id', flat=True)[3 : 3 + message_quantity]
+        )
         self._change_messages_date_sent(
             msg_ids,
-            timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
+            timezone_now() - timedelta(ZULIP_REALM_DAYS + 1),
         )
 
         return msg_ids
@@ -159,18 +173,26 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
             create_attachment(file_name, path_id, user_profile, size)
 
         self.subscribe(user_profile, "Denmark")
-        body = ("Some files here ... [zulip.txt](http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/zulip.txt)" +
-                " http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/temp_file.py.... Some more...." +
-                " http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py").format(id=realm_id, host=host)
+        body = (
+            "Some files here ... [zulip.txt](http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/zulip.txt)"
+            + " http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/temp_file.py.... Some more...."
+            + " http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py"
+        ).format(id=realm_id, host=host)
 
         expired_message_id = self.send_stream_message(user_profile, "Denmark", body)
         actual_message_id = self.send_stream_message(user_profile, "Denmark", body)
 
         othello = self.example_user('othello')
         other_message_id = self.send_stream_message(othello, "Denmark", body)
-        self._change_messages_date_sent([expired_message_id], timezone_now() - timedelta(days=MIT_REALM_DAYS + 1))
-        return {'expired_message_id': expired_message_id, 'actual_message_id': actual_message_id,
-                'other_user_message_id': other_message_id}
+        self._change_messages_date_sent(
+            [expired_message_id], timezone_now() - timedelta(days=MIT_REALM_DAYS + 1)
+        )
+        return {
+            'expired_message_id': expired_message_id,
+            'actual_message_id': actual_message_id,
+            'other_user_message_id': other_message_id,
+        }
+
 
 class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
     def test_no_expired_messages(self) -> None:
@@ -185,17 +207,20 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         # Make some expired messages in MIT:
         expired_mit_msg_ids = self._make_mit_messages(
             5,
-            timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
+            timezone_now() - timedelta(days=MIT_REALM_DAYS + 1),
         )
         # Make some non-expired messages in MIT:
-        self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS-1))
+        self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS - 1))
 
         # Change some Zulip messages to be expired:
-        expired_zulip_msg_ids = list(Message.objects.order_by('id').filter(
-            sender__realm=self.zulip_realm).values_list('id', flat=True)[3:10])
+        expired_zulip_msg_ids = list(
+            Message.objects.order_by('id')
+            .filter(sender__realm=self.zulip_realm)
+            .values_list('id', flat=True)[3:10]
+        )
         self._change_messages_date_sent(
             expired_zulip_msg_ids,
-            timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
+            timezone_now() - timedelta(ZULIP_REALM_DAYS + 1),
         )
 
         expired_msg_ids = expired_mit_msg_ids + expired_zulip_msg_ids
@@ -214,18 +239,21 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         # Make some expired messages in MIT:
         expired_mit_msg_ids = self._make_mit_messages(
             5,
-            timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
+            timezone_now() - timedelta(days=MIT_REALM_DAYS + 1),
         )
         # Make some non-expired messages in MIT:
-        self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS-1))
+        self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS - 1))
 
         # Change some Zulip messages date_sent, but the realm has no retention policy,
         # so they shouldn't get archived
-        zulip_msg_ids = list(Message.objects.order_by('id').filter(
-            sender__realm=self.zulip_realm).values_list('id', flat=True)[3:10])
+        zulip_msg_ids = list(
+            Message.objects.order_by('id')
+            .filter(sender__realm=self.zulip_realm)
+            .values_list('id', flat=True)[3:10]
+        )
         self._change_messages_date_sent(
             zulip_msg_ids,
-            timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
+            timezone_now() - timedelta(ZULIP_REALM_DAYS + 1),
         )
 
         # Only MIT has a retention policy:
@@ -271,14 +299,14 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         msg_ids = [self._send_cross_realm_personal_message() for i in range(1, 7)]
         usermsg_ids = self._get_usermessage_ids(msg_ids)
         # Make the message expired on the recipient's realm:
-        self._change_messages_date_sent(msg_ids, timezone_now() - timedelta(ZULIP_REALM_DAYS+1))
+        self._change_messages_date_sent(msg_ids, timezone_now() - timedelta(ZULIP_REALM_DAYS + 1))
 
         archive_messages()
         self._verify_archive_data(msg_ids, usermsg_ids)
 
     def test_archiving_interrupted(self) -> None:
-        """ Check that queries get rolled back to a consistent state
-        if archiving gets interrupted in the middle of processing a chunk. """
+        """Check that queries get rolled back to a consistent state
+        if archiving gets interrupted in the middle of processing a chunk."""
         expired_msg_ids = self._make_expired_zulip_messages(7)
         expired_usermsg_ids = self._get_usermessage_ids(expired_msg_ids)
 
@@ -296,7 +324,11 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
                 set(expired_msg_ids),
             )
             self.assertEqual(
-                set(UserMessage.objects.filter(id__in=expired_usermsg_ids).values_list('id', flat=True)),
+                set(
+                    UserMessage.objects.filter(id__in=expired_usermsg_ids).values_list(
+                        'id', flat=True
+                    )
+                ),
                 set(expired_usermsg_ids),
             )
 
@@ -306,10 +338,10 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         # Make some expired messages in MIT:
         expired_mit_msg_ids = self._make_mit_messages(
             5,
-            timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
+            timezone_now() - timedelta(days=MIT_REALM_DAYS + 1),
         )
         # Make some non-expired messages in MIT:
-        self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS-1))
+        self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS - 1))
 
         # Change some Zulip messages to be expired:
         expired_zulip_msg_ids = self._make_expired_zulip_messages(7)
@@ -318,7 +350,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         # Make the message expired in the recipient's realm:
         self._change_messages_date_sent(
             [expired_crossrealm_msg_id],
-            timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
+            timezone_now() - timedelta(ZULIP_REALM_DAYS + 1),
         )
 
         expired_msg_ids = [*expired_mit_msg_ids, *expired_zulip_msg_ids, expired_crossrealm_msg_id]
@@ -343,31 +375,39 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         archive_messages()
         self.assertEqual(ArchivedAttachment.objects.count(), 3)
         self.assertEqual(
-            list(ArchivedAttachment.objects.distinct('messages__id').values_list('messages__id',
-                                                                                 flat=True)),
+            list(
+                ArchivedAttachment.objects.distinct('messages__id').values_list(
+                    'messages__id', flat=True
+                )
+            ),
             [msgs_ids['expired_message_id']],
         )
         self.assertEqual(Attachment.objects.count(), 3)
 
         # Now make `actual_message_id` expired too.  We still don't
         # delete the Attachment objects.
-        self._change_messages_date_sent([msgs_ids['actual_message_id']],
-                                        timezone_now() - timedelta(days=MIT_REALM_DAYS + 1))
+        self._change_messages_date_sent(
+            [msgs_ids['actual_message_id']], timezone_now() - timedelta(days=MIT_REALM_DAYS + 1)
+        )
         archive_messages()
         self.assertEqual(Attachment.objects.count(), 3)
 
         # Finally, make the last message mentioning those attachments
         # expired.  We should now delete the Attachment objects and
         # each ArchivedAttachment object should list all 3 messages.
-        self._change_messages_date_sent([msgs_ids['other_user_message_id']],
-                                        timezone_now() - timedelta(days=MIT_REALM_DAYS + 1))
+        self._change_messages_date_sent(
+            [msgs_ids['other_user_message_id']], timezone_now() - timedelta(days=MIT_REALM_DAYS + 1)
+        )
 
         archive_messages()
         self.assertEqual(Attachment.objects.count(), 0)
         self.assertEqual(ArchivedAttachment.objects.count(), 3)
         self.assertEqual(
-            list(ArchivedAttachment.objects.distinct('messages__id').order_by('messages__id').values_list(
-                'messages__id', flat=True)),
+            list(
+                ArchivedAttachment.objects.distinct('messages__id')
+                .order_by('messages__id')
+                .values_list('messages__id', flat=True)
+            ),
             sorted(msgs_ids.values()),
         )
 
@@ -377,15 +417,18 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         # Archived data doesn't get deleted by restoring.
         self.assertEqual(ArchivedAttachment.objects.count(), 3)
         self.assertEqual(
-            list(Attachment.objects.distinct('messages__id').order_by('messages__id').values_list(
-                'messages__id', flat=True)),
+            list(
+                Attachment.objects.distinct('messages__id')
+                .order_by('messages__id')
+                .values_list('messages__id', flat=True)
+            ),
             sorted(msgs_ids.values()),
         )
 
     def test_restoring_and_rearchiving(self) -> None:
         expired_msg_ids = self._make_mit_messages(
             7,
-            timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
+            timezone_now() - timedelta(days=MIT_REALM_DAYS + 1),
         )
         expired_usermsg_ids = self._get_usermessage_ids(expired_msg_ids)
 
@@ -412,6 +455,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
         for message in archived_messages:
             self.assertEqual(message.archive_transaction_id, transactions[2].id)
 
+
 class TestArchivingSubMessages(ArchiveMessagesTestingBase):
     def test_archiving_submessages(self) -> None:
         expired_msg_ids = self._make_expired_zulip_messages(2)
@@ -451,7 +495,11 @@ class TestArchivingSubMessages(ArchiveMessagesTestingBase):
         self.assertEqual(SubMessage.objects.filter(id__in=submessage_ids).count(), 0)
 
         self.assertEqual(
-            set(ArchivedSubMessage.objects.filter(id__in=submessage_ids).values_list('id', flat=True)),
+            set(
+                ArchivedSubMessage.objects.filter(id__in=submessage_ids).values_list(
+                    'id', flat=True
+                )
+            ),
             set(submessage_ids),
         )
 
@@ -461,6 +509,7 @@ class TestArchivingSubMessages(ArchiveMessagesTestingBase):
             set(submessage_ids),
         )
 
+
 class TestArchivingReactions(ArchiveMessagesTestingBase):
     def test_archiving_reactions(self) -> None:
         expired_msg_ids = self._make_expired_zulip_messages(2)
@@ -501,6 +550,7 @@ class TestArchivingReactions(ArchiveMessagesTestingBase):
             set(reaction_ids),
         )
 
+
 class MoveMessageToArchiveBase(RetentionTestingBase):
     def setUp(self) -> None:
         super().setUp()
@@ -526,10 +576,10 @@ class MoveMessageToArchiveBase(RetentionTestingBase):
         self.assertFalse(ArchivedMessage.objects.exists())
         self.assertFalse(ArchivedAttachment.objects.exists())
 
+
 class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
     def test_personal_messages_archiving(self) -> None:
-        msg_ids = [self.send_personal_message(self.sender, self.recipient)
-                   for i in range(0, 3)]
+        msg_ids = [self.send_personal_message(self.sender, self.recipient) for i in range(0, 3)]
         usermsg_ids = self._get_usermessage_ids(msg_ids)
 
         self._assert_archive_empty()
@@ -541,8 +591,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
 
     def test_move_messages_to_archive_with_realm_argument(self) -> None:
         realm = get_realm("zulip")
-        msg_ids = [self.send_personal_message(self.sender, self.recipient)
-                   for i in range(0, 3)]
+        msg_ids = [self.send_personal_message(self.sender, self.recipient) for i in range(0, 3)]
         usermsg_ids = self._get_usermessage_ids(msg_ids)
 
         self._assert_archive_empty()
@@ -553,8 +602,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
         self.assertEqual(archive_transaction.realm, realm)
 
     def test_stream_messages_archiving(self) -> None:
-        msg_ids = [self.send_stream_message(self.sender, "Verona")
-                   for i in range(0, 3)]
+        msg_ids = [self.send_stream_message(self.sender, "Verona") for i in range(0, 3)]
         usermsg_ids = self._get_usermessage_ids(msg_ids)
 
         self._assert_archive_empty()
@@ -565,8 +613,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
         self._verify_restored_data(msg_ids, usermsg_ids)
 
     def test_archiving_messages_second_time(self) -> None:
-        msg_ids = [self.send_stream_message(self.sender, "Verona")
-                   for i in range(0, 3)]
+        msg_ids = [self.send_stream_message(self.sender, "Verona") for i in range(0, 3)]
         usermsg_ids = self._get_usermessage_ids(msg_ids)
 
         self._assert_archive_empty()
@@ -587,10 +634,8 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
         cordelia = self.lear_user("cordelia")
         king = self.lear_user("king")
 
-        zulip_msg_ids = [self.send_personal_message(iago, othello)
-                         for i in range(0, 3)]
-        leary_msg_ids = [self.send_personal_message(cordelia, king)
-                         for i in range(0, 3)]
+        zulip_msg_ids = [self.send_personal_message(iago, othello) for i in range(0, 3)]
+        leary_msg_ids = [self.send_personal_message(cordelia, king) for i in range(0, 3)]
         msg_ids = zulip_msg_ids + leary_msg_ids
         usermsg_ids = self._get_usermessage_ids(msg_ids)
 
@@ -609,12 +654,16 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/zulip.txt)
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/temp_file.py ....
             Some more.... http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py
-        """.format(id=realm_id, host=host)
+        """.format(
+            id=realm_id, host=host
+        )
         body2 = """Some files here
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/zulip.txt ...
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/hello.txt ....
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/new.py ....
-        """.format(id=realm_id, host=host)
+        """.format(
+            id=realm_id, host=host
+        )
 
         msg_ids = [
             self.send_personal_message(self.sender, self.recipient, body1),
@@ -638,15 +687,20 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
 
         self.assertFalse(Attachment.objects.exists())
         archived_attachment_ids = list(
-            ArchivedAttachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True),
+            ArchivedAttachment.objects.filter(messages__id__in=msg_ids).values_list(
+                "id", flat=True
+            ),
         )
 
         self.assertEqual(set(attachment_ids), set(archived_attachment_ids))
         for attachment_id in archived_attachment_ids:
             self.assertEqual(
                 set(attachment_id_to_message_ids[attachment_id]),
-                set(ArchivedMessage.objects.filter(
-                    archivedattachment__id=attachment_id).values_list("id", flat=True)),
+                set(
+                    ArchivedMessage.objects.filter(
+                        archivedattachment__id=attachment_id
+                    ).values_list("id", flat=True)
+                ),
             )
 
         restore_all_data_from_archive()
@@ -660,7 +714,11 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
         for attachment_id in restored_attachment_ids:
             self.assertEqual(
                 set(attachment_id_to_message_ids[attachment_id]),
-                set(Message.objects.filter(attachment__id=attachment_id).values_list("id", flat=True)),
+                set(
+                    Message.objects.filter(attachment__id=attachment_id).values_list(
+                        "id", flat=True
+                    )
+                ),
             )
 
     def test_archiving_message_with_shared_attachment(self) -> None:
@@ -674,7 +732,9 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
             Some more.... http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py ...
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/new.py ....
             http://{host}/user_uploads/{id}/31/4CBjtTLYZhk66pZrF8hnYGwc/hello.txt ....
-        """.format(id=realm_id, host=host)
+        """.format(
+            id=realm_id, host=host
+        )
 
         msg_id = self.send_personal_message(self.sender, self.recipient, body)
         # Simulate a reply with the same contents.
@@ -697,7 +757,9 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
         self.assertEqual(Attachment.objects.count(), 5)
 
         self.assertEqual(
-            set(ArchivedAttachment.objects.filter(messages__id=msg_id).values_list("id", flat=True)),
+            set(
+                ArchivedAttachment.objects.filter(messages__id=msg_id).values_list("id", flat=True)
+            ),
             set(attachment_ids),
         )
 
@@ -720,6 +782,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
             set(attachment_ids),
         )
 
+
 class MoveMessageToArchiveWithSubMessages(MoveMessageToArchiveBase):
     def test_archiving_message_with_submessages(self) -> None:
         msg_id = self.send_stream_message(self.sender, "Verona")
@@ -760,6 +823,7 @@ class MoveMessageToArchiveWithSubMessages(MoveMessageToArchiveBase):
             set(submessage_ids),
         )
 
+
 class MoveMessageToArchiveWithReactions(MoveMessageToArchiveBase):
     def test_archiving_message_with_reactions(self) -> None:
         msg_id = self.send_stream_message(self.sender, "Verona")
@@ -790,6 +854,7 @@ class MoveMessageToArchiveWithReactions(MoveMessageToArchiveBase):
             set(reaction_ids),
         )
 
+
 class TestCleaningArchive(ArchiveMessagesTestingBase):
     def test_clean_archived_data(self) -> None:
         self._make_expired_zulip_messages(7)
@@ -798,11 +863,15 @@ class TestCleaningArchive(ArchiveMessagesTestingBase):
         transactions = list(ArchiveTransaction.objects.all())
         for transaction in transactions[0:-1]:
             transaction.timestamp = timezone_now() - timedelta(
-                days=settings.ARCHIVED_DATA_VACUUMING_DELAY_DAYS + 1)
+                days=settings.ARCHIVED_DATA_VACUUMING_DELAY_DAYS + 1
+            )
             transaction.save()
 
-        message_ids_to_clean = list(ArchivedMessage.objects.filter(
-            archive_transaction__in=transactions[0:-1]).values_list('id', flat=True))
+        message_ids_to_clean = list(
+            ArchivedMessage.objects.filter(archive_transaction__in=transactions[0:-1]).values_list(
+                'id', flat=True
+            )
+        )
 
         clean_archived_data()
         remaining_transactions = list(ArchiveTransaction.objects.all())
@@ -811,7 +880,9 @@ class TestCleaningArchive(ArchiveMessagesTestingBase):
         self.assertEqual(remaining_transactions[0].id, transactions[-1].id)
         # And corresponding ArchivedMessages should have been deleted:
         self.assertFalse(ArchivedMessage.objects.filter(id__in=message_ids_to_clean).exists())
-        self.assertFalse(ArchivedUserMessage.objects.filter(message_id__in=message_ids_to_clean).exists())
+        self.assertFalse(
+            ArchivedUserMessage.objects.filter(message_id__in=message_ids_to_clean).exists()
+        )
 
         for message in ArchivedMessage.objects.all():
             self.assertEqual(message.archive_transaction_id, remaining_transactions[0].id)
@@ -843,8 +914,11 @@ class TestGetRealmAndStreamsForArchiving(ZulipTestCase):
                 streams = Stream.objects.filter(realm=realm).exclude(message_retention_days=-1)
                 result.append((realm, list(streams)))
             else:
-                streams = Stream.objects.filter(realm=realm).exclude(message_retention_days__isnull=True) \
+                streams = (
+                    Stream.objects.filter(realm=realm)
+                    .exclude(message_retention_days__isnull=True)
                     .exclude(message_retention_days=-1)
+                )
                 if streams.exists():
                     result.append((realm, list(streams)))
 
@@ -875,9 +949,12 @@ class TestGetRealmAndStreamsForArchiving(ZulipTestCase):
         archiving_enabled_zephyr_stream.message_retention_days = 1
         archiving_enabled_zephyr_stream.save()
 
-        Realm.objects.create(string_id="no_archiving", invite_required=False, message_retention_days=-1)
-        empty_realm_with_archiving = Realm.objects.create(string_id="with_archiving", invite_required=False,
-                                                          message_retention_days=1)
+        Realm.objects.create(
+            string_id="no_archiving", invite_required=False, message_retention_days=-1
+        )
+        empty_realm_with_archiving = Realm.objects.create(
+            string_id="with_archiving", invite_required=False, message_retention_days=1
+        )
 
         # We construct a list representing how the result of get_realms_and_streams_for_archiving should be.
         # One nuisance is that the ordering of the elements in the result structure is not deterministic,
@@ -903,6 +980,7 @@ class TestGetRealmAndStreamsForArchiving(ZulipTestCase):
         self.assert_length(result, len(simple_algorithm_result))
         self.assertEqual(result, simple_algorithm_result)
 
+
 class TestRestoreStreamMessages(ArchiveMessagesTestingBase):
     def test_restore_retention_policy_deletions_for_stream(self) -> None:
         cordelia = self.example_user('cordelia')
@@ -915,18 +993,27 @@ class TestRestoreStreamMessages(ArchiveMessagesTestingBase):
         message_ids_to_archive_manually = [
             self.send_stream_message(cordelia, stream_name, str(i)) for i in range(0, 2)
         ]
-        usermessage_ids_to_archive_manually = self._get_usermessage_ids(message_ids_to_archive_manually)
+        usermessage_ids_to_archive_manually = self._get_usermessage_ids(
+            message_ids_to_archive_manually
+        )
         message_ids_to_archive_by_policy = [
             self.send_stream_message(hamlet, stream_name, str(i)) for i in range(0, 2)
         ]
-        usermessage_ids_to_archive_by_policy = self._get_usermessage_ids(message_ids_to_archive_by_policy)
+        usermessage_ids_to_archive_by_policy = self._get_usermessage_ids(
+            message_ids_to_archive_by_policy
+        )
 
-        expected_archived_message_ids = message_ids_to_archive_manually + message_ids_to_archive_by_policy
-        expected_archived_usermessage_ids = usermessage_ids_to_archive_manually + \
-            usermessage_ids_to_archive_by_policy
+        expected_archived_message_ids = (
+            message_ids_to_archive_manually + message_ids_to_archive_by_policy
+        )
+        expected_archived_usermessage_ids = (
+            usermessage_ids_to_archive_manually + usermessage_ids_to_archive_by_policy
+        )
 
         self._set_stream_message_retention_value(stream, 5)
-        self._change_messages_date_sent(message_ids_to_archive_by_policy, timezone_now() - timedelta(days=6))
+        self._change_messages_date_sent(
+            message_ids_to_archive_by_policy, timezone_now() - timedelta(days=6)
+        )
 
         move_messages_to_archive(message_ids_to_archive_manually)
         archive_messages()
@@ -937,8 +1024,10 @@ class TestRestoreStreamMessages(ArchiveMessagesTestingBase):
 
         # Verify that we restore the stream messages that were archived due to retention policy,
         # but not the ones manually deleted.
-        self.assert_length(Message.objects.filter(id__in=message_ids_to_archive_by_policy),
-                           len(message_ids_to_archive_by_policy))
+        self.assert_length(
+            Message.objects.filter(id__in=message_ids_to_archive_by_policy),
+            len(message_ids_to_archive_by_policy),
+        )
         self.assertFalse(Message.objects.filter(id__in=message_ids_to_archive_manually))
 
 
diff --git a/zerver/tests/test_service_bot_system.py b/zerver/tests/test_service_bot_system.py
index 23d2457893..3a00b4693b 100644
--- a/zerver/tests/test_service_bot_system.py
+++ b/zerver/tests/test_service_bot_system.py
@@ -20,6 +20,7 @@ BOT_TYPE_TO_QUEUE_NAME = {
     UserProfile.EMBEDDED_BOT: 'embedded_bots',
 }
 
+
 class TestServiceBotBasics(ZulipTestCase):
     def _get_outgoing_bot(self) -> UserProfile:
         outgoing_bot = do_create_user(
@@ -35,7 +36,7 @@ class TestServiceBotBasics(ZulipTestCase):
 
     def test_service_events_for_pms(self) -> None:
         sender = self.example_user('hamlet')
-        assert(not sender.is_bot)
+        assert not sender.is_bot
 
         outgoing_bot = self._get_outgoing_bot()
         assert outgoing_bot.bot_type is not None
@@ -60,7 +61,7 @@ class TestServiceBotBasics(ZulipTestCase):
 
     def test_spurious_mentions(self) -> None:
         sender = self.example_user('hamlet')
-        assert(not sender.is_bot)
+        assert not sender.is_bot
 
         outgoing_bot = self._get_outgoing_bot()
         assert outgoing_bot.bot_type is not None
@@ -84,7 +85,7 @@ class TestServiceBotBasics(ZulipTestCase):
 
     def test_service_events_for_stream_mentions(self) -> None:
         sender = self.example_user('hamlet')
-        assert(not sender.is_bot)
+        assert not sender.is_bot
 
         outgoing_bot = self._get_outgoing_bot()
         assert outgoing_bot.bot_type is not None
@@ -119,7 +120,7 @@ class TestServiceBotBasics(ZulipTestCase):
         """Service bots should not get access to mentions if they aren't a
         direct recipient."""
         sender = self.example_user('hamlet')
-        assert(not sender.is_bot)
+        assert not sender.is_bot
 
         outgoing_bot = self._get_outgoing_bot()
         assert outgoing_bot.bot_type is not None
@@ -160,24 +161,32 @@ class TestServiceBotBasics(ZulipTestCase):
             )
 
         self.assertEqual(len(event_dict), 0)
-        self.assertEqual(m.output, [f"ERROR:root:Unexpected bot_type for Service bot id={bot.id}: {wrong_bot_type}"])
+        self.assertEqual(
+            m.output,
+            [f"ERROR:root:Unexpected bot_type for Service bot id={bot.id}: {wrong_bot_type}"],
+        )
+
 
 class TestServiceBotStateHandler(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user_profile = self.example_user("othello")
-        self.bot_profile = do_create_user(email="embedded-bot-1@zulip.com",
-                                          password="test",
-                                          realm=get_realm("zulip"),
-                                          full_name="EmbeddedBo1",
-                                          bot_type=UserProfile.EMBEDDED_BOT,
-                                          bot_owner=self.user_profile)
-        self.second_bot_profile = do_create_user(email="embedded-bot-2@zulip.com",
-                                                 password="test",
-                                                 realm=get_realm("zulip"),
-                                                 full_name="EmbeddedBot2",
-                                                 bot_type=UserProfile.EMBEDDED_BOT,
-                                                 bot_owner=self.user_profile)
+        self.bot_profile = do_create_user(
+            email="embedded-bot-1@zulip.com",
+            password="test",
+            realm=get_realm("zulip"),
+            full_name="EmbeddedBo1",
+            bot_type=UserProfile.EMBEDDED_BOT,
+            bot_owner=self.user_profile,
+        )
+        self.second_bot_profile = do_create_user(
+            email="embedded-bot-2@zulip.com",
+            password="test",
+            realm=get_realm("zulip"),
+            full_name="EmbeddedBot2",
+            bot_type=UserProfile.EMBEDDED_BOT,
+            bot_owner=self.user_profile,
+        )
 
     def test_basic_storage_and_retrieval(self) -> None:
         storage = StateHandler(self.bot_profile)
@@ -187,9 +196,9 @@ class TestServiceBotStateHandler(ZulipTestCase):
         self.assertEqual(storage.get('some other key'), 'some other value')
         self.assertTrue(storage.contains('some key'))
         self.assertFalse(storage.contains('nonexistent key'))
-        self.assertRaisesMessage(StateError,
-                                 "Key does not exist.",
-                                 lambda: storage.get('nonexistent key'))
+        self.assertRaisesMessage(
+            StateError, "Key does not exist.", lambda: storage.get('nonexistent key')
+        )
         storage.put('some key', 'a new value')
         self.assertEqual(storage.get('some key'), 'a new value')
         second_storage = StateHandler(self.second_bot_profile)
@@ -217,7 +226,10 @@ class TestServiceBotStateHandler(ZulipTestCase):
         key = 'capacity-filling entry'
         storage.put(key, 'x' * (settings.USER_STATE_SIZE_LIMIT - len(key)))
 
-        with self.assertRaisesMessage(StateError, "Request exceeds storage limit by 32 characters. The limit is 100 characters."):
+        with self.assertRaisesMessage(
+            StateError,
+            "Request exceeds storage limit by 32 characters. The limit is 100 characters.",
+        ):
             storage.put('too much data', 'a few bits too long')
 
         second_storage = StateHandler(self.second_bot_profile)
@@ -329,14 +341,18 @@ class TestServiceBotStateHandler(ZulipTestCase):
         self.assert_json_success(result)
         self.assertEqual(result.json()['storage'], {})
 
+
 class TestServiceBotConfigHandler(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user_profile = self.example_user("othello")
-        self.bot_profile = self.create_test_bot('embedded', self.user_profile,
-                                                full_name='Embedded bot',
-                                                bot_type=UserProfile.EMBEDDED_BOT,
-                                                service_name='helloworld')
+        self.bot_profile = self.create_test_bot(
+            'embedded',
+            self.user_profile,
+            full_name='Embedded bot',
+            bot_type=UserProfile.EMBEDDED_BOT,
+            service_name='helloworld',
+        )
         self.bot_handler = EmbeddedBotHandler(self.bot_profile)
 
     def test_basic_storage_and_retrieval(self) -> None:
@@ -358,17 +374,23 @@ class TestServiceBotConfigHandler(ZulipTestCase):
 
     @override_settings(BOT_CONFIG_SIZE_LIMIT=100)
     def test_config_entry_limit(self) -> None:
-        set_bot_config(self.bot_profile, "some key", 'x' * (settings.BOT_CONFIG_SIZE_LIMIT-8))
-        self.assertRaisesMessage(ConfigError,
-                                 "Cannot store configuration. Request would require 101 characters. "
-                                 "The current configuration size limit is 100 characters.",
-                                 lambda: set_bot_config(self.bot_profile, "some key", 'x' * (settings.BOT_CONFIG_SIZE_LIMIT-8+1)))
-        set_bot_config(self.bot_profile, "some key", 'x' * (settings.BOT_CONFIG_SIZE_LIMIT-20))
+        set_bot_config(self.bot_profile, "some key", 'x' * (settings.BOT_CONFIG_SIZE_LIMIT - 8))
+        self.assertRaisesMessage(
+            ConfigError,
+            "Cannot store configuration. Request would require 101 characters. "
+            "The current configuration size limit is 100 characters.",
+            lambda: set_bot_config(
+                self.bot_profile, "some key", 'x' * (settings.BOT_CONFIG_SIZE_LIMIT - 8 + 1)
+            ),
+        )
+        set_bot_config(self.bot_profile, "some key", 'x' * (settings.BOT_CONFIG_SIZE_LIMIT - 20))
         set_bot_config(self.bot_profile, "another key", 'x')
-        self.assertRaisesMessage(ConfigError,
-                                 "Cannot store configuration. Request would require 116 characters. "
-                                 "The current configuration size limit is 100 characters.",
-                                 lambda: set_bot_config(self.bot_profile, "yet another key", 'x'))
+        self.assertRaisesMessage(
+            ConfigError,
+            "Cannot store configuration. Request would require 116 characters. "
+            "The current configuration size limit is 100 characters.",
+            lambda: set_bot_config(self.bot_profile, "yet another key", 'x'),
+        )
 
     def test_load_bot_config_template(self) -> None:
         bot_config = load_bot_config_template('giphy')
@@ -381,7 +403,9 @@ class TestServiceBotConfigHandler(ZulipTestCase):
         self.assertEqual(len(bot_config), 0)
 
     def test_bot_send_pm_with_empty_recipients_list(self) -> None:
-        with self.assertRaisesRegex(EmbeddedBotEmptyRecipientsList, 'Message must have recipients!'):
+        with self.assertRaisesRegex(
+            EmbeddedBotEmptyRecipientsList, 'Message must have recipients!'
+        ):
             self.bot_handler.send_message(message={'type': 'private', 'to': []})
 
 
@@ -394,25 +418,30 @@ def for_all_bot_types(test_func: Callable[..., None]) -> Callable[..., None]:
             self.bot_profile.bot_type = bot_type
             self.bot_profile.save()
             test_func(*args, **kwargs)
+
     return _wrapped
 
-class TestServiceBotEventTriggers(ZulipTestCase):
 
+class TestServiceBotEventTriggers(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user_profile = self.example_user("othello")
-        self.bot_profile = do_create_user(email="foo-bot@zulip.com",
-                                          password="test",
-                                          realm=get_realm("zulip"),
-                                          full_name="FooBot",
-                                          bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
-                                          bot_owner=self.user_profile)
-        self.second_bot_profile = do_create_user(email="bar-bot@zulip.com",
-                                                 password="test",
-                                                 realm=get_realm("zulip"),
-                                                 full_name="BarBot",
-                                                 bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
-                                                 bot_owner=self.user_profile)
+        self.bot_profile = do_create_user(
+            email="foo-bot@zulip.com",
+            password="test",
+            realm=get_realm("zulip"),
+            full_name="FooBot",
+            bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
+            bot_owner=self.user_profile,
+        )
+        self.second_bot_profile = do_create_user(
+            email="bar-bot@zulip.com",
+            password="test",
+            realm=get_realm("zulip"),
+            full_name="BarBot",
+            bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
+            bot_owner=self.user_profile,
+        )
 
     @for_all_bot_types
     @patch_queue_publish('zerver.lib.actions.queue_json_publish')
@@ -435,32 +464,33 @@ class TestServiceBotEventTriggers(ZulipTestCase):
             self.assertEqual(trigger_event["message"]["type"], message_type)
             self.assertEqual(trigger_event['trigger'], trigger)
             self.assertEqual(trigger_event['user_profile_id'], self.bot_profile.id)
+
         mock_queue_json_publish.side_effect = check_values_passed
 
-        self.send_stream_message(
-            self.user_profile,
-            'Denmark',
-            content)
+        self.send_stream_message(self.user_profile, 'Denmark', content)
         self.assertTrue(mock_queue_json_publish.called)
 
     @patch_queue_publish('zerver.lib.actions.queue_json_publish')
-    def test_no_trigger_on_stream_message_without_mention(self, mock_queue_json_publish: mock.Mock) -> None:
+    def test_no_trigger_on_stream_message_without_mention(
+        self, mock_queue_json_publish: mock.Mock
+    ) -> None:
         sender = self.user_profile
         self.send_stream_message(sender, "Denmark")
         self.assertFalse(mock_queue_json_publish.called)
 
     @for_all_bot_types
     @patch_queue_publish('zerver.lib.actions.queue_json_publish')
-    def test_no_trigger_on_stream_mention_from_bot(self, mock_queue_json_publish: mock.Mock) -> None:
-        self.send_stream_message(
-            self.second_bot_profile,
-            'Denmark',
-            '@**FooBot** foo bar!!!')
+    def test_no_trigger_on_stream_mention_from_bot(
+        self, mock_queue_json_publish: mock.Mock
+    ) -> None:
+        self.send_stream_message(self.second_bot_profile, 'Denmark', '@**FooBot** foo bar!!!')
         self.assertFalse(mock_queue_json_publish.called)
 
     @for_all_bot_types
     @patch_queue_publish('zerver.lib.actions.queue_json_publish')
-    def test_trigger_on_personal_message_from_user(self, mock_queue_json_publish: mock.Mock) -> None:
+    def test_trigger_on_personal_message_from_user(
+        self, mock_queue_json_publish: mock.Mock
+    ) -> None:
         sender = self.user_profile
         recipient = self.bot_profile
 
@@ -480,6 +510,7 @@ class TestServiceBotEventTriggers(ZulipTestCase):
             ]
             self.assertTrue(sender.email in display_recipients)
             self.assertTrue(recipient.email in display_recipients)
+
         mock_queue_json_publish.side_effect = check_values_passed
 
         self.send_personal_message(sender, recipient, 'test')
@@ -487,7 +518,9 @@ class TestServiceBotEventTriggers(ZulipTestCase):
 
     @for_all_bot_types
     @patch_queue_publish('zerver.lib.actions.queue_json_publish')
-    def test_no_trigger_on_personal_message_from_bot(self, mock_queue_json_publish: mock.Mock) -> None:
+    def test_no_trigger_on_personal_message_from_bot(
+        self, mock_queue_json_publish: mock.Mock
+    ) -> None:
         sender = self.second_bot_profile
         recipient = self.bot_profile
         self.send_personal_message(sender, recipient)
@@ -515,6 +548,7 @@ class TestServiceBotEventTriggers(ZulipTestCase):
             self.assertEqual(trigger_event["trigger"], "private_message")
             self.assertEqual(trigger_event["message"]["sender_email"], sender.email)
             self.assertEqual(trigger_event["message"]["type"], 'private')
+
         mock_queue_json_publish.side_effect = check_values_passed
 
         self.send_huddle_message(sender, recipients, 'test')
@@ -522,7 +556,9 @@ class TestServiceBotEventTriggers(ZulipTestCase):
 
     @for_all_bot_types
     @patch_queue_publish('zerver.lib.actions.queue_json_publish')
-    def test_no_trigger_on_huddle_message_from_bot(self, mock_queue_json_publish: mock.Mock) -> None:
+    def test_no_trigger_on_huddle_message_from_bot(
+        self, mock_queue_json_publish: mock.Mock
+    ) -> None:
         sender = self.second_bot_profile
         recipients = [self.user_profile, self.bot_profile]
         self.send_huddle_message(sender, recipients)
diff --git a/zerver/tests/test_sessions.py b/zerver/tests/test_sessions.py
index 9bf6385db2..34347ff5a9 100644
--- a/zerver/tests/test_sessions.py
+++ b/zerver/tests/test_sessions.py
@@ -19,11 +19,9 @@ from zerver.models import Realm, UserProfile, get_realm
 
 
 class TestSessions(ZulipTestCase):
-
-    def do_test_session(self, user: UserProfile,
-                        action: Callable[[], Any],
-                        realm: Realm,
-                        expected_result: bool) -> None:
+    def do_test_session(
+        self, user: UserProfile, action: Callable[[], Any], realm: Realm, expected_result: bool
+    ) -> None:
         self.login_user(user)
         self.assertIn('_auth_user_id', self.client.session)
         action()
@@ -44,28 +42,41 @@ class TestSessions(ZulipTestCase):
 
     def test_delete_user_sessions(self) -> None:
         user_profile = self.example_user('hamlet')
-        self.do_test_session(user_profile, lambda: delete_user_sessions(user_profile),
-                             get_realm("zulip"), True)
-        self.do_test_session(self.example_user("othello"),
-                             lambda: delete_user_sessions(user_profile),
-                             get_realm("zulip"), False)
+        self.do_test_session(
+            user_profile, lambda: delete_user_sessions(user_profile), get_realm("zulip"), True
+        )
+        self.do_test_session(
+            self.example_user("othello"),
+            lambda: delete_user_sessions(user_profile),
+            get_realm("zulip"),
+            False,
+        )
 
     def test_delete_realm_user_sessions(self) -> None:
         realm = get_realm('zulip')
-        self.do_test_session(self.example_user("hamlet"),
-                             lambda: delete_realm_user_sessions(realm),
-                             get_realm("zulip"), True)
-        self.do_test_session(self.mit_user("sipbtest"),
-                             lambda: delete_realm_user_sessions(realm),
-                             get_realm("zephyr"), False)
+        self.do_test_session(
+            self.example_user("hamlet"),
+            lambda: delete_realm_user_sessions(realm),
+            get_realm("zulip"),
+            True,
+        )
+        self.do_test_session(
+            self.mit_user("sipbtest"),
+            lambda: delete_realm_user_sessions(realm),
+            get_realm("zephyr"),
+            False,
+        )
 
     def test_delete_all_user_sessions(self) -> None:
-        self.do_test_session(self.example_user("hamlet"),
-                             lambda: delete_all_user_sessions(),
-                             get_realm("zulip"), True)
-        self.do_test_session(self.mit_user("sipbtest"),
-                             lambda: delete_all_user_sessions(),
-                             get_realm("zephyr"), True)
+        self.do_test_session(
+            self.example_user("hamlet"),
+            lambda: delete_all_user_sessions(),
+            get_realm("zulip"),
+            True,
+        )
+        self.do_test_session(
+            self.mit_user("sipbtest"), lambda: delete_all_user_sessions(), get_realm("zephyr"), True
+        )
 
     def test_delete_all_deactivated_user_sessions(self) -> None:
 
@@ -91,12 +102,13 @@ class TestSessions(ZulipTestCase):
         user_profile_3.save()
         with self.assertLogs(level='INFO') as info_logs:
             delete_all_deactivated_user_sessions()
-        self.assertEqual(info_logs.output, [
-            'INFO:root:Deactivating session for deactivated user 8'
-        ])
+        self.assertEqual(
+            info_logs.output, ['INFO:root:Deactivating session for deactivated user 8']
+        )
         result = self.client_get("/")
         self.check_rendered_web_public_visitor(result)
 
+
 class TestExpirableSessionVars(ZulipTestCase):
     def setUp(self) -> None:
         self.session = self.client.session
@@ -105,26 +117,41 @@ class TestExpirableSessionVars(ZulipTestCase):
     def test_set_and_get_basic(self) -> None:
         start_time = timezone_now()
         with mock.patch('zerver.lib.sessions.timezone_now', return_value=start_time):
-            set_expirable_session_var(self.session, 'test_set_and_get_basic', 'some_value', expiry_seconds=10)
+            set_expirable_session_var(
+                self.session, 'test_set_and_get_basic', 'some_value', expiry_seconds=10
+            )
             value = get_expirable_session_var(self.session, 'test_set_and_get_basic')
             self.assertEqual(value, 'some_value')
-        with mock.patch('zerver.lib.sessions.timezone_now', return_value=start_time + timedelta(seconds=11)):
+        with mock.patch(
+            'zerver.lib.sessions.timezone_now', return_value=start_time + timedelta(seconds=11)
+        ):
             value = get_expirable_session_var(self.session, 'test_set_and_get_basic')
             self.assertEqual(value, None)
 
     def test_set_and_get_with_delete(self) -> None:
-        set_expirable_session_var(self.session, 'test_set_and_get_with_delete', 'some_value', expiry_seconds=10)
+        set_expirable_session_var(
+            self.session, 'test_set_and_get_with_delete', 'some_value', expiry_seconds=10
+        )
         value = get_expirable_session_var(self.session, 'test_set_and_get_with_delete', delete=True)
         self.assertEqual(value, 'some_value')
-        self.assertEqual(get_expirable_session_var(self.session, 'test_set_and_get_with_delete'), None)
+        self.assertEqual(
+            get_expirable_session_var(self.session, 'test_set_and_get_with_delete'), None
+        )
 
     def test_get_var_not_set(self) -> None:
-        value = get_expirable_session_var(self.session, 'test_get_var_not_set', default_value='default')
+        value = get_expirable_session_var(
+            self.session, 'test_get_var_not_set', default_value='default'
+        )
         self.assertEqual(value, 'default')
 
     def test_get_var_is_not_expirable(self) -> None:
         self.session["test_get_var_is_not_expirable"] = 0
         with self.assertLogs(level='WARNING') as m:
-            value = get_expirable_session_var(self.session, 'test_get_var_is_not_expirable', default_value='default')
+            value = get_expirable_session_var(
+                self.session, 'test_get_var_is_not_expirable', default_value='default'
+            )
             self.assertEqual(value, 'default')
-            self.assertIn('WARNING:root:get_expirable_session_var: error getting test_get_var_is_not_expirable', m.output[0])
+            self.assertIn(
+                'WARNING:root:get_expirable_session_var: error getting test_get_var_is_not_expirable',
+                m.output[0],
+            )
diff --git a/zerver/tests/test_settings.py b/zerver/tests/test_settings.py
index ebfc1e947c..9460528605 100644
--- a/zerver/tests/test_settings.py
+++ b/zerver/tests/test_settings.py
@@ -15,7 +15,6 @@ from zerver.models import UserProfile, get_user_profile_by_api_key
 
 
 class ChangeSettingsTest(ZulipTestCase):
-
     def check_well_formed_change_settings_response(self, result: Dict[str, Any]) -> None:
         self.assertIn("full_name", result)
 
@@ -24,15 +23,13 @@ class ChangeSettingsTest(ZulipTestCase):
     def check_for_toggle_param(self, pattern: str, param: str) -> None:
         self.login('hamlet')
         user_profile = self.example_user('hamlet')
-        json_result = self.client_post(pattern,
-                                       {param: orjson.dumps(True).decode()})
+        json_result = self.client_post(pattern, {param: orjson.dumps(True).decode()})
         self.assert_json_success(json_result)
         # refetch user_profile object to correctly handle caching
         user_profile = self.example_user('hamlet')
         self.assertEqual(getattr(user_profile, param), True)
 
-        json_result = self.client_post(pattern,
-                                       {param: orjson.dumps(False).decode()})
+        json_result = self.client_post(pattern, {param: orjson.dumps(False).decode()})
         self.assert_json_success(json_result)
         # refetch user_profile object to correctly handle caching
         user_profile = self.example_user('hamlet')
@@ -43,15 +40,13 @@ class ChangeSettingsTest(ZulipTestCase):
     def check_for_toggle_param_patch(self, pattern: str, param: str) -> None:
         self.login('hamlet')
         user_profile = self.example_user('hamlet')
-        json_result = self.client_patch(pattern,
-                                        {param: orjson.dumps(True).decode()})
+        json_result = self.client_patch(pattern, {param: orjson.dumps(True).decode()})
         self.assert_json_success(json_result)
         # refetch user_profile object to correctly handle caching
         user_profile = self.example_user('hamlet')
         self.assertEqual(getattr(user_profile, param), True)
 
-        json_result = self.client_patch(pattern,
-                                        {param: orjson.dumps(False).decode()})
+        json_result = self.client_patch(pattern, {param: orjson.dumps(False).decode()})
         self.assert_json_success(json_result)
         # refetch user_profile object to correctly handle caching
         user_profile = self.example_user('hamlet')
@@ -70,7 +65,8 @@ class ChangeSettingsTest(ZulipTestCase):
                 full_name='Foo Bar',
                 old_password=initial_password(user.delivery_email),
                 new_password='foobar1',
-            ))
+            ),
+        )
         self.assert_json_success(json_result)
         result = orjson.loads(json_result.content)
         self.check_well_formed_change_settings_response(result)
@@ -103,7 +99,8 @@ class ChangeSettingsTest(ZulipTestCase):
                     full_name='Foo Bar',
                     old_password=initial_password(self.example_email("hamlet")),
                     new_password='easy',
-                ))
+                ),
+            )
             self.assert_json_error(json_result, "New password is too weak!")
 
             json_result = self.client_patch(
@@ -112,7 +109,8 @@ class ChangeSettingsTest(ZulipTestCase):
                     full_name='Foo Bar',
                     old_password=initial_password(self.example_email("hamlet")),
                     new_password='f657gdGGk9',
-                ))
+                ),
+            )
             self.assert_json_success(json_result)
 
     def test_illegal_name_changes(self) -> None:
@@ -121,8 +119,7 @@ class ChangeSettingsTest(ZulipTestCase):
         full_name = user.full_name
 
         with self.settings(NAME_CHANGES_DISABLED=True):
-            json_result = self.client_patch("/json/settings",
-                                            dict(full_name='Foo Bar'))
+            json_result = self.client_patch("/json/settings", dict(full_name='Foo Bar'))
 
         # We actually fail silently here, since this only happens if
         # somebody is trying to game our API, and there's no reason to
@@ -133,21 +130,18 @@ class ChangeSettingsTest(ZulipTestCase):
         self.assertEqual(user.full_name, full_name)
 
         # Now try a too-long name
-        json_result = self.client_patch("/json/settings",
-                                        dict(full_name='x' * 1000))
+        json_result = self.client_patch("/json/settings", dict(full_name='x' * 1000))
         self.assert_json_error(json_result, 'Name too long!')
 
         # Now try a too-short name
-        json_result = self.client_patch("/json/settings",
-                                        dict(full_name='x'))
+        json_result = self.client_patch("/json/settings", dict(full_name='x'))
         self.assert_json_error(json_result, 'Name too short!')
 
     def test_illegal_characters_in_name_changes(self) -> None:
         self.login('hamlet')
 
         # Now try a name with invalid characters
-        json_result = self.client_patch("/json/settings",
-                                        dict(full_name='Opheli*'))
+        json_result = self.client_patch("/json/settings", dict(full_name='Opheli*'))
         self.assert_json_error(json_result, 'Invalid characters in name!')
 
     def test_change_email_to_disposable_email(self) -> None:
@@ -158,8 +152,7 @@ class ChangeSettingsTest(ZulipTestCase):
         realm.emails_restricted_to_domains = False
         realm.save()
 
-        json_result = self.client_patch("/json/settings",
-                                        dict(email='hamlet@mailnator.com'))
+        json_result = self.client_patch("/json/settings", dict(email='hamlet@mailnator.com'))
         self.assert_json_error(json_result, 'Please use your real email address.')
 
     # This is basically a don't-explode test.
@@ -170,8 +163,9 @@ class ChangeSettingsTest(ZulipTestCase):
             #
             # TODO: Make this work more like do_test_realm_update_api
             if notification_setting != 'notification_sound':
-                self.check_for_toggle_param_patch("/json/settings/notifications",
-                                                  notification_setting)
+                self.check_for_toggle_param_patch(
+                    "/json/settings/notifications", notification_setting
+                )
 
     def test_change_notification_sound(self) -> None:
         pattern = "/json/settings/notifications"
@@ -179,20 +173,17 @@ class ChangeSettingsTest(ZulipTestCase):
         user_profile = self.example_user('hamlet')
         self.login_user(user_profile)
 
-        json_result = self.client_patch(pattern,
-                                        {param: orjson.dumps("invalid").decode()})
+        json_result = self.client_patch(pattern, {param: orjson.dumps("invalid").decode()})
         self.assert_json_error(json_result, "Invalid notification sound 'invalid'")
 
-        json_result = self.client_patch(pattern,
-                                        {param: orjson.dumps("ding").decode()})
+        json_result = self.client_patch(pattern, {param: orjson.dumps("ding").decode()})
         self.assert_json_success(json_result)
 
         # refetch user_profile object to correctly handle caching
         user_profile = self.example_user('hamlet')
         self.assertEqual(getattr(user_profile, param), "ding")
 
-        json_result = self.client_patch(pattern,
-                                        {param: orjson.dumps('zulip').decode()})
+        json_result = self.client_patch(pattern, {param: orjson.dumps('zulip').decode()})
 
         self.assert_json_success(json_result)
         # refetch user_profile object to correctly handle caching
@@ -201,7 +192,9 @@ class ChangeSettingsTest(ZulipTestCase):
 
     def test_toggling_boolean_user_display_settings(self) -> None:
         """Test updating each boolean setting in UserProfile property_types"""
-        boolean_settings = (s for s in UserProfile.property_types if UserProfile.property_types[s] is bool)
+        boolean_settings = (
+            s for s in UserProfile.property_types if UserProfile.property_types[s] is bool
+        )
         for display_setting in boolean_settings:
             self.check_for_toggle_param_patch("/json/settings/display", display_setting)
 
@@ -215,7 +208,8 @@ class ChangeSettingsTest(ZulipTestCase):
             dict(
                 old_password='bad_password',
                 new_password="ignored",
-            ))
+            ),
+        )
         self.assert_json_error(result, "Wrong password!")
 
     def test_wrong_old_password_rate_limiter(self) -> None:
@@ -229,14 +223,16 @@ class ChangeSettingsTest(ZulipTestCase):
                     dict(
                         old_password='bad_password',
                         new_password="ignored",
-                    ))
+                    ),
+                )
                 self.assert_json_error(result, "Wrong password!")
                 result = self.client_patch(
                     "/json/settings",
                     dict(
                         old_password='bad_password',
                         new_password="ignored",
-                    ))
+                    ),
+                )
                 self.assert_json_error(result, "Wrong password!")
 
                 # We're over the limit, so we'll get blocked even with the correct password.
@@ -245,8 +241,11 @@ class ChangeSettingsTest(ZulipTestCase):
                     dict(
                         old_password=initial_password(self.example_email("hamlet")),
                         new_password="ignored",
-                    ))
-                self.assert_json_error(result, "You're making too many attempts! Try again in 10 seconds.")
+                    ),
+                )
+                self.assert_json_error(
+                    result, "You're making too many attempts! Try again in 10 seconds."
+                )
 
             # After time passes, we should be able to succeed if we give the correct password.
             with mock.patch('time.time', return_value=start_time + 11):
@@ -255,28 +254,35 @@ class ChangeSettingsTest(ZulipTestCase):
                     dict(
                         old_password=initial_password(self.example_email("hamlet")),
                         new_password='foobar1',
-                    ))
+                    ),
+                )
                 self.assert_json_success(json_result)
 
             remove_ratelimit_rule(10, 2, domain='authenticate_by_username')
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_change_password_ldap_backend(self) -> None:
         self.init_default_ldap_database()
         ldap_user_attr_map = {'full_name': 'cn', 'short_name': 'sn'}
 
         self.login('hamlet')
 
-        with self.settings(LDAP_APPEND_DOMAIN="zulip.com",
-                           AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map):
+        with self.settings(
+            LDAP_APPEND_DOMAIN="zulip.com", AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map
+        ):
             result = self.client_patch(
                 "/json/settings",
                 dict(
                     old_password=initial_password(self.example_email("hamlet")),
                     new_password="ignored",
-                ))
+                ),
+            )
             self.assert_json_error(result, "Your Zulip password is managed in LDAP")
 
             result = self.client_patch(
@@ -284,31 +290,36 @@ class ChangeSettingsTest(ZulipTestCase):
                 dict(
                     old_password=self.ldap_password("hamlet"),  # hamlet's password in LDAP
                     new_password="ignored",
-                ))
+                ),
+            )
             self.assert_json_error(result, "Your Zulip password is managed in LDAP")
 
-        with self.settings(LDAP_APPEND_DOMAIN="example.com",
-                           AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map), \
-                self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
+        with self.settings(
+            LDAP_APPEND_DOMAIN="example.com", AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map
+        ), self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
             result = self.client_patch(
                 "/json/settings",
                 dict(
                     old_password=initial_password(self.example_email("hamlet")),
                     new_password="ignored",
-                ))
+                ),
+            )
             self.assert_json_success(result)
-            self.assertEqual(debug_log.output, [
-                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: Email hamlet@zulip.com does not match LDAP domain example.com.'
-            ])
+            self.assertEqual(
+                debug_log.output,
+                [
+                    'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: Email hamlet@zulip.com does not match LDAP domain example.com.'
+                ],
+            )
 
-        with self.settings(LDAP_APPEND_DOMAIN=None,
-                           AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map):
+        with self.settings(LDAP_APPEND_DOMAIN=None, AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map):
             result = self.client_patch(
                 "/json/settings",
                 dict(
                     old_password=initial_password(self.example_email("hamlet")),
                     new_password="ignored",
-                ))
+                ),
+            )
             self.assert_json_error(result, "Your Zulip password is managed in LDAP")
 
     def test_changing_nothing_returns_error(self) -> None:
@@ -318,18 +329,17 @@ class ChangeSettingsTest(ZulipTestCase):
         probably use a patch interface for these changes.)
         """
         self.login('hamlet')
-        result = self.client_patch("/json/settings",
-                                   dict(old_password='ignored'))
+        result = self.client_patch("/json/settings", dict(old_password='ignored'))
         self.assert_json_error(result, "Please fill out all fields.")
 
     def do_test_change_user_display_setting(self, setting_name: str) -> None:
 
         test_changes: Dict[str, Any] = dict(
-            default_language = 'de',
-            emojiset = 'google',
-            timezone = 'US/Mountain',
-            demote_inactive_streams = 2,
-            color_scheme = 2,
+            default_language='de',
+            emojiset='google',
+            timezone='US/Mountain',
+            demote_inactive_streams=2,
+            color_scheme=2,
         )
 
         self.login('hamlet')
@@ -363,7 +373,9 @@ class ChangeSettingsTest(ZulipTestCase):
 
     def test_change_user_display_setting(self) -> None:
         """Test updating each non-boolean setting in UserProfile property_types"""
-        user_settings = (s for s in UserProfile.property_types if UserProfile.property_types[s] is not bool)
+        user_settings = (
+            s for s in UserProfile.property_types if UserProfile.property_types[s] is not bool
+        )
         for setting in user_settings:
             self.do_test_change_user_display_setting(setting)
 
@@ -398,6 +410,7 @@ class ChangeSettingsTest(ZulipTestCase):
                 result = self.client_post("/json/users/me/avatar", {'f1': fp1})
             self.assert_json_error(result, "Avatar changes are disabled in this organization.", 400)
 
+
 class UserChangesTest(ZulipTestCase):
     def test_update_api_key(self) -> None:
         user = self.example_user('hamlet')
diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py
index 659849a969..a56534ab7c 100644
--- a/zerver/tests/test_signup.py
+++ b/zerver/tests/test_signup.py
@@ -110,39 +110,51 @@ class RedirectAndLogIntoSubdomainTestCase(ZulipTestCase):
         email = user_profile.delivery_email
         response = redirect_and_log_into_subdomain(ExternalAuthResult(user_profile=user_profile))
         data = load_subdomain_token(response)
-        self.assertDictEqual(data, {'full_name': name,
-                                    'email': email,
-                                    'subdomain': realm.subdomain,
-                                    'is_signup': False})
+        self.assertDictEqual(
+            data,
+            {'full_name': name, 'email': email, 'subdomain': realm.subdomain, 'is_signup': False},
+        )
 
         data_dict = ExternalAuthDataDict(is_signup=True, multiuse_object_key='key')
-        response = redirect_and_log_into_subdomain(ExternalAuthResult(user_profile=user_profile,
-                                                                      data_dict=data_dict))
+        response = redirect_and_log_into_subdomain(
+            ExternalAuthResult(user_profile=user_profile, data_dict=data_dict)
+        )
         data = load_subdomain_token(response)
-        self.assertDictEqual(data, {'full_name': name,
-                                    'email': email,
-                                    'subdomain': realm.subdomain,
-                                    # the email has an account at the subdomain,
-                                    # so is_signup get overridden to False:
-                                    'is_signup': False,
-                                    'multiuse_object_key': 'key',
-                                    })
+        self.assertDictEqual(
+            data,
+            {
+                'full_name': name,
+                'email': email,
+                'subdomain': realm.subdomain,
+                # the email has an account at the subdomain,
+                # so is_signup get overridden to False:
+                'is_signup': False,
+                'multiuse_object_key': 'key',
+            },
+        )
 
-        data_dict = ExternalAuthDataDict(email=self.nonreg_email("alice"),
-                                         full_name="Alice",
-                                         subdomain=realm.subdomain,
-                                         is_signup=True,
-                                         full_name_validated=True,
-                                         multiuse_object_key='key')
+        data_dict = ExternalAuthDataDict(
+            email=self.nonreg_email("alice"),
+            full_name="Alice",
+            subdomain=realm.subdomain,
+            is_signup=True,
+            full_name_validated=True,
+            multiuse_object_key='key',
+        )
         response = redirect_and_log_into_subdomain(ExternalAuthResult(data_dict=data_dict))
         data = load_subdomain_token(response)
-        self.assertDictEqual(data, {'full_name': "Alice",
-                                    'email': self.nonreg_email("alice"),
-                                    'full_name_validated': True,
-                                    'subdomain': realm.subdomain,
-                                    'is_signup': True,
-                                    'multiuse_object_key': 'key',
-                                    })
+        self.assertDictEqual(
+            data,
+            {
+                'full_name': "Alice",
+                'email': self.nonreg_email("alice"),
+                'full_name_validated': True,
+                'subdomain': realm.subdomain,
+                'is_signup': True,
+                'multiuse_object_key': 'key',
+            },
+        )
+
 
 class DeactivationNoticeTestCase(ZulipTestCase):
     def test_redirection_for_deactivated_realm(self) -> None:
@@ -181,26 +193,41 @@ class DeactivationNoticeTestCase(ZulipTestCase):
         realm.save(update_fields=["deactivated", "deactivated_redirect"])
 
         result = self.client_get('/accounts/deactivated/')
-        self.assertIn('It has moved to <a href="http://example.zulipchat.com">http://example.zulipchat.com</a>.', result.content.decode())
+        self.assertIn(
+            'It has moved to <a href="http://example.zulipchat.com">http://example.zulipchat.com</a>.',
+            result.content.decode(),
+        )
 
     def test_deactivation_notice_when_realm_subdomain_is_changed(self) -> None:
         realm = get_realm("zulip")
         do_change_realm_subdomain(realm, "new-subdomain-name")
 
         result = self.client_get('/accounts/deactivated/')
-        self.assertIn('It has moved to <a href="http://new-subdomain-name.testserver">http://new-subdomain-name.testserver</a>.', result.content.decode())
+        self.assertIn(
+            'It has moved to <a href="http://new-subdomain-name.testserver">http://new-subdomain-name.testserver</a>.',
+            result.content.decode(),
+        )
 
-    def test_deactivated_redirect_field_of_placeholder_realms_are_modified_on_changing_subdomain_multiple_times(self) -> None:
+    def test_deactivated_redirect_field_of_placeholder_realms_are_modified_on_changing_subdomain_multiple_times(
+        self,
+    ) -> None:
         realm = get_realm('zulip')
         do_change_realm_subdomain(realm, 'new-name-1')
 
         result = self.client_get('/accounts/deactivated/')
-        self.assertIn('It has moved to <a href="http://new-name-1.testserver">http://new-name-1.testserver</a>.', result.content.decode())
+        self.assertIn(
+            'It has moved to <a href="http://new-name-1.testserver">http://new-name-1.testserver</a>.',
+            result.content.decode(),
+        )
 
         realm = get_realm('new-name-1')
         do_change_realm_subdomain(realm, 'new-name-2')
         result = self.client_get('/accounts/deactivated/')
-        self.assertIn('It has moved to <a href="http://new-name-2.testserver">http://new-name-2.testserver</a>.', result.content.decode())
+        self.assertIn(
+            'It has moved to <a href="http://new-name-2.testserver">http://new-name-2.testserver</a>.',
+            result.content.decode(),
+        )
+
 
 class AddNewUserHistoryTest(ZulipTestCase):
     def test_add_new_user_history_race(self) -> None:
@@ -218,45 +245,60 @@ class AddNewUserHistoryTest(ZulipTestCase):
             self.register(self.nonreg_email('test'), "test")
         user_profile = self.nonreg_user('test')
         subs = Subscription.objects.select_related("recipient").filter(
-            user_profile=user_profile, recipient__type=Recipient.STREAM)
+            user_profile=user_profile, recipient__type=Recipient.STREAM
+        )
         streams = Stream.objects.filter(id__in=[sub.recipient.type_id for sub in subs])
 
         # Sent a message afterwards to trigger a race between message
         # sending and `add_new_user_history`.
-        race_message_id = self.send_stream_message(self.example_user('hamlet'),
-                                                   streams[0].name, "test")
+        race_message_id = self.send_stream_message(
+            self.example_user('hamlet'), streams[0].name, "test"
+        )
 
         # Overwrite ONBOARDING_UNREAD_MESSAGES to 2
         ONBOARDING_UNREAD_MESSAGES = 2
-        with patch("zerver.lib.actions.ONBOARDING_UNREAD_MESSAGES",
-                   ONBOARDING_UNREAD_MESSAGES):
+        with patch("zerver.lib.actions.ONBOARDING_UNREAD_MESSAGES", ONBOARDING_UNREAD_MESSAGES):
             add_new_user_history(user_profile, streams)
 
         # Our first message is in the user's history
-        self.assertTrue(UserMessage.objects.filter(user_profile=user_profile,
-                                                   message_id=message_id).exists())
+        self.assertTrue(
+            UserMessage.objects.filter(user_profile=user_profile, message_id=message_id).exists()
+        )
         # The race message is in the user's history and marked unread.
-        self.assertTrue(UserMessage.objects.filter(user_profile=user_profile,
-                                                   message_id=race_message_id).exists())
-        self.assertFalse(UserMessage.objects.get(user_profile=user_profile,
-                                                 message_id=race_message_id).flags.read.is_set)
+        self.assertTrue(
+            UserMessage.objects.filter(
+                user_profile=user_profile, message_id=race_message_id
+            ).exists()
+        )
+        self.assertFalse(
+            UserMessage.objects.get(
+                user_profile=user_profile, message_id=race_message_id
+            ).flags.read.is_set
+        )
 
         # Verify that the ONBOARDING_UNREAD_MESSAGES latest messages
         # that weren't the race message are marked as unread.
-        latest_messages = UserMessage.objects.filter(
-            user_profile=user_profile,
-            message__recipient__type=Recipient.STREAM,
-        ).exclude(message_id=race_message_id).order_by('-message_id')[0:ONBOARDING_UNREAD_MESSAGES]
+        latest_messages = (
+            UserMessage.objects.filter(
+                user_profile=user_profile,
+                message__recipient__type=Recipient.STREAM,
+            )
+            .exclude(message_id=race_message_id)
+            .order_by('-message_id')[0:ONBOARDING_UNREAD_MESSAGES]
+        )
         self.assertEqual(len(latest_messages), 2)
         for msg in latest_messages:
             self.assertFalse(msg.flags.read.is_set)
 
         # Verify that older messages are correctly marked as read.
-        older_messages = UserMessage.objects.filter(
-            user_profile=user_profile,
-            message__recipient__type=Recipient.STREAM,
-        ).exclude(message_id=race_message_id).order_by(
-            '-message_id')[ONBOARDING_UNREAD_MESSAGES:ONBOARDING_UNREAD_MESSAGES + 1]
+        older_messages = (
+            UserMessage.objects.filter(
+                user_profile=user_profile,
+                message__recipient__type=Recipient.STREAM,
+            )
+            .exclude(message_id=race_message_id)
+            .order_by('-message_id')[ONBOARDING_UNREAD_MESSAGES : ONBOARDING_UNREAD_MESSAGES + 1]
+        )
         self.assertTrue(len(older_messages) > 0)
         for msg in older_messages:
             self.assertTrue(msg.flags.read.is_set)
@@ -274,8 +316,7 @@ class AddNewUserHistoryTest(ZulipTestCase):
         new_messages_count = message_stream_count(user_profile)
         self.assertEqual(new_messages_count, old_messages_count + 1)
 
-        recipient = Recipient.objects.get(type_id=user_profile.id,
-                                          type=Recipient.PERSONAL)
+        recipient = Recipient.objects.get(type_id=user_profile.id, type=Recipient.PERSONAL)
         message = most_recent_message(user_profile)
         self.assertEqual(message.recipient, recipient)
 
@@ -283,7 +324,8 @@ class AddNewUserHistoryTest(ZulipTestCase):
             self.assertEqual(
                 str(message),
                 '<Message: recip /  / '
-                '<UserProfile: {} {}>>'.format(user_profile.email, user_profile.realm))
+                '<UserProfile: {} {}>>'.format(user_profile.email, user_profile.realm),
+            )
 
             user_message = most_recent_usermessage(user_profile)
             self.assertEqual(
@@ -291,18 +333,21 @@ class AddNewUserHistoryTest(ZulipTestCase):
                 f'<UserMessage: recip / {user_profile.email} ([])>',
             )
 
+
 class InitialPasswordTest(ZulipTestCase):
     def test_none_initial_password_salt(self) -> None:
         with self.settings(INITIAL_PASSWORD_SALT=None):
             self.assertIsNone(initial_password('test@test.com'))
 
+
 class PasswordResetTest(ZulipTestCase):
     """
     Log in, reset password, log out, log in with new password.
     """
 
-    def get_reset_mail_body(self, subdomain: str='zulip') -> str:
+    def get_reset_mail_body(self, subdomain: str = 'zulip') -> str:
         from django.core.mail import outbox
+
         [message] = outbox
         self.assertRegex(
             message.from_email,
@@ -329,8 +374,7 @@ class PasswordResetTest(ZulipTestCase):
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            "/accounts/password/reset/done/"))
+        self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
         result = self.client_get(result["Location"])
 
         self.assert_in_response("Check your email in a few minutes to finish the process.", result)
@@ -341,7 +385,8 @@ class PasswordResetTest(ZulipTestCase):
 
         # Visit the password reset link.
         password_reset_url = self.get_confirmation_url_from_outbox(
-            email, url_pattern=settings.EXTERNAL_HOST + r"(\S\S+)")
+            email, url_pattern=settings.EXTERNAL_HOST + r"(\S\S+)"
+        )
         result = self.client_get(password_reset_url)
         self.assertEqual(result.status_code, 302)
         self.assertTrue(result.url.endswith(f'/{PasswordResetConfirmView.reset_url_token}/'))
@@ -353,15 +398,14 @@ class PasswordResetTest(ZulipTestCase):
         # Reset your password
         with self.settings(PASSWORD_MIN_LENGTH=3, PASSWORD_MIN_GUESSES=1000):
             # Verify weak passwords don't work.
-            result = self.client_post(final_reset_url,
-                                      {'new_password1': 'easy',
-                                       'new_password2': 'easy'})
-            self.assert_in_response("The password is too weak.",
-                                    result)
+            result = self.client_post(
+                final_reset_url, {'new_password1': 'easy', 'new_password2': 'easy'}
+            )
+            self.assert_in_response("The password is too weak.", result)
 
-            result = self.client_post(final_reset_url,
-                                      {'new_password1': 'f657gdGGk9',
-                                       'new_password2': 'f657gdGGk9'})
+            result = self.client_post(
+                final_reset_url, {'new_password1': 'f657gdGGk9', 'new_password2': 'f657gdGGk9'}
+            )
             # password reset succeeded
             self.assertEqual(result.status_code, 302)
             self.assertTrue(result["Location"].endswith("/password/done/"))
@@ -382,8 +426,7 @@ class PasswordResetTest(ZulipTestCase):
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            "/accounts/password/reset/done/"))
+        self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
         result = self.client_get(result["Location"])
 
         self.assert_in_response("Check your email in a few minutes to finish the process.", result)
@@ -406,8 +449,7 @@ class PasswordResetTest(ZulipTestCase):
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            "/accounts/password/reset/done/"))
+        self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
         result = self.client_get(result["Location"])
 
         self.assert_in_response("Check your email in a few minutes to finish the process.", result)
@@ -432,14 +474,14 @@ class PasswordResetTest(ZulipTestCase):
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            "/accounts/password/reset/done/"))
+        self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
         result = self.client_get(result["Location"])
 
         self.assert_in_response("Check your email in a few minutes to finish the process.", result)
 
         # Check that the password reset email is from a noreply address.
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
     @override_settings(RATE_LIMITING=True)
@@ -458,9 +500,10 @@ class PasswordResetTest(ZulipTestCase):
             # Too many password reset emails sent to the address, we won't send more.
             with self.assertLogs(level='INFO') as info_logs:
                 self.client_post('/accounts/password/reset/', {'email': email})
-            self.assertEqual(info_logs.output, [
-                'INFO:root:Too many password reset attempts for email hamlet@zulip.com'
-            ])
+            self.assertEqual(
+                info_logs.output,
+                ['INFO:root:Too many password reset attempts for email hamlet@zulip.com'],
+            )
             self.assert_length(outbox, 2)
 
             # Resetting for a different address works though.
@@ -481,14 +524,11 @@ class PasswordResetTest(ZulipTestCase):
         email = self.example_email("hamlet")
 
         # start the password reset process by supplying an email address
-        result = self.client_post(
-            '/accounts/password/reset/', {'email': email},
-            subdomain="zephyr")
+        result = self.client_post('/accounts/password/reset/', {'email': email}, subdomain="zephyr")
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            "/accounts/password/reset/done/"))
+        self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
         result = self.client_get(result["Location"])
 
         self.assert_in_response("Check your email in a few minutes to finish the process.", result)
@@ -496,8 +536,9 @@ class PasswordResetTest(ZulipTestCase):
         body = self.get_reset_mail_body('zephyr')
         self.assertIn('Somebody (possibly you) requested a new password', body)
         self.assertIn('You do not have an account', body)
-        self.assertIn("active accounts in the following organization(s).\nhttp://zulip.testserver",
-                      body)
+        self.assertIn(
+            "active accounts in the following organization(s).\nhttp://zulip.testserver", body
+        )
         self.assertIn('safely ignore', body)
         self.assertNotIn('reset your password', body)
         self.assertNotIn('deactivated', body)
@@ -507,50 +548,66 @@ class PasswordResetTest(ZulipTestCase):
 
         # start the password reset process by supplying an email address
         result = self.client_post(
-            '/accounts/password/reset/', {'email': email},
-            subdomain="invalid")
+            '/accounts/password/reset/', {'email': email}, subdomain="invalid"
+        )
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 404)
-        self.assert_in_response("There is no Zulip organization hosted at this subdomain.",
-                                result)
+        self.assert_in_response("There is no Zulip organization hosted at this subdomain.", result)
 
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_auth_only(self) -> None:
         """If the email auth backend is not enabled, password reset should do nothing"""
         email = self.example_email("hamlet")
         with self.assertLogs(level="INFO") as m:
             result = self.client_post('/accounts/password/reset/', {'email': email})
-            self.assertEqual(m.output, ["INFO:root:Password reset attempted for hamlet@zulip.com even though password auth is disabled."])
+            self.assertEqual(
+                m.output,
+                [
+                    "INFO:root:Password reset attempted for hamlet@zulip.com even though password auth is disabled."
+                ],
+            )
 
         # check the redirect link telling you to check mail for password reset link
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            "/accounts/password/reset/done/"))
+        self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
         result = self.client_get(result["Location"])
 
         self.assert_in_response("Check your email in a few minutes to finish the process.", result)
 
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_and_email_auth(self) -> None:
         """If both email and LDAP auth backends are enabled, limit password
-           reset to users outside the LDAP domain"""
+        reset to users outside the LDAP domain"""
         # If the domain matches, we don't generate an email
         with self.settings(LDAP_APPEND_DOMAIN="zulip.com"):
             email = self.example_email("hamlet")
             with self.assertLogs(level="INFO") as m:
                 result = self.client_post('/accounts/password/reset/', {'email': email})
-                self.assertEqual(m.output, ["INFO:root:Password reset not allowed for user in LDAP domain"])
+                self.assertEqual(
+                    m.output, ["INFO:root:Password reset not allowed for user in LDAP domain"]
+                )
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
         # If the domain doesn't match, we do generate an email
@@ -558,20 +615,19 @@ class PasswordResetTest(ZulipTestCase):
             email = self.example_email("hamlet")
             result = self.client_post('/accounts/password/reset/', {'email': email})
             self.assertEqual(result.status_code, 302)
-            self.assertTrue(result["Location"].endswith(
-                "/accounts/password/reset/done/"))
+            self.assertTrue(result["Location"].endswith("/accounts/password/reset/done/"))
             result = self.client_get(result["Location"])
 
         body = self.get_reset_mail_body()
         self.assertIn('reset your password', body)
 
     def test_redirect_endpoints(self) -> None:
-        '''
+        """
         These tests are mostly designed to give us 100% URL coverage
         in our URL coverage reports.  Our mechanism for finding URL
         coverage doesn't handle redirects, so we just have a few quick
         tests here.
-        '''
+        """
         result = self.client_get('/accounts/password/reset/done/')
         self.assert_in_success_response(["Check your email"], result)
 
@@ -584,6 +640,7 @@ class PasswordResetTest(ZulipTestCase):
         result = self.client_get('/accounts/new/send_confirm/alice@example.com')
         self.assert_in_success_response(["/new/"], result)
 
+
 class LoginTest(ZulipTestCase):
     """
     Logging in, registration, and logging out.
@@ -651,15 +708,22 @@ class LoginTest(ZulipTestCase):
     def test_login_wrong_subdomain(self) -> None:
         with self.assertLogs(level="WARNING") as m:
             result = self.login_with_return(self.mit_email("sipbtest"), "xxx")
-            self.assertEqual(m.output, ["WARNING:root:User sipbtest@mit.edu attempted password login to wrong subdomain zulip"])
+            self.assertEqual(
+                m.output,
+                [
+                    "WARNING:root:User sipbtest@mit.edu attempted password login to wrong subdomain zulip"
+                ],
+            )
         self.assertEqual(result.status_code, 200)
-        self.assert_in_response("Your Zulip account is not a member of the "
-                                "organization associated with this subdomain.", result)
+        self.assert_in_response(
+            "Your Zulip account is not a member of the "
+            "organization associated with this subdomain.",
+            result,
+        )
         self.assert_logged_in_user_id(None)
 
     def test_login_invalid_subdomain(self) -> None:
-        result = self.login_with_return(self.example_email("hamlet"), "xxx",
-                                        subdomain="invalid")
+        result = self.login_with_return(self.example_email("hamlet"), "xxx", subdomain="invalid")
         self.assertEqual(result.status_code, 404)
         self.assert_in_response("There is no Zulip organization hosted at this subdomain.", result)
         self.assert_logged_in_user_id(None)
@@ -701,8 +765,9 @@ class LoginTest(ZulipTestCase):
         realm.deactivated = True
         realm.save(update_fields=["deactivated"])
 
-        result = self.client_post('/accounts/home/', {'email': self.nonreg_email('test')},
-                                  subdomain="zulip")
+        result = self.client_post(
+            '/accounts/home/', {'email': self.nonreg_email('test')}, subdomain="zulip"
+        )
         self.assertEqual(result.status_code, 302)
         self.assertEqual('/accounts/deactivated/', result.url)
 
@@ -715,8 +780,7 @@ class LoginTest(ZulipTestCase):
         page
         """
         invalid_email = "foo\x00bar"
-        result = self.client_post('/accounts/home/', {'email': invalid_email},
-                                  subdomain="zulip")
+        result = self.client_post('/accounts/home/', {'email': invalid_email}, subdomain="zulip")
 
         self.assertEqual(result.status_code, 200)
         self.assertContains(result, "Enter a valid email address")
@@ -727,8 +791,7 @@ class LoginTest(ZulipTestCase):
         page.
         """
         email = self.nonreg_email('test')
-        result = self.client_post('/accounts/home/', {'email': email},
-                                  subdomain="zulip")
+        result = self.client_post('/accounts/home/', {'email': email}, subdomain="zulip")
         self.assertEqual(result.status_code, 302)
         self.assertNotIn('deactivated', result.url)
 
@@ -834,10 +897,13 @@ https://www.google.com/images/srpr/logo4w.png</a></p>"""
         self.assertEqual(response.context_data["realm_description"], expected_response)
         self.assertEqual(response.status_code, 200)
 
+
 class InviteUserBase(ZulipTestCase):
-    def check_sent_emails(self, correct_recipients: List[str],
-                          custom_from_name: Optional[str]=None) -> None:
+    def check_sent_emails(
+        self, correct_recipients: List[str], custom_from_name: Optional[str] = None
+    ) -> None:
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), len(correct_recipients))
         email_recipients = [email.recipients()[0] for email in outbox]
         self.assertEqual(sorted(email_recipients), sorted(correct_recipients))
@@ -851,8 +917,13 @@ class InviteUserBase(ZulipTestCase):
 
         self.assertEqual(outbox[0].extra_headers["List-Id"], "Zulip Dev <zulip.testserver>")
 
-    def invite(self, invitee_emails: str, stream_names: Sequence[str], body: str='',
-               invite_as: int=PreregistrationUser.INVITE_AS['MEMBER']) -> HttpResponse:
+    def invite(
+        self,
+        invitee_emails: str,
+        stream_names: Sequence[str],
+        body: str = '',
+        invite_as: int = PreregistrationUser.INVITE_AS['MEMBER'],
+    ) -> HttpResponse:
         """
         Invites the specified users to Zulip with the specified streams.
 
@@ -864,10 +935,15 @@ class InviteUserBase(ZulipTestCase):
         stream_ids = []
         for stream_name in stream_names:
             stream_ids.append(self.get_stream_id(stream_name))
-        return self.client_post("/json/invites",
-                                {"invitee_emails": invitee_emails,
-                                 "stream_ids": orjson.dumps(stream_ids).decode(),
-                                 "invite_as": invite_as})
+        return self.client_post(
+            "/json/invites",
+            {
+                "invitee_emails": invitee_emails,
+                "stream_ids": orjson.dumps(stream_ids).decode(),
+                "invite_as": invite_as,
+            },
+        )
+
 
 class InviteUserTest(InviteUserBase):
     def test_successful_invite_user(self) -> None:
@@ -917,10 +993,7 @@ class InviteUserTest(InviteUserBase):
 
         daily_counts = [(1, max_daily_count)]
 
-        invite_emails = [
-            f'foo-{i:02}@zulip.com'
-            for i in range(num_invitees)
-        ]
+        invite_emails = [f'foo-{i:02}@zulip.com' for i in range(num_invitees)]
         invitees = ','.join(invite_emails)
 
         self.login_user(user_profile)
@@ -930,9 +1003,11 @@ class InviteUserTest(InviteUserBase):
         realm.save()
 
         def try_invite() -> HttpResponse:
-            with self.settings(OPEN_REALM_CREATION=True,
-                               INVITES_DEFAULT_REALM_DAILY_MAX=site_max,
-                               INVITES_NEW_REALM_LIMIT_DAYS=daily_counts):
+            with self.settings(
+                OPEN_REALM_CREATION=True,
+                INVITES_DEFAULT_REALM_DAILY_MAX=site_max,
+                INVITES_NEW_REALM_LIMIT_DAYS=daily_counts,
+            ):
                 result = self.invite(invitees, [stream_name])
                 return result
 
@@ -962,12 +1037,14 @@ class InviteUserTest(InviteUserBase):
         actual_count = len(queries)
         expected_count = 251
         if abs(actual_count - expected_count) > 1:
-            raise AssertionError(f'''
+            raise AssertionError(
+                f'''
                 Unexpected number of queries:
 
                 expected query count: {expected_count}
                 actual: {actual_count}
-                ''')
+                '''
+            )
 
         # Almost all of these cache hits are to re-fetch each one of the
         # invitees.  These happen inside our queue processor for sending
@@ -1003,12 +1080,13 @@ class InviteUserTest(InviteUserBase):
         result = self.invite(invitee_emails, ['Denmark'])
         self.assert_json_error(
             result,
-            "Some of those addresses are already using Zulip," +
-            " so we didn't send them an invitation." +
-            " We did send invitations to everyone else!")
+            "Some of those addresses are already using Zulip,"
+            + " so we didn't send them an invitation."
+            + " We did send invitations to everyone else!",
+        )
 
     def test_invite_mirror_dummy_user(self) -> None:
-        '''
+        """
         A mirror dummy account is a temporary account
         that we keep in our system if we are mirroring
         data from something like Zephyr or IRC.
@@ -1019,7 +1097,7 @@ class InviteUserTest(InviteUserBase):
 
         Here we test that you can invite a person who
         has a mirror dummy account.
-        '''
+        """
         inviter = self.example_user('hamlet')
         self.login_user(inviter)
 
@@ -1045,8 +1123,9 @@ class InviteUserTest(InviteUserBase):
     def test_successful_invite_user_as_owner_from_owner_account(self) -> None:
         self.login('desdemona')
         invitee = self.nonreg_email('alice')
-        result = self.invite(invitee, ["Denmark"],
-                             invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER'])
+        result = self.invite(
+            invitee, ["Denmark"], invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER']
+        )
         self.assert_json_success(result)
         self.assertTrue(find_key_by_email(invitee))
 
@@ -1058,15 +1137,17 @@ class InviteUserTest(InviteUserBase):
     def test_invite_user_as_owner_from_admin_account(self) -> None:
         self.login('iago')
         invitee = self.nonreg_email('alice')
-        response = self.invite(invitee, ["Denmark"],
-                               invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER'])
+        response = self.invite(
+            invitee, ["Denmark"], invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER']
+        )
         self.assert_json_error(response, "Must be an organization owner")
 
     def test_successful_invite_user_as_admin_from_admin_account(self) -> None:
         self.login('iago')
         invitee = self.nonreg_email('alice')
-        result = self.invite(invitee, ["Denmark"],
-                             invite_as=PreregistrationUser.INVITE_AS['REALM_ADMIN'])
+        result = self.invite(
+            invitee, ["Denmark"], invite_as=PreregistrationUser.INVITE_AS['REALM_ADMIN']
+        )
         self.assert_json_success(result)
         self.assertTrue(find_key_by_email(invitee))
 
@@ -1079,8 +1160,9 @@ class InviteUserTest(InviteUserBase):
     def test_invite_user_as_admin_from_normal_account(self) -> None:
         self.login('hamlet')
         invitee = self.nonreg_email('alice')
-        response = self.invite(invitee, ["Denmark"],
-                               invite_as=PreregistrationUser.INVITE_AS['REALM_ADMIN'])
+        response = self.invite(
+            invitee, ["Denmark"], invite_as=PreregistrationUser.INVITE_AS['REALM_ADMIN']
+        )
         self.assert_json_error(response, "Must be an organization administrator")
 
     def test_invite_user_as_invalid_type(self) -> None:
@@ -1096,8 +1178,9 @@ class InviteUserTest(InviteUserBase):
     def test_successful_invite_user_as_guest_from_normal_account(self) -> None:
         self.login('hamlet')
         invitee = self.nonreg_email('alice')
-        self.assert_json_success(self.invite(invitee, ["Denmark"],
-                                             invite_as=PreregistrationUser.INVITE_AS['GUEST_USER']))
+        self.assert_json_success(
+            self.invite(invitee, ["Denmark"], invite_as=PreregistrationUser.INVITE_AS['GUEST_USER'])
+        )
         self.assertTrue(find_key_by_email(invitee))
 
         self.submit_reg_form_for_user(invitee, "password")
@@ -1108,8 +1191,9 @@ class InviteUserTest(InviteUserBase):
     def test_successful_invite_user_as_guest_from_admin_account(self) -> None:
         self.login('iago')
         invitee = self.nonreg_email('alice')
-        self.assert_json_success(self.invite(invitee, ["Denmark"],
-                                             invite_as=PreregistrationUser.INVITE_AS['GUEST_USER']))
+        self.assert_json_success(
+            self.invite(invitee, ["Denmark"], invite_as=PreregistrationUser.INVITE_AS['GUEST_USER'])
+        )
         self.assertTrue(find_key_by_email(invitee))
 
         self.submit_reg_form_for_user(invitee, "password")
@@ -1155,8 +1239,9 @@ class InviteUserTest(InviteUserBase):
         email = "alice-test@zulip.com"
         email2 = "bob-test@zulip.com"
         invitee = f"Alice Test <{email}>, {email2}"
-        self.assert_json_error(self.invite(invitee, ["Denmark"]),
-                               "Must be an organization administrator")
+        self.assert_json_error(
+            self.invite(invitee, ["Denmark"]), "Must be an organization administrator"
+        )
 
         # Now verify an administrator can do it
         self.login('iago')
@@ -1193,8 +1278,9 @@ class InviteUserTest(InviteUserBase):
 
         self.submit_reg_form_for_user(invitee, "password")
         invitee_profile = self.nonreg_user('alice')
-        invitee_msg_ids = [um.message_id for um in
-                           UserMessage.objects.filter(user_profile=invitee_profile)]
+        invitee_msg_ids = [
+            um.message_id for um in UserMessage.objects.filter(user_profile=invitee_profile)
+        ]
         self.assertTrue(public_msg_id in invitee_msg_ids)
         self.assertFalse(secret_msg_id in invitee_msg_ids)
         self.assertFalse(invitee_profile.is_realm_admin)
@@ -1206,9 +1292,11 @@ class InviteUserTest(InviteUserBase):
         # The first, from notification-bot to the user who invited the new user.
         second_msg = last_3_messages[1]
         self.assertEqual(second_msg.sender.email, "notification-bot@zulip.com")
-        self.assertTrue(second_msg.content.startswith(
-            f"alice_zulip.com <`{invitee_profile.email}`> accepted your",
-        ))
+        self.assertTrue(
+            second_msg.content.startswith(
+                f"alice_zulip.com <`{invitee_profile.email}`> accepted your",
+            )
+        )
 
         # The second, from welcome-bot to the user who was invited.
         third_msg = last_3_messages[2]
@@ -1221,16 +1309,26 @@ class InviteUserTest(InviteUserBase):
         """
         self.login('hamlet')
         # Intentionally use a weird string.
-        self.assert_json_success(self.invite(
-            """bob-test@zulip.com,     carol-test@zulip.com,
+        self.assert_json_success(
+            self.invite(
+                """bob-test@zulip.com,     carol-test@zulip.com,
             dave-test@zulip.com
 
 
-earl-test@zulip.com""", ["Denmark"]))
+earl-test@zulip.com""",
+                ["Denmark"],
+            )
+        )
         for user in ("bob", "carol", "dave", "earl"):
             self.assertTrue(find_key_by_email(f"{user}-test@zulip.com"))
-        self.check_sent_emails(["bob-test@zulip.com", "carol-test@zulip.com",
-                                "dave-test@zulip.com", "earl-test@zulip.com"])
+        self.check_sent_emails(
+            [
+                "bob-test@zulip.com",
+                "carol-test@zulip.com",
+                "dave-test@zulip.com",
+                "earl-test@zulip.com",
+            ]
+        )
 
     def test_max_invites_model(self) -> None:
         realm = get_realm("zulip")
@@ -1248,10 +1346,12 @@ earl-test@zulip.com""", ["Denmark"]))
         invitee_emails = "1@zulip.com, 2@zulip.com"
         self.invite(invitee_emails, ["Denmark"])
         invitee_emails = ", ".join(str(i) for i in range(get_realm("zulip").max_invites - 1))
-        self.assert_json_error(self.invite(invitee_emails, ["Denmark"]),
-                               "You do not have enough remaining invites for today. "
-                               "Please contact desdemona+admin@zulip.com to have your limit raised. "
-                               "No invitations were sent.")
+        self.assert_json_error(
+            self.invite(invitee_emails, ["Denmark"]),
+            "You do not have enough remaining invites for today. "
+            "Please contact desdemona+admin@zulip.com to have your limit raised. "
+            "No invitations were sent.",
+        )
 
     def test_missing_or_invalid_params(self) -> None:
         """
@@ -1262,18 +1362,21 @@ earl-test@zulip.com""", ["Denmark"]))
 
         self.login('hamlet')
         invitee_emails = "foo@zulip.com"
-        self.assert_json_error(self.invite(invitee_emails, []),
-                               "You must specify at least one stream for invitees to join.")
+        self.assert_json_error(
+            self.invite(invitee_emails, []),
+            "You must specify at least one stream for invitees to join.",
+        )
 
         for address in ("noatsign.com", "outsideyourdomain@example.net"):
             self.assert_json_error(
                 self.invite(address, ["Denmark"]),
-                "Some emails did not validate, so we didn't send any invitations.")
+                "Some emails did not validate, so we didn't send any invitations.",
+            )
         self.check_sent_emails([])
 
         self.assert_json_error(
-            self.invite("", ["Denmark"]),
-            "You must specify at least one email address.")
+            self.invite("", ["Denmark"]), "You must specify at least one email address."
+        )
         self.check_sent_emails([])
 
     def test_guest_user_invitation(self) -> None:
@@ -1291,8 +1394,10 @@ earl-test@zulip.com""", ["Denmark"]))
         Tests inviting to a non-existent stream.
         """
         self.login('hamlet')
-        self.assert_json_error(self.invite("iago-test@zulip.com", ["NotARealStream"]),
-                               f"Stream does not exist with id: {self.INVALID_STREAM_ID}. No invites were sent.")
+        self.assert_json_error(
+            self.invite("iago-test@zulip.com", ["NotARealStream"]),
+            f"Stream does not exist with id: {self.INVALID_STREAM_ID}. No invites were sent.",
+        )
         self.check_sent_emails([])
 
     def test_invite_existing_user(self) -> None:
@@ -1327,13 +1432,17 @@ earl-test@zulip.com""", ["Denmark"]))
         self.assert_json_success(result)
         self.check_sent_emails(['newuser@zulip.com'])
         from django.core.mail import outbox
+
         body = self.normalize_string(outbox[0].alternatives[0][0])
 
         # Verify that one can't get Zulip to send invitation emails
         # that third-party products will linkify using the full_name
         # field, because we've included that field inside the mailto:
         # link for the sender.
-        self.assertIn('<a href="mailto:hamlet@zulip.com" style="color:#46aa8f; text-decoration:underline">&lt;/a&gt; https://www.google.com (hamlet@zulip.com)</a> wants', body)
+        self.assertIn(
+            '<a href="mailto:hamlet@zulip.com" style="color:#46aa8f; text-decoration:underline">&lt;/a&gt; https://www.google.com (hamlet@zulip.com)</a> wants',
+            body,
+        )
 
         # TODO: Ideally, this test would also test the Invitation
         # Reminder email generated, but the test setup for that is
@@ -1348,15 +1457,18 @@ earl-test@zulip.com""", ["Denmark"]))
         existing = [self.example_email("hamlet"), "othello@zulip.com"]
         new = ["foo-test@zulip.com", "bar-test@zulip.com"]
         invitee_emails = "\n".join(existing + new)
-        self.assert_json_error(self.invite(invitee_emails, ["Denmark"]),
-                               "Some of those addresses are already using Zulip, \
-so we didn't send them an invitation. We did send invitations to everyone else!")
+        self.assert_json_error(
+            self.invite(invitee_emails, ["Denmark"]),
+            "Some of those addresses are already using Zulip, \
+so we didn't send them an invitation. We did send invitations to everyone else!",
+        )
 
         # We only created accounts for the new users.
         for email in existing:
-            self.assertRaises(PreregistrationUser.DoesNotExist,
-                              lambda: PreregistrationUser.objects.get(
-                                  email=email))
+            self.assertRaises(
+                PreregistrationUser.DoesNotExist,
+                lambda: PreregistrationUser.objects.get(email=email),
+            )
         for email in new:
             self.assertTrue(PreregistrationUser.objects.get(email=email))
 
@@ -1380,7 +1492,8 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
 
         self.assert_json_error(
             self.invite(external_address, ["Denmark"]),
-            "Some emails did not validate, so we didn't send any invitations.")
+            "Some emails did not validate, so we didn't send any invitations.",
+        )
 
     def test_invite_using_disposable_email(self) -> None:
         """
@@ -1397,7 +1510,8 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
 
         self.assert_json_error(
             self.invite(external_address, ["Denmark"]),
-            "Some emails did not validate, so we didn't send any invitations.")
+            "Some emails did not validate, so we didn't send any invitations.",
+        )
 
     def test_invite_outside_domain_in_open_realm(self) -> None:
         """
@@ -1487,7 +1601,9 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
 
         result = self.submit_reg_form_for_user(external_address, "password")
         self.assertEqual(result.status_code, 200)
-        self.assert_in_response("Zulip Dev, does not allow signups using emails\n        that contains +", result)
+        self.assert_in_response(
+            "Zulip Dev, does not allow signups using emails\n        that contains +", result
+        )
 
     def test_invalid_email_check_after_confirming_email(self) -> None:
         self.login('hamlet')
@@ -1502,7 +1618,9 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
 
         result = self.submit_reg_form_for_user(email, "password")
         self.assertEqual(result.status_code, 200)
-        self.assert_in_response("The email address you are trying to sign up with is not valid", result)
+        self.assert_in_response(
+            "The email address you are trying to sign up with is not valid", result
+        )
 
     def test_invite_with_non_ascii_streams(self) -> None:
         """
@@ -1544,10 +1662,15 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         with self.settings(EMAIL_BACKEND='django.core.mail.backends.console.EmailBackend'):
             email = data["email"]
             send_future_email(
-                "zerver/emails/invitation_reminder", referrer.realm, to_emails=[email],
-                from_address=FromAddress.no_reply_placeholder, context=context)
+                "zerver/emails/invitation_reminder",
+                referrer.realm,
+                to_emails=[email],
+                from_address=FromAddress.no_reply_placeholder,
+                context=context,
+            )
         email_jobs_to_deliver = ScheduledEmail.objects.filter(
-            scheduled_timestamp__lte=timezone_now())
+            scheduled_timestamp__lte=timezone_now()
+        )
         self.assertEqual(len(email_jobs_to_deliver), 1)
         email_count = len(outbox)
         for job in email_jobs_to_deliver:
@@ -1559,16 +1682,22 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         with self.settings(EMAIL_BACKEND='django.core.mail.backends.console.EmailBackend'):
             email = data["email"]
             send_future_email(
-                "zerver/emails/invitation_reminder", referrer.realm, to_emails=[email],
-                from_address=FromAddress.no_reply_placeholder, context=context)
+                "zerver/emails/invitation_reminder",
+                referrer.realm,
+                to_emails=[email],
+                from_address=FromAddress.no_reply_placeholder,
+                context=context,
+            )
 
         email_jobs_to_deliver = ScheduledEmail.objects.filter(
-            scheduled_timestamp__lte=timezone_now(), type=ScheduledEmail.INVITATION_REMINDER)
+            scheduled_timestamp__lte=timezone_now(), type=ScheduledEmail.INVITATION_REMINDER
+        )
         self.assertEqual(len(email_jobs_to_deliver), 1)
 
         self.register(invitee_email, "test")
         email_jobs_to_deliver = ScheduledEmail.objects.filter(
-            scheduled_timestamp__lte=timezone_now(), type=ScheduledEmail.INVITATION_REMINDER)
+            scheduled_timestamp__lte=timezone_now(), type=ScheduledEmail.INVITATION_REMINDER
+        )
         self.assertEqual(len(email_jobs_to_deliver), 0)
 
     def test_no_invitation_reminder_when_link_expires_quickly(self) -> None:
@@ -1576,11 +1705,15 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         # Check invitation reminder email is scheduled with 4 day link expiry
         with self.settings(INVITATION_LINK_VALIDITY_DAYS=4):
             self.invite('alice@zulip.com', ['Denmark'])
-        self.assertEqual(ScheduledEmail.objects.filter(type=ScheduledEmail.INVITATION_REMINDER).count(), 1)
+        self.assertEqual(
+            ScheduledEmail.objects.filter(type=ScheduledEmail.INVITATION_REMINDER).count(), 1
+        )
         # Check invitation reminder email is not scheduled with 3 day link expiry
         with self.settings(INVITATION_LINK_VALIDITY_DAYS=3):
             self.invite('bob@zulip.com', ['Denmark'])
-        self.assertEqual(ScheduledEmail.objects.filter(type=ScheduledEmail.INVITATION_REMINDER).count(), 1)
+        self.assertEqual(
+            ScheduledEmail.objects.filter(type=ScheduledEmail.INVITATION_REMINDER).count(), 1
+        )
 
     # make sure users can't take a valid confirmation key from another
     # pathway and use it with the invitation URL route
@@ -1589,7 +1722,8 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         realm = get_realm('zulip')
         inviter = self.example_user('iago')
         prereg_user = PreregistrationUser.objects.create(
-            email=email, referred_by=inviter, realm=realm)
+            email=email, referred_by=inviter, realm=realm
+        )
         url = create_confirmation_link(prereg_user, Confirmation.USER_REGISTRATION)
         registration_key = url.split('/')[-1]
 
@@ -1603,14 +1737,17 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         email_change_key = email_change_url.split('/')[-1]
         url = '/accounts/do_confirm/' + email_change_key
         result = self.client_get(url)
-        self.assert_in_success_response(["Whoops. We couldn't find your confirmation link in the system."], result)
+        self.assert_in_success_response(
+            ["Whoops. We couldn't find your confirmation link in the system."], result
+        )
 
     def test_confirmation_expired(self) -> None:
         email = self.nonreg_email("alice")
         realm = get_realm('zulip')
         inviter = self.example_user('iago')
         prereg_user = PreregistrationUser.objects.create(
-            email=email, referred_by=inviter, realm=realm)
+            email=email, referred_by=inviter, realm=realm
+        )
         url = create_confirmation_link(prereg_user, Confirmation.USER_REGISTRATION)
         registration_key = url.split('/')[-1]
 
@@ -1620,7 +1757,9 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
 
         target_url = '/' + url.split('/', 3)[3]
         result = self.client_get(target_url)
-        self.assert_in_success_response(["Whoops. The confirmation link has expired or been deactivated."], result)
+        self.assert_in_success_response(
+            ["Whoops. The confirmation link has expired or been deactivated."], result
+        )
 
     def test_send_more_than_one_invite_to_same_user(self) -> None:
         self.user_profile = self.example_user('iago')
@@ -1645,9 +1784,11 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         )
 
         accepted_invite = PreregistrationUser.objects.filter(
-            email__iexact="foo@zulip.com", status=confirmation_settings.STATUS_ACTIVE)
+            email__iexact="foo@zulip.com", status=confirmation_settings.STATUS_ACTIVE
+        )
         revoked_invites = PreregistrationUser.objects.filter(
-            email__iexact="foo@zulip.com", status=confirmation_settings.STATUS_REVOKED)
+            email__iexact="foo@zulip.com", status=confirmation_settings.STATUS_REVOKED
+        )
         # If a user was invited more than once, when it accepts one invite and register
         # the others must be canceled.
         self.assertEqual(len(accepted_invite), 1)
@@ -1657,7 +1798,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         self.assertEqual(set(revoked_invites), expected_revoked_invites)
 
     def test_confirmation_obj_not_exist_error(self) -> None:
-        """ Since the key is a param input by the user to the registration endpoint,
+        """Since the key is a param input by the user to the registration endpoint,
         if it inserts an invalid value, the confirmation object won't be found. This
         tests if, in that scenario, we handle the exception by redirecting the user to
         the confirmation_link_expired_error page.
@@ -1667,17 +1808,24 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         realm = get_realm('zulip')
         inviter = self.example_user('iago')
         prereg_user = PreregistrationUser.objects.create(
-            email=email, referred_by=inviter, realm=realm)
+            email=email, referred_by=inviter, realm=realm
+        )
         confirmation_link = create_confirmation_link(prereg_user, Confirmation.USER_REGISTRATION)
 
         registration_key = 'invalid_confirmation_key'
         url = '/accounts/register/'
-        response = self.client_post(url, {'key': registration_key, 'from_confirmation': 1, 'full_nme': 'alice'})
+        response = self.client_post(
+            url, {'key': registration_key, 'from_confirmation': 1, 'full_nme': 'alice'}
+        )
         self.assertEqual(response.status_code, 200)
-        self.assert_in_success_response(['The registration link has expired or is not valid.'], response)
+        self.assert_in_success_response(
+            ['The registration link has expired or is not valid.'], response
+        )
 
         registration_key = confirmation_link.split('/')[-1]
-        response = self.client_post(url, {'key': registration_key, 'from_confirmation': 1, 'full_nme': 'alice'})
+        response = self.client_post(
+            url, {'key': registration_key, 'from_confirmation': 1, 'full_nme': 'alice'}
+        )
         self.assert_in_success_response(['We just need you to do one last thing.'], response)
         response = self.submit_reg_form_for_user(email, password, key=registration_key)
         self.assertEqual(response.status_code, 302)
@@ -1688,20 +1836,28 @@ so we didn't send them an invitation. We did send invitations to everyone else!"
         realm = get_realm('zulip')
         inviter = self.example_user('iago')
         prereg_user = PreregistrationUser.objects.create(
-            email=email, referred_by=inviter, realm=realm)
+            email=email, referred_by=inviter, realm=realm
+        )
 
         confirmation_link = create_confirmation_link(prereg_user, Confirmation.USER_REGISTRATION)
         registration_key = confirmation_link.split('/')[-1]
 
         url = "/accounts/register/"
-        self.client_post(url, {"key": registration_key, "from_confirmation": 1, "full_name": "alice"})
+        self.client_post(
+            url, {"key": registration_key, "from_confirmation": 1, "full_name": "alice"}
+        )
         self.submit_reg_form_for_user(email, password, key=registration_key)
 
         url = "/accounts/register/"
-        response = self.client_post(url, {"key": registration_key, "from_confirmation": 1, "full_name": "alice"})
+        response = self.client_post(
+            url, {"key": registration_key, "from_confirmation": 1, "full_name": "alice"}
+        )
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, reverse('login') + '?' +
-                         urlencode({"email": email, "already_registered": 1}))
+        self.assertEqual(
+            response.url,
+            reverse('login') + '?' + urlencode({"email": email, "already_registered": 1}),
+        )
+
 
 class InvitationsTestCase(InviteUserBase):
     def test_do_get_user_invites(self) -> None:
@@ -1718,9 +1874,12 @@ class InvitationsTestCase(InviteUserBase):
         prereg_user_four = PreregistrationUser(email="TestFour@zulip.com", referred_by=othello)
         prereg_user_four.save()
         prereg_user_other_realm = PreregistrationUser(
-            email="TestOne@zulip.com", referred_by=self.mit_user("sipbtest"))
+            email="TestOne@zulip.com", referred_by=self.mit_user("sipbtest")
+        )
         prereg_user_other_realm.save()
-        multiuse_invite = MultiuseInvite.objects.create(referred_by=user_profile, realm=user_profile.realm)
+        multiuse_invite = MultiuseInvite.objects.create(
+            referred_by=user_profile, realm=user_profile.realm
+        )
         create_confirmation_link(multiuse_invite, Confirmation.MULTIUSE_INVITE)
         self.assertEqual(len(do_get_user_invites(user_profile)), 5)
         self.assertEqual(len(do_get_user_invites(hamlet)), 1)
@@ -1741,12 +1900,15 @@ class InvitationsTestCase(InviteUserBase):
 
         prereg_user_one = PreregistrationUser(email="TestOne@zulip.com", referred_by=user_profile)
         prereg_user_one.save()
-        expired_datetime = timezone_now() - datetime.timedelta(days=(days_to_activate+1))
+        expired_datetime = timezone_now() - datetime.timedelta(days=(days_to_activate + 1))
         prereg_user_two = PreregistrationUser(email="TestTwo@zulip.com", referred_by=user_profile)
         prereg_user_two.save()
-        PreregistrationUser.objects.filter(id=prereg_user_two.id).update(invited_at=expired_datetime)
-        prereg_user_three = PreregistrationUser(email="TestThree@zulip.com",
-                                                referred_by=user_profile, status=active_value)
+        PreregistrationUser.objects.filter(id=prereg_user_two.id).update(
+            invited_at=expired_datetime
+        )
+        prereg_user_three = PreregistrationUser(
+            email="TestThree@zulip.com", referred_by=user_profile, status=active_value
+        )
         prereg_user_three.save()
 
         hamlet = self.example_user('hamlet')
@@ -1783,17 +1945,19 @@ class InvitationsTestCase(InviteUserBase):
         prereg_user = PreregistrationUser.objects.get(email=invitee)
 
         # Verify that the scheduled email exists.
-        ScheduledEmail.objects.get(address__iexact=invitee,
-                                   type=ScheduledEmail.INVITATION_REMINDER)
+        ScheduledEmail.objects.get(address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER)
 
         result = self.client_delete('/json/invites/' + str(prereg_user.id))
         self.assertEqual(result.status_code, 200)
         error_result = self.client_delete('/json/invites/' + str(prereg_user.id))
         self.assert_json_error(error_result, "No such invitation")
 
-        self.assertRaises(ScheduledEmail.DoesNotExist,
-                          lambda: ScheduledEmail.objects.get(address__iexact=invitee,
-                                                             type=ScheduledEmail.INVITATION_REMINDER))
+        self.assertRaises(
+            ScheduledEmail.DoesNotExist,
+            lambda: ScheduledEmail.objects.get(
+                address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+            ),
+        )
 
     def test_successful_member_delete_invitation(self) -> None:
         """
@@ -1806,54 +1970,59 @@ class InvitationsTestCase(InviteUserBase):
         self.assert_json_success(self.invite(invitee, ['Denmark']))
 
         # Verify that the scheduled email exists.
-        prereg_user = PreregistrationUser.objects.get(email=invitee,
-                                                      referred_by=user_profile)
-        ScheduledEmail.objects.get(address__iexact=invitee,
-                                   type=ScheduledEmail.INVITATION_REMINDER)
+        prereg_user = PreregistrationUser.objects.get(email=invitee, referred_by=user_profile)
+        ScheduledEmail.objects.get(address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER)
 
         # Verify another non-admin can't delete
-        result = self.api_delete(self.example_user("othello"),
-                                 '/api/v1/invites/' + str(prereg_user.id))
+        result = self.api_delete(
+            self.example_user("othello"), '/api/v1/invites/' + str(prereg_user.id)
+        )
         self.assert_json_error(result, "Must be an organization administrator")
 
         # Verify that the scheduled email still exists.
-        prereg_user = PreregistrationUser.objects.get(email=invitee,
-                                                      referred_by=user_profile)
-        ScheduledEmail.objects.get(address__iexact=invitee,
-                                   type=ScheduledEmail.INVITATION_REMINDER)
+        prereg_user = PreregistrationUser.objects.get(email=invitee, referred_by=user_profile)
+        ScheduledEmail.objects.get(address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER)
 
         # Verify deletion works.
-        result = self.api_delete(user_profile,
-                                 '/api/v1/invites/' + str(prereg_user.id))
+        result = self.api_delete(user_profile, '/api/v1/invites/' + str(prereg_user.id))
         self.assertEqual(result.status_code, 200)
 
-        result = self.api_delete(user_profile,
-                                 '/api/v1/invites/' + str(prereg_user.id))
+        result = self.api_delete(user_profile, '/api/v1/invites/' + str(prereg_user.id))
         self.assert_json_error(result, "No such invitation")
 
-        self.assertRaises(ScheduledEmail.DoesNotExist,
-                          lambda: ScheduledEmail.objects.get(address__iexact=invitee,
-                                                             type=ScheduledEmail.INVITATION_REMINDER))
+        self.assertRaises(
+            ScheduledEmail.DoesNotExist,
+            lambda: ScheduledEmail.objects.get(
+                address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+            ),
+        )
 
     def test_delete_owner_invitation(self) -> None:
         self.login('desdemona')
         owner = self.example_user('desdemona')
 
         invitee = "DeleteMe@zulip.com"
-        self.assert_json_success(self.invite(invitee, ['Denmark'],
-                                 invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER']))
+        self.assert_json_success(
+            self.invite(
+                invitee, ['Denmark'], invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER']
+            )
+        )
         prereg_user = PreregistrationUser.objects.get(email=invitee)
-        result = self.api_delete(self.example_user('iago'),
-                                 '/api/v1/invites/' + str(prereg_user.id))
+        result = self.api_delete(
+            self.example_user('iago'), '/api/v1/invites/' + str(prereg_user.id)
+        )
         self.assert_json_error(result, "Must be an organization owner")
 
         result = self.api_delete(owner, '/api/v1/invites/' + str(prereg_user.id))
         self.assert_json_success(result)
         result = self.api_delete(owner, '/api/v1/invites/' + str(prereg_user.id))
-        self.assert_json_error(result,  "No such invitation")
-        self.assertRaises(ScheduledEmail.DoesNotExist,
-                          lambda: ScheduledEmail.objects.get(address__iexact=invitee,
-                                                             type=ScheduledEmail.INVITATION_REMINDER))
+        self.assert_json_error(result, "No such invitation")
+        self.assertRaises(
+            ScheduledEmail.DoesNotExist,
+            lambda: ScheduledEmail.objects.get(
+                address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+            ),
+        )
 
     def test_delete_multiuse_invite(self) -> None:
         """
@@ -1863,7 +2032,9 @@ class InvitationsTestCase(InviteUserBase):
         self.login('iago')
 
         zulip_realm = get_realm("zulip")
-        multiuse_invite = MultiuseInvite.objects.create(referred_by=self.example_user("hamlet"), realm=zulip_realm)
+        multiuse_invite = MultiuseInvite.objects.create(
+            referred_by=self.example_user("hamlet"), realm=zulip_realm
+        )
         create_confirmation_link(multiuse_invite, Confirmation.MULTIUSE_INVITE)
         result = self.client_delete('/json/invites/multiuse/' + str(multiuse_invite.id))
         self.assertEqual(result.status_code, 200)
@@ -1873,8 +2044,11 @@ class InvitationsTestCase(InviteUserBase):
         self.assert_json_error(error_result, "No such invitation")
 
         # Test deleting owner mutiuse_invite.
-        multiuse_invite = MultiuseInvite.objects.create(referred_by=self.example_user("desdemona"), realm=zulip_realm,
-                                                        invited_as=PreregistrationUser.INVITE_AS['REALM_OWNER'])
+        multiuse_invite = MultiuseInvite.objects.create(
+            referred_by=self.example_user("desdemona"),
+            realm=zulip_realm,
+            invited_as=PreregistrationUser.INVITE_AS['REALM_OWNER'],
+        )
         create_confirmation_link(multiuse_invite, Confirmation.MULTIUSE_INVITE)
         error_result = self.client_delete('/json/invites/multiuse/' + str(multiuse_invite.id))
         self.assert_json_error(error_result, 'Must be an organization owner')
@@ -1886,9 +2060,13 @@ class InvitationsTestCase(InviteUserBase):
 
         # Test deleting multiuse invite from another realm
         mit_realm = get_realm("zephyr")
-        multiuse_invite_in_mit = MultiuseInvite.objects.create(referred_by=self.mit_user("sipbtest"), realm=mit_realm)
+        multiuse_invite_in_mit = MultiuseInvite.objects.create(
+            referred_by=self.mit_user("sipbtest"), realm=mit_realm
+        )
         create_confirmation_link(multiuse_invite_in_mit, Confirmation.MULTIUSE_INVITE)
-        error_result = self.client_delete('/json/invites/multiuse/' + str(multiuse_invite_in_mit.id))
+        error_result = self.client_delete(
+            '/json/invites/multiuse/' + str(multiuse_invite_in_mit.id)
+        )
         self.assert_json_error(error_result, "No such invitation")
 
     def test_successful_resend_invitation(self) -> None:
@@ -1905,23 +2083,30 @@ class InvitationsTestCase(InviteUserBase):
         # Verify and then clear from the outbox the original invite email
         self.check_sent_emails([invitee], custom_from_name="Zulip")
         from django.core.mail import outbox
+
         outbox.pop()
 
         # Verify that the scheduled email exists.
         scheduledemail_filter = ScheduledEmail.objects.filter(
-            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER)
+            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+        )
         self.assertEqual(scheduledemail_filter.count(), 1)
         original_timestamp = scheduledemail_filter.values_list('scheduled_timestamp', flat=True)
 
         # Resend invite
         result = self.client_post('/json/invites/' + str(prereg_user.id) + '/resend')
-        self.assertEqual(ScheduledEmail.objects.filter(
-            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER).count(), 1)
+        self.assertEqual(
+            ScheduledEmail.objects.filter(
+                address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+            ).count(),
+            1,
+        )
 
         # Check that we have exactly one scheduled email, and that it is different
         self.assertEqual(scheduledemail_filter.count(), 1)
-        self.assertNotEqual(original_timestamp,
-                            scheduledemail_filter.values_list('scheduled_timestamp', flat=True))
+        self.assertNotEqual(
+            original_timestamp, scheduledemail_filter.values_list('scheduled_timestamp', flat=True)
+        )
 
         self.assertEqual(result.status_code, 200)
         error_result = self.client_post('/json/invites/' + str(9999) + '/resend')
@@ -1946,23 +2131,30 @@ class InvitationsTestCase(InviteUserBase):
         # Verify and then clear from the outbox the original invite email
         self.check_sent_emails([invitee], custom_from_name="Zulip")
         from django.core.mail import outbox
+
         outbox.pop()
 
         # Verify that the scheduled email exists.
         scheduledemail_filter = ScheduledEmail.objects.filter(
-            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER)
+            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+        )
         self.assertEqual(scheduledemail_filter.count(), 1)
         original_timestamp = scheduledemail_filter.values_list('scheduled_timestamp', flat=True)
 
         # Resend invite
         result = self.client_post('/json/invites/' + str(prereg_user.id) + '/resend')
-        self.assertEqual(ScheduledEmail.objects.filter(
-            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER).count(), 1)
+        self.assertEqual(
+            ScheduledEmail.objects.filter(
+                address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+            ).count(),
+            1,
+        )
 
         # Check that we have exactly one scheduled email, and that it is different
         self.assertEqual(scheduledemail_filter.count(), 1)
-        self.assertNotEqual(original_timestamp,
-                            scheduledemail_filter.values_list('scheduled_timestamp', flat=True))
+        self.assertNotEqual(
+            original_timestamp, scheduledemail_filter.values_list('scheduled_timestamp', flat=True)
+        )
 
         self.assertEqual(result.status_code, 200)
         error_result = self.client_post('/json/invites/' + str(9999) + '/resend')
@@ -1983,11 +2175,15 @@ class InvitationsTestCase(InviteUserBase):
         self.login("desdemona")
 
         invitee = "resend_owner@zulip.com"
-        self.assert_json_success(self.invite(invitee, ['Denmark'],
-                                             invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER']))
+        self.assert_json_success(
+            self.invite(
+                invitee, ['Denmark'], invite_as=PreregistrationUser.INVITE_AS['REALM_OWNER']
+            )
+        )
         self.check_sent_emails([invitee], custom_from_name="Zulip")
         scheduledemail_filter = ScheduledEmail.objects.filter(
-            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER)
+            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+        )
         self.assertEqual(scheduledemail_filter.count(), 1)
         original_timestamp = scheduledemail_filter.values_list('scheduled_timestamp', flat=True)
 
@@ -2001,18 +2197,24 @@ class InvitationsTestCase(InviteUserBase):
         result = self.client_post('/json/invites/' + str(prereg_user.id) + '/resend')
         self.assert_json_success(result)
 
-        self.assertEqual(ScheduledEmail.objects.filter(
-            address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER).count(), 1)
+        self.assertEqual(
+            ScheduledEmail.objects.filter(
+                address__iexact=invitee, type=ScheduledEmail.INVITATION_REMINDER
+            ).count(),
+            1,
+        )
 
         # Check that we have exactly one scheduled email, and that it is different
         self.assertEqual(scheduledemail_filter.count(), 1)
-        self.assertNotEqual(original_timestamp,
-                            scheduledemail_filter.values_list('scheduled_timestamp', flat=True))
+        self.assertNotEqual(
+            original_timestamp, scheduledemail_filter.values_list('scheduled_timestamp', flat=True)
+        )
 
     def test_accessing_invites_in_another_realm(self) -> None:
         inviter = UserProfile.objects.exclude(realm=get_realm('zulip')).first()
         prereg_user = PreregistrationUser.objects.create(
-            email='email', referred_by=inviter, realm=inviter.realm)
+            email='email', referred_by=inviter, realm=inviter.realm
+        )
         self.login('iago')
         error_result = self.client_post('/json/invites/' + str(prereg_user.id) + '/resend')
         self.assert_json_error(error_result, "No such invitation")
@@ -2026,16 +2228,16 @@ class InvitationsTestCase(InviteUserBase):
 
         inviter = UserProfile.objects.first()
         prereg_user = PreregistrationUser.objects.create(
-            email=email, referred_by=inviter, realm=realm)
+            email=email, referred_by=inviter, realm=realm
+        )
 
         confirmation_link = create_confirmation_link(prereg_user, Confirmation.USER_REGISTRATION)
         registration_key = confirmation_link.split('/')[-1]
 
         result = self.client_post(
             "/accounts/register/",
-            {"key": registration_key,
-             "from_confirmation": "1",
-             "full_name": "alice"})
+            {"key": registration_key, "from_confirmation": "1", "full_name": "alice"},
+        )
         self.assertEqual(result.status_code, 200)
         confirmation = Confirmation.objects.get(confirmation_key=registration_key)
         prereg_user = confirmation.content_object
@@ -2043,13 +2245,13 @@ class InvitationsTestCase(InviteUserBase):
 
         result = self.submit_reg_form_for_user(email, password, key=registration_key)
         self.assertEqual(result.status_code, 302)
-        prereg_user = PreregistrationUser.objects.get(
-            email=email, referred_by=inviter, realm=realm)
+        prereg_user = PreregistrationUser.objects.get(email=email, referred_by=inviter, realm=realm)
         self.assertEqual(prereg_user.status, confirmation_settings.STATUS_ACTIVE)
         user = get_user_by_delivery_email(email, realm)
         self.assertIsNotNone(user)
         self.assertEqual(user.delivery_email, email)
 
+
 class InviteeEmailsParserTests(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -2068,7 +2270,9 @@ class InviteeEmailsParserTests(ZulipTestCase):
         self.assertEqual(get_invitee_emails_set(emails_raw), expected_set)
 
     def test_if_emails_from_email_client_separated_by_newlines_are_parsed_correctly(self) -> None:
-        emails_raw = f"Email One <{self.email1}>\nEmailTwo<{self.email2}>\nEmail Three<{self.email3}>"
+        emails_raw = (
+            f"Email One <{self.email1}>\nEmailTwo<{self.email2}>\nEmail Three<{self.email3}>"
+        )
         expected_set = {self.email1, self.email2, self.email3}
         self.assertEqual(get_invitee_emails_set(emails_raw), expected_set)
 
@@ -2077,6 +2281,7 @@ class InviteeEmailsParserTests(ZulipTestCase):
         expected_set = {self.email1, self.email2, self.email3}
         self.assertEqual(get_invitee_emails_set(emails_raw), expected_set)
 
+
 class MultiuseInviteTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -2084,8 +2289,9 @@ class MultiuseInviteTest(ZulipTestCase):
         self.realm.invite_required = True
         self.realm.save()
 
-    def generate_multiuse_invite_link(self, streams: Optional[List[Stream]]=None,
-                                      date_sent: Optional[datetime.datetime]=None) -> str:
+    def generate_multiuse_invite_link(
+        self, streams: Optional[List[Stream]] = None, date_sent: Optional[datetime.datetime] = None
+    ) -> str:
         invite = MultiuseInvite(realm=self.realm, referred_by=self.example_user("iago"))
         invite.save()
 
@@ -2095,8 +2301,12 @@ class MultiuseInviteTest(ZulipTestCase):
         if date_sent is None:
             date_sent = timezone_now()
         key = generate_key()
-        Confirmation.objects.create(content_object=invite, date_sent=date_sent,
-                                    confirmation_key=key, type=Confirmation.MULTIUSE_INVITE)
+        Confirmation.objects.create(
+            content_object=invite,
+            date_sent=date_sent,
+            confirmation_key=key,
+            type=Confirmation.MULTIUSE_INVITE,
+        )
 
         return confirmation_url(key, self.realm, Confirmation.MULTIUSE_INVITE)
 
@@ -2105,8 +2315,7 @@ class MultiuseInviteTest(ZulipTestCase):
 
         result = self.client_post(invite_link, {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2118,6 +2327,7 @@ class MultiuseInviteTest(ZulipTestCase):
         self.assertEqual(result.status_code, 302)
 
         from django.core.mail import outbox
+
         outbox.pop()
 
     def test_valid_multiuse_link(self) -> None:
@@ -2125,7 +2335,9 @@ class MultiuseInviteTest(ZulipTestCase):
         email2 = self.nonreg_email("test1")
         email3 = self.nonreg_email("alice")
 
-        date_sent = timezone_now() - datetime.timedelta(days=settings.INVITATION_LINK_VALIDITY_DAYS - 1)
+        date_sent = timezone_now() - datetime.timedelta(
+            days=settings.INVITATION_LINK_VALIDITY_DAYS - 1
+        )
         invite_link = self.generate_multiuse_invite_link(date_sent=date_sent)
 
         self.check_user_able_to_register(email1, invite_link)
@@ -2193,8 +2405,9 @@ class MultiuseInviteTest(ZulipTestCase):
         streams = [get_stream(stream_name, self.realm) for stream_name in stream_names]
         stream_ids = [stream.id for stream in streams]
 
-        result = self.client_post('/json/invites/multiuse',
-                                  {"stream_ids": orjson.dumps(stream_ids).decode()})
+        result = self.client_post(
+            '/json/invites/multiuse', {"stream_ids": orjson.dumps(stream_ids).decode()}
+        )
         self.assert_json_success(result)
 
         invite_link = result.json()["invite_link"]
@@ -2220,13 +2433,17 @@ class MultiuseInviteTest(ZulipTestCase):
 
     def test_multiuse_link_for_inviting_as_owner(self) -> None:
         self.login('iago')
-        result = self.client_post('/json/invites/multiuse',
-                                  {"invite_as": orjson.dumps(PreregistrationUser.INVITE_AS['REALM_OWNER']).decode()})
+        result = self.client_post(
+            '/json/invites/multiuse',
+            {"invite_as": orjson.dumps(PreregistrationUser.INVITE_AS['REALM_OWNER']).decode()},
+        )
         self.assert_json_error(result, "Must be an organization owner")
 
         self.login('desdemona')
-        result = self.client_post('/json/invites/multiuse',
-                                  {"invite_as": orjson.dumps(PreregistrationUser.INVITE_AS['REALM_OWNER']).decode()})
+        result = self.client_post(
+            '/json/invites/multiuse',
+            {"invite_as": orjson.dumps(PreregistrationUser.INVITE_AS['REALM_OWNER']).decode()},
+        )
         self.assert_json_success(result)
 
         invite_link = result.json()["invite_link"]
@@ -2234,10 +2451,12 @@ class MultiuseInviteTest(ZulipTestCase):
 
     def test_create_multiuse_link_invalid_stream_api_call(self) -> None:
         self.login('iago')
-        result = self.client_post('/json/invites/multiuse',
-                                  {"stream_ids": orjson.dumps([54321]).decode()})
+        result = self.client_post(
+            '/json/invites/multiuse', {"stream_ids": orjson.dumps([54321]).decode()}
+        )
         self.assert_json_error(result, "Invalid stream id 54321. No invites were sent.")
 
+
 class EmailUnsubscribeTests(ZulipTestCase):
     def test_error_unsubscribe(self) -> None:
 
@@ -2261,8 +2480,7 @@ class EmailUnsubscribeTests(ZulipTestCase):
         user_profile.enable_offline_email_notifications = True
         user_profile.save()
 
-        unsubscribe_link = one_click_unsubscribe_link(user_profile,
-                                                      "missed_messages")
+        unsubscribe_link = one_click_unsubscribe_link(user_profile, "missed_messages")
         result = self.client_get(urllib.parse.urlparse(unsubscribe_link).path)
 
         self.assertEqual(result.status_code, 200)
@@ -2300,10 +2518,21 @@ class EmailUnsubscribeTests(ZulipTestCase):
         self.assertTrue(user_profile.enable_digest_emails)
 
         # Enqueue a fake digest email.
-        context = {'name': '', 'realm_uri': '', 'unread_pms': [], 'hot_conversations': [],
-                   'new_users': [], 'new_streams': {'plain': []}, 'unsubscribe_link': ''}
-        send_future_email('zerver/emails/digest', user_profile.realm,
-                          to_user_ids=[user_profile.id], context=context)
+        context = {
+            'name': '',
+            'realm_uri': '',
+            'unread_pms': [],
+            'hot_conversations': [],
+            'new_users': [],
+            'new_streams': {'plain': []},
+            'unsubscribe_link': '',
+        }
+        send_future_email(
+            'zerver/emails/digest',
+            user_profile.realm,
+            to_user_ids=[user_profile.id],
+            context=context,
+        )
 
         self.assertEqual(1, ScheduledEmail.objects.filter(users=user_profile).count())
 
@@ -2337,9 +2566,10 @@ class EmailUnsubscribeTests(ZulipTestCase):
         user_profile.refresh_from_db()
         self.assertFalse(user_profile.enable_login_emails)
 
+
 class RealmCreationTest(ZulipTestCase):
     @override_settings(OPEN_REALM_CREATION=True)
-    def check_able_to_create_realm(self, email: str, password: str="test") -> None:
+    def check_able_to_create_realm(self, email: str, password: str = "test") -> None:
         notification_bot = get_system_bot(settings.NOTIFICATION_BOT)
         signups_stream, _ = create_stream_if_needed(notification_bot.realm, 'signups')
 
@@ -2351,8 +2581,7 @@ class RealmCreationTest(ZulipTestCase):
         # Create new realm with the email
         result = self.client_post('/new/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/new/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/new/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2363,7 +2592,9 @@ class RealmCreationTest(ZulipTestCase):
 
         result = self.submit_reg_form_for_user(email, password, realm_subdomain=string_id)
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].startswith('http://zuliptest.testserver/accounts/login/subdomain/'))
+        self.assertTrue(
+            result["Location"].startswith('http://zuliptest.testserver/accounts/login/subdomain/')
+        )
 
         # Make sure the realm is created
         realm = get_realm(string_id)
@@ -2381,8 +2612,9 @@ class RealmCreationTest(ZulipTestCase):
 
         # Check welcome messages
         for stream_name, text, message_count in [
-                (Realm.DEFAULT_NOTIFICATION_STREAM_NAME, 'with the topic', 3),
-                (Realm.INITIAL_PRIVATE_STREAM_NAME, 'private stream', 1)]:
+            (Realm.DEFAULT_NOTIFICATION_STREAM_NAME, 'with the topic', 3),
+            (Realm.INITIAL_PRIVATE_STREAM_NAME, 'private stream', 1),
+        ]:
             stream = get_stream(stream_name, realm)
             recipient = stream.recipient
             messages = Message.objects.filter(recipient=recipient).order_by('date_sent')
@@ -2413,8 +2645,9 @@ class RealmCreationTest(ZulipTestCase):
         self.init_default_ldap_database()
 
         with self.settings(LDAP_EMAIL_ATTR="mail"):
-            self.check_able_to_create_realm("newuser_email@zulip.com",
-                                            self.ldap_password("newuser_with_email"))
+            self.check_able_to_create_realm(
+                "newuser_email@zulip.com", self.ldap_password("newuser_with_email")
+            )
 
     def test_create_realm_as_system_bot(self) -> None:
         result = self.client_post('/new/', {'email': 'notification-bot@zulip.com'})
@@ -2448,8 +2681,7 @@ class RealmCreationTest(ZulipTestCase):
         # Create new realm with the email
         result = self.client_post('/new/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/new/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/new/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2458,9 +2690,9 @@ class RealmCreationTest(ZulipTestCase):
         result = self.client_get(confirmation_url)
         self.assertEqual(result.status_code, 200)
 
-        result = self.submit_reg_form_for_user(email, password,
-                                               realm_subdomain = string_id,
-                                               realm_name=realm_name)
+        result = self.submit_reg_form_for_user(
+            email, password, realm_subdomain=string_id, realm_name=realm_name
+        )
         self.assertEqual(result.status_code, 302)
 
         result = self.client_get(result.url, subdomain=string_id)
@@ -2487,8 +2719,7 @@ class RealmCreationTest(ZulipTestCase):
 
         result = self.client_post('/new/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/new/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/new/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2496,9 +2727,9 @@ class RealmCreationTest(ZulipTestCase):
         result = self.client_get(confirmation_url)
         self.assertEqual(result.status_code, 200)
 
-        result = self.submit_reg_form_for_user(email, password,
-                                               realm_subdomain = string_id,
-                                               realm_name=realm_name)
+        result = self.submit_reg_form_for_user(
+            email, password, realm_subdomain=string_id, realm_name=realm_name
+        )
         self.assertEqual(result.status_code, 302)
 
         result = self.client_get(result.url, subdomain=string_id)
@@ -2530,25 +2761,27 @@ class RealmCreationTest(ZulipTestCase):
         confirmation_url = self.get_confirmation_url_from_outbox(email)
         self.client_get(confirmation_url)
 
-        errors = {'id': "length 3 or greater",
-                  '-id': "cannot start or end with a",
-                  'string-ID': "lowercase letters",
-                  'string_id': "lowercase letters",
-                  'stream': "unavailable",
-                  'streams': "unavailable",
-                  'about': "unavailable",
-                  'abouts': "unavailable",
-                  'zephyr': "unavailable"}
+        errors = {
+            'id': "length 3 or greater",
+            '-id': "cannot start or end with a",
+            'string-ID': "lowercase letters",
+            'string_id': "lowercase letters",
+            'stream': "unavailable",
+            'streams': "unavailable",
+            'about': "unavailable",
+            'abouts': "unavailable",
+            'zephyr': "unavailable",
+        }
         for string_id, error_msg in errors.items():
-            result = self.submit_reg_form_for_user(email, password,
-                                                   realm_subdomain = string_id,
-                                                   realm_name = realm_name)
+            result = self.submit_reg_form_for_user(
+                email, password, realm_subdomain=string_id, realm_name=realm_name
+            )
             self.assert_in_response(error_msg, result)
 
         # test valid subdomain
-        result = self.submit_reg_form_for_user(email, password,
-                                               realm_subdomain = 'a-0',
-                                               realm_name = realm_name)
+        result = self.submit_reg_form_for_user(
+            email, password, realm_subdomain='a-0', realm_name=realm_name
+        )
         self.assertEqual(result.status_code, 302)
         self.assertTrue(result.url.startswith('http://a-0.testserver/accounts/login/subdomain/'))
 
@@ -2565,9 +2798,9 @@ class RealmCreationTest(ZulipTestCase):
         self.client_get(result["Location"])
         confirmation_url = self.get_confirmation_url_from_outbox(email)
         self.client_get(confirmation_url)
-        result = self.submit_reg_form_for_user(email, password,
-                                               realm_subdomain = "zulip",
-                                               realm_name = realm_name)
+        result = self.submit_reg_form_for_user(
+            email, password, realm_subdomain="zulip", realm_name=realm_name
+        )
         self.assert_in_response("Subdomain unavailable. Please choose a different one.", result)
 
     @override_settings(OPEN_REALM_CREATION=True)
@@ -2583,15 +2816,15 @@ class RealmCreationTest(ZulipTestCase):
 
         # test root domain will fail with ROOT_DOMAIN_LANDING_PAGE
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
-            result = self.submit_reg_form_for_user(email, password,
-                                                   realm_subdomain = '',
-                                                   realm_name = realm_name)
+            result = self.submit_reg_form_for_user(
+                email, password, realm_subdomain='', realm_name=realm_name
+            )
             self.assert_in_response('unavailable', result)
 
         # test valid use of root domain
-        result = self.submit_reg_form_for_user(email, password,
-                                               realm_subdomain = '',
-                                               realm_name = realm_name)
+        result = self.submit_reg_form_for_user(
+            email, password, realm_subdomain='', realm_name=realm_name
+        )
         self.assertEqual(result.status_code, 302)
         self.assertTrue(result.url.startswith('http://testserver/accounts/login/subdomain/'))
 
@@ -2608,17 +2841,23 @@ class RealmCreationTest(ZulipTestCase):
 
         # test root domain will fail with ROOT_DOMAIN_LANDING_PAGE
         with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
-            result = self.submit_reg_form_for_user(email, password,
-                                                   realm_subdomain = 'abcdef',
-                                                   realm_in_root_domain = 'true',
-                                                   realm_name = realm_name)
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                realm_subdomain='abcdef',
+                realm_in_root_domain='true',
+                realm_name=realm_name,
+            )
             self.assert_in_response('unavailable', result)
 
         # test valid use of root domain
-        result = self.submit_reg_form_for_user(email, password,
-                                               realm_subdomain = 'abcdef',
-                                               realm_in_root_domain = 'true',
-                                               realm_name = realm_name)
+        result = self.submit_reg_form_for_user(
+            email,
+            password,
+            realm_subdomain='abcdef',
+            realm_in_root_domain='true',
+            realm_name=realm_name,
+        )
         self.assertEqual(result.status_code, 302)
         self.assertTrue(result.url.startswith('http://testserver/accounts/login/subdomain/'))
 
@@ -2633,10 +2872,14 @@ class RealmCreationTest(ZulipTestCase):
 
     def test_subdomain_check_api(self) -> None:
         result = self.client_get("/json/realm/subdomain/zulip")
-        self.assert_in_success_response(["Subdomain unavailable. Please choose a different one."], result)
+        self.assert_in_success_response(
+            ["Subdomain unavailable. Please choose a different one."], result
+        )
 
         result = self.client_get("/json/realm/subdomain/zu_lip")
-        self.assert_in_success_response(["Subdomain can only have lowercase letters, numbers, and \'-\'s."], result)
+        self.assert_in_success_response(
+            ["Subdomain can only have lowercase letters, numbers, and \'-\'s."], result
+        )
 
         result = self.client_get("/json/realm/subdomain/hufflepuff")
         self.assert_in_success_response(["available"], result)
@@ -2655,7 +2898,7 @@ class RealmCreationTest(ZulipTestCase):
         with self.assertRaises(ValidationError):
             check_subdomain_available('-ba_d-', allow_reserved_subdomain=True)
 
-        with patch('zerver.lib.name_restrictions.is_reserved_subdomain', return_value = False):
+        with patch('zerver.lib.name_restrictions.is_reserved_subdomain', return_value=False):
             # Existing realms should never work even if they are not reserved keywords
             with self.assertRaises(ValidationError):
                 check_subdomain_available('zulip')
@@ -2667,8 +2910,8 @@ class RealmCreationTest(ZulipTestCase):
             check_subdomain_available('stream')
         check_subdomain_available('stream', allow_reserved_subdomain=True)
 
-class UserSignUpTest(InviteUserBase):
 
+class UserSignUpTest(InviteUserBase):
     def _assert_redirected_to(self, result: HttpResponse, url: str) -> None:
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result['LOCATION'], url)
@@ -2721,8 +2964,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2739,6 +2981,7 @@ class UserSignUpTest(InviteUserBase):
         self.assertEqual(user_profile.default_language, realm.default_language)
         self.assertEqual(user_profile.timezone, timezone)
         from django.core.mail import outbox
+
         outbox.pop()
 
     def test_default_twenty_four_hour_time(self) -> None:
@@ -2753,8 +2996,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2821,8 +3063,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2848,8 +3089,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2861,9 +3101,8 @@ class UserSignUpTest(InviteUserBase):
         with patch('zerver.views.registration.password_auth_enabled', return_value=False):
             result = self.client_post(
                 '/accounts/register/',
-                {'full_name': 'New User',
-                 'key': find_key_by_email(email),
-                 'terms': True})
+                {'full_name': 'New User', 'key': find_key_by_email(email), 'terms': True},
+            )
 
         # User should now be logged in.
         self.assertEqual(result.status_code, 302)
@@ -2880,8 +3119,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2892,10 +3130,13 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post(
             '/accounts/register/',
-            {'password': password,
-             'key': find_key_by_email(email),
-             'terms': True,
-             'from_confirmation': '1'})
+            {
+                'password': password,
+                'key': find_key_by_email(email),
+                'terms': True,
+                'from_confirmation': '1',
+            },
+        )
         self.assert_in_success_response(["We just need you to do one last thing."], result)
 
         # Verify that the user is asked for name and password
@@ -2906,12 +3147,12 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         from django.core.mail import outbox
+
         self.assertEqual(outbox[0].extra_headers["List-Id"], "Zulip Dev <zulip.testserver>")
 
     def test_signup_with_full_name(self) -> None:
@@ -2924,8 +3165,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2936,11 +3176,14 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post(
             '/accounts/register/',
-            {'password': password,
-             'key': find_key_by_email(email),
-             'terms': True,
-             'full_name': "New Guy",
-             'from_confirmation': '1'})
+            {
+                'password': password,
+                'key': find_key_by_email(email),
+                'terms': True,
+                'full_name': "New Guy",
+                'from_confirmation': '1',
+            },
+        )
         self.assert_in_success_response(["We just need you to do one last thing."], result)
 
     def test_signup_with_weak_password(self) -> None:
@@ -2952,8 +3195,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -2965,16 +3207,17 @@ class UserSignUpTest(InviteUserBase):
         with self.settings(PASSWORD_MIN_LENGTH=6, PASSWORD_MIN_GUESSES=1000):
             result = self.client_post(
                 '/accounts/register/',
-                {'password': 'easy',
-                 'key': find_key_by_email(email),
-                 'terms': True,
-                 'full_name': "New Guy",
-                 'from_confirmation': '1'})
+                {
+                    'password': 'easy',
+                    'key': find_key_by_email(email),
+                    'terms': True,
+                    'full_name': "New Guy",
+                    'from_confirmation': '1',
+                },
+            )
             self.assert_in_success_response(["We just need you to do one last thing."], result)
 
-            result = self.submit_reg_form_for_user(email,
-                                                   'easy',
-                                                   full_name="New Guy")
+            result = self.submit_reg_form_for_user(email, 'easy', full_name="New Guy")
             self.assert_in_success_response(["The password is too weak."], result)
             with self.assertRaises(UserProfile.DoesNotExist):
                 # Account wasn't created.
@@ -3029,15 +3272,13 @@ class UserSignUpTest(InviteUserBase):
         self.assertNotEqual(first_confirmation_url, second_confirmation_url)
 
         # Register the account (this will use the second confirmation url):
-        result = self.submit_reg_form_for_user(email, password, full_name="New Guy",
-                                               from_confirmation="1")
-        self.assert_in_success_response(["We just need you to do one last thing.",
-                                         "New Guy",
-                                         email],
-                                        result)
-        result = self.submit_reg_form_for_user(email,
-                                               password,
-                                               full_name="New Guy")
+        result = self.submit_reg_form_for_user(
+            email, password, full_name="New Guy", from_confirmation="1"
+        )
+        self.assert_in_success_response(
+            ["We just need you to do one last thing.", "New Guy", email], result
+        )
+        result = self.submit_reg_form_for_user(email, password, full_name="New Guy")
         user_profile = UserProfile.objects.get(delivery_email=email)
         self.assertEqual(user_profile.delivery_email, email)
 
@@ -3046,13 +3287,18 @@ class UserSignUpTest(InviteUserBase):
         self.assertEqual(result.status_code, 200)
         result = self.client_post(
             '/accounts/register/',
-            {'password': password,
-             'key': first_confirmation_key,
-             'terms': True,
-             'full_name': "New Guy",
-             'from_confirmation': '1'})
+            {
+                'password': password,
+                'key': first_confirmation_key,
+                'terms': True,
+                'full_name': "New Guy",
+                'from_confirmation': '1',
+            },
+        )
         # Error page should be displayed
-        self.assert_in_success_response(["The registration link has expired or is not valid."], result)
+        self.assert_in_success_response(
+            ["The registration link has expired or is not valid."], result
+        )
         self.assertEqual(result.status_code, 200)
 
     def test_signup_with_multiple_default_stream_groups(self) -> None:
@@ -3088,10 +3334,12 @@ class UserSignUpTest(InviteUserBase):
             group2_streams.append(stream)
         do_create_default_stream_group(realm, "group 2", "group 2 description", group2_streams)
 
-        result = self.submit_reg_form_for_user(email, password,
-                                               default_stream_groups=["group 1", "group 2"])
+        result = self.submit_reg_form_for_user(
+            email, password, default_stream_groups=["group 1", "group 2"]
+        )
         self.check_user_subscribed_only_to_streams(
-            "newguy", list(set(default_streams + group1_streams + group2_streams)))
+            "newguy", list(set(default_streams + group1_streams + group2_streams))
+        )
 
     def test_signup_without_user_settings_from_another_realm(self) -> None:
         hamlet_in_zulip = self.example_user('hamlet')
@@ -3116,8 +3364,9 @@ class UserSignUpTest(InviteUserBase):
         confirmation_url = self.get_confirmation_url_from_outbox(email)
         result = self.client_get(confirmation_url, subdomain=subdomain)
         self.assertEqual(result.status_code, 200)
-        result = self.submit_reg_form_for_user(email, password, source_realm="on",
-                                               HTTP_HOST=subdomain + ".testserver")
+        result = self.submit_reg_form_for_user(
+            email, password, source_realm="on", HTTP_HOST=subdomain + ".testserver"
+        )
 
         hamlet = get_user(self.example_email("hamlet"), realm)
         self.assertEqual(hamlet.left_side_userlist, False)
@@ -3157,16 +3406,21 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post(
             '/accounts/register/',
-            {'password': password,
-             'key': find_key_by_email(email),
-             'from_confirmation': '1'},
-            subdomain=subdomain)
-        self.assert_in_success_response(["Import settings from existing Zulip account",
-                                         "selected >\n                            Zulip Dev",
-                                         "We just need you to do one last thing."], result)
+            {'password': password, 'key': find_key_by_email(email), 'from_confirmation': '1'},
+            subdomain=subdomain,
+        )
+        self.assert_in_success_response(
+            [
+                "Import settings from existing Zulip account",
+                "selected >\n                            Zulip Dev",
+                "We just need you to do one last thing.",
+            ],
+            result,
+        )
 
-        result = self.submit_reg_form_for_user(email, password, source_realm="zulip",
-                                               HTTP_HOST=subdomain + ".testserver")
+        result = self.submit_reg_form_for_user(
+            email, password, source_realm="zulip", HTTP_HOST=subdomain + ".testserver"
+        )
 
         hamlet_in_lear = get_user(email, lear_realm)
         self.assertEqual(hamlet_in_lear.left_side_userlist, True)
@@ -3197,8 +3451,7 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/accounts/home/', {'email': email})
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
@@ -3215,11 +3468,17 @@ class UserSignUpTest(InviteUserBase):
             with self.assertLogs(level="ERROR") as m:
                 result = self.client_post(
                     '/accounts/register/',
-                    {'password': password,
-                     'full_name': 'New User',
-                     'key': find_key_by_email(email),
-                     'terms': True})
-                self.assertEqual(m.output, ["ERROR:root:Subdomain mismatch in registration zulip: newuser@zulip.com"])
+                    {
+                        'password': password,
+                        'full_name': 'New User',
+                        'key': find_key_by_email(email),
+                        'terms': True,
+                    },
+                )
+                self.assertEqual(
+                    m.output,
+                    ["ERROR:root:Subdomain mismatch in registration zulip: newuser@zulip.com"],
+                )
         self.assertEqual(result.status_code, 302)
 
     def test_replace_subdomain_in_confirmation_link(self) -> None:
@@ -3231,11 +3490,15 @@ class UserSignUpTest(InviteUserBase):
         self.client_post('/accounts/home/', {'email': email})
         result = self.client_post(
             '/accounts/register/',
-            {'password': "password",
-             'key': find_key_by_email(email),
-             'terms': True,
-             'full_name': "New User",
-             'from_confirmation': '1'},  subdomain="zephyr")
+            {
+                'password': "password",
+                'key': find_key_by_email(email),
+                'terms': True,
+                'full_name': "New User",
+                'from_confirmation': '1',
+            },
+            subdomain="zephyr",
+        )
         self.assert_in_success_response(["We couldn't find your confirmation link"], result)
 
     def test_failed_signup_due_to_restricted_domain(self) -> None:
@@ -3245,8 +3508,9 @@ class UserSignUpTest(InviteUserBase):
 
         email = 'user@acme.com'
         form = HomepageForm({'email': email}, realm=realm)
-        self.assertIn(f"Your email address, {email}, is not in one of the domains",
-                      form.errors['email'][0])
+        self.assertIn(
+            f"Your email address, {email}, is not in one of the domains", form.errors['email'][0]
+        )
 
     def test_failed_signup_due_to_disposable_email(self) -> None:
         realm = get_realm('zulip')
@@ -3265,7 +3529,10 @@ class UserSignUpTest(InviteUserBase):
 
         email = 'iago+label@zulip.com'
         form = HomepageForm({'email': email}, realm=realm)
-        self.assertIn("Email addresses containing + are not allowed in this organization.", form.errors['email'][0])
+        self.assertIn(
+            "Email addresses containing + are not allowed in this organization.",
+            form.errors['email'][0],
+        )
 
     def test_failed_signup_due_to_invite_required(self) -> None:
         realm = get_realm('zulip')
@@ -3273,20 +3540,26 @@ class UserSignUpTest(InviteUserBase):
         realm.save()
         email = 'user@zulip.com'
         form = HomepageForm({'email': email}, realm=realm)
-        self.assertIn(f"Please request an invite for {email} from",
-                      form.errors['email'][0])
+        self.assertIn(f"Please request an invite for {email} from", form.errors['email'][0])
 
     def test_failed_signup_due_to_nonexistent_realm(self) -> None:
         email = 'user@acme.com'
         form = HomepageForm({'email': email}, realm=None)
-        self.assertIn(f"organization you are trying to join using {email} does not exist", form.errors['email'][0])
+        self.assertIn(
+            f"organization you are trying to join using {email} does not exist",
+            form.errors['email'][0],
+        )
 
     def test_access_signup_page_in_root_domain_without_realm(self) -> None:
         result = self.client_get('/register', subdomain="", follow=True)
         self.assert_in_success_response(["Find your Zulip accounts"], result)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_registration_from_confirmation(self) -> None:
         password = self.ldap_password("newuser")
         email = "newuser@zulip.com"
@@ -3298,12 +3571,12 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
         # Visit the confirmation link.
         from django.core.mail import outbox
+
         for message in reversed(outbox):
             if email in message.to:
                 match = re.search(settings.EXTERNAL_HOST + r"(\S+)>", message.body)
@@ -3314,47 +3587,62 @@ class UserSignUpTest(InviteUserBase):
             raise AssertionError("Couldn't find a confirmation email.")
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             result = self.client_get(confirmation_url)
             self.assertEqual(result.status_code, 200)
 
             # Full name should be set from LDAP
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   from_confirmation="1",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                from_confirmation="1",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
 
-            self.assert_in_success_response(["We just need you to do one last thing.",
-                                             "New LDAP fullname",
-                                             "newuser@zulip.com"],
-                                            result)
+            self.assert_in_success_response(
+                [
+                    "We just need you to do one last thing.",
+                    "New LDAP fullname",
+                    "newuser@zulip.com",
+                ],
+                result,
+            )
 
             # Verify that the user is asked for name
             self.assert_in_success_response(['id_full_name'], result)
             # Verify that user is asked for its LDAP/Active Directory password.
-            self.assert_in_success_response(['Enter your LDAP/Active Directory password.',
-                                             'ldap-password'], result)
+            self.assert_in_success_response(
+                ['Enter your LDAP/Active Directory password.', 'ldap-password'], result
+            )
             self.assert_not_in_success_response(['id_password'], result)
 
             # Test the TypeError exception handler
-            with patch("zproject.backends.ZulipLDAPAuthBackendBase.get_mapped_name", side_effect=TypeError):
-                result = self.submit_reg_form_for_user(email,
-                                                       password,
-                                                       from_confirmation='1',
-                                                       # Pass HTTP_HOST for the target subdomain
-                                                       HTTP_HOST=subdomain + ".testserver")
-            self.assert_in_success_response(["We just need you to do one last thing.",
-                                             "newuser@zulip.com"],
-                                            result)
+            with patch(
+                "zproject.backends.ZulipLDAPAuthBackendBase.get_mapped_name", side_effect=TypeError
+            ):
+                result = self.submit_reg_form_for_user(
+                    email,
+                    password,
+                    from_confirmation='1',
+                    # Pass HTTP_HOST for the target subdomain
+                    HTTP_HOST=subdomain + ".testserver",
+                )
+            self.assert_in_success_response(
+                ["We just need you to do one last thing.", "newuser@zulip.com"], result
+            )
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipLDAPUserPopulator',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipLDAPUserPopulator',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_populate_only_registration_from_confirmation(self) -> None:
         password = self.ldap_password("newuser")
         email = "newuser@zulip.com"
@@ -3366,12 +3654,12 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
         # Visit the confirmation link.
         from django.core.mail import outbox
+
         for message in reversed(outbox):
             if email in message.to:
                 match = re.search(settings.EXTERNAL_HOST + r"(\S+)>", message.body)
@@ -3382,40 +3670,52 @@ class UserSignUpTest(InviteUserBase):
             raise AssertionError("Couldn't find a confirmation email.")
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_BIND_PASSWORD='',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
-                AUTH_LDAP_USER_DN_TEMPLATE='uid=%(user)s,ou=users,dc=zulip,dc=com'):
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_BIND_PASSWORD='',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            AUTH_LDAP_USER_DN_TEMPLATE='uid=%(user)s,ou=users,dc=zulip,dc=com',
+        ):
             result = self.client_get(confirmation_url)
             self.assertEqual(result.status_code, 200)
 
             # Full name should be set from LDAP
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   from_confirmation="1",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                from_confirmation="1",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
 
-            self.assert_in_success_response(["We just need you to do one last thing.",
-                                             "New LDAP fullname",
-                                             "newuser@zulip.com"],
-                                            result)
+            self.assert_in_success_response(
+                [
+                    "We just need you to do one last thing.",
+                    "New LDAP fullname",
+                    "newuser@zulip.com",
+                ],
+                result,
+            )
 
             # Verify that the user is asked for name
             self.assert_in_success_response(['id_full_name'], result)
             # Verify that user is NOT asked for its LDAP/Active Directory password.
             # LDAP is not configured for authentication in this test.
-            self.assert_not_in_success_response(['Enter your LDAP/Active Directory password.',
-                                                 'ldap-password'], result)
+            self.assert_not_in_success_response(
+                ['Enter your LDAP/Active Directory password.', 'ldap-password'], result
+            )
             # If we were using e.g. the SAML auth backend, there
             # shouldn't be a password prompt, but since it uses the
             # EmailAuthBackend, there should be password field here.
             self.assert_in_success_response(['id_password'], result)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_registration_end_to_end(self) -> None:
         password = self.ldap_password("newuser")
         email = "newuser@zulip.com"
@@ -3429,36 +3729,38 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             # Click confirmation link
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   from_confirmation="1",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                from_confirmation="1",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
 
             # Full name should be set from LDAP
-            self.assert_in_success_response(["We just need you to do one last thing.",
-                                             full_name,
-                                             "newuser@zulip.com"],
-                                            result)
+            self.assert_in_success_response(
+                ["We just need you to do one last thing.", full_name, "newuser@zulip.com"], result
+            )
 
             # Submit the final form with the wrong password.
-            result = self.submit_reg_form_for_user(email,
-                                                   'wrongpassword',
-                                                   full_name=full_name,
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                'wrongpassword',
+                full_name=full_name,
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             # Didn't create an account
             with self.assertRaises(UserProfile.DoesNotExist):
                 user_profile = UserProfile.objects.get(delivery_email=email)
@@ -3466,17 +3768,23 @@ class UserSignUpTest(InviteUserBase):
             self.assertEqual(result.url, "/accounts/login/?email=newuser%40zulip.com")
 
             # Submit the final form with the correct password.
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name=full_name,
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name=full_name,
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             user_profile = UserProfile.objects.get(delivery_email=email)
             # Name comes from form which was set by LDAP.
             self.assertEqual(user_profile.full_name, full_name)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_split_full_name_mapping(self) -> None:
         self.init_default_ldap_database()
         ldap_user_attr_map = {'first_name': 'sn', 'last_name': 'cn'}
@@ -3488,36 +3796,43 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             # Click confirmation link
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   from_confirmation="1",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                from_confirmation="1",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
 
             # Test split name mapping.
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             user_profile = UserProfile.objects.get(delivery_email=email)
             # Name comes from form which was set by LDAP.
             self.assertEqual(user_profile.full_name, "First Last")
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_auto_registration_on_login(self) -> None:
         """The most common way for LDAP authentication to be used is with a
         server that doesn't have a terms-of-service required, in which
@@ -3539,21 +3854,23 @@ class UserSignUpTest(InviteUserBase):
         full_name = 'New LDAP fullname'
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
-            self.login_with_return(email, password,
-                                   HTTP_HOST=subdomain + ".testserver")
+            self.login_with_return(email, password, HTTP_HOST=subdomain + ".testserver")
 
             user_profile = UserProfile.objects.get(delivery_email=email)
             # Name comes from form which was set by LDAP.
             self.assertEqual(user_profile.full_name, full_name)
 
             # Test custom profile fields are properly synced.
-            phone_number_field = CustomProfileField.objects.get(realm=user_profile.realm, name='Phone number')
-            phone_number_field_value = CustomProfileFieldValue.objects.get(user_profile=user_profile,
-                                                                           field=phone_number_field)
+            phone_number_field = CustomProfileField.objects.get(
+                realm=user_profile.realm, name='Phone number'
+            )
+            phone_number_field_value = CustomProfileFieldValue.objects.get(
+                user_profile=user_profile, field=phone_number_field
+            )
             self.assertEqual(phone_number_field_value.value, 'a-new-number')
 
     @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))
@@ -3568,29 +3885,29 @@ class UserSignUpTest(InviteUserBase):
         do_create_realm('test', 'test', False)
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             subdomain = "zulip"
-            self.login_with_return(email, password,
-                                   HTTP_HOST=subdomain + ".testserver")
+            self.login_with_return(email, password, HTTP_HOST=subdomain + ".testserver")
 
-            user_profile = UserProfile.objects.get(
-                delivery_email=email, realm=get_realm('zulip'))
+            user_profile = UserProfile.objects.get(delivery_email=email, realm=get_realm('zulip'))
             self.logout()
 
             # Test registration in another realm works.
             subdomain = "test"
-            self.login_with_return(email, password,
-                                   HTTP_HOST=subdomain + ".testserver")
+            self.login_with_return(email, password, HTTP_HOST=subdomain + ".testserver")
 
-            user_profile = UserProfile.objects.get(
-                delivery_email=email, realm=get_realm('test'))
+            user_profile = UserProfile.objects.get(delivery_email=email, realm=get_realm('test'))
             self.assertEqual(user_profile.delivery_email, email)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_ldap_registration_when_names_changes_are_disabled(self) -> None:
         password = self.ldap_password("newuser")
         email = "newuser@zulip.com"
@@ -3603,38 +3920,45 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             # Click confirmation link. This will 'authenticated_full_name'
             # session variable which will be used to set the fullname of
             # the user.
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   from_confirmation="1",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                from_confirmation="1",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
 
             with patch('zerver.views.registration.name_changes_disabled', return_value=True):
-                result = self.submit_reg_form_for_user(email,
-                                                       password,
-                                                       # Pass HTTP_HOST for the target subdomain
-                                                       HTTP_HOST=subdomain + ".testserver")
+                result = self.submit_reg_form_for_user(
+                    email,
+                    password,
+                    # Pass HTTP_HOST for the target subdomain
+                    HTTP_HOST=subdomain + ".testserver",
+                )
             user_profile = UserProfile.objects.get(delivery_email=email)
             # Name comes from LDAP session.
             self.assertEqual(user_profile.full_name, 'New LDAP fullname')
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_signup_with_ldap_and_email_enabled_using_email_with_ldap_append_domain(self) -> None:
         password = "nonldappassword"
         email = "newuser@zulip.com"
@@ -3647,31 +3971,33 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         # If the user's email is inside the LDAP directory and we just
         # have a wrong password, then we refuse to create an account
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             result = self.submit_reg_form_for_user(
                 email,
                 password,
                 from_confirmation="1",
                 # Pass HTTP_HOST for the target subdomain
-                HTTP_HOST=subdomain + ".testserver")
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 200)
 
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Non-LDAP Full Name",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Non-LDAP Full Name",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 302)
             # We get redirected back to the login page because password was wrong
             self.assertEqual(result.url, "/accounts/login/?email=newuser%40zulip.com")
@@ -3683,30 +4009,35 @@ class UserSignUpTest(InviteUserBase):
         # If the user's email is not in the LDAP directory, but fits LDAP_APPEND_DOMAIN,
         # we refuse to create the account.
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ), self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Non-LDAP Full Name",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Non-LDAP Full Name",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 302)
             # We get redirected back to the login page because emails matching LDAP_APPEND_DOMAIN,
             # aren't allowed to create non-LDAP accounts.
             self.assertEqual(result.url, "/accounts/login/?email=newuser%40zulip.com")
             self.assertFalse(UserProfile.objects.filter(delivery_email=email).exists())
-            self.assertEqual(debug_log.output, [
-                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: newuser. Input username: newuser@zulip.com'
-            ])
+            self.assertEqual(
+                debug_log.output,
+                [
+                    'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: newuser. Input username: newuser@zulip.com'
+                ],
+            )
 
         # If the email is outside of LDAP_APPEND_DOMAIN, we successfully create a non-LDAP account,
         # with the password managed in the Zulip database.
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='example.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='example.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             with self.assertLogs(level="WARNING") as m:
                 result = self.submit_reg_form_for_user(
@@ -3714,27 +4045,40 @@ class UserSignUpTest(InviteUserBase):
                     password,
                     from_confirmation="1",
                     # Pass HTTP_HOST for the target subdomain
-                    HTTP_HOST=subdomain + ".testserver")
+                    HTTP_HOST=subdomain + ".testserver",
+                )
             self.assertEqual(result.status_code, 200)
-            self.assertEqual(m.output, ['WARNING:root:New account email newuser@zulip.com could not be found in LDAP'])
+            self.assertEqual(
+                m.output,
+                ['WARNING:root:New account email newuser@zulip.com could not be found in LDAP'],
+            )
             with self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
-                result = self.submit_reg_form_for_user(email,
-                                                       password,
-                                                       full_name="Non-LDAP Full Name",
-                                                       # Pass HTTP_HOST for the target subdomain
-                                                       HTTP_HOST=subdomain + ".testserver")
-            self.assertEqual(debug_log.output, [
-                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: Email newuser@zulip.com does not match LDAP domain example.com.'
-            ])
+                result = self.submit_reg_form_for_user(
+                    email,
+                    password,
+                    full_name="Non-LDAP Full Name",
+                    # Pass HTTP_HOST for the target subdomain
+                    HTTP_HOST=subdomain + ".testserver",
+                )
+            self.assertEqual(
+                debug_log.output,
+                [
+                    'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: Email newuser@zulip.com does not match LDAP domain example.com.'
+                ],
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "http://zulip.testserver/")
             user_profile = UserProfile.objects.get(delivery_email=email)
             # Name comes from the POST request, not LDAP
             self.assertEqual(user_profile.full_name, 'Non-LDAP Full Name')
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend',
-                                                'zproject.backends.ZulipDummyBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+            'zproject.backends.ZulipDummyBackend',
+        )
+    )
     def test_signup_with_ldap_and_email_enabled_using_email_with_ldap_email_search(self) -> None:
         # If the user's email is inside the LDAP directory and we just
         # have a wrong password, then we refuse to create an account
@@ -3749,29 +4093,31 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_EMAIL_ATTR='mail',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_EMAIL_ATTR='mail',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             result = self.submit_reg_form_for_user(
                 email,
                 password,
                 from_confirmation="1",
                 # Pass HTTP_HOST for the target subdomain
-                HTTP_HOST=subdomain + ".testserver")
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 200)
 
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Non-LDAP Full Name",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Non-LDAP Full Name",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 302)
             # We get redirected back to the login page because password was wrong
             self.assertEqual(result.url, "/accounts/login/?email=newuser_email%40zulip.com")
@@ -3788,14 +4134,13 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_EMAIL_ATTR='mail',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_EMAIL_ATTR='mail',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             with self.assertLogs(level="WARNING") as m:
                 result = self.submit_reg_form_for_user(
@@ -3803,26 +4148,39 @@ class UserSignUpTest(InviteUserBase):
                     password,
                     from_confirmation="1",
                     # Pass HTTP_HOST for the target subdomain
-                    HTTP_HOST=subdomain + ".testserver")
+                    HTTP_HOST=subdomain + ".testserver",
+                )
                 self.assertEqual(result.status_code, 200)
-                self.assertEqual(m.output, ['WARNING:root:New account email nonexistent@zulip.com could not be found in LDAP'])
+                self.assertEqual(
+                    m.output,
+                    [
+                        'WARNING:root:New account email nonexistent@zulip.com could not be found in LDAP'
+                    ],
+                )
 
             with self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
-                result = self.submit_reg_form_for_user(email,
-                                                       password,
-                                                       full_name="Non-LDAP Full Name",
-                                                       # Pass HTTP_HOST for the target subdomain
-                                                       HTTP_HOST=subdomain + ".testserver")
-            self.assertEqual(debug_log.output, [
-                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: nonexistent@zulip.com. Input username: nonexistent@zulip.com'
-            ])
+                result = self.submit_reg_form_for_user(
+                    email,
+                    password,
+                    full_name="Non-LDAP Full Name",
+                    # Pass HTTP_HOST for the target subdomain
+                    HTTP_HOST=subdomain + ".testserver",
+                )
+            self.assertEqual(
+                debug_log.output,
+                [
+                    'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: nonexistent@zulip.com. Input username: nonexistent@zulip.com'
+                ],
+            )
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, "http://zulip.testserver/")
             user_profile = UserProfile.objects.get(delivery_email=email)
             # Name comes from the POST request, not LDAP
             self.assertEqual(user_profile.full_name, 'Non-LDAP Full Name')
 
-    def ldap_invite_and_signup_as(self, invite_as: int, streams: Sequence[str] = ['Denmark']) -> None:
+    def ldap_invite_and_signup_as(
+        self, invite_as: int, streams: Sequence[str] = ['Denmark']
+    ) -> None:
         self.init_default_ldap_database()
         ldap_user_attr_map = {'full_name': 'cn'}
 
@@ -3831,55 +4189,72 @@ class UserSignUpTest(InviteUserBase):
         password = self.ldap_password("newuser")
 
         with self.settings(
-                POPULATE_PROFILE_VIA_LDAP=True,
-                LDAP_APPEND_DOMAIN='zulip.com',
-                AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
+            POPULATE_PROFILE_VIA_LDAP=True,
+            LDAP_APPEND_DOMAIN='zulip.com',
+            AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
         ):
             with self.assertLogs('zulip.ldap', 'DEBUG') as debug_log:
                 # Invite user.
                 self.login('iago')
-            self.assertEqual(debug_log.output, [
-                'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: iago. Input username: iago@zulip.com'
-            ])
-            response = self.invite(invitee_emails='newuser@zulip.com',
-                                   stream_names=streams,
-                                   invite_as=invite_as)
+            self.assertEqual(
+                debug_log.output,
+                [
+                    'DEBUG:zulip.ldap:ZulipLDAPAuthBackend: No LDAP user matching django_to_ldap_username result: iago. Input username: iago@zulip.com'
+                ],
+            )
+            response = self.invite(
+                invitee_emails='newuser@zulip.com', stream_names=streams, invite_as=invite_as
+            )
             self.assert_json_success(response)
             self.logout()
 
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   from_confirmation="1",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                from_confirmation="1",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 200)
 
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="Ignore",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="Ignore",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             self.assertEqual(result.status_code, 302)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+        )
+    )
     def test_ldap_invite_user_as_admin(self) -> None:
         self.ldap_invite_and_signup_as(PreregistrationUser.INVITE_AS['REALM_ADMIN'])
-        user_profile = UserProfile.objects.get(
-            delivery_email=self.nonreg_email('newuser'))
+        user_profile = UserProfile.objects.get(delivery_email=self.nonreg_email('newuser'))
         self.assertTrue(user_profile.is_realm_admin)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+        )
+    )
     def test_ldap_invite_user_as_guest(self) -> None:
         self.ldap_invite_and_signup_as(PreregistrationUser.INVITE_AS['GUEST_USER'])
-        user_profile = UserProfile.objects.get(
-            delivery_email=self.nonreg_email('newuser'))
+        user_profile = UserProfile.objects.get(delivery_email=self.nonreg_email('newuser'))
         self.assertTrue(user_profile.is_guest)
 
-    @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',
-                                                'zproject.backends.EmailAuthBackend'))
+    @override_settings(
+        AUTHENTICATION_BACKENDS=(
+            'zproject.backends.ZulipLDAPAuthBackend',
+            'zproject.backends.EmailAuthBackend',
+        )
+    )
     def test_ldap_invite_streams(self) -> None:
         stream_name = 'Rome'
         realm = get_realm('zulip')
@@ -3889,7 +4264,9 @@ class UserSignUpTest(InviteUserBase):
         self.assertNotIn(stream_name, default_streams_name)
 
         # Invite user.
-        self.ldap_invite_and_signup_as(PreregistrationUser.INVITE_AS['REALM_ADMIN'], streams=[stream_name])
+        self.ldap_invite_and_signup_as(
+            PreregistrationUser.INVITE_AS['REALM_ADMIN'], streams=[stream_name]
+        )
 
         user_profile = UserProfile.objects.get(delivery_email=self.nonreg_email('newuser'))
         self.assertTrue(user_profile.is_realm_admin)
@@ -3908,17 +4285,18 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         with patch('zerver.views.registration.name_changes_disabled', return_value=True):
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   full_name="New Name",
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                full_name="New Name",
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
             user_profile = UserProfile.objects.get(delivery_email=email)
             # 'New Name' comes from POST data; not from LDAP session.
             self.assertEqual(user_profile.full_name, 'New Name')
@@ -3936,12 +4314,12 @@ class UserSignUpTest(InviteUserBase):
             result = self.client_post('/register/', {'email': email})
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
         # Visit the confirmation link.
         from django.core.mail import outbox
+
         for message in reversed(outbox):
             if email in message.to:
                 match = re.search(settings.EXTERNAL_HOST + r"(\S+)>", message.body)
@@ -3967,18 +4345,23 @@ class UserSignUpTest(InviteUserBase):
             prereg_user.realm_creation = True
             prereg_user.save()
 
-            result = self.submit_reg_form_for_user(email,
-                                                   password,
-                                                   realm_name=realm_name,
-                                                   realm_subdomain=subdomain,
-                                                   from_confirmation='1',
-                                                   # Pass HTTP_HOST for the target subdomain
-                                                   HTTP_HOST=subdomain + ".testserver")
-            self.assert_in_success_response(["We just need you to do one last thing.",
-                                             "newuser@zulip.com"],
-                                            result)
+            result = self.submit_reg_form_for_user(
+                email,
+                password,
+                realm_name=realm_name,
+                realm_subdomain=subdomain,
+                from_confirmation='1',
+                # Pass HTTP_HOST for the target subdomain
+                HTTP_HOST=subdomain + ".testserver",
+            )
+            self.assert_in_success_response(
+                ["We just need you to do one last thing.", "newuser@zulip.com"], result
+            )
 
-    @patch('DNS.dnslookup', return_value=[['sipbtest:*:20922:101:Fred Sipb,,,:/mit/sipbtest:/bin/athena/tcsh']])
+    @patch(
+        'DNS.dnslookup',
+        return_value=[['sipbtest:*:20922:101:Fred Sipb,,,:/mit/sipbtest:/bin/athena/tcsh']],
+    )
     def test_registration_of_mirror_dummy_user(self, ignored: Any) -> None:
         password = "test"
         subdomain = "zephyr"
@@ -3991,12 +4374,12 @@ class UserSignUpTest(InviteUserBase):
         result = self.client_post('/register/', {'email': email}, subdomain="zephyr")
 
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].endswith(
-            f"/accounts/send_confirm/{email}"))
+        self.assertTrue(result["Location"].endswith(f"/accounts/send_confirm/{email}"))
         result = self.client_get(result["Location"], subdomain="zephyr")
         self.assert_in_response("Check your email so we can get started.", result)
         # Visit the confirmation link.
         from django.core.mail import outbox
+
         for message in reversed(outbox):
             if email in message.to:
                 match = re.search(settings.EXTERNAL_HOST + r"(\S+)>", message.body)
@@ -4014,31 +4397,43 @@ class UserSignUpTest(InviteUserBase):
         # (this is an invalid state, so it's a bug we got here):
         user_profile.is_active = True
         user_profile.save()
-        with self.assertRaisesRegex(AssertionError, "Mirror dummy user is already active!"), \
-                self.assertLogs('django.request', 'ERROR') as error_log:
+        with self.assertRaisesRegex(
+            AssertionError, "Mirror dummy user is already active!"
+        ), self.assertLogs('django.request', 'ERROR') as error_log:
             result = self.submit_reg_form_for_user(
                 email,
                 password,
                 from_confirmation='1',
                 # Pass HTTP_HOST for the target subdomain
-                HTTP_HOST=subdomain + ".testserver")
-        self.assertTrue('ERROR:django.request:Internal Server Error: /accounts/register/' in error_log.output[0])
-        self.assertTrue('raise AssertionError("Mirror dummy user is already active!' in error_log.output[0])
-        self.assertTrue('AssertionError: Mirror dummy user is already active!' in error_log.output[0])
+                HTTP_HOST=subdomain + ".testserver",
+            )
+        self.assertTrue(
+            'ERROR:django.request:Internal Server Error: /accounts/register/' in error_log.output[0]
+        )
+        self.assertTrue(
+            'raise AssertionError("Mirror dummy user is already active!' in error_log.output[0]
+        )
+        self.assertTrue(
+            'AssertionError: Mirror dummy user is already active!' in error_log.output[0]
+        )
 
         user_profile.is_active = False
         user_profile.save()
 
-        result = self.submit_reg_form_for_user(email,
-                                               password,
-                                               from_confirmation='1',
-                                               # Pass HTTP_HOST for the target subdomain
-                                               HTTP_HOST=subdomain + ".testserver")
+        result = self.submit_reg_form_for_user(
+            email,
+            password,
+            from_confirmation='1',
+            # Pass HTTP_HOST for the target subdomain
+            HTTP_HOST=subdomain + ".testserver",
+        )
         self.assertEqual(result.status_code, 200)
-        result = self.submit_reg_form_for_user(email,
-                                               password,
-                                               # Pass HTTP_HOST for the target subdomain
-                                               HTTP_HOST=subdomain + ".testserver")
+        result = self.submit_reg_form_for_user(
+            email,
+            password,
+            # Pass HTTP_HOST for the target subdomain
+            HTTP_HOST=subdomain + ".testserver",
+        )
         self.assertEqual(result.status_code, 302)
         self.assert_logged_in_user_id(user_profile.id)
 
@@ -4053,12 +4448,19 @@ class UserSignUpTest(InviteUserBase):
         user_profile.is_active = True
         user_profile.save()
 
-        with self.assertRaisesRegex(AssertionError, "Mirror dummy user is already active!"), \
-                self.assertLogs('django.request', 'ERROR') as error_log:
+        with self.assertRaisesRegex(
+            AssertionError, "Mirror dummy user is already active!"
+        ), self.assertLogs('django.request', 'ERROR') as error_log:
             self.client_post('/register/', {'email': email}, subdomain="zephyr")
-        self.assertTrue('ERROR:django.request:Internal Server Error: /register/' in error_log.output[0])
-        self.assertTrue('raise AssertionError("Mirror dummy user is already active!' in error_log.output[0])
-        self.assertTrue('AssertionError: Mirror dummy user is already active!' in error_log.output[0])
+        self.assertTrue(
+            'ERROR:django.request:Internal Server Error: /register/' in error_log.output[0]
+        )
+        self.assertTrue(
+            'raise AssertionError("Mirror dummy user is already active!' in error_log.output[0]
+        )
+        self.assertTrue(
+            'AssertionError: Mirror dummy user is already active!' in error_log.output[0]
+        )
 
     @override_settings(TERMS_OF_SERVICE=False)
     def test_dev_user_registration(self) -> None:
@@ -4082,8 +4484,9 @@ class UserSignUpTest(InviteUserBase):
 
         result = self.client_post('/devtools/register_realm/')
         self.assertEqual(result.status_code, 302)
-        self.assertTrue(result["Location"].startswith(
-            f'http://{string_id}.testserver/accounts/login/subdomain'))
+        self.assertTrue(
+            result["Location"].startswith(f'http://{string_id}.testserver/accounts/login/subdomain')
+        )
         result = self.client_get(result["Location"], subdomain=string_id)
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result["Location"], f'http://{string_id}.testserver')
@@ -4091,8 +4494,8 @@ class UserSignUpTest(InviteUserBase):
         user_profile = UserProfile.objects.all().order_by("id").last()
         self.assert_logged_in_user_id(user_profile.id)
 
-class DeactivateUserTest(ZulipTestCase):
 
+class DeactivateUserTest(ZulipTestCase):
     def test_deactivate_user(self) -> None:
         user = self.example_user('hamlet')
         email = user.email
@@ -4124,13 +4527,15 @@ class DeactivateUserTest(ZulipTestCase):
 
     def test_do_not_deactivate_final_user(self) -> None:
         realm = get_realm('zulip')
-        UserProfile.objects.filter(realm=realm).exclude(
-            role=UserProfile.ROLE_REALM_OWNER).update(is_active=False)
+        UserProfile.objects.filter(realm=realm).exclude(role=UserProfile.ROLE_REALM_OWNER).update(
+            is_active=False
+        )
         user = self.example_user("desdemona")
         self.login_user(user)
         result = self.client_delete('/json/users/me')
         self.assert_json_error(result, "Cannot deactivate the only user.")
 
+
 class TestLoginPage(ZulipTestCase):
     @patch('django.http.HttpRequest.get_host')
     def test_login_page_redirects_for_root_alias(self, mock_get_host: MagicMock) -> None:
@@ -4157,9 +4562,11 @@ class TestLoginPage(ZulipTestCase):
             self.assertEqual(result.url, '/accounts/go/?next=%2Fupgrade%2F')
 
         mock_get_host.return_value = 'www.testserver.com'
-        with self.settings(ROOT_DOMAIN_LANDING_PAGE=True,
-                           EXTERNAL_HOST='www.testserver.com',
-                           ROOT_SUBDOMAIN_ALIASES=['test']):
+        with self.settings(
+            ROOT_DOMAIN_LANDING_PAGE=True,
+            EXTERNAL_HOST='www.testserver.com',
+            ROOT_SUBDOMAIN_ALIASES=['test'],
+        ):
             result = self.client_get("/en/login/")
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result.url, '/accounts/go/')
@@ -4182,13 +4589,20 @@ class TestLoginPage(ZulipTestCase):
 
     def test_login_page_registration_hint(self) -> None:
         response = self.client_get("/login/")
-        self.assert_not_in_success_response(["Don't have an account yet? You need to be invited to join this organization."], response)
+        self.assert_not_in_success_response(
+            ["Don't have an account yet? You need to be invited to join this organization."],
+            response,
+        )
 
         realm = get_realm("zulip")
         realm.invite_required = True
         realm.save(update_fields=["invite_required"])
         response = self.client_get("/login/")
-        self.assert_in_success_response(["Don't have an account yet? You need to be invited to join this organization."], response)
+        self.assert_in_success_response(
+            ["Don't have an account yet? You need to be invited to join this organization."],
+            response,
+        )
+
 
 class TestFindMyTeam(ZulipTestCase):
     def test_template(self) -> None:
@@ -4197,10 +4611,13 @@ class TestFindMyTeam(ZulipTestCase):
 
     def test_result(self) -> None:
         # We capitalize a letter in cordelia's email to test that the search is case-insensitive.
-        result = self.client_post('/accounts/find/',
-                                  dict(emails="iago@zulip.com,cordeliA@zulip.com"))
+        result = self.client_post(
+            '/accounts/find/', dict(emails="iago@zulip.com,cordeliA@zulip.com")
+        )
         self.assertEqual(result.status_code, 302)
-        self.assertEqual(result.url, "/accounts/find/?emails=iago%40zulip.com%2CcordeliA%40zulip.com")
+        self.assertEqual(
+            result.url, "/accounts/find/?emails=iago%40zulip.com%2CcordeliA%40zulip.com"
+        )
         result = self.client_get(result.url)
         content = result.content.decode('utf8')
         self.assertIn("Emails sent! You will only receive emails", content)
@@ -4212,24 +4629,28 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertEqual(len(outbox), 3)
 
     def test_find_team_ignore_invalid_email(self) -> None:
-        result = self.client_post('/accounts/find/',
-                                  dict(emails="iago@zulip.com,invalid_email@zulip.com"))
+        result = self.client_post(
+            '/accounts/find/', dict(emails="iago@zulip.com,invalid_email@zulip.com")
+        )
         self.assertEqual(result.status_code, 302)
-        self.assertEqual(result.url, "/accounts/find/?emails=iago%40zulip.com%2Cinvalid_email%40zulip.com")
+        self.assertEqual(
+            result.url, "/accounts/find/?emails=iago%40zulip.com%2Cinvalid_email%40zulip.com"
+        )
         result = self.client_get(result.url)
         content = result.content.decode('utf8')
         self.assertIn("Emails sent! You will only receive emails", content)
         self.assertIn(self.example_email("iago"), content)
         self.assertIn("invalid_email@", content)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 1)
 
     def test_find_team_reject_invalid_email(self) -> None:
-        result = self.client_post('/accounts/find/',
-                                  dict(emails="invalid_string"))
+        result = self.client_post('/accounts/find/', dict(emails="invalid_string"))
         self.assertEqual(result.status_code, 200)
         self.assertIn(b"Enter a valid email", result.content)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
         # Just for coverage on perhaps-unnecessary validation code.
@@ -4242,6 +4663,7 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertIn('This field is required', result.content.decode('utf8'))
         self.assertEqual(result.status_code, 200)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
     def test_find_team_one_email(self) -> None:
@@ -4250,6 +4672,7 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, '/accounts/find/?emails=hamlet%40zulip.com')
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 1)
 
     def test_find_team_deactivated_user(self) -> None:
@@ -4259,6 +4682,7 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, '/accounts/find/?emails=hamlet%40zulip.com')
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
     def test_find_team_deactivated_realm(self) -> None:
@@ -4268,6 +4692,7 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, '/accounts/find/?emails=hamlet%40zulip.com')
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
     def test_find_team_bot_email(self) -> None:
@@ -4276,6 +4701,7 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertEqual(result.status_code, 302)
         self.assertEqual(result.url, '/accounts/find/?emails=webhook-bot%40zulip.com')
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
     def test_find_team_more_than_ten_emails(self) -> None:
@@ -4284,8 +4710,10 @@ class TestFindMyTeam(ZulipTestCase):
         self.assertEqual(result.status_code, 200)
         self.assertIn("Please enter at most 10", result.content.decode('utf8'))
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
 
+
 class ConfirmationKeyTest(ZulipTestCase):
     def test_confirmation_key(self) -> None:
         request = MagicMock()
@@ -4296,6 +4724,7 @@ class ConfirmationKeyTest(ZulipTestCase):
         self.assert_json_success(result)
         self.assert_in_response('xyzzy', result)
 
+
 class MobileAuthOTPTest(ZulipTestCase):
     def test_xor_hex_strings(self) -> None:
         self.assertEqual(xor_hex_strings('1237c81ab', '18989fd12'), '0aaf57cb9')
@@ -4320,35 +4749,60 @@ class MobileAuthOTPTest(ZulipTestCase):
         decryped = otp_decrypt_api_key(result, otp)
         self.assertEqual(decryped, api_key)
 
+
 class FollowupEmailTest(ZulipTestCase):
     def test_followup_day2_email(self) -> None:
         user_profile = self.example_user('hamlet')
         # Test date_joined == Sunday
-        user_profile.date_joined = datetime.datetime(2018, 1, 7, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
-        self.assertEqual(followup_day2_email_delay(user_profile), datetime.timedelta(days=2, hours=-1))
+        user_profile.date_joined = datetime.datetime(
+            2018, 1, 7, 1, 0, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        self.assertEqual(
+            followup_day2_email_delay(user_profile), datetime.timedelta(days=2, hours=-1)
+        )
         # Test date_joined == Tuesday
-        user_profile.date_joined = datetime.datetime(2018, 1, 2, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
-        self.assertEqual(followup_day2_email_delay(user_profile), datetime.timedelta(days=2, hours=-1))
+        user_profile.date_joined = datetime.datetime(
+            2018, 1, 2, 1, 0, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        self.assertEqual(
+            followup_day2_email_delay(user_profile), datetime.timedelta(days=2, hours=-1)
+        )
         # Test date_joined == Thursday
-        user_profile.date_joined = datetime.datetime(2018, 1, 4, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
-        self.assertEqual(followup_day2_email_delay(user_profile), datetime.timedelta(days=1, hours=-1))
+        user_profile.date_joined = datetime.datetime(
+            2018, 1, 4, 1, 0, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        self.assertEqual(
+            followup_day2_email_delay(user_profile), datetime.timedelta(days=1, hours=-1)
+        )
         # Test date_joined == Friday
-        user_profile.date_joined = datetime.datetime(2018, 1, 5, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
-        self.assertEqual(followup_day2_email_delay(user_profile), datetime.timedelta(days=3, hours=-1))
+        user_profile.date_joined = datetime.datetime(
+            2018, 1, 5, 1, 0, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        self.assertEqual(
+            followup_day2_email_delay(user_profile), datetime.timedelta(days=3, hours=-1)
+        )
 
         # Time offset of America/Phoenix is -07:00
         user_profile.timezone = 'America/Phoenix'
         # Test date_joined == Friday in UTC, but Thursday in the user's timezone
-        user_profile.date_joined = datetime.datetime(2018, 1, 5, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
-        self.assertEqual(followup_day2_email_delay(user_profile), datetime.timedelta(days=1, hours=-1))
+        user_profile.date_joined = datetime.datetime(
+            2018, 1, 5, 1, 0, 0, 0, tzinfo=datetime.timezone.utc
+        )
+        self.assertEqual(
+            followup_day2_email_delay(user_profile), datetime.timedelta(days=1, hours=-1)
+        )
+
 
 class NoReplyEmailTest(ZulipTestCase):
     def test_noreply_email_address(self) -> None:
-        self.assertTrue(re.search(self.TOKENIZED_NOREPLY_REGEX, FromAddress.tokenized_no_reply_address()))
+        self.assertTrue(
+            re.search(self.TOKENIZED_NOREPLY_REGEX, FromAddress.tokenized_no_reply_address())
+        )
 
         with self.settings(ADD_TOKENS_TO_NOREPLY_ADDRESS=False):
             self.assertEqual(FromAddress.tokenized_no_reply_address(), "noreply@testserver")
 
+
 class TwoFactorAuthTest(ZulipTestCase):
     @patch('two_factor.models.totp')
     def test_two_factor_login(self, mock_totp: MagicMock) -> None:
@@ -4366,23 +4820,30 @@ class TwoFactorAuthTest(ZulipTestCase):
 
         mock_totp.side_effect = totp
 
-        with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',),
-                           TWO_FACTOR_CALL_GATEWAY='two_factor.gateways.fake.Fake',
-                           TWO_FACTOR_SMS_GATEWAY='two_factor.gateways.fake.Fake',
-                           TWO_FACTOR_AUTHENTICATION_ENABLED=True):
+        with self.settings(
+            AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',),
+            TWO_FACTOR_CALL_GATEWAY='two_factor.gateways.fake.Fake',
+            TWO_FACTOR_SMS_GATEWAY='two_factor.gateways.fake.Fake',
+            TWO_FACTOR_AUTHENTICATION_ENABLED=True,
+        ):
 
-            first_step_data = {"username": email,
-                               "password": password,
-                               "two_factor_login_view-current_step": "auth"}
+            first_step_data = {
+                "username": email,
+                "password": password,
+                "two_factor_login_view-current_step": "auth",
+            }
             with self.assertLogs('two_factor.gateways.fake', 'INFO') as info_logs:
                 result = self.client_post("/accounts/login/", first_step_data)
-            self.assertEqual(info_logs.output, [
-                'INFO:two_factor.gateways.fake:Fake SMS to +12125550100: "Your token is: 123456"'
-            ])
+            self.assertEqual(
+                info_logs.output,
+                ['INFO:two_factor.gateways.fake:Fake SMS to +12125550100: "Your token is: 123456"'],
+            )
             self.assertEqual(result.status_code, 200)
 
-            second_step_data = {"token-otp_token": str(token),
-                                "two_factor_login_view-current_step": "token"}
+            second_step_data = {
+                "token-otp_token": str(token),
+                "two_factor_login_view-current_step": "token",
+            }
             result = self.client_post("/accounts/login/", second_step_data)
             self.assertEqual(result.status_code, 302)
             self.assertEqual(result["Location"], "http://zulip.testserver")
@@ -4392,10 +4853,12 @@ class TwoFactorAuthTest(ZulipTestCase):
             result = self.client_get('/accounts/login/')
             self.assertEqual(result["Location"], "http://zulip.testserver")
 
+
 class NameRestrictionsTest(ZulipTestCase):
     def test_whitelisted_disposable_domains(self) -> None:
         self.assertFalse(is_disposable_domain('OPayQ.com'))
 
+
 class RealmRedirectTest(ZulipTestCase):
     def test_realm_redirect_without_next_param(self) -> None:
         result = self.client_get("/accounts/go/")
@@ -4410,7 +4873,9 @@ class RealmRedirectTest(ZulipTestCase):
 
     def test_realm_redirect_with_next_param(self) -> None:
         result = self.client_get("/accounts/go/", {"next": "billing"})
-        self.assert_in_success_response(["Enter your organization's Zulip URL", 'action="/accounts/go/?next=billing"'], result)
+        self.assert_in_success_response(
+            ["Enter your organization's Zulip URL", 'action="/accounts/go/?next=billing"'], result
+        )
 
         result = self.client_post("/accounts/go/?next=billing", {"subdomain": "lear"})
         self.assertEqual(result.status_code, 302)
diff --git a/zerver/tests/test_slack_importer.py b/zerver/tests/test_slack_importer.py
index 42a662620b..e8ea58e8fd 100644
--- a/zerver/tests/test_slack_importer.py
+++ b/zerver/tests/test_slack_importer.py
@@ -49,6 +49,7 @@ def remove_folder(path: str) -> None:
     if os.path.exists(path):
         shutil.rmtree(path)
 
+
 class MockResponse:
     def __init__(self, json_data: Optional[Dict[str, Any]], status_code: int) -> None:
         self.json_data = json_data
@@ -57,6 +58,7 @@ class MockResponse:
     def json(self) -> Optional[Dict[str, Any]]:
         return self.json_data
 
+
 # This method will be used by the mock to replace requests.get
 def mocked_requests_get(*args: str) -> MockResponse:
     if args == ("https://slack.com/api/users.list", {"token": "xoxp-valid-token"}):
@@ -66,13 +68,15 @@ def mocked_requests_get(*args: str) -> MockResponse:
     else:
         return MockResponse(None, 404)
 
+
 class SlackImporter(ZulipTestCase):
     @mock.patch('requests.get', side_effect=mocked_requests_get)
     def test_get_slack_api_data(self, mock_get: mock.Mock) -> None:
         token = 'xoxp-valid-token'
         slack_user_list_url = "https://slack.com/api/users.list"
-        self.assertEqual(get_slack_api_data(slack_user_list_url, "members", token=token),
-                         "user_data")
+        self.assertEqual(
+            get_slack_api_data(slack_user_list_url, "members", token=token), "user_data"
+        )
         token = 'xoxp-invalid-token'
         with self.assertRaises(Exception) as invalid:
             get_slack_api_data(slack_user_list_url, "members", token=token)
@@ -92,7 +96,9 @@ class SlackImporter(ZulipTestCase):
         realm_id = 2
         realm_subdomain = "test-realm"
         time = float(timezone_now().timestamp())
-        test_realm: List[Dict[str, Any]] = build_zerver_realm(realm_id, realm_subdomain, time, 'Slack')
+        test_realm: List[Dict[str, Any]] = build_zerver_realm(
+            realm_id, realm_subdomain, time, 'Slack'
+        )
         test_zerver_realm_dict = test_realm[0]
 
         self.assertEqual(test_zerver_realm_dict['id'], realm_id)
@@ -101,26 +107,29 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(test_zerver_realm_dict['date_created'], time)
 
     def test_get_owner(self) -> None:
-        user_data = [{'is_owner': False, 'is_primary_owner': False},
-                     {'is_owner': True, 'is_primary_owner': False},
-                     {'is_owner': False, 'is_primary_owner': True},
-                     {'is_owner': True, 'is_primary_owner': True}]
+        user_data = [
+            {'is_owner': False, 'is_primary_owner': False},
+            {'is_owner': True, 'is_primary_owner': False},
+            {'is_owner': False, 'is_primary_owner': True},
+            {'is_owner': True, 'is_primary_owner': True},
+        ]
         self.assertEqual(get_owner(user_data[0]), False)
         self.assertEqual(get_owner(user_data[1]), True)
         self.assertEqual(get_owner(user_data[2]), True)
         self.assertEqual(get_owner(user_data[3]), True)
 
     def test_get_admin(self) -> None:
-        user_data = [{'is_admin': True},
-                     {'is_admin': False}]
+        user_data = [{'is_admin': True}, {'is_admin': False}]
         self.assertEqual(get_admin(user_data[0]), True)
         self.assertEqual(get_admin(user_data[1]), False)
 
     def test_get_guest(self) -> None:
-        user_data = [{'is_restricted': False, 'is_ultra_restricted': False},
-                     {'is_restricted': True, 'is_ultra_restricted': False},
-                     {'is_restricted': False, 'is_ultra_restricted': True},
-                     {'is_restricted': True, 'is_ultra_restricted': True}]
+        user_data = [
+            {'is_restricted': False, 'is_ultra_restricted': False},
+            {'is_restricted': True, 'is_ultra_restricted': False},
+            {'is_restricted': False, 'is_ultra_restricted': True},
+            {'is_restricted': True, 'is_ultra_restricted': True},
+        ]
         self.assertEqual(get_guest(user_data[0]), False)
         self.assertEqual(get_guest(user_data[1]), True)
         self.assertEqual(get_guest(user_data[2]), True)
@@ -138,8 +147,9 @@ class SlackImporter(ZulipTestCase):
     @mock.patch("zerver.data_import.slack.get_data_file")
     @mock.patch("zerver.data_import.slack.get_slack_api_data")
     @mock.patch("zerver.data_import.slack.get_messages_iterator")
-    def test_fetch_shared_channel_users(self, messages_mock: mock.Mock, api_mock: mock.Mock,
-                                        data_file_mock: mock.Mock) -> None:
+    def test_fetch_shared_channel_users(
+        self, messages_mock: mock.Mock, api_mock: mock.Mock, data_file_mock: mock.Mock
+    ) -> None:
         users = [{"id": "U061A1R2R"}, {"id": "U061A5N1G"}, {"id": "U064KUGRJ"}]
         data_file_mock.side_effect = [
             [
@@ -188,118 +198,181 @@ class SlackImporter(ZulipTestCase):
 
     @mock.patch("zerver.data_import.slack.get_data_file")
     def test_users_to_zerver_userprofile(self, mock_get_data_file: mock.Mock) -> None:
-        custom_profile_field_user1 = {"Xf06054BBB": {"value": "random1"},
-                                      "Xf023DSCdd": {"value": "employee"}}
-        custom_profile_field_user2 = {"Xf06054BBB": {"value": "random2"},
-                                      "Xf023DSCdd": {"value": "employer"}}
-        user_data = [{"id": "U08RGD1RD",
-                      "team_id": "T5YFFM2QY",
-                      "name": "john",
-                      "deleted": False,
-                      "is_mirror_dummy": False,
-                      "real_name": "John Doe",
-                      "profile": {"image_32": "", "email": "jon@gmail.com", "avatar_hash": "hash",
-                                  "phone": "+1-123-456-77-868",
-                                  "fields": custom_profile_field_user1}},
-                     {"id": "U0CBK5KAT",
-                      "team_id": "T5YFFM2QY",
-                      "is_admin": True,
-                      "is_bot": False,
-                      "is_owner": True,
-                      "is_primary_owner": True,
-                      'name': 'Jane',
-                      "real_name": "Jane Doe",
-                      "deleted": False,
-                      "is_mirror_dummy": False,
-                      "profile": {"image_32": "https://secure.gravatar.com/avatar/random.png",
-                                  "fields": custom_profile_field_user2,
-                                  "email": "jane@foo.com", "avatar_hash": "hash"}},
-                     {"id": "U09TYF5Sk",
-                      "team_id": "T5YFFM2QY",
-                      "name": "Bot",
-                      "real_name": "Bot",
-                      "is_bot": True,
-                      "deleted": False,
-                      "is_mirror_dummy": False,
-                      "profile": {"image_32": "https://secure.gravatar.com/avatar/random1.png",
-                                  "skype": "test_skype_name",
-                                  "email": "bot1@zulipchat.com", "avatar_hash": "hash"}},
-                     {"id": "UHSG7OPQN",
-                      "team_id": "T6LARQE2Z",
-                      'name': 'matt.perry',
-                      "color": '9d8eee',
-                      "is_bot": False,
-                      "is_app_user": False,
-                      "is_mirror_dummy": True,
-                      "team_domain": "foreignteam",
-                      "profile": {"image_32": "https://secure.gravatar.com/avatar/random6.png",
-                                  "avatar_hash": "hash", "first_name": "Matt", "last_name": "Perry",
-                                  "real_name": "Matt Perry", "display_name": "matt.perry", "team": "T6LARQE2Z"}},
-                     {"id": "U8VAHEVUY",
-                      "team_id": "T5YFFM2QY",
-                      "name": "steviejacob34",
-                      "real_name": "Steve Jacob",
-                      "is_admin": False,
-                      "is_owner": False,
-                      "is_primary_owner": False,
-                      "is_restricted": True,
-                      "is_ultra_restricted": False,
-                      "is_bot": False,
-                      "is_mirror_dummy": False,
-                      "profile": {"email": "steviejacob34@yahoo.com", "avatar_hash": "hash",
-                                  "image_32": "https://secure.gravatar.com/avatar/random6.png"}},
-                     {"id": "U8X25EBAB",
-                      "team_id": "T5YFFM2QY",
-                      "name": "pratikweb_0",
-                      "real_name": "Pratik",
-                      "is_admin": False,
-                      "is_owner": False,
-                      "is_primary_owner": False,
-                      "is_restricted": True,
-                      "is_ultra_restricted": True,
-                      "is_bot": False,
-                      "is_mirror_dummy": False,
-                      "profile": {"email": "pratik@mit.edu", "avatar_hash": "hash",
-                                  "image_32": "https://secure.gravatar.com/avatar/random.png"}},
-                     {"id": "U015J7JSE",
-                      "team_id": "T5YFFM2QY",
-                      "name": "georgesm27",
-                      "real_name": "George",
-                      "is_admin": True,
-                      "is_owner": True,
-                      "is_primary_owner": False,
-                      "is_restricted": False,
-                      "is_ultra_restricted": False,
-                      "is_bot": False,
-                      "is_mirror_dummy": False,
-                      "profile": {"email": "geroge@yahoo.com", "avatar_hash": "hash",
-                                  "image_32": "https://secure.gravatar.com/avatar/random5.png"}},
-                     {"id": "U1RDFEC80",
-                      "team_id": "T5YFFM2QY",
-                      "name": "daniel.smith",
-                      "real_name": "Daniel Smith",
-                      "is_admin": True,
-                      "is_owner": False,
-                      "is_primary_owner": False,
-                      "is_restricted": False,
-                      "is_ultra_restricted": False,
-                      "is_bot": False,
-                      "is_mirror_dummy": False,
-                      "profile": {"email": "daniel@gmail.com", "avatar_hash": "hash",
-                                  "image_32": "https://secure.gravatar.com/avatar/random7.png"}}]
+        custom_profile_field_user1 = {
+            "Xf06054BBB": {"value": "random1"},
+            "Xf023DSCdd": {"value": "employee"},
+        }
+        custom_profile_field_user2 = {
+            "Xf06054BBB": {"value": "random2"},
+            "Xf023DSCdd": {"value": "employer"},
+        }
+        user_data = [
+            {
+                "id": "U08RGD1RD",
+                "team_id": "T5YFFM2QY",
+                "name": "john",
+                "deleted": False,
+                "is_mirror_dummy": False,
+                "real_name": "John Doe",
+                "profile": {
+                    "image_32": "",
+                    "email": "jon@gmail.com",
+                    "avatar_hash": "hash",
+                    "phone": "+1-123-456-77-868",
+                    "fields": custom_profile_field_user1,
+                },
+            },
+            {
+                "id": "U0CBK5KAT",
+                "team_id": "T5YFFM2QY",
+                "is_admin": True,
+                "is_bot": False,
+                "is_owner": True,
+                "is_primary_owner": True,
+                'name': 'Jane',
+                "real_name": "Jane Doe",
+                "deleted": False,
+                "is_mirror_dummy": False,
+                "profile": {
+                    "image_32": "https://secure.gravatar.com/avatar/random.png",
+                    "fields": custom_profile_field_user2,
+                    "email": "jane@foo.com",
+                    "avatar_hash": "hash",
+                },
+            },
+            {
+                "id": "U09TYF5Sk",
+                "team_id": "T5YFFM2QY",
+                "name": "Bot",
+                "real_name": "Bot",
+                "is_bot": True,
+                "deleted": False,
+                "is_mirror_dummy": False,
+                "profile": {
+                    "image_32": "https://secure.gravatar.com/avatar/random1.png",
+                    "skype": "test_skype_name",
+                    "email": "bot1@zulipchat.com",
+                    "avatar_hash": "hash",
+                },
+            },
+            {
+                "id": "UHSG7OPQN",
+                "team_id": "T6LARQE2Z",
+                'name': 'matt.perry',
+                "color": '9d8eee',
+                "is_bot": False,
+                "is_app_user": False,
+                "is_mirror_dummy": True,
+                "team_domain": "foreignteam",
+                "profile": {
+                    "image_32": "https://secure.gravatar.com/avatar/random6.png",
+                    "avatar_hash": "hash",
+                    "first_name": "Matt",
+                    "last_name": "Perry",
+                    "real_name": "Matt Perry",
+                    "display_name": "matt.perry",
+                    "team": "T6LARQE2Z",
+                },
+            },
+            {
+                "id": "U8VAHEVUY",
+                "team_id": "T5YFFM2QY",
+                "name": "steviejacob34",
+                "real_name": "Steve Jacob",
+                "is_admin": False,
+                "is_owner": False,
+                "is_primary_owner": False,
+                "is_restricted": True,
+                "is_ultra_restricted": False,
+                "is_bot": False,
+                "is_mirror_dummy": False,
+                "profile": {
+                    "email": "steviejacob34@yahoo.com",
+                    "avatar_hash": "hash",
+                    "image_32": "https://secure.gravatar.com/avatar/random6.png",
+                },
+            },
+            {
+                "id": "U8X25EBAB",
+                "team_id": "T5YFFM2QY",
+                "name": "pratikweb_0",
+                "real_name": "Pratik",
+                "is_admin": False,
+                "is_owner": False,
+                "is_primary_owner": False,
+                "is_restricted": True,
+                "is_ultra_restricted": True,
+                "is_bot": False,
+                "is_mirror_dummy": False,
+                "profile": {
+                    "email": "pratik@mit.edu",
+                    "avatar_hash": "hash",
+                    "image_32": "https://secure.gravatar.com/avatar/random.png",
+                },
+            },
+            {
+                "id": "U015J7JSE",
+                "team_id": "T5YFFM2QY",
+                "name": "georgesm27",
+                "real_name": "George",
+                "is_admin": True,
+                "is_owner": True,
+                "is_primary_owner": False,
+                "is_restricted": False,
+                "is_ultra_restricted": False,
+                "is_bot": False,
+                "is_mirror_dummy": False,
+                "profile": {
+                    "email": "geroge@yahoo.com",
+                    "avatar_hash": "hash",
+                    "image_32": "https://secure.gravatar.com/avatar/random5.png",
+                },
+            },
+            {
+                "id": "U1RDFEC80",
+                "team_id": "T5YFFM2QY",
+                "name": "daniel.smith",
+                "real_name": "Daniel Smith",
+                "is_admin": True,
+                "is_owner": False,
+                "is_primary_owner": False,
+                "is_restricted": False,
+                "is_ultra_restricted": False,
+                "is_bot": False,
+                "is_mirror_dummy": False,
+                "profile": {
+                    "email": "daniel@gmail.com",
+                    "avatar_hash": "hash",
+                    "image_32": "https://secure.gravatar.com/avatar/random7.png",
+                },
+            },
+        ]
 
         mock_get_data_file.return_value = user_data
         # As user with slack_id 'U0CBK5KAT' is the primary owner, that user should be imported first
         # and hence has zulip_id = 1
-        test_slack_user_id_to_zulip_user_id = {'U08RGD1RD': 1, 'U0CBK5KAT': 0, 'U09TYF5Sk': 2, 'UHSG7OPQN': 3, 'U8VAHEVUY': 4, 'U8X25EBAB': 5, 'U015J7JSE': 6, 'U1RDFEC80': 7}
+        test_slack_user_id_to_zulip_user_id = {
+            'U08RGD1RD': 1,
+            'U0CBK5KAT': 0,
+            'U09TYF5Sk': 2,
+            'UHSG7OPQN': 3,
+            'U8VAHEVUY': 4,
+            'U8X25EBAB': 5,
+            'U015J7JSE': 6,
+            'U1RDFEC80': 7,
+        }
         slack_data_dir = './random_path'
         timestamp = int(timezone_now().timestamp())
         mock_get_data_file.return_value = user_data
 
         with self.assertLogs(level="INFO"):
-            zerver_userprofile, avatar_list, slack_user_id_to_zulip_user_id, customprofilefield, \
-                customprofilefield_value = users_to_zerver_userprofile(slack_data_dir, user_data, 1,
-                                                                       timestamp, 'test_domain')
+            (
+                zerver_userprofile,
+                avatar_list,
+                slack_user_id_to_zulip_user_id,
+                customprofilefield,
+                customprofilefield_value,
+            ) = users_to_zerver_userprofile(slack_data_dir, user_data, 1, timestamp, 'test_domain')
 
         # Test custom profile fields
         self.assertEqual(customprofilefield[0]['field_type'], 1)
@@ -333,13 +406,17 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(zerver_userprofile[0]['email'], 'jon@gmail.com')
         self.assertEqual(zerver_userprofile[0]['full_name'], 'John Doe')
 
-        self.assertEqual(zerver_userprofile[1]['id'], test_slack_user_id_to_zulip_user_id['U0CBK5KAT'])
+        self.assertEqual(
+            zerver_userprofile[1]['id'], test_slack_user_id_to_zulip_user_id['U0CBK5KAT']
+        )
         self.assertEqual(zerver_userprofile[1]['role'], UserProfile.ROLE_REALM_OWNER)
         self.assertEqual(zerver_userprofile[1]['is_staff'], False)
         self.assertEqual(zerver_userprofile[1]['is_active'], True)
         self.assertEqual(zerver_userprofile[0]['is_mirror_dummy'], False)
 
-        self.assertEqual(zerver_userprofile[2]['id'], test_slack_user_id_to_zulip_user_id['U09TYF5Sk'])
+        self.assertEqual(
+            zerver_userprofile[2]['id'], test_slack_user_id_to_zulip_user_id['U09TYF5Sk']
+        )
         self.assertEqual(zerver_userprofile[2]['is_bot'], True)
         self.assertEqual(zerver_userprofile[2]['is_active'], True)
         self.assertEqual(zerver_userprofile[2]['is_mirror_dummy'], False)
@@ -347,7 +424,9 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(zerver_userprofile[2]['bot_type'], 1)
         self.assertEqual(zerver_userprofile[2]['avatar_source'], 'U')
 
-        self.assertEqual(zerver_userprofile[3]['id'], test_slack_user_id_to_zulip_user_id['UHSG7OPQN'])
+        self.assertEqual(
+            zerver_userprofile[3]['id'], test_slack_user_id_to_zulip_user_id['UHSG7OPQN']
+        )
         self.assertEqual(zerver_userprofile[3]['role'], UserProfile.ROLE_MEMBER)
         self.assertEqual(zerver_userprofile[3]['is_staff'], False)
         self.assertEqual(zerver_userprofile[3]['is_active'], False)
@@ -357,25 +436,33 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(zerver_userprofile[3]['is_mirror_dummy'], True)
         self.assertEqual(zerver_userprofile[3]['can_forge_sender'], False)
 
-        self.assertEqual(zerver_userprofile[4]['id'], test_slack_user_id_to_zulip_user_id['U8VAHEVUY'])
+        self.assertEqual(
+            zerver_userprofile[4]['id'], test_slack_user_id_to_zulip_user_id['U8VAHEVUY']
+        )
         self.assertEqual(zerver_userprofile[4]['role'], UserProfile.ROLE_GUEST)
         self.assertEqual(zerver_userprofile[4]['is_staff'], False)
         self.assertEqual(zerver_userprofile[4]['is_active'], True)
         self.assertEqual(zerver_userprofile[4]['is_mirror_dummy'], False)
 
-        self.assertEqual(zerver_userprofile[5]['id'], test_slack_user_id_to_zulip_user_id['U8X25EBAB'])
+        self.assertEqual(
+            zerver_userprofile[5]['id'], test_slack_user_id_to_zulip_user_id['U8X25EBAB']
+        )
         self.assertEqual(zerver_userprofile[5]['role'], UserProfile.ROLE_GUEST)
         self.assertEqual(zerver_userprofile[5]['is_staff'], False)
         self.assertEqual(zerver_userprofile[5]['is_active'], True)
         self.assertEqual(zerver_userprofile[5]['is_mirror_dummy'], False)
 
-        self.assertEqual(zerver_userprofile[6]['id'], test_slack_user_id_to_zulip_user_id['U015J7JSE'])
+        self.assertEqual(
+            zerver_userprofile[6]['id'], test_slack_user_id_to_zulip_user_id['U015J7JSE']
+        )
         self.assertEqual(zerver_userprofile[6]['role'], UserProfile.ROLE_REALM_OWNER)
         self.assertEqual(zerver_userprofile[6]['is_staff'], False)
         self.assertEqual(zerver_userprofile[6]['is_active'], True)
         self.assertEqual(zerver_userprofile[6]['is_mirror_dummy'], False)
 
-        self.assertEqual(zerver_userprofile[7]['id'], test_slack_user_id_to_zulip_user_id['U1RDFEC80'])
+        self.assertEqual(
+            zerver_userprofile[7]['id'], test_slack_user_id_to_zulip_user_id['U1RDFEC80']
+        )
         self.assertEqual(zerver_userprofile[7]['role'], UserProfile.ROLE_REALM_ADMINISTRATOR)
         self.assertEqual(zerver_userprofile[7]['is_staff'], False)
         self.assertEqual(zerver_userprofile[7]['is_active'], True)
@@ -410,60 +497,100 @@ class SlackImporter(ZulipTestCase):
 
     def test_build_subscription(self) -> None:
         channel_members = ["U061A1R2R", "U061A3E0G", "U061A5N1G", "U064KUGRJ"]
-        slack_user_id_to_zulip_user_id = {"U061A1R2R": 1, "U061A3E0G": 8, "U061A5N1G": 7, "U064KUGRJ": 5}
+        slack_user_id_to_zulip_user_id = {
+            "U061A1R2R": 1,
+            "U061A3E0G": 8,
+            "U061A5N1G": 7,
+            "U064KUGRJ": 5,
+        }
         subscription_id_count = 0
         recipient_id = 12
         zerver_subscription: List[Dict[str, Any]] = []
-        final_subscription_id = get_subscription(channel_members, zerver_subscription,
-                                                 recipient_id, slack_user_id_to_zulip_user_id,
-                                                 subscription_id_count)
+        final_subscription_id = get_subscription(
+            channel_members,
+            zerver_subscription,
+            recipient_id,
+            slack_user_id_to_zulip_user_id,
+            subscription_id_count,
+        )
         # sanity checks
         self.assertEqual(final_subscription_id, 4)
         self.assertEqual(zerver_subscription[0]['recipient'], 12)
         self.assertEqual(zerver_subscription[0]['id'], 0)
-        self.assertEqual(zerver_subscription[0]['user_profile'],
-                         slack_user_id_to_zulip_user_id[channel_members[0]])
-        self.assertEqual(zerver_subscription[2]['user_profile'],
-                         slack_user_id_to_zulip_user_id[channel_members[2]])
+        self.assertEqual(
+            zerver_subscription[0]['user_profile'],
+            slack_user_id_to_zulip_user_id[channel_members[0]],
+        )
+        self.assertEqual(
+            zerver_subscription[2]['user_profile'],
+            slack_user_id_to_zulip_user_id[channel_members[2]],
+        )
         self.assertEqual(zerver_subscription[3]['id'], 3)
-        self.assertEqual(zerver_subscription[1]['recipient'],
-                         zerver_subscription[3]['recipient'])
+        self.assertEqual(zerver_subscription[1]['recipient'], zerver_subscription[3]['recipient'])
         self.assertEqual(zerver_subscription[1]['pin_to_top'], False)
 
     def test_channels_to_zerver_stream(self) -> None:
-        slack_user_id_to_zulip_user_id = {"U061A1R2R": 1, "U061A3E0G": 8, "U061A5N1G": 7, "U064KUGRJ": 5}
+        slack_user_id_to_zulip_user_id = {
+            "U061A1R2R": 1,
+            "U061A3E0G": 8,
+            "U061A5N1G": 7,
+            "U064KUGRJ": 5,
+        }
         zerver_userprofile = [{'id': 1}, {'id': 8}, {'id': 7}, {'id': 5}]
         realm_id = 3
 
         with self.assertLogs(level="INFO"):
-            realm, added_channels, added_mpims, dm_members, slack_recipient_name_to_zulip_recipient_id = \
-                channels_to_zerver_stream(self.fixture_file_name("", "slack_fixtures"), realm_id,
-                                          {"zerver_userpresence": []}, slack_user_id_to_zulip_user_id,
-                                          zerver_userprofile)
+            (
+                realm,
+                added_channels,
+                added_mpims,
+                dm_members,
+                slack_recipient_name_to_zulip_recipient_id,
+            ) = channels_to_zerver_stream(
+                self.fixture_file_name("", "slack_fixtures"),
+                realm_id,
+                {"zerver_userpresence": []},
+                slack_user_id_to_zulip_user_id,
+                zerver_userprofile,
+            )
 
-        test_added_channels = {'sharedchannel': ("C061A0HJG", 3), 'general': ("C061A0YJG", 1),
-                               'general1': ("C061A0YJP", 2), 'random': ("C061A0WJG", 0)}
-        test_added_mpims = {'mpdm-user9--user2--user10-1': ('G9HBG2A5D', 0),
-                            'mpdm-user6--user7--user4-1': ('G6H1Z0ZPS', 1),
-                            'mpdm-user4--user1--user5-1': ('G6N944JPL', 2)}
-        test_dm_members = {'DJ47BL849': ('U061A1R2R', 'U061A5N1G'), 'DHX1UP7EG': ('U061A5N1G', 'U064KUGRJ'),
-                           'DK8HSJDHS': ('U061A1R2R', 'U064KUGRJ'), 'DRS3PSLDK': ('U064KUGRJ', 'U064KUGRJ')}
-        slack_recipient_names = set(slack_user_id_to_zulip_user_id.keys()) | set(test_added_channels.keys()) \
+        test_added_channels = {
+            'sharedchannel': ("C061A0HJG", 3),
+            'general': ("C061A0YJG", 1),
+            'general1': ("C061A0YJP", 2),
+            'random': ("C061A0WJG", 0),
+        }
+        test_added_mpims = {
+            'mpdm-user9--user2--user10-1': ('G9HBG2A5D', 0),
+            'mpdm-user6--user7--user4-1': ('G6H1Z0ZPS', 1),
+            'mpdm-user4--user1--user5-1': ('G6N944JPL', 2),
+        }
+        test_dm_members = {
+            'DJ47BL849': ('U061A1R2R', 'U061A5N1G'),
+            'DHX1UP7EG': ('U061A5N1G', 'U064KUGRJ'),
+            'DK8HSJDHS': ('U061A1R2R', 'U064KUGRJ'),
+            'DRS3PSLDK': ('U064KUGRJ', 'U064KUGRJ'),
+        }
+        slack_recipient_names = (
+            set(slack_user_id_to_zulip_user_id.keys())
+            | set(test_added_channels.keys())
             | set(test_added_mpims.keys())
+        )
 
         self.assertDictEqual(test_added_channels, added_channels)
         # zerver defaultstream already tested in helper functions.
         # Note that the `random` stream is archived and thus should
         # not be created as a DefaultStream.
-        self.assertEqual(realm["zerver_defaultstream"],
-                         [{'id': 0, 'realm': 3, 'stream': 1}])
+        self.assertEqual(realm["zerver_defaultstream"], [{'id': 0, 'realm': 3, 'stream': 1}])
 
         self.assertDictEqual(test_added_mpims, added_mpims)
         self.assertDictEqual(test_dm_members, dm_members)
 
         # We can't do an assertDictEqual since during the construction of personal
         # recipients, slack_user_id_to_zulip_user_id are iterated in different order in Python 3.5 and 3.6.
-        self.assertEqual(set(slack_recipient_name_to_zulip_recipient_id.keys()), slack_recipient_names)
+        self.assertEqual(
+            set(slack_recipient_name_to_zulip_recipient_id.keys()), slack_recipient_names
+        )
         self.assertEqual(set(slack_recipient_name_to_zulip_recipient_id.values()), set(range(11)))
 
         # functioning of zerver subscriptions are already tested in the helper functions
@@ -476,7 +603,9 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(self.get_set(zerver_subscription, "recipient"), set(range(11)))
         self.assertEqual(self.get_set(zerver_subscription, "user_profile"), {1, 5, 7, 8})
 
-        self.assertEqual(self.get_set(zerver_recipient, "id"), self.get_set(zerver_subscription, "recipient"))
+        self.assertEqual(
+            self.get_set(zerver_recipient, "id"), self.get_set(zerver_subscription, "recipient")
+        )
         self.assertEqual(self.get_set(zerver_recipient, "type_id"), {0, 1, 2, 3, 5, 7, 8})
         self.assertEqual(self.get_set(zerver_recipient, "type"), {1, 2, 3})
 
@@ -486,27 +615,39 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(zerver_stream[0]['description'], 'no purpose')
         self.assertEqual(zerver_stream[0]['invite_only'], False)
         self.assertEqual(zerver_stream[0]['realm'], realm_id)
-        self.assertEqual(zerver_stream[2]['id'],
-                         test_added_channels[zerver_stream[2]['name']][1])
+        self.assertEqual(zerver_stream[2]['id'], test_added_channels[zerver_stream[2]['name']][1])
 
         self.assertEqual(self.get_set(realm["zerver_huddle"], "id"), {0, 1, 2})
         self.assertEqual(realm["zerver_userpresence"], [])
 
-    @mock.patch("zerver.data_import.slack.users_to_zerver_userprofile",
-                return_value=[[], [], {}, [], []])
-    @mock.patch("zerver.data_import.slack.channels_to_zerver_stream",
-                return_value=[{"zerver_stream": []}, {}, {}, {}, {}])
-    def test_slack_workspace_to_realm(self, mock_channels_to_zerver_stream: mock.Mock,
-                                      mock_users_to_zerver_userprofile: mock.Mock) -> None:
+    @mock.patch(
+        "zerver.data_import.slack.users_to_zerver_userprofile", return_value=[[], [], {}, [], []]
+    )
+    @mock.patch(
+        "zerver.data_import.slack.channels_to_zerver_stream",
+        return_value=[{"zerver_stream": []}, {}, {}, {}, {}],
+    )
+    def test_slack_workspace_to_realm(
+        self, mock_channels_to_zerver_stream: mock.Mock, mock_users_to_zerver_userprofile: mock.Mock
+    ) -> None:
 
         realm_id = 1
         user_list: List[Dict[str, Any]] = []
-        realm, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id, \
-            added_channels, added_mpims, dm_members, \
-            avatar_list, em = slack_workspace_to_realm('testdomain', realm_id, user_list, 'test-realm',
-                                                       './random_path', {})
-        test_zerver_realmdomain = [{'realm': realm_id, 'allow_subdomains': False,
-                                    'domain': 'testdomain', 'id': realm_id}]
+        (
+            realm,
+            slack_user_id_to_zulip_user_id,
+            slack_recipient_name_to_zulip_recipient_id,
+            added_channels,
+            added_mpims,
+            dm_members,
+            avatar_list,
+            em,
+        ) = slack_workspace_to_realm(
+            'testdomain', realm_id, user_list, 'test-realm', './random_path', {}
+        )
+        test_zerver_realmdomain = [
+            {'realm': realm_id, 'allow_subdomains': False, 'domain': 'testdomain', 'id': realm_id}
+        ]
         # Functioning already tests in helper functions
         self.assertEqual(slack_user_id_to_zulip_user_id, {})
         self.assertEqual(added_channels, {})
@@ -518,7 +659,9 @@ class SlackImporter(ZulipTestCase):
         passed_realm = mock_channels_to_zerver_stream.call_args_list[0][0][2]
         zerver_realmdomain = passed_realm['zerver_realmdomain']
         self.assertListEqual(zerver_realmdomain, test_zerver_realmdomain)
-        self.assertEqual(passed_realm['zerver_realm'][0]['description'], 'Organization imported from Slack!')
+        self.assertEqual(
+            passed_realm['zerver_realm'][0]['description'], 'Organization imported from Slack!'
+        )
         self.assertEqual(passed_realm['zerver_userpresence'], [])
         self.assertEqual(len(passed_realm.keys()), 14)
 
@@ -530,8 +673,7 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(len(realm.keys()), 5)
 
     def test_get_message_sending_user(self) -> None:
-        message_with_file = {'subtype': 'file', 'type': 'message',
-                             'file': {'user': 'U064KUGRJ'}}
+        message_with_file = {'subtype': 'file', 'type': 'message', 'file': {'user': 'U064KUGRJ'}}
         message_without_file = {'subtype': 'file', 'type': 'messge', 'user': 'U064KUGRJ'}
 
         user_file = get_message_sending_user(message_with_file)
@@ -579,62 +721,146 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(zerver_usermessage[3]['id'], um_id + 4)
         self.assertEqual(zerver_usermessage[3]['message'], message_id)
 
-    @mock.patch("zerver.data_import.slack.build_usermessages", return_value = (2, 4))
+    @mock.patch("zerver.data_import.slack.build_usermessages", return_value=(2, 4))
     def test_channel_message_to_zerver_message(self, mock_build_usermessage: mock.Mock) -> None:
 
-        user_data = [{"id": "U066MTL5U", "name": "john doe", "deleted": False, "real_name": "John"},
-                     {"id": "U061A5N1G", "name": "jane doe", "deleted": False, "real_name": "Jane"},
-                     {"id": "U061A1R2R", "name": "jon", "deleted": False, "real_name": "Jon"}]
+        user_data = [
+            {"id": "U066MTL5U", "name": "john doe", "deleted": False, "real_name": "John"},
+            {"id": "U061A5N1G", "name": "jane doe", "deleted": False, "real_name": "Jane"},
+            {"id": "U061A1R2R", "name": "jon", "deleted": False, "real_name": "Jon"},
+        ]
 
         slack_user_id_to_zulip_user_id = {"U066MTL5U": 5, "U061A5N1G": 24, "U061A1R2R": 43}
 
         reactions = [{"name": "grinning", "users": ["U061A5N1G"], "count": 1}]
 
         all_messages: List[Dict[str, Any]] = [
-            {"text": "<@U066MTL5U> has joined the channel", "subtype": "channel_join",
-             "user": "U066MTL5U", "ts": "1434139102.000002", "channel_name": "random"},
-            {"text": "<@U061A5N1G>: hey!", "user": "U061A1R2R",
-             "ts": "1437868294.000006", "has_image": True, "channel_name": "random"},
-            {"text": "random", "user": "U061A5N1G", "reactions": reactions,
-             "ts": "1439868294.000006", "channel_name": "random"},
-            {"text": "without a user", "user": None,  # this message will be ignored as it has no user
-             "ts": "1239868294.000006", "channel_name": "general"},
-            {"text": "<http://journals.plos.org/plosone/article>", "user": "U061A1R2R",
-             "ts": "1463868370.000008", "channel_name": "general"},
-            {"text": "added bot", "user": "U061A5N1G", "subtype": "bot_add",
-             "ts": "1433868549.000010", "channel_name": "general"},
+            {
+                "text": "<@U066MTL5U> has joined the channel",
+                "subtype": "channel_join",
+                "user": "U066MTL5U",
+                "ts": "1434139102.000002",
+                "channel_name": "random",
+            },
+            {
+                "text": "<@U061A5N1G>: hey!",
+                "user": "U061A1R2R",
+                "ts": "1437868294.000006",
+                "has_image": True,
+                "channel_name": "random",
+            },
+            {
+                "text": "random",
+                "user": "U061A5N1G",
+                "reactions": reactions,
+                "ts": "1439868294.000006",
+                "channel_name": "random",
+            },
+            {
+                "text": "without a user",
+                "user": None,  # this message will be ignored as it has no user
+                "ts": "1239868294.000006",
+                "channel_name": "general",
+            },
+            {
+                "text": "<http://journals.plos.org/plosone/article>",
+                "user": "U061A1R2R",
+                "ts": "1463868370.000008",
+                "channel_name": "general",
+            },
+            {
+                "text": "added bot",
+                "user": "U061A5N1G",
+                "subtype": "bot_add",
+                "ts": "1433868549.000010",
+                "channel_name": "general",
+            },
             # This message will be ignored since it has no user and file is None.
             # See #9217 for the situation; likely file uploads on archived channels
-            {'upload': False, 'file': None, 'text': 'A file was shared',
-             'channel_name': 'general', 'type': 'message', 'ts': '1433868549.000011',
-             'subtype': 'file_share'},
-            {"text": "random test", "user": "U061A1R2R",
-             "ts": "1433868669.000012", "channel_name": "general"},
-            {"text": "Hello everyone", "user": "U061A1R2R", "type": "message",
-             "ts": "1433868669.000015", "mpim_name": "mpdm-user9--user2--user10-1"},
-            {"text": "Who is watching the World Cup", "user": "U061A5N1G", "type": "message",
-             "ts": "1433868949.000015", "mpim_name": "mpdm-user6--user7--user4-1"},
-            {'client_msg_id': '998d9229-35aa-424f-8d87-99e00df27dc9', 'type': 'message',
-             'text': 'Who is coming for camping this weekend?', 'user': 'U061A1R2R',
-             'ts': '1553607595.000700', 'pm_name': 'DHX1UP7EG'},
-            {"client_msg_id": "998d9229-35aa-424f-8d87-99e00df27dc9", "type": "message",
-             "text": "<@U061A5N1G>: Are you in Kochi?", "user": "U066MTL5U",
-             "ts": "1553607595.000700", "pm_name": "DJ47BL849"},
+            {
+                'upload': False,
+                'file': None,
+                'text': 'A file was shared',
+                'channel_name': 'general',
+                'type': 'message',
+                'ts': '1433868549.000011',
+                'subtype': 'file_share',
+            },
+            {
+                "text": "random test",
+                "user": "U061A1R2R",
+                "ts": "1433868669.000012",
+                "channel_name": "general",
+            },
+            {
+                "text": "Hello everyone",
+                "user": "U061A1R2R",
+                "type": "message",
+                "ts": "1433868669.000015",
+                "mpim_name": "mpdm-user9--user2--user10-1",
+            },
+            {
+                "text": "Who is watching the World Cup",
+                "user": "U061A5N1G",
+                "type": "message",
+                "ts": "1433868949.000015",
+                "mpim_name": "mpdm-user6--user7--user4-1",
+            },
+            {
+                'client_msg_id': '998d9229-35aa-424f-8d87-99e00df27dc9',
+                'type': 'message',
+                'text': 'Who is coming for camping this weekend?',
+                'user': 'U061A1R2R',
+                'ts': '1553607595.000700',
+                'pm_name': 'DHX1UP7EG',
+            },
+            {
+                "client_msg_id": "998d9229-35aa-424f-8d87-99e00df27dc9",
+                "type": "message",
+                "text": "<@U061A5N1G>: Are you in Kochi?",
+                "user": "U066MTL5U",
+                "ts": "1553607595.000700",
+                "pm_name": "DJ47BL849",
+            },
         ]
 
-        slack_recipient_name_to_zulip_recipient_id = {'random': 2, 'general': 1, 'mpdm-user9--user2--user10-1': 5,
-                                                      'mpdm-user6--user7--user4-1': 6, 'U066MTL5U': 7, 'U061A5N1G': 8,
-                                                      'U061A1R2R': 8}
-        dm_members = {'DJ47BL849': ('U066MTL5U', 'U061A5N1G'), 'DHX1UP7EG': ('U061A5N1G', 'U061A1R2R')}
+        slack_recipient_name_to_zulip_recipient_id = {
+            'random': 2,
+            'general': 1,
+            'mpdm-user9--user2--user10-1': 5,
+            'mpdm-user6--user7--user4-1': 6,
+            'U066MTL5U': 7,
+            'U061A5N1G': 8,
+            'U061A1R2R': 8,
+        }
+        dm_members = {
+            'DJ47BL849': ('U066MTL5U', 'U061A5N1G'),
+            'DHX1UP7EG': ('U061A5N1G', 'U061A1R2R'),
+        }
 
         zerver_usermessage: List[Dict[str, Any]] = []
         subscriber_map: Dict[int, Set[int]] = {}
         added_channels: Dict[str, Tuple[str, int]] = {'random': ('c5', 1), 'general': ('c6', 2)}
 
-        zerver_message, zerver_usermessage, attachment, uploads, reaction = \
-            channel_message_to_zerver_message(
-                1, user_data, slack_user_id_to_zulip_user_id, slack_recipient_name_to_zulip_recipient_id,
-                all_messages, [], subscriber_map, added_channels, dm_members, 'domain', set())
+        (
+            zerver_message,
+            zerver_usermessage,
+            attachment,
+            uploads,
+            reaction,
+        ) = channel_message_to_zerver_message(
+            1,
+            user_data,
+            slack_user_id_to_zulip_user_id,
+            slack_recipient_name_to_zulip_recipient_id,
+            all_messages,
+            [],
+            subscriber_map,
+            added_channels,
+            dm_members,
+            'domain',
+            set(),
+        )
         # functioning already tested in helper function
         self.assertEqual(zerver_usermessage, [])
         # subtype: channel_join is filtered
@@ -657,13 +883,27 @@ class SlackImporter(ZulipTestCase):
 
         self.assertEqual(zerver_message[3][EXPORT_TOPIC_NAME], 'imported from Slack')
         self.assertEqual(zerver_message[3]['content'], '/me added bot')
-        self.assertEqual(zerver_message[4]['recipient'], slack_recipient_name_to_zulip_recipient_id['general'])
+        self.assertEqual(
+            zerver_message[4]['recipient'], slack_recipient_name_to_zulip_recipient_id['general']
+        )
         self.assertEqual(zerver_message[2][EXPORT_TOPIC_NAME], 'imported from Slack')
-        self.assertEqual(zerver_message[1]['recipient'], slack_recipient_name_to_zulip_recipient_id['random'])
-        self.assertEqual(zerver_message[5]['recipient'], slack_recipient_name_to_zulip_recipient_id['mpdm-user9--user2--user10-1'])
-        self.assertEqual(zerver_message[6]['recipient'], slack_recipient_name_to_zulip_recipient_id['mpdm-user6--user7--user4-1'])
-        self.assertEqual(zerver_message[7]['recipient'], slack_recipient_name_to_zulip_recipient_id['U061A5N1G'])
-        self.assertEqual(zerver_message[7]['recipient'], slack_recipient_name_to_zulip_recipient_id['U061A5N1G'])
+        self.assertEqual(
+            zerver_message[1]['recipient'], slack_recipient_name_to_zulip_recipient_id['random']
+        )
+        self.assertEqual(
+            zerver_message[5]['recipient'],
+            slack_recipient_name_to_zulip_recipient_id['mpdm-user9--user2--user10-1'],
+        )
+        self.assertEqual(
+            zerver_message[6]['recipient'],
+            slack_recipient_name_to_zulip_recipient_id['mpdm-user6--user7--user4-1'],
+        )
+        self.assertEqual(
+            zerver_message[7]['recipient'], slack_recipient_name_to_zulip_recipient_id['U061A5N1G']
+        )
+        self.assertEqual(
+            zerver_message[7]['recipient'], slack_recipient_name_to_zulip_recipient_id['U061A5N1G']
+        )
 
         self.assertEqual(zerver_message[3]['id'], zerver_message[0]['id'] + 3)
         self.assertEqual(zerver_message[4]['id'], zerver_message[0]['id'] + 4)
@@ -684,8 +924,9 @@ class SlackImporter(ZulipTestCase):
 
     @mock.patch("zerver.data_import.slack.channel_message_to_zerver_message")
     @mock.patch("zerver.data_import.slack.get_messages_iterator")
-    def test_convert_slack_workspace_messages(self, mock_get_messages_iterator: mock.Mock,
-                                              mock_message: mock.Mock) -> None:
+    def test_convert_slack_workspace_messages(
+        self, mock_get_messages_iterator: mock.Mock, mock_message: mock.Mock
+    ) -> None:
         output_dir = os.path.join(settings.TEST_WORKER_DIR, 'test-slack-import')
         os.makedirs(output_dir, exist_ok=True)
 
@@ -694,9 +935,14 @@ class SlackImporter(ZulipTestCase):
         time = float(timezone_now().timestamp())
         zerver_message = [{'id': 1, 'ts': time}, {'id': 5, 'ts': time}]
 
-        def fake_get_messages_iter(slack_data_dir: str, added_channels: AddedChannelsT,
-                                   added_mpims: AddedMPIMsT, dm_members: DMMembersT) -> Iterator[ZerverFieldsT]:
+        def fake_get_messages_iter(
+            slack_data_dir: str,
+            added_channels: AddedChannelsT,
+            added_mpims: AddedMPIMsT,
+            dm_members: DMMembersT,
+        ) -> Iterator[ZerverFieldsT]:
             import copy
+
             return iter(copy.deepcopy(zerver_message))
 
         realm: Dict[str, Any] = {'zerver_subscription': []}
@@ -708,16 +954,29 @@ class SlackImporter(ZulipTestCase):
         zerver_usermessage = [{'id': 3}, {'id': 5}, {'id': 6}, {'id': 9}]
 
         mock_get_messages_iterator.side_effect = fake_get_messages_iter
-        mock_message.side_effect = [[zerver_message[:1], zerver_usermessage[:2],
-                                     attachments, uploads, reactions[:1]],
-                                    [zerver_message[1:2], zerver_usermessage[2:5],
-                                     attachments, uploads, reactions[1:1]]]
+        mock_message.side_effect = [
+            [zerver_message[:1], zerver_usermessage[:2], attachments, uploads, reactions[:1]],
+            [zerver_message[1:2], zerver_usermessage[2:5], attachments, uploads, reactions[1:1]],
+        ]
 
         with self.assertLogs(level="INFO"):
             # Hacky: We should include a zerver_userprofile, not the empty []
             test_reactions, uploads, zerver_attachment = convert_slack_workspace_messages(
-                './random_path', user_list, 2, {}, {}, added_channels, {}, {},
-                realm, [], [], 'domain', output_dir=output_dir, chunk_size=1)
+                './random_path',
+                user_list,
+                2,
+                {},
+                {},
+                added_channels,
+                {},
+                {},
+                realm,
+                [],
+                [],
+                'domain',
+                output_dir=output_dir,
+                chunk_size=1,
+            )
 
         messages_file_1 = os.path.join(output_dir, 'messages-000001.json')
         self.assertTrue(os.path.exists(messages_file_1))
@@ -737,20 +996,23 @@ class SlackImporter(ZulipTestCase):
         self.assertEqual(test_reactions, reactions)
 
     @mock.patch("zerver.data_import.slack.requests.get")
-    @mock.patch("zerver.data_import.slack.process_uploads", return_value = [])
-    @mock.patch("zerver.data_import.slack.build_attachment",
-                return_value = [])
+    @mock.patch("zerver.data_import.slack.process_uploads", return_value=[])
+    @mock.patch("zerver.data_import.slack.build_attachment", return_value=[])
     @mock.patch("zerver.data_import.slack.build_avatar_url")
     @mock.patch("zerver.data_import.slack.build_avatar")
     @mock.patch("zerver.data_import.slack.get_slack_api_data")
-    def test_slack_import_to_existing_database(self, mock_get_slack_api_data: mock.Mock,
-                                               mock_build_avatar_url: mock.Mock,
-                                               mock_build_avatar: mock.Mock,
-                                               mock_process_uploads: mock.Mock,
-                                               mock_attachment: mock.Mock,
-                                               mock_requests_get: mock.Mock) -> None:
-        test_slack_dir = os.path.join(settings.DEPLOY_ROOT, "zerver", "tests", "fixtures",
-                                      "slack_fixtures")
+    def test_slack_import_to_existing_database(
+        self,
+        mock_get_slack_api_data: mock.Mock,
+        mock_build_avatar_url: mock.Mock,
+        mock_build_avatar: mock.Mock,
+        mock_process_uploads: mock.Mock,
+        mock_attachment: mock.Mock,
+        mock_requests_get: mock.Mock,
+    ) -> None:
+        test_slack_dir = os.path.join(
+            settings.DEPLOY_ROOT, "zerver", "tests", "fixtures", "slack_fixtures"
+        )
         test_slack_zip_file = os.path.join(test_slack_dir, "test_slack_importer.zip")
         test_slack_unzipped_file = os.path.join(test_slack_dir, "test_slack_importer")
 
@@ -767,7 +1029,11 @@ class SlackImporter(ZulipTestCase):
 
         user_data_fixture = orjson.loads(self.fixture_data('user_data.json', type='slack_fixtures'))
         team_info_fixture = orjson.loads(self.fixture_data('team_info.json', type='slack_fixtures'))
-        mock_get_slack_api_data.side_effect = [user_data_fixture['members'], {}, team_info_fixture["team"]]
+        mock_get_slack_api_data.side_effect = [
+            user_data_fixture['members'],
+            {},
+            team_info_fixture["team"],
+        ]
         with get_test_image_file("img.png") as f:
             mock_requests_get.return_value.raw = BytesIO(f.read())
 
@@ -800,8 +1066,10 @@ class SlackImporter(ZulipTestCase):
         # test RealmAuditLog
         realmauditlog = RealmAuditLog.objects.filter(realm=realm)
         realmauditlog_event_type = {log.event_type for log in realmauditlog}
-        self.assertEqual(realmauditlog_event_type, {RealmAuditLog.SUBSCRIPTION_CREATED,
-                                                    RealmAuditLog.REALM_PLAN_TYPE_CHANGED})
+        self.assertEqual(
+            realmauditlog_event_type,
+            {RealmAuditLog.SUBSCRIPTION_CREATED, RealmAuditLog.REALM_PLAN_TYPE_CHANGED},
+        )
 
         Realm.objects.filter(name=test_realm_subdomain).delete()
 
diff --git a/zerver/tests/test_slack_message_conversion.py b/zerver/tests/test_slack_message_conversion.py
index a023f3eded..046bfdd568 100644
--- a/zerver/tests/test_slack_message_conversion.py
+++ b/zerver/tests/test_slack_message_conversion.py
@@ -12,18 +12,22 @@ from zerver.lib.test_classes import ZulipTestCase
 
 
 class SlackMessageConversion(ZulipTestCase):
-    def assertEqual(self, first: Any, second: Any, msg: str="") -> None:
+    def assertEqual(self, first: Any, second: Any, msg: str = "") -> None:
         if isinstance(first, str) and isinstance(second, str):
             if first != second:
-                raise AssertionError("Actual and expected outputs do not match; showing diff.\n" +
-                                     mdiff.diff_strings(first, second) + msg)
+                raise AssertionError(
+                    "Actual and expected outputs do not match; showing diff.\n"
+                    + mdiff.diff_strings(first, second)
+                    + msg
+                )
         else:
             super().assertEqual(first, second)
 
     def load_slack_message_conversion_tests(self) -> Dict[Any, Any]:
         test_fixtures = {}
-        with open(os.path.join(os.path.dirname(__file__),
-                               'fixtures/slack_message_conversion.json'), "rb") as f:
+        with open(
+            os.path.join(os.path.dirname(__file__), 'fixtures/slack_message_conversion.json'), "rb"
+        ) as f:
             data = orjson.loads(f.read())
         for test in data['regular_tests']:
             test_fixtures[test['name']] = test
@@ -46,29 +50,36 @@ class SlackMessageConversion(ZulipTestCase):
                 self.assertEqual(converted_text, test['conversion_output'])
 
     def test_mentioned_data(self) -> None:
-        slack_user_map = {'U08RGD1RD': 540,
-                          'U0CBK5KAT': 554,
-                          'U09TYF5SK': 571}
+        slack_user_map = {'U08RGD1RD': 540, 'U0CBK5KAT': 554, 'U09TYF5SK': 571}
         # For this test, only relevant keys are 'id', 'name', 'deleted'
         # and 'real_name'
-        users = [{"id": "U0CBK5KAT",
-                  "name": "aaron.anzalone",
-                  "deleted": False,
-                  "is_mirror_dummy": False,
-                  "real_name": ""},
-                 {"id": "U08RGD1RD",
-                  "name": "john",
-                  "deleted": False,
-                  "is_mirror_dummy": False,
-                  "real_name": "John Doe"},
-                 {"id": "U09TYF5Sk",
-                  "name": "Jane",
-                  "is_mirror_dummy": False,
-                  "deleted": True,  # Deleted users don't have 'real_name' key in Slack
-                  }]
+        users = [
+            {
+                "id": "U0CBK5KAT",
+                "name": "aaron.anzalone",
+                "deleted": False,
+                "is_mirror_dummy": False,
+                "real_name": "",
+            },
+            {
+                "id": "U08RGD1RD",
+                "name": "john",
+                "deleted": False,
+                "is_mirror_dummy": False,
+                "real_name": "John Doe",
+            },
+            {
+                "id": "U09TYF5Sk",
+                "name": "Jane",
+                "is_mirror_dummy": False,
+                "deleted": True,  # Deleted users don't have 'real_name' key in Slack
+            },
+        ]
         channel_map = {'general': ('C5Z73A7RA', 137)}
         message = 'Hi <@U08RGD1RD|john>: How are you? <#C5Z73A7RA|general>'
-        text, mentioned_users, has_link = convert_to_zulip_markdown(message, users, channel_map, slack_user_map)
+        text, mentioned_users, has_link = convert_to_zulip_markdown(
+            message, users, channel_map, slack_user_map
+        )
         full_name = get_user_full_name(users[1])
         self.assertEqual(full_name, 'John Doe')
         self.assertEqual(get_user_full_name(users[2]), 'Jane')
@@ -78,13 +89,17 @@ class SlackMessageConversion(ZulipTestCase):
 
         # multiple mentioning
         message = 'Hi <@U08RGD1RD|john>: How are you?<@U0CBK5KAT> asked.'
-        text, mentioned_users, has_link = convert_to_zulip_markdown(message, users, channel_map, slack_user_map)
+        text, mentioned_users, has_link = convert_to_zulip_markdown(
+            message, users, channel_map, slack_user_map
+        )
         self.assertEqual(text, 'Hi @**John Doe**: How are you?@**aaron.anzalone** asked.')
         self.assertEqual(mentioned_users, [540, 554])
 
         # Check wrong mentioning
         message = 'Hi <@U08RGD1RD|jon>: How are you?'
-        text, mentioned_users, has_link = convert_to_zulip_markdown(message, users, channel_map, slack_user_map)
+        text, mentioned_users, has_link = convert_to_zulip_markdown(
+            message, users, channel_map, slack_user_map
+        )
         self.assertEqual(text, message)
         self.assertEqual(mentioned_users, [])
 
diff --git a/zerver/tests/test_soft_deactivation.py b/zerver/tests/test_soft_deactivation.py
index 2be89c902f..3ab2e57f65 100644
--- a/zerver/tests/test_soft_deactivation.py
+++ b/zerver/tests/test_soft_deactivation.py
@@ -35,8 +35,8 @@ from zerver.models import (
 
 logger_string = "zulip.soft_deactivation"
 
-class UserSoftDeactivationTests(ZulipTestCase):
 
+class UserSoftDeactivationTests(ZulipTestCase):
     def test_do_soft_deactivate_user(self) -> None:
         user = self.example_user('hamlet')
         self.assertFalse(user.long_term_idle)
@@ -67,7 +67,9 @@ class UserSoftDeactivationTests(ZulipTestCase):
         log_output = []
         for user in users:
             log_output.append(f"INFO:{logger_string}:Soft deactivated user {user.id}")
-        log_output.append(f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process")
+        log_output.append(
+            f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process"
+        )
 
         self.assertEqual(m.output, log_output)
 
@@ -120,7 +122,9 @@ class UserSoftDeactivationTests(ZulipTestCase):
         log_output = []
         for user in users:
             log_output.append(f"INFO:{logger_string}:Soft deactivated user {user.id}")
-        log_output.append(f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process")
+        log_output.append(
+            f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process"
+        )
 
         self.assertEqual(m.output, log_output)
 
@@ -180,7 +184,9 @@ class UserSoftDeactivationTests(ZulipTestCase):
         log_output = []
         for user in users:
             log_output.append(f"INFO:{logger_string}:Soft deactivated user {user.id}")
-        log_output.append(f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process")
+        log_output.append(
+            f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process"
+        )
 
         self.assertEqual(m.output, log_output)
 
@@ -190,9 +196,11 @@ class UserSoftDeactivationTests(ZulipTestCase):
         message_id = self.send_stream_message(hamlet, stream, 'Hello world!')
         already_received = UserMessage.objects.filter(message_id=message_id).count()
 
-        with self.assertLogs(logger_string, level = "INFO") as m:
+        with self.assertLogs(logger_string, level="INFO") as m:
             do_catch_up_soft_deactivated_users(users)
-        self.assertEqual(m.output, [f"INFO:{logger_string}:Caught up {len(users)} soft-deactivated users"])
+        self.assertEqual(
+            m.output, [f"INFO:{logger_string}:Caught up {len(users)} soft-deactivated users"]
+        )
 
         catch_up_received = UserMessage.objects.filter(message_id=message_id).count()
         self.assertEqual(already_received + len(users), catch_up_received)
@@ -238,7 +246,9 @@ class UserSoftDeactivationTests(ZulipTestCase):
         log_output = []
         for user in users:
             log_output.append(f"INFO:{logger_string}:Soft deactivated user {user.id}")
-        log_output.append(f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process")
+        log_output.append(
+            f"INFO:{logger_string}:Soft-deactivated batch of {len(users[:100])} users; {len(users[100:])} remain to process"
+        )
         log_output.append(f"INFO:{logger_string}:Caught up {len(users)} soft-deactivated users")
         self.assertEqual(set(m.output), set(log_output))
 
@@ -249,8 +259,9 @@ class UserSoftDeactivationTests(ZulipTestCase):
         # Verify that deactivated users are caught up automatically
 
         message_id = self.send_stream_message(sender, stream_name)
-        received_count = UserMessage.objects.filter(user_profile__in=users,
-                                                    message_id=message_id).count()
+        received_count = UserMessage.objects.filter(
+            user_profile__in=users, message_id=message_id
+        ).count()
         self.assertEqual(0, received_count)
 
         with self.assertLogs(logger_string, level="INFO") as m:
@@ -260,34 +271,41 @@ class UserSoftDeactivationTests(ZulipTestCase):
         log_output.append(f"INFO:{logger_string}:Caught up {len(users)} soft-deactivated users")
         self.assertEqual(set(m.output), set(log_output))
 
-        self.assert_length(users_deactivated, 0)   # all users are already deactivated
-        received_count = UserMessage.objects.filter(user_profile__in=users,
-                                                    message_id=message_id).count()
+        self.assert_length(users_deactivated, 0)  # all users are already deactivated
+        received_count = UserMessage.objects.filter(
+            user_profile__in=users, message_id=message_id
+        ).count()
         self.assertEqual(len(users), received_count)
 
         # Verify that deactivated users are NOT caught up if
         # AUTO_CATCH_UP_SOFT_DEACTIVATED_USERS is off
 
         message_id = self.send_stream_message(sender, stream_name)
-        received_count = UserMessage.objects.filter(user_profile__in=users,
-                                                    message_id=message_id).count()
+        received_count = UserMessage.objects.filter(
+            user_profile__in=users, message_id=message_id
+        ).count()
         self.assertEqual(0, received_count)
 
         with self.settings(AUTO_CATCH_UP_SOFT_DEACTIVATED_USERS=False):
             with self.assertLogs(logger_string, level="INFO") as m:
                 users_deactivated = do_auto_soft_deactivate_users(-1, realm)
-        self.assertEqual(m.output, [f"INFO:{logger_string}:Not catching up users since AUTO_CATCH_UP_SOFT_DEACTIVATED_USERS is off"])
+        self.assertEqual(
+            m.output,
+            [
+                f"INFO:{logger_string}:Not catching up users since AUTO_CATCH_UP_SOFT_DEACTIVATED_USERS is off"
+            ],
+        )
 
-        self.assert_length(users_deactivated, 0)   # all users are already deactivated
-        received_count = UserMessage.objects.filter(user_profile__in=users,
-                                                    message_id=message_id).count()
+        self.assert_length(users_deactivated, 0)  # all users are already deactivated
+        received_count = UserMessage.objects.filter(
+            user_profile__in=users, message_id=message_id
+        ).count()
         self.assertEqual(0, received_count)
 
 
 class SoftDeactivationMessageTest(ZulipTestCase):
-
     def test_reactivate_user_if_soft_deactivated(self) -> None:
-        recipient_list  = [self.example_user("hamlet"), self.example_user("iago")]
+        recipient_list = [self.example_user("hamlet"), self.example_user("iago")]
         for user_profile in recipient_list:
             self.subscribe(user_profile, "Denmark")
 
@@ -296,9 +314,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         topic_name = 'foo'
 
         def last_realm_audit_log_entry(event_type: int) -> RealmAuditLog:
-            return RealmAuditLog.objects.filter(
-                event_type=event_type
-            ).order_by('-event_time')[0]
+            return RealmAuditLog.objects.filter(event_type=event_type).order_by('-event_time')[0]
 
         long_term_idle_user = self.example_user('hamlet')
         # We are sending this message to ensure that long_term_idle_user has
@@ -306,14 +322,16 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         self.send_stream_message(long_term_idle_user, stream_name)
         with self.assertLogs(logger_string, level='INFO') as info_logs:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_logs.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         message = 'Test Message 1'
-        message_id = self.send_stream_message(sender, stream_name,
-                                              message, topic_name)
+        message_id = self.send_stream_message(sender, stream_name, message, topic_name)
         idle_user_msg_list = get_user_messages(long_term_idle_user)
         idle_user_msg_count = len(idle_user_msg_list)
         self.assertNotEqual(idle_user_msg_list[-1].content, message)
@@ -321,8 +339,10 @@ class SoftDeactivationMessageTest(ZulipTestCase):
             reactivate_user_if_soft_deactivated(long_term_idle_user)
         self.assert_length(queries, 8)
         self.assertFalse(long_term_idle_user.long_term_idle)
-        self.assertEqual(last_realm_audit_log_entry(
-            RealmAuditLog.USER_SOFT_ACTIVATED).modified_user, long_term_idle_user)
+        self.assertEqual(
+            last_realm_audit_log_entry(RealmAuditLog.USER_SOFT_ACTIVATED).modified_user,
+            long_term_idle_user,
+        )
         idle_user_msg_list = get_user_messages(long_term_idle_user)
         self.assertEqual(len(idle_user_msg_list), idle_user_msg_count + 1)
         self.assertEqual(idle_user_msg_list[-1].content, message)
@@ -330,7 +350,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         self.assertEqual(long_term_idle_user.last_active_message_id, message_id)
 
     def test_add_missing_messages(self) -> None:
-        recipient_list  = [self.example_user("hamlet"), self.example_user("iago")]
+        recipient_list = [self.example_user("hamlet"), self.example_user("iago")]
         for user_profile in recipient_list:
             self.subscribe(user_profile, "Denmark")
 
@@ -343,11 +363,13 @@ class SoftDeactivationMessageTest(ZulipTestCase):
 
         def send_fake_message(message_content: str, stream: Stream) -> Message:
             recipient = stream.recipient
-            message = Message(sender = sender,
-                              recipient = recipient,
-                              content = message_content,
-                              date_sent = timezone_now(),
-                              sending_client = sending_client)
+            message = Message(
+                sender=sender,
+                recipient=recipient,
+                content=message_content,
+                date_sent=timezone_now(),
+                sending_client=sending_client,
+            )
             message.set_topic_name(topic_name)
             message.save()
             return message
@@ -356,10 +378,13 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         self.send_stream_message(long_term_idle_user, stream_name)
         with self.assertLogs(logger_string, level='INFO') as info_logs:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_logs.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         # Test that add_missing_messages() in simplest case of adding a
         # message for which UserMessage row doesn't exist for this user.
@@ -457,16 +482,18 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         do_soft_activate_users([long_term_idle_user])
         self.subscribe(long_term_idle_user, stream_name)
         # Send a real message to update last_active_message_id
-        sent_message_id = self.send_stream_message(
-            sender, stream_name, 'Test Message 9')
+        sent_message_id = self.send_stream_message(sender, stream_name, 'Test Message 9')
         self.unsubscribe(long_term_idle_user, stream_name)
         # Soft deactivate and send another message to the unsubscribed stream.
         with self.assertLogs(logger_string, level='INFO') as info_logs:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_logs.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
         send_fake_message('Test Message 10', stream)
 
         idle_user_msg_list = get_user_messages(long_term_idle_user)
@@ -513,7 +540,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
 
     @mock.patch('zerver.lib.soft_deactivation.BULK_CREATE_BATCH_SIZE', 2)
     def test_add_missing_messages_pagination(self) -> None:
-        recipient_list  = [self.example_user("hamlet"), self.example_user("iago")]
+        recipient_list = [self.example_user("hamlet"), self.example_user("iago")]
         stream_name = 'Denmark'
         for user_profile in recipient_list:
             self.subscribe(user_profile, stream_name)
@@ -523,10 +550,13 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         self.send_stream_message(long_term_idle_user, stream_name)
         with self.assertLogs(logger_string, level='INFO') as info_logs:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_logs.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         num_new_messages = 5
         message_ids = []
@@ -548,7 +578,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         # In this test we are basically testing out the logic used out in
         # do_send_messages() in action.py for filtering the messages for which
         # UserMessage rows should be created for a soft-deactivated user.
-        recipient_list  = [
+        recipient_list = [
             self.example_user("hamlet"),
             self.example_user("iago"),
             self.example_user('cordelia'),
@@ -562,8 +592,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         topic_name = 'foo'
 
         def send_stream_message(content: str) -> None:
-            self.send_stream_message(sender, stream_name,
-                                     content, topic_name)
+            self.send_stream_message(sender, stream_name, content, topic_name)
 
         def send_personal_message(content: str) -> None:
             self.send_personal_message(sender, self.example_user("hamlet"), content)
@@ -572,16 +601,19 @@ class SoftDeactivationMessageTest(ZulipTestCase):
         self.send_stream_message(long_term_idle_user, stream_name)
         with self.assertLogs(logger_string, level='INFO') as info_logs:
             do_soft_deactivate_users([long_term_idle_user])
-        self.assertEqual(info_logs.output, [
-            f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
-            f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process'
-        ])
+        self.assertEqual(
+            info_logs.output,
+            [
+                f'INFO:{logger_string}:Soft deactivated user {long_term_idle_user.id}',
+                f'INFO:{logger_string}:Soft-deactivated batch of 1 users; 0 remain to process',
+            ],
+        )
 
         def assert_um_count(user: UserProfile, count: int) -> None:
             user_messages = get_user_messages(user)
             self.assertEqual(len(user_messages), count)
 
-        def assert_last_um_content(user: UserProfile, content: str, negate: bool=False) -> None:
+        def assert_last_um_content(user: UserProfile, content: str, negate: bool = False) -> None:
             user_messages = get_user_messages(user)
             if negate:
                 self.assertNotEqual(user_messages[-1].content, content)
diff --git a/zerver/tests/test_subdomains.py b/zerver/tests/test_subdomains.py
index 954f9f6dc1..fbe4ae0588 100644
--- a/zerver/tests/test_subdomains.py
+++ b/zerver/tests/test_subdomains.py
@@ -8,23 +8,28 @@ from zerver.models import Realm
 
 class SubdomainsTest(ZulipTestCase):
     def test_get_subdomain(self) -> None:
-
         def request_mock(host: str) -> Any:
             request = mock.Mock(spec=['get_host'])
             request.attach_mock(mock.Mock(return_value=host), 'get_host')
             return request
 
-        def test(expected: str, host: str, *, plusport: bool=True,
-                 external_host: str='example.org',
-                 realm_hosts: Mapping[str, str]={},
-                 root_aliases: Sequence[str]=[]) -> None:
-            with self.settings(EXTERNAL_HOST=external_host,
-                               REALM_HOSTS=realm_hosts,
-                               ROOT_SUBDOMAIN_ALIASES=root_aliases):
+        def test(
+            expected: str,
+            host: str,
+            *,
+            plusport: bool = True,
+            external_host: str = 'example.org',
+            realm_hosts: Mapping[str, str] = {},
+            root_aliases: Sequence[str] = [],
+        ) -> None:
+            with self.settings(
+                EXTERNAL_HOST=external_host,
+                REALM_HOSTS=realm_hosts,
+                ROOT_SUBDOMAIN_ALIASES=root_aliases,
+            ):
                 self.assertEqual(get_subdomain(request_mock(host)), expected)
                 if plusport and ':' not in host:
-                    self.assertEqual(get_subdomain(request_mock(host + ':443')),
-                                     expected)
+                    self.assertEqual(get_subdomain(request_mock(host + ':443')), expected)
 
         ROOT = Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
 
diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index de02dae333..6b1a54b20d 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -113,6 +113,7 @@ class TestMiscStuff(ZulipTestCase):
         )
         self.assertEqual(streams, [])
 
+
 class TestCreateStreams(ZulipTestCase):
     def test_creating_streams(self) -> None:
         stream_names = ['new1', 'new2', 'new3']
@@ -146,12 +147,17 @@ class TestCreateStreams(ZulipTestCase):
 
         new_streams, existing_streams = create_streams_if_needed(
             realm,
-            [{"name": stream_name,
-              "description": stream_description,
-              "invite_only": True,
-              "stream_post_policy": Stream.STREAM_POST_POLICY_ADMINS,
-              "message_retention_days": -1}
-             for (stream_name, stream_description) in zip(stream_names, stream_descriptions)])
+            [
+                {
+                    "name": stream_name,
+                    "description": stream_description,
+                    "invite_only": True,
+                    "stream_post_policy": Stream.STREAM_POST_POLICY_ADMINS,
+                    "message_retention_days": -1,
+                }
+                for (stream_name, stream_description) in zip(stream_names, stream_descriptions)
+            ],
+        )
 
         self.assertEqual(len(new_streams), 3)
         self.assertEqual(len(existing_streams), 0)
@@ -167,10 +173,11 @@ class TestCreateStreams(ZulipTestCase):
 
         new_streams, existing_streams = create_streams_if_needed(
             realm,
-            [{"name": stream_name,
-              "description": stream_description,
-              "invite_only": True}
-             for (stream_name, stream_description) in zip(stream_names, stream_descriptions)])
+            [
+                {"name": stream_name, "description": stream_description, "invite_only": True}
+                for (stream_name, stream_description) in zip(stream_names, stream_descriptions)
+            ],
+        )
 
         self.assertEqual(len(new_streams), 0)
         self.assertEqual(len(existing_streams), 3)
@@ -186,11 +193,13 @@ class TestCreateStreams(ZulipTestCase):
         user = self.example_user("hamlet")
         realm = user.realm
         self.login_user(user)
-        post_data = {'subscriptions': orjson.dumps([{"name": 'new_stream',
-                                                     "description": "multi\nline\ndescription"}]).decode(),
-                     'invite_only': orjson.dumps(False).decode()}
-        result = self.api_post(user, "/api/v1/users/me/subscriptions", post_data,
-                               subdomain="zulip")
+        post_data = {
+            'subscriptions': orjson.dumps(
+                [{"name": 'new_stream', "description": "multi\nline\ndescription"}]
+            ).decode(),
+            'invite_only': orjson.dumps(False).decode(),
+        }
+        result = self.api_post(user, "/api/v1/users/me/subscriptions", post_data, subdomain="zulip")
         self.assert_json_success(result)
         stream = get_stream("new_stream", realm)
         self.assertEqual(stream.description, 'multi line description')
@@ -202,11 +211,7 @@ class TestCreateStreams(ZulipTestCase):
                 "name": "publicstream",
                 "description": "Public stream with public history",
             },
-            {
-                "name": "webpublicstream",
-                "description": "Web public stream",
-                "is_web_public": True
-            },
+            {"name": "webpublicstream", "description": "Web public stream", "is_web_public": True},
             {
                 "name": "privatestream",
                 "description": "Private stream with non-public history",
@@ -313,8 +318,9 @@ class TestCreateStreams(ZulipTestCase):
         # 4 UserMessages per subscriber: One for each of the subscribers, plus 1 for
         # each user in the notifications stream.
         announce_stream_subs = Subscription.objects.filter(recipient=announce_stream.recipient)
-        self.assertEqual(final_usermessage_count - initial_usermessage_count,
-                         4 + announce_stream_subs.count())
+        self.assertEqual(
+            final_usermessage_count - initial_usermessage_count, 4 + announce_stream_subs.count()
+        )
 
         def get_unread_stream_data(user: UserProfile) -> List[Dict[str, Any]]:
             raw_unread_data = get_raw_unread_data(user)
@@ -336,6 +342,7 @@ class TestCreateStreams(ZulipTestCase):
         # But it should be marked as read for Iago, the stream creator.
         self.assertEqual(len(iago_unread_messages), 0)
 
+
 class RecipientTest(ZulipTestCase):
     def test_recipient(self) -> None:
         realm = get_realm('zulip')
@@ -346,6 +353,7 @@ class RecipientTest(ZulipTestCase):
         )
         self.assertEqual(str(recipient), f'<Recipient: Verona ({stream.id}, {Recipient.STREAM})>')
 
+
 class StreamAdminTest(ZulipTestCase):
     def test_make_stream_public(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -389,7 +397,9 @@ class StreamAdminTest(ZulipTestCase):
         self.assert_json_error(result, "Must be an organization or stream administrator")
 
         sub = get_subscription('private_stream_2', user_profile)
-        do_change_subscription_property(user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR)
+        do_change_subscription_property(
+            user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+        )
         result = self.client_patch(f"/json/streams/{stream.id}", params)
         self.assert_json_success(result)
 
@@ -437,7 +447,9 @@ class StreamAdminTest(ZulipTestCase):
         self.assert_json_error(result, "Must be an organization or stream administrator")
 
         sub = get_subscription('public_stream_2', user_profile)
-        do_change_subscription_property(user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR)
+        do_change_subscription_property(
+            user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+        )
         result = self.client_patch(f"/json/streams/{stream.id}", params)
         self.assert_json_success(result)
 
@@ -458,8 +470,7 @@ class StreamAdminTest(ZulipTestCase):
             'is_private': orjson.dumps(False).decode(),
         }
         stream_id = get_stream('target_stream', realm).id
-        result = self.client_patch(f"/json/streams/{stream_id}", params,
-                                   subdomain="zephyr")
+        result = self.client_patch(f"/json/streams/{stream_id}", params, subdomain="zephyr")
         self.assert_json_success(result)
         stream = get_stream('target_stream', realm)
         self.assertFalse(stream.invite_only)
@@ -512,22 +523,32 @@ class StreamAdminTest(ZulipTestCase):
 
         result = self.client_delete(f'/json/streams/{stream.id}')
         self.assert_json_success(result)
-        subscription_exists = get_active_subscriptions_for_stream_id(stream.id).filter(
-            user_profile=user_profile,
-        ).exists()
+        subscription_exists = (
+            get_active_subscriptions_for_stream_id(stream.id)
+            .filter(
+                user_profile=user_profile,
+            )
+            .exists()
+        )
         self.assertFalse(subscription_exists)
 
         do_change_user_role(user_profile, UserProfile.ROLE_MEMBER)
         stream = self.make_stream('new_stream_2')
         self.subscribe(user_profile, stream.name)
         sub = get_subscription(stream.name, user_profile)
-        do_change_subscription_property(user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR)
+        do_change_subscription_property(
+            user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+        )
 
         result = self.client_delete(f'/json/streams/{stream.id}')
         self.assert_json_success(result)
-        subscription_exists = get_active_subscriptions_for_stream_id(stream.id).filter(
-            user_profile=user_profile,
-        ).exists()
+        subscription_exists = (
+            get_active_subscriptions_for_stream_id(stream.id)
+            .filter(
+                user_profile=user_profile,
+            )
+            .exists()
+        )
         self.assertFalse(subscription_exists)
 
     def test_deactivate_stream_removes_default_stream(self) -> None:
@@ -631,8 +652,10 @@ class StreamAdminTest(ZulipTestCase):
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
             stream_id = get_stream('private_stream', user_profile.realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'description': orjson.dumps('Test description').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}',
+                {'description': orjson.dumps('Test description').decode()},
+            )
         self.assert_json_success(result)
         # Should be just a description change event
         self.assert_length(events, 1)
@@ -648,8 +671,9 @@ class StreamAdminTest(ZulipTestCase):
         events = []
         with tornado_redirected_to_list(events):
             stream_id = get_stream('private_stream', user_profile.realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('whatever').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'new_name': orjson.dumps('whatever').decode()}
+            )
         self.assert_json_success(result)
         # Should be a name event, an email address event and a notification event
         self.assert_length(events, 3)
@@ -674,36 +698,44 @@ class StreamAdminTest(ZulipTestCase):
         stream = self.subscribe(user_profile, 'stream_name1')
         do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
 
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'new_name': orjson.dumps('stream_name1').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'new_name': orjson.dumps('stream_name1').decode()}
+        )
         self.assert_json_error(result, "Stream already has that name!")
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'new_name': orjson.dumps('Denmark').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'new_name': orjson.dumps('Denmark').decode()}
+        )
         self.assert_json_error(result, "Stream name 'Denmark' is already taken.")
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'new_name': orjson.dumps('denmark ').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'new_name': orjson.dumps('denmark ').decode()}
+        )
         self.assert_json_error(result, "Stream name 'denmark' is already taken.")
 
         # Do a rename that is case-only--this should succeed.
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'new_name': orjson.dumps('sTREAm_name1').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'new_name': orjson.dumps('sTREAm_name1').decode()}
+        )
         self.assert_json_success(result)
 
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
             stream_id = get_stream('stream_name1', user_profile.realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('stream_name2').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'new_name': orjson.dumps('stream_name2').decode()}
+            )
         self.assert_json_success(result)
         event = events[1]['event']
-        self.assertEqual(event, dict(
-            op='update',
-            type='stream',
-            property='name',
-            value='stream_name2',
-            stream_id=stream_id,
-            name='sTREAm_name1',
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                op='update',
+                type='stream',
+                property='name',
+                value='stream_name2',
+                stream_id=stream_id,
+                name='sTREAm_name1',
+            ),
+        )
         notified_user_ids = set(events[1]['users'])
 
         self.assertRaises(Stream.DoesNotExist, get_stream, 'stream_name1', realm)
@@ -712,19 +744,17 @@ class StreamAdminTest(ZulipTestCase):
         self.assertTrue(stream_name2_exists)
 
         self.assertEqual(notified_user_ids, set(active_non_guest_user_ids(realm.id)))
-        self.assertIn(user_profile.id,
-                      notified_user_ids)
-        self.assertIn(self.example_user('prospero').id,
-                      notified_user_ids)
-        self.assertNotIn(self.example_user('polonius').id,
-                         notified_user_ids)
+        self.assertIn(user_profile.id, notified_user_ids)
+        self.assertIn(self.example_user('prospero').id, notified_user_ids)
+        self.assertNotIn(self.example_user('polonius').id, notified_user_ids)
 
         # Test case to handle Unicode stream name change
         # *NOTE: Here encoding is needed when Unicode string is passed as an argument*
         with tornado_redirected_to_list(events):
             stream_id = stream_name2_exists.id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('नया नाम').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'new_name': orjson.dumps('नया नाम').decode()}
+            )
         self.assert_json_success(result)
         # While querying, system can handle Unicode strings.
         stream_name_uni_exists = get_stream('नया नाम', realm)
@@ -735,8 +765,10 @@ class StreamAdminTest(ZulipTestCase):
         # by client_patch call, encoding of URL is not needed.
         with tornado_redirected_to_list(events):
             stream_id = stream_name_uni_exists.id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('नाम में क्या रक्खा हे').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}',
+                {'new_name': orjson.dumps('नाम में क्या रक्खा हे').decode()},
+            )
         self.assert_json_success(result)
         # While querying, system can handle Unicode strings.
         self.assertRaises(Stream.DoesNotExist, get_stream, 'नया नाम', realm)
@@ -747,8 +779,9 @@ class StreamAdminTest(ZulipTestCase):
         # Test case to change name from one language to other.
         with tornado_redirected_to_list(events):
             stream_id = stream_name_new_uni_exists.id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('français').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'new_name': orjson.dumps('français').decode()}
+            )
         self.assert_json_success(result)
         stream_name_fr_exists = get_stream('français', realm)
         self.assertTrue(stream_name_fr_exists)
@@ -756,20 +789,25 @@ class StreamAdminTest(ZulipTestCase):
         # Test case to change name to mixed language name.
         with tornado_redirected_to_list(events):
             stream_id = stream_name_fr_exists.id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('français name').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'new_name': orjson.dumps('français name').decode()}
+            )
         self.assert_json_success(result)
         stream_name_mixed_exists = get_stream('français name', realm)
         self.assertTrue(stream_name_mixed_exists)
 
         # Test case for notified users in private streams.
-        stream_private = self.make_stream('stream_private_name1', realm=user_profile.realm, invite_only=True)
+        stream_private = self.make_stream(
+            'stream_private_name1', realm=user_profile.realm, invite_only=True
+        )
         self.subscribe(self.example_user('cordelia'), 'stream_private_name1')
         del events[:]
         with tornado_redirected_to_list(events):
             stream_id = get_stream('stream_private_name1', realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'new_name': orjson.dumps('stream_private_name2').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}',
+                {'new_name': orjson.dumps('stream_private_name2').decode()},
+            )
         self.assert_json_success(result)
         notified_user_ids = set(events[1]['users'])
         self.assertEqual(notified_user_ids, can_access_stream_user_ids(stream_private))
@@ -778,19 +816,22 @@ class StreamAdminTest(ZulipTestCase):
         self.assertIn(self.example_user('iago').id, notified_user_ids)
         # The current user, Hamlet was made an admin and thus should be notified too.
         self.assertIn(user_profile.id, notified_user_ids)
-        self.assertNotIn(self.example_user('prospero').id,
-                         notified_user_ids)
+        self.assertNotIn(self.example_user('prospero').id, notified_user_ids)
 
         # Test renaming of stream by stream admin.
         do_change_user_role(user_profile, UserProfile.ROLE_MEMBER)
         new_stream = self.make_stream('new_stream', realm=user_profile.realm)
         self.subscribe(user_profile, 'new_stream')
         sub = get_subscription('new_stream', user_profile)
-        do_change_subscription_property(user_profile, sub, new_stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR)
+        do_change_subscription_property(
+            user_profile, sub, new_stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+        )
         del events[:]
         with tornado_redirected_to_list(events):
-            result = self.client_patch(f'/json/streams/{new_stream.id}',
-                                       {'new_name': orjson.dumps('stream_rename').decode()})
+            result = self.client_patch(
+                f'/json/streams/{new_stream.id}',
+                {'new_name': orjson.dumps('stream_rename').decode()},
+            )
         self.assert_json_success(result)
         self.assertEqual(len(events), 3)
 
@@ -807,8 +848,9 @@ class StreamAdminTest(ZulipTestCase):
         self.assertFalse(sub.is_stream_admin)
 
         stream_id = get_stream('stream_name1', user_profile.realm).id
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'new_name': orjson.dumps('stream_name2').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}', {'new_name': orjson.dumps('stream_name2').decode()}
+        )
         self.assert_json_error(result, 'Must be an organization or stream administrator')
 
     def test_notify_on_stream_rename(self) -> None:
@@ -818,8 +860,9 @@ class StreamAdminTest(ZulipTestCase):
 
         stream = self.subscribe(user_profile, 'stream_name1')
         do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'new_name': orjson.dumps('stream_name2').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'new_name': orjson.dumps('stream_name2').decode()}
+        )
         self.assert_json_success(result)
 
         # Inspect the notification message sent
@@ -838,24 +881,34 @@ class StreamAdminTest(ZulipTestCase):
         hamlet = self.example_user('hamlet')
 
         self.login_user(iago)
-        result = self.common_subscribe_to_streams(iago, ["private_stream"],
-                                                  dict(principals=orjson.dumps([hamlet.id]).decode()),
-                                                  invite_only=True)
+        result = self.common_subscribe_to_streams(
+            iago,
+            ["private_stream"],
+            dict(principals=orjson.dumps([hamlet.id]).decode()),
+            invite_only=True,
+        )
         self.assert_json_success(result)
 
         stream_id = get_stream('private_stream', iago.realm).id
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'new_name': orjson.dumps('new_private_stream').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}', {'new_name': orjson.dumps('new_private_stream').decode()}
+        )
         self.assert_json_success(result)
 
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'new_description': orjson.dumps('new description').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}',
+            {'new_description': orjson.dumps('new description').decode()},
+        )
         self.assert_json_success(result)
 
         # But cannot change stream type.
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'stream_name': orjson.dumps('private_stream').decode(),
-                                    'is_private': orjson.dumps(True).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}',
+            {
+                'stream_name': orjson.dumps('private_stream').decode(),
+                'is_private': orjson.dumps(True).decode(),
+            },
+        )
         self.assert_json_error(result, "Invalid stream id")
 
     def test_non_admin_cannot_access_unsub_private_stream(self) -> None:
@@ -863,24 +916,34 @@ class StreamAdminTest(ZulipTestCase):
         hamlet = self.example_user('hamlet')
 
         self.login_user(hamlet)
-        result = self.common_subscribe_to_streams(hamlet, ["private_stream_1"],
-                                                  dict(principals=orjson.dumps([iago.id]).decode()),
-                                                  invite_only=True)
+        result = self.common_subscribe_to_streams(
+            hamlet,
+            ["private_stream_1"],
+            dict(principals=orjson.dumps([iago.id]).decode()),
+            invite_only=True,
+        )
         self.assert_json_success(result)
 
         stream_id = get_stream('private_stream_1', hamlet.realm).id
 
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'new_name': orjson.dumps('private_stream_2').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}', {'new_name': orjson.dumps('private_stream_2').decode()}
+        )
         self.assert_json_error(result, "Invalid stream id")
 
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'new_description': orjson.dumps('new description').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}',
+            {'new_description': orjson.dumps('new description').decode()},
+        )
         self.assert_json_error(result, "Invalid stream id")
 
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'stream_name': orjson.dumps('private_stream_1').decode(),
-                                    'is_private': orjson.dumps(True).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}',
+            {
+                'stream_name': orjson.dumps('private_stream_1').decode(),
+                'is_private': orjson.dumps(True).decode(),
+            },
+        )
         self.assert_json_error(result, "Invalid stream id")
 
         result = self.client_delete(f'/json/streams/{stream_id}')
@@ -895,50 +958,57 @@ class StreamAdminTest(ZulipTestCase):
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
             stream_id = get_stream('stream_name1', realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'description': orjson.dumps('Test description').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}',
+                {'description': orjson.dumps('Test description').decode()},
+            )
         self.assert_json_success(result)
 
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            op='update',
-            type='stream',
-            property='description',
-            value='Test description',
-            rendered_description='<p>Test description</p>',
-            stream_id=stream_id,
-            name='stream_name1',
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                op='update',
+                type='stream',
+                property='description',
+                value='Test description',
+                rendered_description='<p>Test description</p>',
+                stream_id=stream_id,
+                name='stream_name1',
+            ),
+        )
         notified_user_ids = set(events[0]['users'])
 
         stream = get_stream('stream_name1', realm)
         self.assertEqual(notified_user_ids, set(active_non_guest_user_ids(realm.id)))
-        self.assertIn(user_profile.id,
-                      notified_user_ids)
-        self.assertIn(self.example_user('prospero').id,
-                      notified_user_ids)
-        self.assertNotIn(self.example_user('polonius').id,
-                         notified_user_ids)
+        self.assertIn(user_profile.id, notified_user_ids)
+        self.assertIn(self.example_user('prospero').id, notified_user_ids)
+        self.assertNotIn(self.example_user('polonius').id, notified_user_ids)
 
         self.assertEqual('Test description', stream.description)
 
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'description': orjson.dumps('a' * 1025).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}', {'description': orjson.dumps('a' * 1025).decode()}
+        )
         self.assert_json_error(
             result,
             f"description is too long (limit: {Stream.MAX_DESCRIPTION_LENGTH} characters)",
         )
 
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'description': orjson.dumps('a\nmulti\nline\ndescription').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}',
+            {'description': orjson.dumps('a\nmulti\nline\ndescription').decode()},
+        )
         self.assert_json_success(result)
         stream = get_stream('stream_name1', realm)
         self.assertEqual(stream.description, 'a multi line description')
 
         # Verify that we don't render inline URL previews in this code path.
         with self.settings(INLINE_URL_EMBED_PREVIEW=True):
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'description': orjson.dumps('See https://zulip.com/team').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}',
+                {'description': orjson.dumps('See https://zulip.com/team').decode()},
+            )
         self.assert_json_success(result)
         stream = get_stream('stream_name1', realm)
         self.assertEqual(
@@ -949,12 +1019,16 @@ class StreamAdminTest(ZulipTestCase):
         # Test changing stream description by stream admin.
         do_change_user_role(user_profile, UserProfile.ROLE_MEMBER)
         sub = get_subscription('stream_name1', user_profile)
-        do_change_subscription_property(user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR)
+        do_change_subscription_property(
+            user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+        )
 
         with tornado_redirected_to_list(events):
             stream_id = get_stream('stream_name1', realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'description': orjson.dumps('Test description').decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}',
+                {'description': orjson.dumps('Test description').decode()},
+            )
         self.assert_json_success(result)
         stream = get_stream('stream_name1', realm)
         self.assertEqual(stream.description, 'Test description')
@@ -970,8 +1044,9 @@ class StreamAdminTest(ZulipTestCase):
         do_change_subscription_property(user_profile, sub, stream, "role", Subscription.ROLE_MEMBER)
 
         stream_id = get_stream('stream_name1', user_profile.realm).id
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'description': orjson.dumps('Test description').decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}', {'description': orjson.dumps('Test description').decode()}
+        )
         self.assert_json_error(result, 'Must be an organization or stream administrator')
 
     def test_change_to_stream_post_policy_admins(self) -> None:
@@ -982,8 +1057,9 @@ class StreamAdminTest(ZulipTestCase):
         do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
 
         stream_id = get_stream('stream_name1', user_profile.realm).id
-        result = self.client_patch(f'/json/streams/{stream_id}',
-                                   {'is_announcement_only': orjson.dumps(True).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream_id}', {'is_announcement_only': orjson.dumps(True).decode()}
+        )
         self.assert_json_success(result)
         stream = get_stream('stream_name1', user_profile.realm)
         self.assertTrue(stream.stream_post_policy == Stream.STREAM_POST_POLICY_ADMINS)
@@ -1005,21 +1081,29 @@ class StreamAdminTest(ZulipTestCase):
             user_profile.save()
             self.assertEqual(user_profile.is_new_member, is_new)
             stream_id = get_stream('stream_name1', user_profile.realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'stream_post_policy': orjson.dumps(policy).decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'stream_post_policy': orjson.dumps(policy).decode()}
+            )
             self.assert_json_error(result, 'Must be an organization or stream administrator')
-        policies = [Stream.STREAM_POST_POLICY_ADMINS, Stream.STREAM_POST_POLICY_RESTRICT_NEW_MEMBERS]
+
+        policies = [
+            Stream.STREAM_POST_POLICY_ADMINS,
+            Stream.STREAM_POST_POLICY_RESTRICT_NEW_MEMBERS,
+        ]
 
         for policy in policies:
             test_non_admin(how_old=15, is_new=False, policy=policy)
             test_non_admin(how_old=5, is_new=True, policy=policy)
 
-        do_change_subscription_property(user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR)
+        do_change_subscription_property(
+            user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+        )
 
         for policy in policies:
             stream_id = get_stream('stream_name1', user_profile.realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'stream_post_policy': orjson.dumps(policy).decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'stream_post_policy': orjson.dumps(policy).decode()}
+            )
             self.assert_json_success(result)
             stream = get_stream('stream_name1', user_profile.realm)
             self.assertEqual(stream.stream_post_policy, policy)
@@ -1028,8 +1112,9 @@ class StreamAdminTest(ZulipTestCase):
 
         for policy in policies:
             stream_id = get_stream('stream_name1', user_profile.realm).id
-            result = self.client_patch(f'/json/streams/{stream_id}',
-                                       {'stream_post_policy': orjson.dumps(policy).decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream_id}', {'stream_post_policy': orjson.dumps(policy).decode()}
+            )
             self.assert_json_success(result)
             stream = get_stream('stream_name1', user_profile.realm)
             self.assertEqual(stream.stream_post_policy, policy)
@@ -1041,26 +1126,31 @@ class StreamAdminTest(ZulipTestCase):
         do_change_plan_type(realm, Realm.LIMITED)
         stream = self.subscribe(user_profile, 'stream_name1')
 
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'message_retention_days': orjson.dumps(2).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'message_retention_days': orjson.dumps(2).decode()}
+        )
         self.assert_json_error(result, "Available on Zulip Standard. Upgrade to access.")
 
         do_change_plan_type(realm, Realm.SELF_HOSTED)
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            result = self.client_patch(f'/json/streams/{stream.id}',
-                                       {'message_retention_days': orjson.dumps(2).decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream.id}', {'message_retention_days': orjson.dumps(2).decode()}
+            )
         self.assert_json_success(result)
 
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            op='update',
-            type='stream',
-            property='message_retention_days',
-            value=2,
-            stream_id=stream.id,
-            name='stream_name1',
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                op='update',
+                type='stream',
+                property='message_retention_days',
+                value=2,
+                stream_id=stream.id,
+                name='stream_name1',
+            ),
+        )
         notified_user_ids = set(events[0]['users'])
         stream = get_stream('stream_name1', realm)
 
@@ -1072,49 +1162,63 @@ class StreamAdminTest(ZulipTestCase):
 
         events = []
         with tornado_redirected_to_list(events):
-            result = self.client_patch(f'/json/streams/{stream.id}',
-                                       {'message_retention_days': orjson.dumps("forever").decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream.id}',
+                {'message_retention_days': orjson.dumps("forever").decode()},
+            )
         self.assert_json_success(result)
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            op='update',
-            type='stream',
-            property='message_retention_days',
-            value=-1,
-            stream_id=stream.id,
-            name='stream_name1',
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                op='update',
+                type='stream',
+                property='message_retention_days',
+                value=-1,
+                stream_id=stream.id,
+                name='stream_name1',
+            ),
+        )
         self.assert_json_success(result)
         stream = get_stream('stream_name1', realm)
         self.assertEqual(stream.message_retention_days, -1)
 
         events = []
         with tornado_redirected_to_list(events):
-            result = self.client_patch(f'/json/streams/{stream.id}',
-                                       {'message_retention_days': orjson.dumps("realm_default").decode()})
+            result = self.client_patch(
+                f'/json/streams/{stream.id}',
+                {'message_retention_days': orjson.dumps("realm_default").decode()},
+            )
         self.assert_json_success(result)
         event = events[0]['event']
-        self.assertEqual(event, dict(
-            op='update',
-            type='stream',
-            property='message_retention_days',
-            value=None,
-            stream_id=stream.id,
-            name='stream_name1',
-        ))
+        self.assertEqual(
+            event,
+            dict(
+                op='update',
+                type='stream',
+                property='message_retention_days',
+                value=None,
+                stream_id=stream.id,
+                name='stream_name1',
+            ),
+        )
         stream = get_stream('stream_name1', realm)
         self.assertEqual(stream.message_retention_days, None)
 
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'message_retention_days': orjson.dumps("invalid").decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}',
+            {'message_retention_days': orjson.dumps("invalid").decode()},
+        )
         self.assert_json_error(result, "Bad value for 'message_retention_days': invalid")
 
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'message_retention_days': orjson.dumps(-1).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'message_retention_days': orjson.dumps(-1).decode()}
+        )
         self.assert_json_error(result, "Bad value for 'message_retention_days': -1")
 
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'message_retention_days': orjson.dumps(0).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'message_retention_days': orjson.dumps(0).decode()}
+        )
         self.assert_json_error(result, "Bad value for 'message_retention_days': 0")
 
     def test_change_stream_message_retention_days_requires_realm_owner(self) -> None:
@@ -1123,13 +1227,15 @@ class StreamAdminTest(ZulipTestCase):
         realm = user_profile.realm
         stream = self.subscribe(user_profile, 'stream_name1')
 
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'message_retention_days': orjson.dumps(2).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'message_retention_days': orjson.dumps(2).decode()}
+        )
         self.assert_json_error(result, "Must be an organization owner")
 
         do_change_user_role(user_profile, UserProfile.ROLE_REALM_OWNER)
-        result = self.client_patch(f'/json/streams/{stream.id}',
-                                   {'message_retention_days': orjson.dumps(2).decode()})
+        result = self.client_patch(
+            f'/json/streams/{stream.id}', {'message_retention_days': orjson.dumps(2).decode()}
+        )
         self.assert_json_success(result)
         stream = get_stream('stream_name1', realm)
         self.assertEqual(stream.message_retention_days, 2)
@@ -1141,24 +1247,30 @@ class StreamAdminTest(ZulipTestCase):
         """
         admin = self.example_user('iago')
 
-        streams_raw: List[StreamDict] = [{
-            'name': 'new_stream',
-            'message_retention_days': 10,
-        }]
+        streams_raw: List[StreamDict] = [
+            {
+                'name': 'new_stream',
+                'message_retention_days': 10,
+            }
+        ]
         with self.assertRaisesRegex(JsonableError, "User cannot create stream with this settings."):
             list_to_streams(streams_raw, admin, autocreate=True)
 
-        streams_raw = [{
-            'name': 'new_stream',
-            'message_retention_days': -1,
-        }]
+        streams_raw = [
+            {
+                'name': 'new_stream',
+                'message_retention_days': -1,
+            }
+        ]
         with self.assertRaisesRegex(JsonableError, "User cannot create stream with this settings."):
             list_to_streams(streams_raw, admin, autocreate=True)
 
-        streams_raw = [{
-            'name': 'new_stream',
-            'message_retention_days': None,
-        }]
+        streams_raw = [
+            {
+                'name': 'new_stream',
+                'message_retention_days': None,
+            }
+        ]
         result = list_to_streams(streams_raw, admin, autocreate=True)
         self.assert_length(result[0], 0)
         self.assert_length(result[1], 1)
@@ -1168,15 +1280,15 @@ class StreamAdminTest(ZulipTestCase):
         owner = self.example_user('desdemona')
         realm = owner.realm
         streams_raw = [
-            {'name': 'new_stream1',
-             'message_retention_days': 10},
-            {'name': 'new_stream2',
-             'message_retention_days': -1},
+            {'name': 'new_stream1', 'message_retention_days': 10},
+            {'name': 'new_stream2', 'message_retention_days': -1},
             {'name': 'new_stream3'},
         ]
 
         do_change_plan_type(realm, Realm.LIMITED)
-        with self.assertRaisesRegex(JsonableError, "Available on Zulip Standard. Upgrade to access."):
+        with self.assertRaisesRegex(
+            JsonableError, "Available on Zulip Standard. Upgrade to access."
+        ):
             list_to_streams(streams_raw, owner, autocreate=True)
 
         do_change_plan_type(realm, Realm.SELF_HOSTED)
@@ -1190,8 +1302,9 @@ class StreamAdminTest(ZulipTestCase):
         self.assertEqual(result[1][2].name, 'new_stream3')
         self.assertEqual(result[1][2].message_retention_days, None)
 
-    def set_up_stream_for_deletion(self, stream_name: str, invite_only: bool=False,
-                                   subscribed: bool=True) -> Stream:
+    def set_up_stream_for_deletion(
+        self, stream_name: str, invite_only: bool = False, subscribed: bool = True
+    ) -> Stream:
         """
         Create a stream for deletion by an administrator.
         """
@@ -1244,8 +1357,7 @@ class StreamAdminTest(ZulipTestCase):
         self.assertTrue(deactivated_stream.deactivated)
         self.assertTrue(deactivated_stream.invite_only)
         self.assertEqual(deactivated_stream.name, deactivated_stream_name)
-        subscribers = self.users_subscribed_to_stream(
-            deactivated_stream_name, realm)
+        subscribers = self.users_subscribed_to_stream(deactivated_stream_name, realm)
         self.assertEqual(subscribers, [])
 
         # It doesn't show up in the list of public streams anymore.
@@ -1257,9 +1369,9 @@ class StreamAdminTest(ZulipTestCase):
         # Even if you could guess the new name, you can't subscribe to it.
         result = self.client_post(
             "/json/users/me/subscriptions",
-            {"subscriptions": orjson.dumps([{"name": deactivated_stream_name}]).decode()})
-        self.assert_json_error(
-            result, f"Unable to access stream ({deactivated_stream_name}).")
+            {"subscriptions": orjson.dumps([{"name": deactivated_stream_name}]).decode()},
+        )
+        self.assert_json_error(result, f"Unable to access stream ({deactivated_stream_name}).")
 
     def test_you_must_be_realm_admin(self) -> None:
         """
@@ -1300,26 +1412,26 @@ class StreamAdminTest(ZulipTestCase):
         Administrators can delete public streams they aren't on, including
         private streams in their realm.
         """
-        pub_stream = self.set_up_stream_for_deletion(
-            "pubstream", subscribed=False)
+        pub_stream = self.set_up_stream_for_deletion("pubstream", subscribed=False)
         self.delete_stream(pub_stream)
 
         priv_stream = self.set_up_stream_for_deletion(
-            "privstream", subscribed=False, invite_only=True)
+            "privstream", subscribed=False, invite_only=True
+        )
         self.delete_stream(priv_stream)
 
     def attempt_unsubscribe_of_principal(
         self,
         target_users: List[UserProfile],
         query_count: int,
-        cache_count: Optional[int]=None,
-        is_realm_admin: bool=False,
-        is_stream_admin: bool=False,
-        is_subbed: bool=True,
-        invite_only: bool=False,
-        target_users_subbed: bool=True,
-        using_legacy_emails: bool=False,
-        other_sub_users: Sequence[UserProfile]=[]
+        cache_count: Optional[int] = None,
+        is_realm_admin: bool = False,
+        is_stream_admin: bool = False,
+        is_subbed: bool = True,
+        invite_only: bool = False,
+        target_users_subbed: bool = True,
+        using_legacy_emails: bool = False,
+        other_sub_users: Sequence[UserProfile] = [],
     ) -> HttpResponse:
 
         # Set up the main user, who is in most cases an admin.
@@ -1347,8 +1459,9 @@ class StreamAdminTest(ZulipTestCase):
             stream = self.subscribe(user_profile, stream_name)
             if is_stream_admin:
                 sub = get_subscription(stream_name, user_profile)
-                do_change_subscription_property(user_profile, sub, stream, "role",
-                                                Subscription.ROLE_STREAM_ADMINISTRATOR)
+                do_change_subscription_property(
+                    user_profile, sub, stream, "role", Subscription.ROLE_STREAM_ADMINISTRATOR
+                )
         if target_users_subbed:
             for user in target_users:
                 self.subscribe(user, stream_name)
@@ -1359,8 +1472,11 @@ class StreamAdminTest(ZulipTestCase):
             with cache_tries_captured() as cache_tries:
                 result = self.client_delete(
                     "/json/users/me/subscriptions",
-                    {"subscriptions": orjson.dumps([stream_name]).decode(),
-                     "principals": orjson.dumps(principals).decode()})
+                    {
+                        "subscriptions": orjson.dumps([stream_name]).decode(),
+                        "principals": orjson.dumps(principals).decode(),
+                    },
+                )
         self.assert_length(queries, query_count)
         if cache_count is not None:
             self.assert_length(cache_tries, cache_count)
@@ -1378,10 +1494,15 @@ class StreamAdminTest(ZulipTestCase):
         If you're not an admin, you can't remove other people from streams.
         """
         result = self.attempt_unsubscribe_of_principal(
-            query_count=5, target_users=[self.example_user('cordelia')], is_realm_admin=False,
-            is_stream_admin=False, is_subbed=True, invite_only=False, target_users_subbed=True)
-        self.assert_json_error(
-            result, "Must be an organization or stream administrator")
+            query_count=5,
+            target_users=[self.example_user('cordelia')],
+            is_realm_admin=False,
+            is_stream_admin=False,
+            is_subbed=True,
+            invite_only=False,
+            target_users_subbed=True,
+        )
+        self.assert_json_error(result, "Must be an organization or stream administrator")
 
     def test_realm_admin_remove_others_from_public_stream(self) -> None:
         """
@@ -1412,8 +1533,7 @@ class StreamAdminTest(ZulipTestCase):
               using a queue.
         """
         target_users = [
-            self.example_user(name)
-            for name in ['cordelia', 'prospero', 'iago', 'hamlet', 'ZOE']
+            self.example_user(name) for name in ['cordelia', 'prospero', 'iago', 'hamlet', 'ZOE']
         ]
         result = self.attempt_unsubscribe_of_principal(
             query_count=31,
@@ -1485,8 +1605,7 @@ class StreamAdminTest(ZulipTestCase):
         You can remove multiple users from public streams you're a stream administrator of.
         """
         target_users = [
-            self.example_user(name)
-            for name in ['cordelia', 'prospero', 'othello', 'hamlet', 'ZOE']
+            self.example_user(name) for name in ['cordelia', 'prospero', 'othello', 'hamlet', 'ZOE']
         ]
         result = self.attempt_unsubscribe_of_principal(
             query_count=31,
@@ -1521,11 +1640,16 @@ class StreamAdminTest(ZulipTestCase):
 
     def test_cant_remove_others_from_stream_legacy_emails(self) -> None:
         result = self.attempt_unsubscribe_of_principal(
-            query_count=5, is_realm_admin=False, is_stream_admin=False, is_subbed=True,
-            invite_only=False, target_users=[self.example_user('cordelia')], target_users_subbed=True,
-            using_legacy_emails=True)
-        self.assert_json_error(
-            result, "Must be an organization or stream administrator")
+            query_count=5,
+            is_realm_admin=False,
+            is_stream_admin=False,
+            is_subbed=True,
+            invite_only=False,
+            target_users=[self.example_user('cordelia')],
+            target_users_subbed=True,
+            using_legacy_emails=True,
+        )
+        self.assert_json_error(result, "Must be an organization or stream administrator")
 
     def test_admin_remove_others_from_stream_legacy_emails(self) -> None:
         result = self.attempt_unsubscribe_of_principal(
@@ -1573,8 +1697,7 @@ class StreamAdminTest(ZulipTestCase):
         do_change_user_role(user_profile, UserProfile.ROLE_MEMBER)
 
         # Allow all members to create streams.
-        do_set_realm_property(user_profile.realm, 'create_stream_policy',
-                              Realm.POLICY_MEMBERS_ONLY)
+        do_set_realm_property(user_profile.realm, 'create_stream_policy', Realm.POLICY_MEMBERS_ONLY)
         # Set waiting period to 10 days.
         do_set_realm_property(user_profile.realm, 'waiting_period_threshold', 10)
 
@@ -1585,8 +1708,7 @@ class StreamAdminTest(ZulipTestCase):
         self.assert_json_success(result)
 
         # Allow only administrators to create streams.
-        do_set_realm_property(user_profile.realm, 'create_stream_policy',
-                              Realm.POLICY_ADMINS_ONLY)
+        do_set_realm_property(user_profile.realm, 'create_stream_policy', Realm.POLICY_ADMINS_ONLY)
 
         # Cannot create stream because not an admin.
         stream_name = ['admins_only']
@@ -1601,8 +1723,9 @@ class StreamAdminTest(ZulipTestCase):
         self.common_subscribe_to_streams(user_profile, stream_name)
 
         # Allow users older than the waiting period to create streams.
-        do_set_realm_property(user_profile.realm, 'create_stream_policy',
-                              Realm.POLICY_FULL_MEMBERS_ONLY)
+        do_set_realm_property(
+            user_profile.realm, 'create_stream_policy', Realm.POLICY_FULL_MEMBERS_ONLY
+        )
 
         # Can successfully create stream despite being under waiting period because user is admin.
         stream_name = ['waiting_period_as_admin']
@@ -1638,8 +1761,9 @@ class StreamAdminTest(ZulipTestCase):
         cordelia_user.date_joined = timezone_now()
         cordelia_user.save()
 
-        do_set_realm_property(hamlet_user.realm, 'invite_to_stream_policy',
-                              Realm.POLICY_FULL_MEMBERS_ONLY)
+        do_set_realm_property(
+            hamlet_user.realm, 'invite_to_stream_policy', Realm.POLICY_FULL_MEMBERS_ONLY
+        )
         cordelia_user_id = cordelia_user.id
 
         self.login_user(hamlet_user)
@@ -1660,14 +1784,17 @@ class StreamAdminTest(ZulipTestCase):
             {"principals": orjson.dumps([cordelia_user_id]).decode()},
             allow_fail=True,
         )
-        self.assert_json_error(result,
-                               "Your account is too new to modify other users' subscriptions.")
+        self.assert_json_error(
+            result, "Your account is too new to modify other users' subscriptions."
+        )
 
         # Anyone can invite users..
         do_set_realm_property(hamlet_user.realm, 'waiting_period_threshold', 0)
 
         # Attempt and succeed to invite Cordelia to the stream..
-        self.common_subscribe_to_streams(hamlet_user, stream_name, {"principals": orjson.dumps([cordelia_user_id]).decode()})
+        self.common_subscribe_to_streams(
+            hamlet_user, stream_name, {"principals": orjson.dumps([cordelia_user_id]).decode()}
+        )
 
         # Set threshold to 20 days..
         do_set_realm_property(hamlet_user.realm, 'waiting_period_threshold', 20)
@@ -1678,7 +1805,9 @@ class StreamAdminTest(ZulipTestCase):
         self.unsubscribe(cordelia_user, stream_name[0])
 
         # Attempt and succeed to invite Aaron to the stream..
-        self.common_subscribe_to_streams(hamlet_user, stream_name, {"principals": orjson.dumps([cordelia_user_id]).decode()})
+        self.common_subscribe_to_streams(
+            hamlet_user, stream_name, {"principals": orjson.dumps([cordelia_user_id]).decode()}
+        )
 
     def test_remove_already_not_subbed(self) -> None:
         """
@@ -1708,13 +1837,17 @@ class StreamAdminTest(ZulipTestCase):
         stream_name = "hümbüǵ"
         self.make_stream(stream_name)
 
-        result = self.client_delete("/json/users/me/subscriptions",
-                                    {"subscriptions": orjson.dumps([stream_name]).decode(),
-                                     "principals": orjson.dumps([99]).decode()})
+        result = self.client_delete(
+            "/json/users/me/subscriptions",
+            {
+                "subscriptions": orjson.dumps([stream_name]).decode(),
+                "principals": orjson.dumps([99]).decode(),
+            },
+        )
         self.assert_json_error(
-            result,
-            "User not authorized to execute queries on behalf of '99'",
-            status_code=403)
+            result, "User not authorized to execute queries on behalf of '99'", status_code=403
+        )
+
 
 class DefaultStreamTest(ZulipTestCase):
     def get_default_stream_names(self, realm: Realm) -> Set[str]:
@@ -1761,18 +1894,10 @@ class DefaultStreamTest(ZulipTestCase):
         result = self.client_get('/json/streams', payload)
         self.assert_json_success(result)
         streams = result.json()['streams']
-        default_streams = {
-            stream['name']
-            for stream in streams
-            if stream['is_default']
-        }
+        default_streams = {stream['name'] for stream in streams if stream['is_default']}
         self.assertEqual(default_streams, {stream_name})
 
-        other_streams = {
-            stream['name']
-            for stream in streams
-            if not stream['is_default']
-        }
+        other_streams = {stream['name'] for stream in streams if not stream['is_default']}
         self.assertTrue(len(other_streams) > 0)
 
         # and remove it
@@ -1806,19 +1931,13 @@ class DefaultStreamTest(ZulipTestCase):
         unsubscribed = sub_info.unsubscribed
         never_subscribed = sub_info.never_subscribed
 
-        self.assertEqual(len(streams),
-                         len(subscribed) + len(unsubscribed) + len(never_subscribed))
+        self.assertEqual(len(streams), len(subscribed) + len(unsubscribed) + len(never_subscribed))
         expected_streams = subscribed + unsubscribed + never_subscribed
-        stream_names = [
-            stream['name']
-            for stream in streams
-        ]
-        expected_stream_names = [
-            stream['name']
-            for stream in expected_streams
-        ]
+        stream_names = [stream['name'] for stream in streams]
+        expected_stream_names = [stream['name'] for stream in expected_streams]
         self.assertEqual(set(stream_names), set(expected_stream_names))
 
+
 class DefaultStreamGroupTest(ZulipTestCase):
     def test_create_update_and_remove_default_stream_group(self) -> None:
         realm = get_realm("zulip")
@@ -1890,8 +2009,11 @@ class DefaultStreamGroupTest(ZulipTestCase):
         # Test creating a default stream group which contains a default stream
         do_add_default_stream(remaining_streams[0])
         with self.assertRaisesRegex(
-                JsonableError, "'stream1' is a default stream and cannot be added to 'new group1'"):
-            do_create_default_stream_group(realm, new_group_name, "This is group1", remaining_streams)
+            JsonableError, "'stream1' is a default stream and cannot be added to 'new group1'"
+        ):
+            do_create_default_stream_group(
+                realm, new_group_name, "This is group1", remaining_streams
+            )
 
     def test_api_calls(self) -> None:
         self.login('hamlet')
@@ -1911,9 +2033,14 @@ class DefaultStreamGroupTest(ZulipTestCase):
             stream = ensure_stream(realm, stream_name)
             streams.append(stream)
 
-        result = self.client_post('/json/default_stream_groups/create',
-                                  {"group_name": group_name, "description": description,
-                                   "stream_names": orjson.dumps(stream_names).decode()})
+        result = self.client_post(
+            '/json/default_stream_groups/create',
+            {
+                "group_name": group_name,
+                "description": description,
+                "stream_names": orjson.dumps(stream_names).decode(),
+            },
+        )
         self.assert_json_success(result)
         default_stream_groups = get_default_stream_groups(realm)
         self.assert_length(default_stream_groups, 1)
@@ -1922,9 +2049,14 @@ class DefaultStreamGroupTest(ZulipTestCase):
         self.assertEqual(list(default_stream_groups[0].streams.all().order_by("id")), streams)
 
         # Try adding the same streams to the group.
-        result = self.client_post('/json/default_stream_groups/create',
-                                  {"group_name": group_name, "description": description,
-                                   "stream_names": orjson.dumps(stream_names).decode()})
+        result = self.client_post(
+            '/json/default_stream_groups/create',
+            {
+                "group_name": group_name,
+                "description": description,
+                "stream_names": orjson.dumps(stream_names).decode(),
+            },
+        )
         self.assert_json_error(result, "Default stream group 'group1' already exists")
 
         # Test adding streams to existing default stream group
@@ -1936,77 +2068,109 @@ class DefaultStreamGroupTest(ZulipTestCase):
             new_streams.append(new_stream)
             streams.append(new_stream)
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"stream_names": orjson.dumps(new_stream_names).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"stream_names": orjson.dumps(new_stream_names).decode()},
+        )
         self.assert_json_error(result, "Missing 'op' argument")
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "invalid", "stream_names": orjson.dumps(new_stream_names).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "invalid", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
         self.assert_json_error(result, 'Invalid value for "op". Specify one of "add" or "remove".')
 
-        result = self.client_patch("/json/default_stream_groups/12345/streams",
-                                   {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()})
+        result = self.client_patch(
+            "/json/default_stream_groups/12345/streams",
+            {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
         self.assert_json_error(result, "Default stream group with id '12345' does not exist.")
 
         result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams", {"op": "add"})
         self.assert_json_error(result, "Missing 'stream_names' argument")
 
         do_add_default_stream(new_streams[0])
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()})
-        self.assert_json_error(result, "'stream4' is a default stream and cannot be added to 'group1'")
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
+        self.assert_json_error(
+            result, "'stream4' is a default stream and cannot be added to 'group1'"
+        )
 
         do_remove_default_stream(new_streams[0])
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
         self.assert_json_success(result)
         default_stream_groups = get_default_stream_groups(realm)
         self.assert_length(default_stream_groups, 1)
         self.assertEqual(default_stream_groups[0].name, group_name)
         self.assertEqual(list(default_stream_groups[0].streams.all().order_by('name')), streams)
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()})
-        self.assert_json_error(result,
-                               "Stream 'stream4' is already present in default stream group 'group1'")
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "add", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
+        self.assert_json_error(
+            result, "Stream 'stream4' is already present in default stream group 'group1'"
+        )
 
         # Test removing streams from default stream group
-        result = self.client_patch("/json/default_stream_groups/12345/streams",
-                                   {"op": "remove", "stream_names": orjson.dumps(new_stream_names).decode()})
+        result = self.client_patch(
+            "/json/default_stream_groups/12345/streams",
+            {"op": "remove", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
         self.assert_json_error(result, "Default stream group with id '12345' does not exist.")
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "remove", "stream_names": orjson.dumps(["random stream name"]).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "remove", "stream_names": orjson.dumps(["random stream name"]).decode()},
+        )
         self.assert_json_error(result, "Invalid stream name 'random stream name'")
 
         streams.remove(new_streams[0])
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "remove", "stream_names": orjson.dumps([new_stream_names[0]]).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "remove", "stream_names": orjson.dumps([new_stream_names[0]]).decode()},
+        )
         self.assert_json_success(result)
         default_stream_groups = get_default_stream_groups(realm)
         self.assert_length(default_stream_groups, 1)
         self.assertEqual(default_stream_groups[0].name, group_name)
         self.assertEqual(list(default_stream_groups[0].streams.all().order_by('name')), streams)
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}/streams",
-                                   {"op": "remove", "stream_names": orjson.dumps(new_stream_names).decode()})
-        self.assert_json_error(result, "Stream 'stream4' is not present in default stream group 'group1'")
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}/streams",
+            {"op": "remove", "stream_names": orjson.dumps(new_stream_names).decode()},
+        )
+        self.assert_json_error(
+            result, "Stream 'stream4' is not present in default stream group 'group1'"
+        )
 
         # Test changing description of default stream group
         new_description = "new group1 description"
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}",
-                                   {"group_name": group_name, "op": "change"})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}", {"group_name": group_name, "op": "change"}
+        )
         self.assert_json_error(result, 'You must pass "new_description" or "new_group_name".')
 
-        result = self.client_patch("/json/default_stream_groups/12345",
-                                   {"op": "change", "new_description": orjson.dumps(new_description).decode()})
+        result = self.client_patch(
+            "/json/default_stream_groups/12345",
+            {"op": "change", "new_description": orjson.dumps(new_description).decode()},
+        )
         self.assert_json_error(result, "Default stream group with id '12345' does not exist.")
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}",
-                                   {"group_name": group_name,
-                                    "op": "change",
-                                    "new_description": orjson.dumps(new_description).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}",
+            {
+                "group_name": group_name,
+                "op": "change",
+                "new_description": orjson.dumps(new_description).decode(),
+            },
+        )
         self.assert_json_success(result)
         default_stream_groups = get_default_stream_groups(realm)
         self.assert_length(default_stream_groups, 1)
@@ -2016,18 +2180,24 @@ class DefaultStreamGroupTest(ZulipTestCase):
         # Test changing name of default stream group
         new_group_name = "new group1"
         do_create_default_stream_group(realm, "group2", "", [])
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}",
-                                   {"op": "change", "new_group_name": orjson.dumps("group2").decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}",
+            {"op": "change", "new_group_name": orjson.dumps("group2").decode()},
+        )
         self.assert_json_error(result, "Default stream group 'group2' already exists")
         new_group = lookup_default_stream_groups(["group2"], realm)[0]
         do_remove_default_stream_group(realm, new_group)
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}",
-                                   {"op": "change", "new_group_name": orjson.dumps(group_name).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}",
+            {"op": "change", "new_group_name": orjson.dumps(group_name).decode()},
+        )
         self.assert_json_error(result, "This default stream group is already named 'group1'")
 
-        result = self.client_patch(f"/json/default_stream_groups/{group_id}",
-                                   {"op": "change", "new_group_name": orjson.dumps(new_group_name).decode()})
+        result = self.client_patch(
+            f"/json/default_stream_groups/{group_id}",
+            {"op": "change", "new_group_name": orjson.dumps(new_group_name).decode()},
+        )
         self.assert_json_success(result)
         default_stream_groups = get_default_stream_groups(realm)
         self.assert_length(default_stream_groups, 1)
@@ -2056,21 +2226,42 @@ class DefaultStreamGroupTest(ZulipTestCase):
             stream = ensure_stream(realm, stream_name)
             streams.append(stream)
 
-        result = self.client_post('/json/default_stream_groups/create',
-                                  {"group_name": "", "description": description,
-                                   "stream_names": orjson.dumps(stream_names).decode()})
+        result = self.client_post(
+            '/json/default_stream_groups/create',
+            {
+                "group_name": "",
+                "description": description,
+                "stream_names": orjson.dumps(stream_names).decode(),
+            },
+        )
         self.assert_json_error(result, "Invalid default stream group name ''")
 
-        result = self.client_post('/json/default_stream_groups/create',
-                                  {"group_name": 'x'*100, "description": description,
-                                   "stream_names": orjson.dumps(stream_names).decode()})
-        self.assert_json_error(result, "Default stream group name too long (limit: {} characters)"
-                               .format(DefaultStreamGroup.MAX_NAME_LENGTH))
+        result = self.client_post(
+            '/json/default_stream_groups/create',
+            {
+                "group_name": 'x' * 100,
+                "description": description,
+                "stream_names": orjson.dumps(stream_names).decode(),
+            },
+        )
+        self.assert_json_error(
+            result,
+            "Default stream group name too long (limit: {} characters)".format(
+                DefaultStreamGroup.MAX_NAME_LENGTH
+            ),
+        )
 
-        result = self.client_post('/json/default_stream_groups/create',
-                                  {"group_name": "abc\000", "description": description,
-                                   "stream_names": orjson.dumps(stream_names).decode()})
-        self.assert_json_error(result, "Default stream group name 'abc\000' contains NULL (0x00) characters.")
+        result = self.client_post(
+            '/json/default_stream_groups/create',
+            {
+                "group_name": "abc\000",
+                "description": description,
+                "stream_names": orjson.dumps(stream_names).decode(),
+            },
+        )
+        self.assert_json_error(
+            result, "Default stream group name 'abc\000' contains NULL (0x00) characters."
+        )
 
         # Also test that lookup_default_stream_groups raises an
         # error if we pass it a bad name.  This function is used
@@ -2079,6 +2270,7 @@ class DefaultStreamGroupTest(ZulipTestCase):
         with self.assertRaisesRegex(JsonableError, 'Invalid default stream group invalid-name'):
             lookup_default_stream_groups(['invalid-name'], realm)
 
+
 class SubscriptionPropertiesTest(ZulipTestCase):
     def test_set_stream_color(self) -> None:
         """
@@ -2093,10 +2285,15 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         sub = old_subs[0]
         stream_id = sub['stream_id']
         new_color = "#ffffff"  # TODO: ensure that this is different from old_color
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "color",
-                                                                    "stream_id": stream_id,
-                                                                    "value": "#ffffff"}]).decode()})
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "color", "stream_id": stream_id, "value": "#ffffff"}]
+                ).decode()
+            },
+        )
         self.assert_json_success(result)
 
         new_subs = gather_subscriptions(test_user)[0]
@@ -2106,7 +2303,7 @@ class SubscriptionPropertiesTest(ZulipTestCase):
                 found_sub = sub
                 break
 
-        assert(found_sub is not None)
+        assert found_sub is not None
         self.assertEqual(found_sub['color'], new_color)
 
         new_subs.remove(found_sub)
@@ -2118,10 +2315,15 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         self.assertEqual(old_subs, new_subs)
 
         invalid_color = "3ffrff"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "color",
-                                                                    "stream_id": stream_id,
-                                                                    "value": invalid_color}]).decode()})
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "color", "stream_id": stream_id, "value": invalid_color}]
+                ).decode()
+            },
+        )
         self.assert_json_error(result, "color is not a valid hex color code")
 
     def test_set_color_missing_stream_id(self) -> None:
@@ -2130,11 +2332,16 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         """
         test_user = self.example_user('hamlet')
         self.login_user(test_user)
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "color",
-                                                                    "value": "#ffffff"}]).decode()})
-        self.assert_json_error(
-            result, "stream_id key is missing from subscription_data[0]")
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "color", "value": "#ffffff"}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, "stream_id key is missing from subscription_data[0]")
 
     def test_set_color_unsubscribed_stream_id(self) -> None:
         """
@@ -2147,12 +2354,24 @@ class SubscriptionPropertiesTest(ZulipTestCase):
 
         not_subbed = sub_info.never_subscribed
 
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "color",
-                                                                    "stream_id": not_subbed[0]["stream_id"],
-                                                                    "value": "#ffffff"}]).decode()})
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [
+                        {
+                            "property": "color",
+                            "stream_id": not_subbed[0]["stream_id"],
+                            "value": "#ffffff",
+                        }
+                    ]
+                ).decode()
+            },
+        )
         self.assert_json_error(
-            result, "Not subscribed to stream id {}".format(not_subbed[0]["stream_id"]))
+            result, "Not subscribed to stream id {}".format(not_subbed[0]["stream_id"])
+        )
 
     def test_set_color_missing_color(self) -> None:
         """
@@ -2161,11 +2380,16 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         test_user = self.example_user('hamlet')
         self.login_user(test_user)
         subs = gather_subscriptions(test_user)[0]
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "color",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(
-            result, "value key is missing from subscription_data[0]")
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "color", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, "value key is missing from subscription_data[0]")
 
     def test_set_stream_wildcard_mentions_notify(self) -> None:
         """
@@ -2177,10 +2401,21 @@ class SubscriptionPropertiesTest(ZulipTestCase):
 
         subs = gather_subscriptions(test_user)[0]
         sub = subs[0]
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "wildcard_mentions_notify",
-                                                                    "stream_id": sub["stream_id"],
-                                                                    "value": True}]).decode()})
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [
+                        {
+                            "property": "wildcard_mentions_notify",
+                            "stream_id": sub["stream_id"],
+                            "value": True,
+                        }
+                    ]
+                ).decode()
+            },
+        )
 
         self.assert_json_success(result)
 
@@ -2200,10 +2435,15 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         sub = old_subs[0]
         stream_id = sub['stream_id']
         new_pin_to_top = not sub['pin_to_top']
-        result = self.api_post(user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "pin_to_top",
-                                                                    "stream_id": stream_id,
-                                                                    "value": new_pin_to_top}]).decode()})
+        result = self.api_post(
+            user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "pin_to_top", "stream_id": stream_id, "value": new_pin_to_top}]
+                ).decode()
+            },
+        )
         self.assert_json_success(result)
 
         updated_sub = get_subscription(sub['name'], user)
@@ -2216,58 +2456,99 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         self.login_user(test_user)
         subs = gather_subscriptions(test_user)[0]
 
-        sub = Subscription.objects.get(recipient__type=Recipient.STREAM,
-                                       recipient__type_id=subs[0]["stream_id"],
-                                       user_profile=test_user)
+        sub = Subscription.objects.get(
+            recipient__type=Recipient.STREAM,
+            recipient__type_id=subs[0]["stream_id"],
+            user_profile=test_user,
+        )
         self.assertEqual(sub.is_muted, False)
 
         events: List[Mapping[str, Any]] = []
         property_name = "is_muted"
         with tornado_redirected_to_list(events):
-            result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                                   {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                        "value": True,
-                                                                        "stream_id": subs[0]["stream_id"]}]).decode()})
+            result = self.api_post(
+                test_user,
+                "/api/v1/users/me/subscriptions/properties",
+                {
+                    "subscription_data": orjson.dumps(
+                        [
+                            {
+                                "property": property_name,
+                                "value": True,
+                                "stream_id": subs[0]["stream_id"],
+                            }
+                        ]
+                    ).decode()
+                },
+            )
         self.assert_json_success(result)
         self.assert_length(events, 1)
         self.assertEqual(events[0]['event']['property'], 'in_home_view')
         self.assertEqual(events[0]['event']['value'], False)
-        sub = Subscription.objects.get(recipient__type=Recipient.STREAM,
-                                       recipient__type_id=subs[0]["stream_id"],
-                                       user_profile=test_user)
+        sub = Subscription.objects.get(
+            recipient__type=Recipient.STREAM,
+            recipient__type_id=subs[0]["stream_id"],
+            user_profile=test_user,
+        )
         self.assertEqual(sub.is_muted, True)
 
         events = []
         legacy_property_name = 'in_home_view'
         with tornado_redirected_to_list(events):
-            result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                                   {"subscription_data": orjson.dumps([{"property": legacy_property_name,
-                                                                        "value": True,
-                                                                        "stream_id": subs[0]["stream_id"]}]).decode()})
+            result = self.api_post(
+                test_user,
+                "/api/v1/users/me/subscriptions/properties",
+                {
+                    "subscription_data": orjson.dumps(
+                        [
+                            {
+                                "property": legacy_property_name,
+                                "value": True,
+                                "stream_id": subs[0]["stream_id"],
+                            }
+                        ]
+                    ).decode()
+                },
+            )
         self.assert_json_success(result)
         self.assert_length(events, 1)
         self.assertEqual(events[0]['event']['property'], 'in_home_view')
         self.assertEqual(events[0]['event']['value'], True)
         self.assert_json_success(result)
-        sub = Subscription.objects.get(recipient__type=Recipient.STREAM,
-                                       recipient__type_id=subs[0]["stream_id"],
-                                       user_profile=test_user)
+        sub = Subscription.objects.get(
+            recipient__type=Recipient.STREAM,
+            recipient__type_id=subs[0]["stream_id"],
+            user_profile=test_user,
+        )
         self.assertEqual(sub.is_muted, False)
 
         events = []
         with tornado_redirected_to_list(events):
-            result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                                   {"subscription_data": orjson.dumps([{"property": legacy_property_name,
-                                                                        "value": False,
-                                                                        "stream_id": subs[0]["stream_id"]}]).decode()})
+            result = self.api_post(
+                test_user,
+                "/api/v1/users/me/subscriptions/properties",
+                {
+                    "subscription_data": orjson.dumps(
+                        [
+                            {
+                                "property": legacy_property_name,
+                                "value": False,
+                                "stream_id": subs[0]["stream_id"],
+                            }
+                        ]
+                    ).decode()
+                },
+            )
         self.assert_json_success(result)
         self.assert_length(events, 1)
         self.assertEqual(events[0]['event']['property'], 'in_home_view')
         self.assertEqual(events[0]['event']['value'], False)
 
-        sub = Subscription.objects.get(recipient__type=Recipient.STREAM,
-                                       recipient__type_id=subs[0]["stream_id"],
-                                       user_profile=test_user)
+        sub = Subscription.objects.get(
+            recipient__type=Recipient.STREAM,
+            recipient__type_id=subs[0]["stream_id"],
+            user_profile=test_user,
+        )
         self.assertEqual(sub.is_muted, True)
 
     def test_set_subscription_property_incorrect(self) -> None:
@@ -2279,79 +2560,116 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         subs = gather_subscriptions(test_user)[0]
 
         property_name = "is_muted"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a boolean')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a boolean')
 
         property_name = "in_home_view"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a boolean')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a boolean')
 
         property_name = "desktop_notifications"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a boolean')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a boolean')
 
         property_name = "audible_notifications"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a boolean')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a boolean')
 
         property_name = "push_notifications"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a boolean')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a boolean')
 
         property_name = "email_notifications"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a boolean')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a boolean')
 
         property_name = "wildcard_mentions_notify"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
 
-        self.assert_json_error(result,
-                               f"{property_name} is not a boolean")
+        self.assert_json_error(result, f"{property_name} is not a boolean")
 
         property_name = "color"
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": property_name,
-                                                                    "value": False,
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               f'{property_name} is not a string')
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": property_name, "value": False, "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, f'{property_name} is not a string')
 
     def test_json_subscription_property_invalid_stream(self) -> None:
         test_user = self.example_user("hamlet")
         self.login_user(test_user)
 
         stream_id = 1000
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "is_muted",
-                                                                    "stream_id": stream_id,
-                                                                    "value": False}]).decode()})
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "is_muted", "stream_id": stream_id, "value": False}]
+                ).decode()
+            },
+        )
         self.assert_json_error(result, "Invalid stream id")
 
     def test_set_invalid_property(self) -> None:
@@ -2361,12 +2679,17 @@ class SubscriptionPropertiesTest(ZulipTestCase):
         test_user = self.example_user('hamlet')
         self.login_user(test_user)
         subs = gather_subscriptions(test_user)[0]
-        result = self.api_post(test_user, "/api/v1/users/me/subscriptions/properties",
-                               {"subscription_data": orjson.dumps([{"property": "bad",
-                                                                    "value": "bad",
-                                                                    "stream_id": subs[0]["stream_id"]}]).decode()})
-        self.assert_json_error(result,
-                               "Unknown subscription property: bad")
+        result = self.api_post(
+            test_user,
+            "/api/v1/users/me/subscriptions/properties",
+            {
+                "subscription_data": orjson.dumps(
+                    [{"property": "bad", "value": "bad", "stream_id": subs[0]["stream_id"]}]
+                ).decode()
+            },
+        )
+        self.assert_json_error(result, "Unknown subscription property: bad")
+
 
 class SubscriptionRestApiTest(ZulipTestCase):
     def test_basic_add_delete(self) -> None:
@@ -2404,7 +2727,9 @@ class SubscriptionRestApiTest(ZulipTestCase):
 
         # incorrect color format
         request = {
-            'subscriptions': orjson.dumps([{'name': 'my_test_stream_3', 'color': '#0g0g0g'}]).decode(),
+            'subscriptions': orjson.dumps(
+                [{'name': 'my_test_stream_3', 'color': '#0g0g0g'}]
+            ).decode(),
         }
         result = self.api_post(user, "/api/v1/users/me/subscriptions", request)
         self.assert_json_error(result, 'subscriptions[0]["color"] is not a valid hex color code')
@@ -2417,8 +2742,11 @@ class SubscriptionRestApiTest(ZulipTestCase):
 
         self.login_user(user)
         subs = gather_subscriptions(user)[0]
-        result = self.api_patch(user, "/api/v1/users/me/subscriptions/{}".format(subs[0]["stream_id"]),
-                                {'property': 'color', 'value': '#c2c2c2'})
+        result = self.api_patch(
+            user,
+            "/api/v1/users/me/subscriptions/{}".format(subs[0]["stream_id"]),
+            {'property': 'color', 'value': '#c2c2c2'},
+        )
         self.assert_json_success(result)
 
     def test_api_invalid_property(self) -> None:
@@ -2431,10 +2759,12 @@ class SubscriptionRestApiTest(ZulipTestCase):
         self.login_user(user)
         subs = gather_subscriptions(user)[0]
 
-        result = self.api_patch(user, "/api/v1/users/me/subscriptions/{}".format(subs[0]["stream_id"]),
-                                {'property': 'invalid', 'value': 'somevalue'})
-        self.assert_json_error(result,
-                               "Unknown subscription property: invalid")
+        result = self.api_patch(
+            user,
+            "/api/v1/users/me/subscriptions/{}".format(subs[0]["stream_id"]),
+            {'property': 'invalid', 'value': 'somevalue'},
+        )
+        self.assert_json_error(result, "Unknown subscription property: invalid")
 
     def test_api_invalid_stream_id(self) -> None:
         """
@@ -2442,10 +2772,12 @@ class SubscriptionRestApiTest(ZulipTestCase):
         """
         user = self.example_user("hamlet")
         self.login_user(user)
-        result = self.api_patch(user, "/api/v1/users/me/subscriptions/121",
-                                {'property': 'is_muted', 'value': 'somevalue'})
-        self.assert_json_error(result,
-                               "Invalid stream id")
+        result = self.api_patch(
+            user,
+            "/api/v1/users/me/subscriptions/121",
+            {'property': 'is_muted', 'value': 'somevalue'},
+        )
+        self.assert_json_error(result, "Invalid stream id")
 
     def test_bad_add_parameters(self) -> None:
         user = self.example_user('hamlet')
@@ -2488,8 +2820,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
         self.login_user(user)
 
         result = self.api_patch(user, "/api/v1/users/me/subscriptions", {})
-        self.assert_json_error(result,
-                               'Nothing to do. Specify at least one of "add" or "delete".')
+        self.assert_json_error(result, 'Nothing to do. Specify at least one of "add" or "delete".')
 
     def test_patch_enforces_valid_stream_name_check(self) -> None:
         """
@@ -2503,8 +2834,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
             'delete': orjson.dumps([invalid_stream_name]).decode(),
         }
         result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
-        self.assert_json_error(result,
-                               f"Invalid stream name '{invalid_stream_name}'")
+        self.assert_json_error(result, f"Invalid stream name '{invalid_stream_name}'")
 
     def test_stream_name_too_long(self) -> None:
         user = self.example_user('hamlet')
@@ -2515,8 +2845,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
             'delete': orjson.dumps([long_stream_name]).decode(),
         }
         result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
-        self.assert_json_error(result,
-                               "Stream name too long (limit: 60 characters).")
+        self.assert_json_error(result, "Stream name too long (limit: 60 characters).")
 
     def test_stream_name_contains_null(self) -> None:
         user = self.example_user('hamlet')
@@ -2527,18 +2856,19 @@ class SubscriptionRestApiTest(ZulipTestCase):
             'delete': orjson.dumps([stream_name]).decode(),
         }
         result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
-        self.assert_json_error(result,
-                               f"Stream name '{stream_name}' contains NULL (0x00) characters.")
+        self.assert_json_error(
+            result, f"Stream name '{stream_name}' contains NULL (0x00) characters."
+        )
 
     def test_compose_views_rollback(self) -> None:
-        '''
+        """
         The compose_views function() is used under the hood by
         update_subscriptions_backend.  It's a pretty simple method in terms of
         control flow, but it uses a Django rollback, which may make it brittle
         code when we upgrade Django.  We test the functions's rollback logic
         here with a simple scenario to avoid false positives related to
         subscription complications.
-        '''
+        """
         user_profile = self.example_user('hamlet')
         user_profile.full_name = 'Hamlet'
         user_profile.save()
@@ -2557,8 +2887,8 @@ class SubscriptionRestApiTest(ZulipTestCase):
         user_profile = self.example_user('hamlet')
         self.assertEqual(user_profile.full_name, 'Hamlet')
 
-class SubscriptionAPITest(ZulipTestCase):
 
+class SubscriptionAPITest(ZulipTestCase):
     def setUp(self) -> None:
         """
         All tests will be logged in as hamlet. Also save various useful values
@@ -2605,13 +2935,17 @@ class SubscriptionAPITest(ZulipTestCase):
         # also check that this matches the list of your subscriptions
         self.assertEqual(sorted(list_streams), sorted(self.streams))
 
-    def helper_check_subs_before_and_after_add(self, subscriptions: List[str],
-                                               other_params: Dict[str, Any],
-                                               subscribed: List[str],
-                                               already_subscribed: List[str],
-                                               email: str, new_subs: List[str],
-                                               realm: Realm,
-                                               invite_only: bool=False) -> None:
+    def helper_check_subs_before_and_after_add(
+        self,
+        subscriptions: List[str],
+        other_params: Dict[str, Any],
+        subscribed: List[str],
+        already_subscribed: List[str],
+        email: str,
+        new_subs: List[str],
+        realm: Realm,
+        invite_only: bool = False,
+    ) -> None:
         """
         Check result of adding subscriptions.
 
@@ -2626,8 +2960,9 @@ class SubscriptionAPITest(ZulipTestCase):
          "already_subscribed": {self.example_email("iago"): ["Venice", "Verona"]},
          "subscribed": {self.example_email("iago"): ["Venice8"]}}
         """
-        result = self.common_subscribe_to_streams(self.test_user, subscriptions,
-                                                  other_params, invite_only=invite_only)
+        result = self.common_subscribe_to_streams(
+            self.test_user, subscriptions, other_params, invite_only=invite_only
+        )
         json = result.json()
         self.assertEqual(sorted(subscribed), sorted(json["subscribed"][email]))
         self.assertEqual(sorted(already_subscribed), sorted(json["already_subscribed"][email]))
@@ -2648,9 +2983,15 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assertNotEqual(len(add_streams), 0)  # necessary for full test coverage
         events: List[Mapping[str, Any]] = []
         with tornado_redirected_to_list(events):
-            self.helper_check_subs_before_and_after_add(self.streams + add_streams, {},
-                                                        add_streams, self.streams, self.test_email,
-                                                        self.streams + add_streams, self.test_realm)
+            self.helper_check_subs_before_and_after_add(
+                self.streams + add_streams,
+                {},
+                add_streams,
+                self.streams,
+                self.test_email,
+                self.streams + add_streams,
+                self.test_realm,
+            )
         self.assert_length(events, 6)
 
     def test_successful_subscriptions_add_with_announce(self) -> None:
@@ -2676,15 +3017,18 @@ class SubscriptionAPITest(ZulipTestCase):
         # picked up
         cache.cache_delete(cache.user_profile_by_email_cache_key(self.test_email))
         with tornado_redirected_to_list(events):
-            self.helper_check_subs_before_and_after_add(self.streams + add_streams, other_params,
-                                                        add_streams, self.streams, self.test_email,
-                                                        self.streams + add_streams, self.test_realm)
+            self.helper_check_subs_before_and_after_add(
+                self.streams + add_streams,
+                other_params,
+                add_streams,
+                self.streams,
+                self.test_email,
+                self.streams + add_streams,
+                self.test_realm,
+            )
         self.assertEqual(len(events), 7)
 
-        expected_stream_ids = {
-            get_stream(stream, self.test_realm).id
-            for stream in add_streams
-        }
+        expected_stream_ids = {get_stream(stream, self.test_realm).id for stream in add_streams}
 
         (peer_add_event,) = [event for event in events if event["event"].get("op") == "peer_add"]
 
@@ -2731,14 +3075,16 @@ class SubscriptionAPITest(ZulipTestCase):
             invite_streams,
             extra_post_data=dict(
                 announce='true',
-                principals= orjson.dumps([self.user_profile.id]).decode(),
+                principals=orjson.dumps([self.user_profile.id]).decode(),
             ),
         )
 
         msg = self.get_second_to_last_message()
         self.assertEqual(msg.recipient.type, Recipient.STREAM)
         self.assertEqual(msg.sender_id, self.notification_bot().id)
-        expected_msg = f"@_**{invitee_full_name}|{invitee.id}** created a new stream #**{invite_streams[0]}**."
+        expected_msg = (
+            f"@_**{invitee_full_name}|{invitee.id}** created a new stream #**{invite_streams[0]}**."
+        )
         self.assertEqual(msg.content, expected_msg)
 
     def test_successful_cross_realm_notification(self) -> None:
@@ -2802,16 +3148,24 @@ class SubscriptionAPITest(ZulipTestCase):
 
         msg = self.get_second_to_last_message()
         self.assertEqual(msg.sender_id, self.notification_bot().id)
-        expected_msg = f"@_**{invitee_full_name}|{invitee.id}** created a new stream #**{invite_streams[0]}**."
+        expected_msg = (
+            f"@_**{invitee_full_name}|{invitee.id}** created a new stream #**{invite_streams[0]}**."
+        )
         self.assertEqual(msg.content, expected_msg)
 
     def test_non_ascii_stream_subscription(self) -> None:
         """
         Subscribing to a stream name with non-ASCII characters succeeds.
         """
-        self.helper_check_subs_before_and_after_add([*self.streams, "hümbüǵ"], {},
-                                                    ["hümbüǵ"], self.streams, self.test_email,
-                                                    [*self.streams, "hümbüǵ"], self.test_realm)
+        self.helper_check_subs_before_and_after_add(
+            [*self.streams, "hümbüǵ"],
+            {},
+            ["hümbüǵ"],
+            self.streams,
+            self.test_email,
+            [*self.streams, "hümbüǵ"],
+            self.test_realm,
+        )
 
     def test_subscriptions_add_too_long(self) -> None:
         """
@@ -2820,9 +3174,10 @@ class SubscriptionAPITest(ZulipTestCase):
         """
         # character limit is 60 characters
         long_stream_name = "a" * 61
-        result = self.common_subscribe_to_streams(self.test_user, [long_stream_name], allow_fail=True)
-        self.assert_json_error(result,
-                               "Stream name too long (limit: 60 characters).")
+        result = self.common_subscribe_to_streams(
+            self.test_user, [long_stream_name], allow_fail=True
+        )
+        self.assert_json_error(result, "Stream name too long (limit: 60 characters).")
 
     def test_subscriptions_add_stream_with_null(self) -> None:
         """
@@ -2831,8 +3186,9 @@ class SubscriptionAPITest(ZulipTestCase):
         """
         stream_name = "abc\000"
         result = self.common_subscribe_to_streams(self.test_user, [stream_name], allow_fail=True)
-        self.assert_json_error(result,
-                               f"Stream name '{stream_name}' contains NULL (0x00) characters.")
+        self.assert_json_error(
+            result, f"Stream name '{stream_name}' contains NULL (0x00) characters."
+        )
 
     def test_user_settings_for_adding_streams(self) -> None:
         with mock.patch('zerver.models.UserProfile.can_create_streams', return_value=False):
@@ -2862,10 +3218,14 @@ class SubscriptionAPITest(ZulipTestCase):
         othello.role = UserProfile.ROLE_MEMBER
         othello.realm.waiting_period_threshold = 1000
         othello.realm.create_stream_policy = Realm.POLICY_FULL_MEMBERS_ONLY
-        othello.date_joined = timezone_now() - timedelta(days=(othello.realm.waiting_period_threshold - 1))
+        othello.date_joined = timezone_now() - timedelta(
+            days=(othello.realm.waiting_period_threshold - 1)
+        )
         self.assertFalse(othello.can_create_streams())
 
-        othello.date_joined = timezone_now() - timedelta(days=(othello.realm.waiting_period_threshold + 1))
+        othello.date_joined = timezone_now() - timedelta(
+            days=(othello.realm.waiting_period_threshold + 1)
+        )
         self.assertTrue(othello.can_create_streams())
 
     def test_user_settings_for_subscribing_other_users(self) -> None:
@@ -2878,26 +3238,24 @@ class SubscriptionAPITest(ZulipTestCase):
         realm = user_profile.realm
 
         do_set_realm_property(realm, "create_stream_policy", Realm.POLICY_MEMBERS_ONLY)
-        do_set_realm_property(realm, "invite_to_stream_policy",
-                              Realm.POLICY_ADMINS_ONLY)
+        do_set_realm_property(realm, "invite_to_stream_policy", Realm.POLICY_ADMINS_ONLY)
         result = self.common_subscribe_to_streams(
             self.test_user,
             ['stream1'],
             {"principals": orjson.dumps([invitee_user_id]).decode()},
             allow_fail=True,
         )
-        self.assert_json_error(
-            result, "Only administrators can modify other users' subscriptions.")
+        self.assert_json_error(result, "Only administrators can modify other users' subscriptions.")
 
-        do_set_realm_property(realm, "invite_to_stream_policy",
-                              Realm.POLICY_MEMBERS_ONLY)
+        do_set_realm_property(realm, "invite_to_stream_policy", Realm.POLICY_MEMBERS_ONLY)
         self.common_subscribe_to_streams(
-            self.test_user, ['stream2'],  {"principals": orjson.dumps([
-                self.test_user.id, invitee_user_id]).decode()})
+            self.test_user,
+            ['stream2'],
+            {"principals": orjson.dumps([self.test_user.id, invitee_user_id]).decode()},
+        )
         self.unsubscribe(user_profile, "stream2")
 
-        do_set_realm_property(realm, "invite_to_stream_policy",
-                              Realm.POLICY_FULL_MEMBERS_ONLY)
+        do_set_realm_property(realm, "invite_to_stream_policy", Realm.POLICY_FULL_MEMBERS_ONLY)
         do_set_realm_property(realm, "waiting_period_threshold", 100000)
         result = self.common_subscribe_to_streams(
             self.test_user,
@@ -2906,11 +3264,13 @@ class SubscriptionAPITest(ZulipTestCase):
             allow_fail=True,
         )
         self.assert_json_error(
-            result, "Your account is too new to modify other users' subscriptions.")
+            result, "Your account is too new to modify other users' subscriptions."
+        )
 
         do_set_realm_property(realm, "waiting_period_threshold", 0)
         self.common_subscribe_to_streams(
-            self.test_user, ['stream2'], {"principals": orjson.dumps([invitee_user_id]).decode()})
+            self.test_user, ['stream2'], {"principals": orjson.dumps([invitee_user_id]).decode()}
+        )
 
     def test_can_subscribe_other_users(self) -> None:
         """
@@ -2927,12 +3287,17 @@ class SubscriptionAPITest(ZulipTestCase):
 
         do_change_user_role(othello, UserProfile.ROLE_MEMBER)
         do_set_realm_property(othello.realm, "waiting_period_threshold", 1000)
-        do_set_realm_property(othello.realm, "invite_to_stream_policy",
-                              Realm.POLICY_FULL_MEMBERS_ONLY)
-        othello.date_joined = timezone_now() - timedelta(days=(othello.realm.waiting_period_threshold - 1))
+        do_set_realm_property(
+            othello.realm, "invite_to_stream_policy", Realm.POLICY_FULL_MEMBERS_ONLY
+        )
+        othello.date_joined = timezone_now() - timedelta(
+            days=(othello.realm.waiting_period_threshold - 1)
+        )
         self.assertFalse(othello.can_subscribe_other_users())
 
-        othello.date_joined = timezone_now() - timedelta(days=(othello.realm.waiting_period_threshold + 1))
+        othello.date_joined = timezone_now() - timedelta(
+            days=(othello.realm.waiting_period_threshold + 1)
+        )
         self.assertTrue(othello.can_subscribe_other_users())
 
     def test_subscriptions_add_invalid_stream(self) -> None:
@@ -2943,12 +3308,18 @@ class SubscriptionAPITest(ZulipTestCase):
         """
         # currently, the only invalid name is the empty string
         invalid_stream_name = ""
-        result = self.common_subscribe_to_streams(self.test_user, [invalid_stream_name], allow_fail=True)
-        self.assert_json_error(result,
-                               f"Invalid stream name '{invalid_stream_name}'")
+        result = self.common_subscribe_to_streams(
+            self.test_user, [invalid_stream_name], allow_fail=True
+        )
+        self.assert_json_error(result, f"Invalid stream name '{invalid_stream_name}'")
 
-    def assert_adding_subscriptions_for_principal(self, invitee_data: Union[str, int], invitee_realm: Realm,
-                                                  streams: List[str], invite_only: bool=False) -> None:
+    def assert_adding_subscriptions_for_principal(
+        self,
+        invitee_data: Union[str, int],
+        invitee_realm: Realm,
+        streams: List[str],
+        invite_only: bool = False,
+    ) -> None:
         """
         Calling POST /json/users/me/subscriptions on behalf of another principal (for
         whom you have permission to add subscriptions) should successfully add
@@ -2965,17 +3336,25 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assertNotEqual(len(streams), 0)  # necessary for full test coverage
         streams_to_sub = streams[:1]  # just add one, to make the message easier to check
         streams_to_sub.extend(current_streams)
-        self.helper_check_subs_before_and_after_add(streams_to_sub,
-                                                    {"principals": orjson.dumps([invitee_data]).decode()}, streams[:1],
-                                                    current_streams, other_profile.email, streams_to_sub,
-                                                    invitee_realm, invite_only=invite_only)
+        self.helper_check_subs_before_and_after_add(
+            streams_to_sub,
+            {"principals": orjson.dumps([invitee_data]).decode()},
+            streams[:1],
+            current_streams,
+            other_profile.email,
+            streams_to_sub,
+            invitee_realm,
+            invite_only=invite_only,
+        )
 
         # verify that a welcome message was sent to the stream
         msg = self.get_last_message()
         self.assertEqual(msg.recipient.type, msg.recipient.STREAM)
         self.assertEqual(msg.topic_name(), 'stream events')
         self.assertEqual(msg.sender.email, settings.NOTIFICATION_BOT)
-        self.assertIn(f"Stream created by @_**{self.test_user.full_name}|{self.test_user.id}**", msg.content)
+        self.assertIn(
+            f"Stream created by @_**{self.test_user.full_name}|{self.test_user.id}**", msg.content
+        )
 
     def test_multi_user_subscription(self) -> None:
         user1 = self.example_user("cordelia")
@@ -3173,16 +3552,17 @@ class SubscriptionAPITest(ZulipTestCase):
 
         # Verify the internal checks also block guest users.
         stream = get_stream("Denmark", guest_user.realm)
-        self.assertEqual(filter_stream_authorization(guest_user, [stream]),
-                         ([], [stream]))
+        self.assertEqual(filter_stream_authorization(guest_user, [stream]), ([], [stream]))
 
         # Test UserProfile.can_create_streams for guest users.
-        streams_raw: List[StreamDict] = [{
-            'invite_only': False,
-            'history_public_to_subscribers': None,
-            'name': 'new_stream',
-            'stream_post_policy': Stream.STREAM_POST_POLICY_EVERYONE,
-        }]
+        streams_raw: List[StreamDict] = [
+            {
+                'invite_only': False,
+                'history_public_to_subscribers': None,
+                'name': 'new_stream',
+                'stream_post_policy': Stream.STREAM_POST_POLICY_EVERYONE,
+            }
+        ]
 
         with self.assertRaisesRegex(JsonableError, "User cannot create streams."):
             list_to_streams(streams_raw, guest_user)
@@ -3190,8 +3570,7 @@ class SubscriptionAPITest(ZulipTestCase):
         stream = self.make_stream('private_stream', invite_only=True)
         result = self.common_subscribe_to_streams(guest_user, ["private_stream"], allow_fail=True)
         self.assert_json_error(result, "Not allowed for guest users")
-        self.assertEqual(filter_stream_authorization(guest_user, [stream]),
-                         ([], [stream]))
+        self.assertEqual(filter_stream_authorization(guest_user, [stream]), ([], [stream]))
 
         web_public_stream = self.make_stream('web_public_stream', is_web_public=True)
         public_stream = self.make_stream('public_stream', invite_only=False)
@@ -3205,8 +3584,10 @@ class SubscriptionAPITest(ZulipTestCase):
         #                                           is_web_public=True, allow_fail=True)
         # self.assert_json_success(result)
         streams_to_sub = [web_public_stream, public_stream, private_stream]
-        self.assertEqual(filter_stream_authorization(guest_user, streams_to_sub),
-                         ([web_public_stream], [public_stream, private_stream]))
+        self.assertEqual(
+            filter_stream_authorization(guest_user, streams_to_sub),
+            ([web_public_stream], [public_stream, private_stream]),
+        )
 
     def test_users_getting_add_peer_event(self) -> None:
         """
@@ -3220,7 +3601,8 @@ class SubscriptionAPITest(ZulipTestCase):
         self.common_subscribe_to_streams(
             self.test_user,
             streams_to_sub,
-            dict(principals=orjson.dumps(orig_user_ids_to_subscribe).decode()))
+            dict(principals=orjson.dumps(orig_user_ids_to_subscribe).decode()),
+        )
 
         new_user_ids_to_subscribe = [iago.id, cordelia.id]
         events: List[Mapping[str, Any]] = []
@@ -3285,8 +3667,7 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assert_length(query_count, 28)
         self.assert_length(cache_count, 4)
 
-        peer_events = [e for e in events
-                       if e['event'].get('op') == 'peer_remove']
+        peer_events = [e for e in events if e['event'].get('op') == 'peer_remove']
 
         # We only care about a subset of users when we inspect
         # peer_remove events.
@@ -3302,10 +3683,7 @@ class SubscriptionAPITest(ZulipTestCase):
         notifications = []
         for event in peer_events:
             stream_ids = event["event"]["stream_ids"]
-            stream_names = sorted(
-                Stream.objects.get(id=stream_id).name
-                for stream_id in stream_ids
-            )
+            stream_names = sorted(Stream.objects.get(id=stream_id).name for stream_id in stream_ids)
             removed_user_ids = set(event['event']['user_ids'])
             notified_user_ids = set(event['users']) & our_user_ids
             notifications.append((','.join(stream_names), removed_user_ids, notified_user_ids))
@@ -3326,9 +3704,7 @@ class SubscriptionAPITest(ZulipTestCase):
 
         realm = get_realm("zephyr")
         stream_names = [f"stream_{i}" for i in range(40)]
-        streams = [
-            self.make_stream(stream_name, realm=realm)
-            for stream_name in stream_names]
+        streams = [self.make_stream(stream_name, realm=realm) for stream_name in stream_names]
 
         for stream in streams:
             stream.is_in_zephyr_realm = True
@@ -3431,11 +3807,14 @@ class SubscriptionAPITest(ZulipTestCase):
         self.common_subscribe_to_streams(self.test_user, "Verona", post_data)
 
         do_deactivate_user(target_profile)
-        result = self.common_subscribe_to_streams(self.test_user, "Denmark", post_data, allow_fail=True)
+        result = self.common_subscribe_to_streams(
+            self.test_user, "Denmark", post_data, allow_fail=True
+        )
         self.assert_json_error(
             result,
             f"User not authorized to execute queries on behalf of '{target_profile.id}'",
-            status_code=403)
+            status_code=403,
+        )
 
     def test_subscriptions_add_for_principal_invite_only(self) -> None:
         """
@@ -3444,8 +3823,9 @@ class SubscriptionAPITest(ZulipTestCase):
         invitee = self.example_user("iago")
         current_streams = self.get_streams(invitee)
         invite_streams = self.make_random_stream_names(current_streams)
-        self.assert_adding_subscriptions_for_principal(invitee.id, invitee.realm, invite_streams,
-                                                       invite_only=True)
+        self.assert_adding_subscriptions_for_principal(
+            invitee.id, invitee.realm, invite_streams, invite_only=True
+        )
 
     def test_non_ascii_subscription_for_principal(self) -> None:
         """
@@ -3465,9 +3845,12 @@ class SubscriptionAPITest(ZulipTestCase):
         # verify that invalid_principal actually doesn't exist
         with self.assertRaises(UserProfile.DoesNotExist):
             get_user(invalid_principal, invalid_principal_realm)
-        result = self.common_subscribe_to_streams(self.test_user, self.streams,
-                                                  {"principals": orjson.dumps([invalid_principal]).decode()},
-                                                  allow_fail=True)
+        result = self.common_subscribe_to_streams(
+            self.test_user,
+            self.streams,
+            {"principals": orjson.dumps([invalid_principal]).decode()},
+            allow_fail=True,
+        )
         self.assert_json_error(
             result,
             f"User not authorized to execute queries on behalf of '{invalid_principal}'",
@@ -3479,9 +3862,12 @@ class SubscriptionAPITest(ZulipTestCase):
         invalid_principal_realm = get_realm("zulip")
         with self.assertRaises(UserProfile.DoesNotExist):
             get_user_profile_by_id_in_realm(invalid_principal, invalid_principal_realm)
-        result = self.common_subscribe_to_streams(self.test_user, self.streams,
-                                                  {"principals": orjson.dumps([invalid_principal]).decode()},
-                                                  allow_fail=True)
+        result = self.common_subscribe_to_streams(
+            self.test_user,
+            self.streams,
+            {"principals": orjson.dumps([invalid_principal]).decode()},
+            allow_fail=True,
+        )
         self.assert_json_error(
             result,
             f"User not authorized to execute queries on behalf of '{invalid_principal}'",
@@ -3497,19 +3883,26 @@ class SubscriptionAPITest(ZulipTestCase):
         principal = profile.id
         # verify that principal exists (thus, the reason for the error is the cross-realming)
         self.assertIsInstance(profile, UserProfile)
-        result = self.common_subscribe_to_streams(self.test_user, self.streams,
-                                                  {"principals": orjson.dumps([principal]).decode()},
-                                                  allow_fail=True)
+        result = self.common_subscribe_to_streams(
+            self.test_user,
+            self.streams,
+            {"principals": orjson.dumps([principal]).decode()},
+            allow_fail=True,
+        )
         self.assert_json_error(
             result,
             f"User not authorized to execute queries on behalf of '{principal}'",
             status_code=403,
         )
 
-    def helper_check_subs_before_and_after_remove(self, subscriptions: List[str],
-                                                  json_dict: Dict[str, Any],
-                                                  email: str, new_subs: List[str],
-                                                  realm: Realm) -> None:
+    def helper_check_subs_before_and_after_remove(
+        self,
+        subscriptions: List[str],
+        json_dict: Dict[str, Any],
+        email: str,
+        new_subs: List[str],
+        realm: Realm,
+    ) -> None:
         """
         Check result of removing subscriptions.
 
@@ -3520,8 +3913,9 @@ class SubscriptionAPITest(ZulipTestCase):
          "removed": ["Denmark", "Scotland", "Verona"],
          "not_removed": ["Rome"], "result": "success"}
         """
-        result = self.client_delete("/json/users/me/subscriptions",
-                                    {"subscriptions": orjson.dumps(subscriptions).decode()})
+        result = self.client_delete(
+            "/json/users/me/subscriptions", {"subscriptions": orjson.dumps(subscriptions).decode()}
+        )
         self.assert_json_success(result)
         json = result.json()
         for key, val in json_dict.items():
@@ -3548,9 +3942,13 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assertNotEqual(len(not_subbed), 0)  # necessary for full test coverage
         try_to_remove = not_subbed[:3]  # attempt to remove up to 3 streams not already subbed to
         streams_to_remove.extend(try_to_remove)
-        self.helper_check_subs_before_and_after_remove(streams_to_remove,
-                                                       {"removed": self.streams[1:], "not_removed": try_to_remove},
-                                                       self.test_email, [self.streams[0]], self.test_realm)
+        self.helper_check_subs_before_and_after_remove(
+            streams_to_remove,
+            {"removed": self.streams[1:], "not_removed": try_to_remove},
+            self.test_email,
+            [self.streams[0]],
+            self.test_realm,
+        )
 
     def test_subscriptions_remove_fake_stream(self) -> None:
         """
@@ -3561,16 +3959,19 @@ class SubscriptionAPITest(ZulipTestCase):
         self.assertNotEqual(len(random_streams), 0)  # necessary for full test coverage
         # pick only one fake stream, to make checking the error message easy
         streams_to_remove = random_streams[:1]
-        result = self.client_delete("/json/users/me/subscriptions",
-                                    {"subscriptions": orjson.dumps(streams_to_remove).decode()})
+        result = self.client_delete(
+            "/json/users/me/subscriptions",
+            {"subscriptions": orjson.dumps(streams_to_remove).decode()},
+        )
         self.assert_json_error(result, f"Stream(s) ({random_streams[0]}) do not exist")
 
-    def helper_subscriptions_exists(self, stream: str, expect_success: bool, subscribed: bool) -> None:
+    def helper_subscriptions_exists(
+        self, stream: str, expect_success: bool, subscribed: bool
+    ) -> None:
         """
         Call /json/subscriptions/exists on a stream and expect a certain result.
         """
-        result = self.client_post("/json/subscriptions/exists",
-                                  {"stream": stream})
+        result = self.client_post("/json/subscriptions/exists", {"stream": stream})
         json = result.json()
         if expect_success:
             self.assert_json_success(result)
@@ -3615,8 +4016,7 @@ class SubscriptionAPITest(ZulipTestCase):
         """
         # currently, the only invalid stream name is the empty string
         invalid_stream_name = ""
-        result = self.client_post("/json/subscriptions/exists",
-                                  {"stream": invalid_stream_name})
+        result = self.client_post("/json/subscriptions/exists", {"stream": invalid_stream_name})
         self.assert_json_error(result, "Invalid stream name ''")
 
     def test_existing_subscriptions_autosubscription(self) -> None:
@@ -3626,14 +4026,16 @@ class SubscriptionAPITest(ZulipTestCase):
         stream_name = "new_public_stream"
         cordelia = self.example_user('cordelia')
         self.common_subscribe_to_streams(cordelia, [stream_name], invite_only=False)
-        result = self.client_post("/json/subscriptions/exists",
-                                  {"stream": stream_name, "autosubscribe": "false"})
+        result = self.client_post(
+            "/json/subscriptions/exists", {"stream": stream_name, "autosubscribe": "false"}
+        )
         self.assert_json_success(result)
         self.assertIn("subscribed", result.json())
         self.assertFalse(result.json()["subscribed"])
 
-        result = self.client_post("/json/subscriptions/exists",
-                                  {"stream": stream_name, "autosubscribe": "true"})
+        result = self.client_post(
+            "/json/subscriptions/exists", {"stream": stream_name, "autosubscribe": "true"}
+        )
         self.assert_json_success(result)
         self.assertIn("subscribed", result.json())
         self.assertTrue(result.json()["subscribed"])
@@ -3647,8 +4049,9 @@ class SubscriptionAPITest(ZulipTestCase):
         self.common_subscribe_to_streams(cordelia, [stream_name], invite_only=True)
         stream = get_stream(stream_name, self.test_realm)
 
-        result = self.client_post("/json/subscriptions/exists",
-                                  {"stream": stream_name, "autosubscribe": "true"})
+        result = self.client_post(
+            "/json/subscriptions/exists", {"stream": stream_name, "autosubscribe": "true"}
+        )
         # We can't see invite-only streams here
         self.assert_json_error(result, "Invalid stream name 'Saxony'", status_code=404)
         # Importantly, we are not now subscribed
@@ -3656,8 +4059,9 @@ class SubscriptionAPITest(ZulipTestCase):
 
         # A user who is subscribed still sees the stream exists
         self.login('cordelia')
-        result = self.client_post("/json/subscriptions/exists",
-                                  {"stream": stream_name, "autosubscribe": "false"})
+        result = self.client_post(
+            "/json/subscriptions/exists", {"stream": stream_name, "autosubscribe": "false"}
+        )
         self.assert_json_success(result)
         self.assertIn("subscribed", result.json())
         self.assertTrue(result.json()["subscribed"])
@@ -3686,13 +4090,17 @@ class SubscriptionAPITest(ZulipTestCase):
         user_profile.save()
         current_stream = self.get_streams(user_profile)[0]
         invite_streams = self.make_random_stream_names([current_stream])
-        self.assert_adding_subscriptions_for_principal(invitee_user_id, invitee_realm, invite_streams)
+        self.assert_adding_subscriptions_for_principal(
+            invitee_user_id, invitee_realm, invite_streams
+        )
         subscription = self.get_subscription(user_profile, invite_streams[0])
 
         with mock.patch('zerver.models.Recipient.__str__', return_value='recip'):
-            self.assertEqual(str(subscription),
-                             '<Subscription: '
-                             f'<UserProfile: {user_profile.email} {user_profile.realm}> -> recip>')
+            self.assertEqual(
+                str(subscription),
+                '<Subscription: '
+                f'<UserProfile: {user_profile.email} {user_profile.realm}> -> recip>',
+            )
 
         self.assertIsNone(subscription.desktop_notifications)
         self.assertIsNone(subscription.push_notifications)
@@ -3775,10 +4183,13 @@ class SubscriptionAPITest(ZulipTestCase):
         # Compare results - should be 1 stream less
         self.assertTrue(
             len(admin_before_delete.subscriptions) == len(admin_after_delete.subscriptions) + 1,
-            'Expected exactly 1 less stream from gather_subscriptions_helper')
+            'Expected exactly 1 less stream from gather_subscriptions_helper',
+        )
         self.assertTrue(
-            len(non_admin_before_delete.subscriptions) == len(non_admin_after_delete.subscriptions) + 1,
-            'Expected exactly 1 less stream from gather_subscriptions_helper')
+            len(non_admin_before_delete.subscriptions)
+            == len(non_admin_after_delete.subscriptions) + 1,
+            'Expected exactly 1 less stream from gather_subscriptions_helper',
+        )
 
     def test_validate_user_access_to_subscribers_helper(self) -> None:
         """
@@ -3795,7 +4206,9 @@ class SubscriptionAPITest(ZulipTestCase):
         }
 
         # For this test to work, othello can't be in the no_othello_here realm
-        self.assertNotEqual(user_profile.realm.id, realm.id, 'Expected othello user to not be in this realm.')
+        self.assertNotEqual(
+            user_profile.realm.id, realm.id, 'Expected othello user to not be in this realm.'
+        )
 
         # This should result in missing user
         with self.assertRaises(ValidationError):
@@ -3803,7 +4216,9 @@ class SubscriptionAPITest(ZulipTestCase):
 
         # This should result in user not in realm
         with self.assertRaises(ValidationError):
-            validate_user_access_to_subscribers_helper(user_profile, stream_dict, lambda user_profile: True)
+            validate_user_access_to_subscribers_helper(
+                user_profile, stream_dict, lambda user_profile: True
+            )
 
     def test_subscriptions_query_count(self) -> None:
         """
@@ -3851,6 +4266,7 @@ class SubscriptionAPITest(ZulipTestCase):
             )
         self.assert_length(queries, 42)
 
+
 class GetStreamsTest(ZulipTestCase):
     def test_streams_api_for_bot_owners(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -3862,9 +4278,9 @@ class GetStreamsTest(ZulipTestCase):
         # Check it correctly lists the bot owner's subs with
         # include_owner_subscribed=true
         filters = dict(
-            include_owner_subscribed = "true",
-            include_public = "false",
-            include_subscribed = "false",
+            include_owner_subscribed="true",
+            include_public="false",
+            include_subscribed="false",
         )
         result = self.api_get(test_bot, "/api/v1/streams", filters)
         owner_subs = self.api_get(hamlet, "/api/v1/users/me/subscriptions")
@@ -3877,16 +4293,18 @@ class GetStreamsTest(ZulipTestCase):
         self.assert_json_success(owner_subs)
         owner_subs_json = orjson.loads(owner_subs.content)
 
-        self.assertEqual(sorted(s["name"] for s in json["streams"]),
-                         sorted(s["name"] for s in owner_subs_json["subscriptions"]))
+        self.assertEqual(
+            sorted(s["name"] for s in json["streams"]),
+            sorted(s["name"] for s in owner_subs_json["subscriptions"]),
+        )
 
         # Check it correctly lists the bot owner's subs and the
         # bot's subs
         self.subscribe(test_bot, 'Scotland')
         filters = dict(
-            include_owner_subscribed = "true",
-            include_public = "false",
-            include_subscribed = "true",
+            include_owner_subscribed="true",
+            include_public="false",
+            include_subscribed="true",
         )
         result = self.api_get(test_bot, "/api/v1/streams", filters)
 
@@ -3908,7 +4326,11 @@ class GetStreamsTest(ZulipTestCase):
         result = self.api_get(
             test_bot,
             "/api/v1/streams",
-            {"include_owner_subscribed": "true", "include_public": "true", "include_subscribed": "false"},
+            {
+                "include_owner_subscribed": "true",
+                "include_public": "true",
+                "include_subscribed": "false",
+            },
         )
 
         self.assert_json_success(result)
@@ -3928,7 +4350,11 @@ class GetStreamsTest(ZulipTestCase):
         result = self.api_get(
             test_bot,
             "/api/v1/streams",
-            {"include_owner_subscribed": "true", "include_public": "true", "include_subscribed": "true"},
+            {
+                "include_owner_subscribed": "true",
+                "include_public": "true",
+                "include_subscribed": "true",
+            },
         )
 
         self.assert_json_success(result)
@@ -4009,22 +4435,20 @@ class GetStreamsTest(ZulipTestCase):
         self.assert_json_success(result2)
         json2 = orjson.loads(result2.content)
 
-        self.assertEqual(sorted(s["name"] for s in json["streams"]),
-                         sorted(s["name"] for s in json2["subscriptions"]))
+        self.assertEqual(
+            sorted(s["name"] for s in json["streams"]),
+            sorted(s["name"] for s in json2["subscriptions"]),
+        )
 
         # Check it correctly lists all public streams with include_subscribed=false
-        filters = dict(
-            include_public = "true",
-            include_subscribed = "false"
-        )
+        filters = dict(include_public="true", include_subscribed="false")
         result = self.api_get(user, "/api/v1/streams", filters)
         self.assert_json_success(result)
 
         json = result.json()
-        all_streams = [stream.name for stream in
-                       Stream.objects.filter(realm=realm)]
-        self.assertEqual(sorted(s["name"] for s in json["streams"]),
-                         sorted(all_streams))
+        all_streams = [stream.name for stream in Stream.objects.filter(realm=realm)]
+        self.assertEqual(sorted(s["name"] for s in json["streams"]), sorted(all_streams))
+
 
 class StreamIdTest(ZulipTestCase):
     def test_get_stream_id(self) -> None:
@@ -4041,6 +4465,7 @@ class StreamIdTest(ZulipTestCase):
         result = self.client_get("/json/get_stream_id", {"stream": "wrongname"})
         self.assert_json_error(result, "Invalid stream name 'wrongname'")
 
+
 class InviteOnlyStreamTest(ZulipTestCase):
     def test_must_be_subbed_to_send(self) -> None:
         """
@@ -4051,8 +4476,8 @@ class InviteOnlyStreamTest(ZulipTestCase):
         self.login_user(user)
         # Create Saxony as an invite-only stream.
         self.assert_json_success(
-            self.common_subscribe_to_streams(user, ["Saxony"],
-                                             invite_only=True))
+            self.common_subscribe_to_streams(user, ["Saxony"], invite_only=True)
+        )
 
         cordelia = self.example_user("cordelia")
         with self.assertRaises(JsonableError):
@@ -4074,7 +4499,9 @@ class InviteOnlyStreamTest(ZulipTestCase):
         self.assertIn("subscriptions", result.json())
         for sub in result.json()["subscriptions"]:
             if sub['name'] == "Normandy":
-                self.assertEqual(sub['invite_only'], False, "Normandy was mistakenly marked private")
+                self.assertEqual(
+                    sub['invite_only'], False, "Normandy was mistakenly marked private"
+                )
             if sub['name'] == "Saxony":
                 self.assertEqual(sub['invite_only'], True, "Saxony was not properly marked private")
 
@@ -4098,8 +4525,11 @@ class InviteOnlyStreamTest(ZulipTestCase):
 
         # authorization_errors_fatal=False works
         self.login_user(othello)
-        result = self.common_subscribe_to_streams(othello, [stream_name],
-                                                  extra_post_data={'authorization_errors_fatal': orjson.dumps(False).decode()})
+        result = self.common_subscribe_to_streams(
+            othello,
+            [stream_name],
+            extra_post_data={'authorization_errors_fatal': orjson.dumps(False).decode()},
+        )
         json = result.json()
         self.assertEqual(json["unauthorized"], [stream_name])
         self.assertEqual(json["subscribed"], {})
@@ -4108,8 +4538,10 @@ class InviteOnlyStreamTest(ZulipTestCase):
         # Inviting another user to an invite-only stream is allowed
         self.login_user(hamlet)
         result = self.common_subscribe_to_streams(
-            hamlet, [stream_name],
-            extra_post_data={'principals': orjson.dumps([othello.id]).decode()})
+            hamlet,
+            [stream_name],
+            extra_post_data={'principals': orjson.dumps([othello.id]).decode()},
+        )
         json = result.json()
         self.assertEqual(json["subscribed"], {othello.email: [stream_name]})
         self.assertEqual(json["already_subscribed"], {})
@@ -4123,8 +4555,8 @@ class InviteOnlyStreamTest(ZulipTestCase):
         self.assertTrue(othello.email in json['subscribers'])
         self.assertTrue(hamlet.email in json['subscribers'])
 
-class GetSubscribersTest(ZulipTestCase):
 
+class GetSubscribersTest(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user_profile = self.example_user('hamlet')
@@ -4141,7 +4573,9 @@ class GetSubscribersTest(ZulipTestCase):
 
         self.assertEqual(non_ws(msg.content), non_ws(expected_msg))
 
-    def check_well_formed_result(self, result: Dict[str, Any], stream_name: str, realm: Realm) -> None:
+    def check_well_formed_result(
+        self, result: Dict[str, Any], stream_name: str, realm: Realm
+    ) -> None:
         """
         A successful call to get_subscribers returns the list of subscribers in
         the form:
@@ -4152,11 +4586,15 @@ class GetSubscribersTest(ZulipTestCase):
         """
         self.assertIn("subscribers", result)
         self.assertIsInstance(result["subscribers"], list)
-        true_subscribers = [user_profile.email for user_profile in self.users_subscribed_to_stream(
-            stream_name, realm)]
+        true_subscribers = [
+            user_profile.email
+            for user_profile in self.users_subscribed_to_stream(stream_name, realm)
+        ]
         self.assertEqual(sorted(result["subscribers"]), sorted(true_subscribers))
 
-    def make_subscriber_request(self, stream_id: int, user: Optional[UserProfile]=None) -> HttpResponse:
+    def make_subscriber_request(
+        self, stream_id: int, user: Optional[UserProfile] = None
+    ) -> HttpResponse:
         if user is None:
             user = self.user_profile
         return self.api_get(user, f"/api/v1/streams/{stream_id}/members")
@@ -4165,8 +4603,7 @@ class GetSubscribersTest(ZulipTestCase):
         stream_id = get_stream(stream_name, self.user_profile.realm).id
         result = self.make_subscriber_request(stream_id)
         self.assert_json_success(result)
-        self.check_well_formed_result(result.json(),
-                                      stream_name, self.user_profile.realm)
+        self.check_well_formed_result(result.json(), stream_name, self.user_profile.realm)
 
     def test_subscriber(self) -> None:
         """
@@ -4192,9 +4629,8 @@ class GetSubscribersTest(ZulipTestCase):
             self.example_user("cordelia").id,
         ]
         self.common_subscribe_to_streams(
-            self.user_profile,
-            streams,
-            dict(principals=orjson.dumps(users_to_subscribe).decode()))
+            self.user_profile, streams, dict(principals=orjson.dumps(users_to_subscribe).decode())
+        )
 
         msg = '''
             @**King Hamlet** subscribed you to the following streams:
@@ -4218,7 +4654,8 @@ class GetSubscribersTest(ZulipTestCase):
             self.user_profile,
             ["stream_invite_only_1"],
             dict(principals=orjson.dumps([self.user_profile.id]).decode()),
-            invite_only=True)
+            invite_only=True,
+        )
 
         # Now add in other users, and this should trigger messages
         # to notify the user.
@@ -4226,7 +4663,8 @@ class GetSubscribersTest(ZulipTestCase):
             self.user_profile,
             ["stream_invite_only_1"],
             dict(principals=orjson.dumps(users_to_subscribe).decode()),
-            invite_only=True)
+            invite_only=True,
+        )
 
         msg = '''
             @**King Hamlet** subscribed you to the stream #**stream_invite_only_1**.
@@ -4235,7 +4673,8 @@ class GetSubscribersTest(ZulipTestCase):
 
         with queries_captured() as queries:
             subscribed_streams, _ = gather_subscriptions(
-                self.user_profile, include_subscribers=True)
+                self.user_profile, include_subscribers=True
+            )
         self.assertTrue(len(subscribed_streams) >= 11)
         for sub in subscribed_streams:
             if not sub["name"].startswith("stream_"):
@@ -4291,7 +4730,7 @@ class GetSubscribersTest(ZulipTestCase):
             ret = self.common_subscribe_to_streams(
                 self.user_profile,
                 web_public_streams,
-                dict(principals=orjson.dumps(users_to_subscribe).decode())
+                dict(principals=orjson.dumps(users_to_subscribe).decode()),
             )
             self.assert_json_success(ret)
 
@@ -4314,10 +4753,7 @@ class GetSubscribersTest(ZulipTestCase):
             self.assert_length(queries, 4)
 
             # Ignore old streams.
-            never_subscribed = [
-                dct for dct in never_subscribed
-                if dct['name'].startswith('test_')
-            ]
+            never_subscribed = [dct for dct in never_subscribed if dct['name'].startswith('test_')]
             return never_subscribed
 
         never_subscribed = get_never_subscribed()
@@ -4365,9 +4801,7 @@ class GetSubscribersTest(ZulipTestCase):
                 # subscribers not setup by this test, so we do the
                 # following check only for the streams we created.
                 if stream_dict["name"] in web_public_streams:
-                    self.assertEqual(
-                        len(stream_dict["subscribers"]),
-                        len(users_to_subscribe))
+                    self.assertEqual(len(stream_dict["subscribers"]), len(users_to_subscribe))
 
         test_guest_user_case()
 
@@ -4461,11 +4895,11 @@ class GetSubscribersTest(ZulipTestCase):
             ["mit_invite_only"],
             dict(principals=orjson.dumps(users_to_subscribe).decode()),
             invite_only=True,
-            subdomain="zephyr")
+            subdomain="zephyr",
+        )
 
         with queries_captured() as queries:
-            subscribed_streams, _ = gather_subscriptions(
-                mit_user_profile, include_subscribers=True)
+            subscribed_streams, _ = gather_subscriptions(mit_user_profile, include_subscribers=True)
 
         self.assertTrue(len(subscribed_streams) >= 2)
         for sub in subscribed_streams:
@@ -4496,8 +4930,7 @@ class GetSubscribersTest(ZulipTestCase):
         A subscriber to a private stream can query that stream's membership.
         """
         stream_name = "Saxony"
-        self.common_subscribe_to_streams(self.user_profile, [stream_name],
-                                         invite_only=True)
+        self.common_subscribe_to_streams(self.user_profile, [stream_name], invite_only=True)
         self.make_successful_subscriber_request(stream_name)
 
         stream_id = get_stream(stream_name, self.user_profile.realm).id
@@ -4526,8 +4959,9 @@ class GetSubscribersTest(ZulipTestCase):
         """
         stream_name = gather_subscriptions(self.user_profile)[0][0]['name']
         stream_id = get_stream(stream_name, self.user_profile.realm).id
-        expected_subscribers = gather_subscriptions(
-            self.user_profile, include_subscribers=True)[0][0]['subscribers']
+        expected_subscribers = gather_subscriptions(self.user_profile, include_subscribers=True)[0][
+            0
+        ]['subscribers']
         result = self.client_get(f"/json/streams/{stream_id}/members")
         self.assert_json_success(result)
         result_dict = result.json()
@@ -4567,8 +5001,7 @@ class GetSubscribersTest(ZulipTestCase):
         """
         # Create a private stream for which Hamlet is the only subscriber.
         stream_name = "NewStream"
-        self.common_subscribe_to_streams(self.user_profile, [stream_name],
-                                         invite_only=True)
+        self.common_subscribe_to_streams(self.user_profile, [stream_name], invite_only=True)
         user_profile = self.example_user('othello')
 
         # Try to fetch the subscriber list as a non-member & non-realm-admin-user.
@@ -4580,6 +5013,7 @@ class GetSubscribersTest(ZulipTestCase):
         self.login('iago')
         self.make_successful_subscriber_request(stream_name)
 
+
 class AccessStreamTest(ZulipTestCase):
     def test_access_stream(self) -> None:
         """
@@ -4590,8 +5024,7 @@ class AccessStreamTest(ZulipTestCase):
 
         stream_name = "new_private_stream"
         self.login_user(hamlet)
-        self.common_subscribe_to_streams(hamlet, [stream_name],
-                                         invite_only=True)
+        self.common_subscribe_to_streams(hamlet, [stream_name], invite_only=True)
         stream = get_stream(stream_name, hamlet.realm)
 
         othello = self.example_user('othello')
@@ -4620,8 +5053,7 @@ class AccessStreamTest(ZulipTestCase):
         # Both Othello and Hamlet can access a public stream that only
         # Hamlet is subscribed to in this realm
         public_stream_name = "public_stream"
-        self.common_subscribe_to_streams(hamlet, [public_stream_name],
-                                         invite_only=False)
+        self.common_subscribe_to_streams(hamlet, [public_stream_name], invite_only=False)
         public_stream = get_stream(public_stream_name, hamlet.realm)
         access_stream_by_id(othello, public_stream.id)
         access_stream_by_name(othello, public_stream.name)
@@ -4690,37 +5122,54 @@ class AccessStreamTest(ZulipTestCase):
         assert sub_ret is None
         self.assertEqual(stream.id, stream_ret.id)
 
+
 class StreamTrafficTest(ZulipTestCase):
     def test_average_weekly_stream_traffic_calculation(self) -> None:
         # No traffic data for the stream
         self.assertEqual(
-            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=300), {1: 4003}), 0)
+            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=300), {1: 4003}),
+            0,
+        )
 
         # using high numbers here to make it more likely to catch small errors in the denominators
         # of the calculations. That being said we don't want to go over 100, since then the 2
         # significant digits calculation gets applied
         # old stream
         self.assertEqual(
-            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=300), {42: 98*4+3}), 98)
+            get_average_weekly_stream_traffic(
+                42, timezone_now() - timedelta(days=300), {42: 98 * 4 + 3}
+            ),
+            98,
+        )
         # stream between 7 and 27 days old
         self.assertEqual(
-            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=10), {42: (98*10+9) // 7}), 98)
+            get_average_weekly_stream_traffic(
+                42, timezone_now() - timedelta(days=10), {42: (98 * 10 + 9) // 7}
+            ),
+            98,
+        )
         # stream less than 7 days old
         self.assertEqual(
-            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=5), {42: 100}), None)
+            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=5), {42: 100}),
+            None,
+        )
 
         # average traffic between 0 and 1
         self.assertEqual(
-            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=300), {42: 1}), 1)
+            get_average_weekly_stream_traffic(42, timezone_now() - timedelta(days=300), {42: 1}), 1
+        )
 
     def test_round_to_2_significant_digits(self) -> None:
         self.assertEqual(120, round_to_2_significant_digits(116))
 
+
 class NoRecipientIDsTest(ZulipTestCase):
     def test_no_recipient_ids(self) -> None:
         user_profile = self.example_user('cordelia')
 
-        Subscription.objects.filter(user_profile=user_profile, recipient__type=Recipient.STREAM).delete()
+        Subscription.objects.filter(
+            user_profile=user_profile, recipient__type=Recipient.STREAM
+        ).delete()
         subs = gather_subscriptions_helper(user_profile).subscriptions
 
         # Checks that gather_subscriptions_helper will not return anything
diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py
index efd8db5021..ca616a479c 100644
--- a/zerver/tests/test_templates.py
+++ b/zerver/tests/test_templates.py
@@ -15,8 +15,10 @@ class TemplateTestCase(ZulipTestCase):
         content = template.render(context)
 
         content_sans_whitespace = content.replace(" ", "").replace('\n', '')
-        self.assertEqual(content_sans_whitespace,
-                         'header<h1id="hello">Hello!</h1><p>Thisissome<em>boldtext</em>.</p>footer')
+        self.assertEqual(
+            content_sans_whitespace,
+            'header<h1id="hello">Hello!</h1><p>Thisissome<em>boldtext</em>.</p>footer',
+        )
 
     def test_markdown_tabbed_sections_extension(self) -> None:
         template = get_template("tests/test_markdown.html")
@@ -88,8 +90,7 @@ footer
 """
 
         expected_html_sans_whitespace = expected_html.replace(" ", "").replace('\n', '')
-        self.assertEqual(content_sans_whitespace,
-                         expected_html_sans_whitespace)
+        self.assertEqual(content_sans_whitespace, expected_html_sans_whitespace)
 
     def test_markdown_nested_code_blocks(self) -> None:
         template = get_template("tests/test_markdown.html")
@@ -99,11 +100,13 @@ footer
         content = template.render(context)
 
         content_sans_whitespace = content.replace(" ", "").replace('\n', '')
-        expected = ('header<h1id="this-is-a-heading">Thisisaheading.</h1><ol>'
-                    '<li><p>Alistitemwithanindentedcodeblock:</p><divclass="codehilite">'
-                    '<pre>indentedcodeblockwithmultiplelines</pre></div></li></ol>'
-                    '<divclass="codehilite"><pre><span></span><code>'
-                    'non-indentedcodeblockwithmultiplelines</code></pre></div>footer')
+        expected = (
+            'header<h1id="this-is-a-heading">Thisisaheading.</h1><ol>'
+            '<li><p>Alistitemwithanindentedcodeblock:</p><divclass="codehilite">'
+            '<pre>indentedcodeblockwithmultiplelines</pre></div></li></ol>'
+            '<divclass="codehilite"><pre><span></span><code>'
+            'non-indentedcodeblockwithmultiplelines</code></pre></div>footer'
+        )
         self.assertEqual(content_sans_whitespace, expected)
 
     @patch('builtins.print')
@@ -113,11 +116,18 @@ footer
             'markdown_test_file': "zerver/tests/markdown/test_custom_include_extension.md",
         }
 
-        with self.assertRaisesRegex(InvalidMarkdownIncludeStatement, "Invalid Markdown include statement"):
+        with self.assertRaisesRegex(
+            InvalidMarkdownIncludeStatement, "Invalid Markdown include statement"
+        ):
             template.render(context)
-        self.assertEqual(mock_print.mock_calls, [
-            call("Warning: could not find file templates/zerver/help/include/nonexistent-macro.md. Error: [Errno 2] No such file or directory: 'templates/zerver/help/include/nonexistent-macro.md'")
-        ])
+        self.assertEqual(
+            mock_print.mock_calls,
+            [
+                call(
+                    "Warning: could not find file templates/zerver/help/include/nonexistent-macro.md. Error: [Errno 2] No such file or directory: 'templates/zerver/help/include/nonexistent-macro.md'"
+                )
+            ],
+        )
 
     def test_custom_markdown_include_extension_empty_macro(self) -> None:
         template = get_template("tests/test_markdown.html")
diff --git a/zerver/tests/test_thumbnail.py b/zerver/tests/test_thumbnail.py
index 1f984a02ba..aa3ce89f78 100644
--- a/zerver/tests/test_thumbnail.py
+++ b/zerver/tests/test_thumbnail.py
@@ -16,10 +16,9 @@ from zerver.lib.users import get_api_key
 
 
 class ThumbnailTest(ZulipTestCase):
-
     @use_s3_backend
     def test_s3_source_type(self) -> None:
-        def get_file_path_urlpart(uri: str, size: str='') -> str:
+        def get_file_path_urlpart(uri: str, size: str = '') -> str:
             url_in_result = 'smart/filters:no_upscale()%s/%s/source_type/s3'
             sharpen_filter = ''
             if size:
@@ -28,9 +27,7 @@ class ThumbnailTest(ZulipTestCase):
             hex_uri = base64.urlsafe_b64encode(uri.encode()).decode('utf-8')
             return url_in_result % (sharpen_filter, hex_uri)
 
-        create_s3_buckets(
-            settings.S3_AUTH_UPLOADS_BUCKET,
-            settings.S3_AVATAR_BUCKET)
+        create_s3_buckets(settings.S3_AUTH_UPLOADS_BUCKET, settings.S3_AVATAR_BUCKET)
 
         hamlet = self.example_user('hamlet')
         self.login_user(hamlet)
@@ -43,7 +40,7 @@ class ThumbnailTest(ZulipTestCase):
         self.assertIn("uri", json)
         uri = json["uri"]
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         # Test full size image.
         result = self.client_get("/thumbnail", {"url": uri[1:], "size": "full"})
@@ -65,7 +62,7 @@ class ThumbnailTest(ZulipTestCase):
             upload_emoji_image(image_file, file_name, user_profile)
         custom_emoji_url = upload_backend.get_emoji_url(file_name, user_profile.realm_id)
         emoji_url_base = '/user_avatars/'
-        self.assertEqual(emoji_url_base, custom_emoji_url[:len(emoji_url_base)])
+        self.assertEqual(emoji_url_base, custom_emoji_url[: len(emoji_url_base)])
 
         # Test full size custom emoji image (for emoji link in messages case).
         result = self.client_get("/thumbnail", {"url": custom_emoji_url[1:], "size": "full"})
@@ -74,9 +71,7 @@ class ThumbnailTest(ZulipTestCase):
 
         # Tests the /api/v1/thumbnail API endpoint with standard API auth
         self.logout()
-        result = self.api_get(
-            hamlet,
-            "/thumbnail", {"url": uri[1:], "size": "full"})
+        result = self.api_get(hamlet, "/thumbnail", {"url": uri[1:], "size": "full"})
         self.assertEqual(result.status_code, 302, result)
         expected_part_url = get_file_path_urlpart(uri)
         self.assertIn(expected_part_url, result.url)
@@ -94,36 +89,61 @@ class ThumbnailTest(ZulipTestCase):
             encoded_url = base64.urlsafe_b64encode(image_url.encode()).decode('utf-8')
             result = self.client_get("/thumbnail", {"url": image_url, "size": "full"})
             self.assertEqual(result.status_code, 302, result)
-            expected_part_url = '/smart/filters:no_upscale()/' + encoded_url + '/source_type/external'
+            expected_part_url = (
+                '/smart/filters:no_upscale()/' + encoded_url + '/source_type/external'
+            )
             self.assertIn(expected_part_url, result.url)
 
             # Test thumbnail size.
             result = self.client_get("/thumbnail", {"url": image_url, "size": "thumbnail"})
             self.assertEqual(result.status_code, 302, result)
-            expected_part_url = '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/' + encoded_url + '/source_type/external'
+            expected_part_url = (
+                '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/'
+                + encoded_url
+                + '/source_type/external'
+            )
             self.assertIn(expected_part_url, result.url)
 
             # Test API endpoint with standard API authentication.
             self.logout()
             user_profile = self.example_user("hamlet")
-            result = self.api_get(user_profile,
-                                  "/thumbnail", {"url": image_url, "size": "thumbnail"})
+            result = self.api_get(
+                user_profile, "/thumbnail", {"url": image_url, "size": "thumbnail"}
+            )
             self.assertEqual(result.status_code, 302, result)
-            expected_part_url = '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/' + encoded_url + '/source_type/external'
+            expected_part_url = (
+                '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/'
+                + encoded_url
+                + '/source_type/external'
+            )
             self.assertIn(expected_part_url, result.url)
 
             # Test API endpoint with legacy API authentication.
             user_profile = self.example_user("hamlet")
-            result = self.client_get("/thumbnail", {"url": image_url, "size": "thumbnail", "api_key": get_api_key(user_profile)})
+            result = self.client_get(
+                "/thumbnail",
+                {"url": image_url, "size": "thumbnail", "api_key": get_api_key(user_profile)},
+            )
             self.assertEqual(result.status_code, 302, result)
-            expected_part_url = '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/' + encoded_url + '/source_type/external'
+            expected_part_url = (
+                '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/'
+                + encoded_url
+                + '/source_type/external'
+            )
             self.assertIn(expected_part_url, result.url)
 
             # Test a second logged-in user; they should also be able to access it
             user_profile = self.example_user("iago")
-            result = self.client_get("/thumbnail", {"url": image_url, "size": "thumbnail", "api_key": get_api_key(user_profile)})
+            result = self.client_get(
+                "/thumbnail",
+                {"url": image_url, "size": "thumbnail", "api_key": get_api_key(user_profile)},
+            )
             self.assertEqual(result.status_code, 302, result)
-            expected_part_url = '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/' + encoded_url + '/source_type/external'
+            expected_part_url = (
+                '/0x300/smart/filters:no_upscale():sharpen(0.5,0.2,true)/'
+                + encoded_url
+                + '/source_type/external'
+            )
             self.assertIn(expected_part_url, result.url)
 
             # Test with another user trying to access image using thumbor.
@@ -131,7 +151,9 @@ class ThumbnailTest(ZulipTestCase):
             self.login('iago')
             result = self.client_get("/thumbnail", {"url": image_url, "size": "full"})
             self.assertEqual(result.status_code, 302, result)
-            expected_part_url = '/smart/filters:no_upscale()/' + encoded_url + '/source_type/external'
+            expected_part_url = (
+                '/smart/filters:no_upscale()/' + encoded_url + '/source_type/external'
+            )
             self.assertIn(expected_part_url, result.url)
 
         image_url = 'https://images.foobar.com/12345'
@@ -144,7 +166,7 @@ class ThumbnailTest(ZulipTestCase):
         run_test_with_image_url(image_url)
 
     def test_local_file_type(self) -> None:
-        def get_file_path_urlpart(uri: str, size: str='') -> str:
+        def get_file_path_urlpart(uri: str, size: str = '') -> str:
             url_in_result = 'smart/filters:no_upscale()%s/%s/source_type/local_file'
             sharpen_filter = ''
             if size:
@@ -163,7 +185,7 @@ class ThumbnailTest(ZulipTestCase):
         self.assertIn("uri", json)
         uri = json["uri"]
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         # Test full size image.
         # We remove the forward slash infront of the `/user_uploads/` to match
@@ -204,7 +226,7 @@ class ThumbnailTest(ZulipTestCase):
             upload_emoji_image(image_file, file_name, user_profile)
         custom_emoji_url = upload_backend.get_emoji_url(file_name, user_profile.realm_id)
         emoji_url_base = '/user_avatars/'
-        self.assertEqual(emoji_url_base, custom_emoji_url[:len(emoji_url_base)])
+        self.assertEqual(emoji_url_base, custom_emoji_url[: len(emoji_url_base)])
 
         # Test full size custom emoji image (for emoji link in messages case).
         result = self.client_get("/thumbnail", {"url": custom_emoji_url[1:], "size": "full"})
@@ -214,9 +236,7 @@ class ThumbnailTest(ZulipTestCase):
         # Tests the /api/v1/thumbnail API endpoint with HTTP basic auth.
         self.logout()
         user_profile = self.example_user("hamlet")
-        result = self.api_get(
-            user_profile,
-            "/thumbnail", {"url": uri[1:], "size": "full"})
+        result = self.api_get(user_profile, "/thumbnail", {"url": uri[1:], "size": "full"})
         self.assertEqual(result.status_code, 302, result)
         expected_part_url = get_file_path_urlpart(uri)
         self.assertIn(expected_part_url, result.url)
@@ -225,7 +245,8 @@ class ThumbnailTest(ZulipTestCase):
         # auth.
         user_profile = self.example_user("hamlet")
         result = self.client_get(
-            "/thumbnail", {"url": uri[1:], "size": "full", "api_key": get_api_key(user_profile)})
+            "/thumbnail", {"url": uri[1:], "size": "full", "api_key": get_api_key(user_profile)}
+        )
         self.assertEqual(result.status_code, 302, result)
         expected_part_url = get_file_path_urlpart(uri)
         self.assertIn(expected_part_url, result.url)
@@ -255,7 +276,7 @@ class ThumbnailTest(ZulipTestCase):
         self.assertIn("uri", json)
         uri = json["uri"]
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         with self.settings(THUMBOR_URL=''):
             result = self.client_get("/thumbnail", {"url": uri[1:], "size": "full"})
@@ -294,19 +315,19 @@ class ThumbnailTest(ZulipTestCase):
         self.assertIn("uri", json)
         uri = json["uri"]
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         hex_uri = base64.urlsafe_b64encode(uri.encode()).decode('utf-8')
         with self.settings(THUMBOR_URL='http://test-thumborhost.com'):
             result = self.client_get("/thumbnail", {"url": uri[1:], "size": "full"})
         self.assertEqual(result.status_code, 302, result)
         base = 'http://test-thumborhost.com/'
-        self.assertEqual(base, result.url[:len(base)])
+        self.assertEqual(base, result.url[: len(base)])
         expected_part_url = '/smart/filters:no_upscale()/' + hex_uri + '/source_type/local_file'
         self.assertIn(expected_part_url, result.url)
 
     def test_with_different_sizes(self) -> None:
-        def get_file_path_urlpart(uri: str, size: str='') -> str:
+        def get_file_path_urlpart(uri: str, size: str = '') -> str:
             url_in_result = 'smart/filters:no_upscale()%s/%s/source_type/local_file'
             sharpen_filter = ''
             if size:
@@ -325,7 +346,7 @@ class ThumbnailTest(ZulipTestCase):
         self.assertIn("uri", json)
         uri = json["uri"]
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         # Test with size supplied as a query parameter.
         # size=thumbnail should return a 0x300 sized image.
diff --git a/zerver/tests/test_timestamp.py b/zerver/tests/test_timestamp.py
index 5460d510b5..0b58f62dfb 100644
--- a/zerver/tests/test_timestamp.py
+++ b/zerver/tests/test_timestamp.py
@@ -18,23 +18,26 @@ class TestTimestamp(ZulipTestCase):
     def test_datetime_and_timestamp_conversions(self) -> None:
         timestamp = 1483228800
         for dt in [
-                parser.parse('2017-01-01 00:00:00.123 UTC'),
-                parser.parse('2017-01-01 00:00:00.123').replace(tzinfo=timezone.utc)]:
-            self.assertEqual(timestamp_to_datetime(timestamp), dt-timedelta(microseconds=123000))
+            parser.parse('2017-01-01 00:00:00.123 UTC'),
+            parser.parse('2017-01-01 00:00:00.123').replace(tzinfo=timezone.utc),
+        ]:
+            self.assertEqual(timestamp_to_datetime(timestamp), dt - timedelta(microseconds=123000))
             self.assertEqual(datetime_to_timestamp(dt), timestamp)
 
         for dt in [
-                parser.parse('2017-01-01 00:00:00.123+01:00'),
-                parser.parse('2017-01-01 00:00:00.123')]:
+            parser.parse('2017-01-01 00:00:00.123+01:00'),
+            parser.parse('2017-01-01 00:00:00.123'),
+        ]:
             with self.assertRaises(TimezoneNotUTCException):
                 datetime_to_timestamp(dt)
 
     def test_convert_to_UTC(self) -> None:
         utc_datetime = parser.parse('2017-01-01 00:00:00.123 UTC')
         for dt in [
-                parser.parse('2017-01-01 00:00:00.123').replace(tzinfo=timezone.utc),
-                parser.parse('2017-01-01 00:00:00.123'),
-                parser.parse('2017-01-01 05:00:00.123+05')]:
+            parser.parse('2017-01-01 00:00:00.123').replace(tzinfo=timezone.utc),
+            parser.parse('2017-01-01 00:00:00.123'),
+            parser.parse('2017-01-01 05:00:00.123+05'),
+        ]:
             self.assertEqual(convert_to_UTC(dt), utc_datetime)
 
     def test_enforce_UTC(self) -> None:
diff --git a/zerver/tests/test_timezone.py b/zerver/tests/test_timezone.py
index 3b9f276c7d..f1d504af83 100644
--- a/zerver/tests/test_timezone.py
+++ b/zerver/tests/test_timezone.py
@@ -26,9 +26,7 @@ class TimeZoneTest(ZulipTestCase):
             ("IST", +7200),  # Israel Standard Time
             ("IST", +3600),  # Ireland Standard Time
         ]
-        missing = set(dict(reversed(ambiguous_abbrevs)).items()) - set(
-            common_timezones.items()
-        )
+        missing = set(dict(reversed(ambiguous_abbrevs)).items()) - set(common_timezones.items())
         assert not missing, missing
 
         now = timezone_now()
@@ -44,8 +42,7 @@ class TimeZoneTest(ZulipTestCase):
                 assert delta is not None
                 offset = delta.total_seconds()
                 assert (
-                    common_timezones[abbrev] == offset
-                    or (abbrev, offset) in ambiguous_abbrevs
+                    common_timezones[abbrev] == offset or (abbrev, offset) in ambiguous_abbrevs
                 ), (name, abbrev, offset)
                 extra.discard((abbrev, offset))
         assert not extra, extra
diff --git a/zerver/tests/test_tornado.py b/zerver/tests/test_tornado.py
index 5a18f4c2d5..44881f9870 100644
--- a/zerver/tests/test_tornado.py
+++ b/zerver/tests/test_tornado.py
@@ -88,6 +88,7 @@ class TornadoWebTestCase(AsyncHTTPTestCase, ZulipTestCase):
         self.assertIn('queue_id', body)
         return body['queue_id']
 
+
 class EventsTestCase(TornadoWebTestCase):
     def test_create_queue(self) -> None:
         self.login_user(self.example_user('hamlet'))
@@ -117,7 +118,10 @@ class EventsTestCase(TornadoWebTestCase):
         self.io_loop.call_later(0.1, process_events)
         response = self.wait()
         data = orjson.loads(response.body)
-        self.assertEqual(data['events'], [
-            {'type': 'test', 'data': 'test data', 'id': 0},
-        ])
+        self.assertEqual(
+            data['events'],
+            [
+                {'type': 'test', 'data': 'test data', 'id': 0},
+            ],
+        )
         self.assertEqual(data['result'], 'success')
diff --git a/zerver/tests/test_tutorial.py b/zerver/tests/test_tutorial.py
index bc0ac902c3..b3b92de35b 100644
--- a/zerver/tests/test_tutorial.py
+++ b/zerver/tests/test_tutorial.py
@@ -40,13 +40,15 @@ class TutorialTests(ZulipTestCase):
         self.login_user(user)
         self.send_personal_message(user, bot, content)
         user_messages = message_stream_count(user)
-        expected_response = ("Congratulations on your first reply! :tada:\n\n"
-                             "Feel free to continue using this space to practice your new messaging "
-                             "skills. Or, try clicking on some of the stream names to your left!")
+        expected_response = (
+            "Congratulations on your first reply! :tada:\n\n"
+            "Feel free to continue using this space to practice your new messaging "
+            "skills. Or, try clicking on some of the stream names to your left!"
+        )
         self.assertEqual(most_recent_message(user).content, expected_response)
         # Welcome bot shouldn't respond to further PMs.
         self.send_personal_message(user, bot, content)
-        self.assertEqual(message_stream_count(user), user_messages+1)
+        self.assertEqual(message_stream_count(user), user_messages + 1)
 
     def test_no_response_to_group_pm(self) -> None:
         user1 = self.example_user('hamlet')
@@ -59,4 +61,4 @@ class TutorialTests(ZulipTestCase):
         self.assertEqual(most_recent_message(user1).content, content)
         # Welcome bot should still respond to initial PM after group PM.
         self.send_personal_message(user1, bot, content)
-        self.assertEqual(message_stream_count(user1), user1_messages+2)
+        self.assertEqual(message_stream_count(user1), user1_messages + 2)
diff --git a/zerver/tests/test_type_debug.py b/zerver/tests/test_type_debug.py
index 9e804a379a..acfaac2742 100644
--- a/zerver/tests/test_type_debug.py
+++ b/zerver/tests/test_type_debug.py
@@ -7,12 +7,15 @@ from zerver.lib.type_debug import print_types
 
 T = TypeVar('T')
 
-def add(x: Any=0, y: Any=0) -> Any:
+
+def add(x: Any = 0, y: Any = 0) -> Any:
     return x + y
 
-def to_dict(v: Iterable[Tuple[Any, Any]]=[]) -> Dict[Any, Any]:
+
+def to_dict(v: Iterable[Tuple[Any, Any]] = []) -> Dict[Any, Any]:
     return dict(v)
 
+
 class TypesPrintTest(ZulipTestCase):
 
     # These 2 methods are needed to run tests with our custom test-runner
@@ -22,8 +25,9 @@ class TypesPrintTest(ZulipTestCase):
     def _post_teardown(self) -> None:
         pass
 
-    def check_signature(self, signature: str, retval: T, func: Callable[..., T],
-                        *args: Any, **kwargs: Any) -> None:
+    def check_signature(
+        self, signature: str, retval: T, func: Callable[..., T], *args: Any, **kwargs: Any
+    ) -> None:
         """
         Checks if print_types outputs `signature` when func is called with *args and **kwargs.
         Do not decorate func with print_types before passing into this function.
@@ -40,41 +44,42 @@ class TypesPrintTest(ZulipTestCase):
     def test_empty(self) -> None:
         def empty_func() -> None:
             pass
+
         self.check_signature("empty_func() -> None", None, empty_func)
         self.check_signature("<lambda>() -> None", None, (lambda: None))
 
     def test_basic(self) -> None:
-        self.check_signature("add(float, int) -> float",
-                             5.0, add, 2.0, 3)
-        self.check_signature("add(float, y=int) -> float",
-                             5.0, add, 2.0, y=3)
+        self.check_signature("add(float, int) -> float", 5.0, add, 2.0, 3)
+        self.check_signature("add(float, y=int) -> float", 5.0, add, 2.0, y=3)
         self.check_signature("add(x=int) -> int", 2, add, x=2)
         self.check_signature("add() -> int", 0, add)
 
     def test_list(self) -> None:
-        self.check_signature("add([], [str]) -> [str]",
-                             ['two'], add, [], ['two'])
-        self.check_signature("add([int], [str]) -> [int, ...]",
-                             [2, 'two'], add, [2], ['two'])
-        self.check_signature("add([int, ...], y=[]) -> [int, ...]",
-                             [2, 'two'], add, [2, 'two'], y=[])
+        self.check_signature("add([], [str]) -> [str]", ['two'], add, [], ['two'])
+        self.check_signature("add([int], [str]) -> [int, ...]", [2, 'two'], add, [2], ['two'])
+        self.check_signature(
+            "add([int, ...], y=[]) -> [int, ...]", [2, 'two'], add, [2, 'two'], y=[]
+        )
 
     def test_dict(self) -> None:
         self.check_signature("to_dict() -> {}", {}, to_dict)
-        self.check_signature("to_dict([(int, str)]) -> {int: str}",
-                             {2: 'two'}, to_dict, [(2, 'two')])
-        self.check_signature("to_dict(((int, str),)) -> {int: str}",
-                             {2: 'two'}, to_dict, ((2, 'two'),))
-        self.check_signature("to_dict([(int, str), ...]) -> {int: str, ...}",
-                             {1: 'one', 2: 'two'}, to_dict, [(1, 'one'), (2, 'two')])
+        self.check_signature(
+            "to_dict([(int, str)]) -> {int: str}", {2: 'two'}, to_dict, [(2, 'two')]
+        )
+        self.check_signature(
+            "to_dict(((int, str),)) -> {int: str}", {2: 'two'}, to_dict, ((2, 'two'),)
+        )
+        self.check_signature(
+            "to_dict([(int, str), ...]) -> {int: str, ...}",
+            {1: 'one', 2: 'two'},
+            to_dict,
+            [(1, 'one'), (2, 'two')],
+        )
 
     def test_tuple(self) -> None:
-        self.check_signature("add((), ()) -> ()",
-                             (), add, (), ())
-        self.check_signature("add((int,), (str,)) -> (int, str)",
-                             (1, 'one'), add, (1,), ('one',))
-        self.check_signature("add(((),), ((),)) -> ((), ())",
-                             ((), ()), add, ((),), ((),))
+        self.check_signature("add((), ()) -> ()", (), add, (), ())
+        self.check_signature("add((int,), (str,)) -> (int, str)", (1, 'one'), add, (1,), ('one',))
+        self.check_signature("add(((),), ((),)) -> ((), ())", ((), ()), add, ((),), ((),))
 
     def test_class(self) -> None:
         class A:
@@ -93,24 +98,34 @@ class TypesPrintTest(ZulipTestCase):
         class B(List[Any]):
             pass
 
-        self.check_signature("add(A([]), B([str])) -> [str]",
-                             ['two'], add, A([]), B(['two']))
-        self.check_signature("add(A([int]), B([str])) -> [int, ...]",
-                             [2, 'two'], add, A([2]), B(['two']))
-        self.check_signature("add(A([int, ...]), y=B([])) -> [int, ...]",
-                             [2, 'two'], add, A([2, 'two']), y=B([]))
+        self.check_signature("add(A([]), B([str])) -> [str]", ['two'], add, A([]), B(['two']))
+        self.check_signature(
+            "add(A([int]), B([str])) -> [int, ...]", [2, 'two'], add, A([2]), B(['two'])
+        )
+        self.check_signature(
+            "add(A([int, ...]), y=B([])) -> [int, ...]", [2, 'two'], add, A([2, 'two']), y=B([])
+        )
 
     def test_mapping(self) -> None:
         class A(Dict[Any, Any]):
             pass
 
-        def to_A(v: Iterable[Tuple[Any, Any]]=[]) -> A:
+        def to_A(v: Iterable[Tuple[Any, Any]] = []) -> A:
             return A(v)
 
         self.check_signature("to_A() -> A([])", A(()), to_A)
-        self.check_signature("to_A([(int, str)]) -> A([(int, str)])",
-                             {2: 'two'}, to_A, [(2, 'two')])
-        self.check_signature("to_A([(int, str), ...]) -> A([(int, str), ...])",
-                             {1: 'one', 2: 'two'}, to_A, [(1, 'one'), (2, 'two')])
-        self.check_signature("to_A(((int, str), (int, str))) -> A([(int, str), ...])",
-                             {1: 'one', 2: 'two'}, to_A, ((1, 'one'), (2, 'two')))
+        self.check_signature(
+            "to_A([(int, str)]) -> A([(int, str)])", {2: 'two'}, to_A, [(2, 'two')]
+        )
+        self.check_signature(
+            "to_A([(int, str), ...]) -> A([(int, str), ...])",
+            {1: 'one', 2: 'two'},
+            to_A,
+            [(1, 'one'), (2, 'two')],
+        )
+        self.check_signature(
+            "to_A(((int, str), (int, str))) -> A([(int, str), ...])",
+            {1: 'one', 2: 'two'},
+            to_A,
+            ((1, 'one'), (2, 'two')),
+        )
diff --git a/zerver/tests/test_typing.py b/zerver/tests/test_typing.py
index d95f7ce1e7..d907e7c49f 100644
--- a/zerver/tests/test_typing.py
+++ b/zerver/tests/test_typing.py
@@ -31,6 +31,7 @@ class TypingValidateOperatorTest(ZulipTestCase):
         result = self.api_post(sender, '/api/v1/typing', params)
         self.assert_json_error(result, 'Invalid \'op\' value (should be start or stop)')
 
+
 class TypingValidateUsersTest(ZulipTestCase):
     def test_empty_array(self) -> None:
         """
@@ -66,6 +67,7 @@ class TypingValidateUsersTest(ZulipTestCase):
         result = self.api_post(sender, '/api/v1/typing', {'op': 'start', 'to': invalid})
         self.assert_json_error(result, 'Invalid user ID 9999999')
 
+
 class TypingHappyPathTest(ZulipTestCase):
     def test_start_to_single_recipient(self) -> None:
         sender = self.example_user('hamlet')
diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py
index 15c30b71b9..0c1ea8a2ba 100644
--- a/zerver/tests/test_upload.py
+++ b/zerver/tests/test_upload.py
@@ -77,8 +77,8 @@ def destroy_uploads() -> None:
     if os.path.exists(settings.LOCAL_UPLOADS_DIR):
         shutil.rmtree(settings.LOCAL_UPLOADS_DIR)
 
-class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
 
+class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
     def test_rest_endpoint(self) -> None:
         """
         Tests the /api/v1/user_uploads API endpoint. Here a single file is uploaded
@@ -92,7 +92,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         self.assertIn("uri", result.json())
         uri = result.json()['uri']
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         # Download file via API
         self.logout()
@@ -119,7 +119,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         self.assertIn("uri", result.json())
         uri = result.json()['uri']
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         self.logout()
 
@@ -142,9 +142,9 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         """
         fp = StringIO("zulip!")
         fp.name = "pasted_file"
-        result = self.api_post(self.example_user("hamlet"),
-                               "/api/v1/user_uploads?mimetype=image/png",
-                               {"file": fp})
+        result = self.api_post(
+            self.example_user("hamlet"), "/api/v1/user_uploads?mimetype=image/png", {"file": fp}
+        )
         self.assertEqual(result.status_code, 200)
         uri = result.json()["uri"]
         self.assertTrue(uri.endswith("pasted_file.png"))
@@ -202,7 +202,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         self.assertIn("uri", result.json())
         uri = result.json()["uri"]
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         # In the future, local file requests will follow the same style as S3
         # requests; they will be first authenthicated and redirected
@@ -286,13 +286,14 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
 
         self.logout()
         response = self.client_get(uri)
-        self.assert_json_error(response, "Not logged in: API authentication or user session required",
-                               status_code=401)
+        self.assert_json_error(
+            response, "Not logged in: API authentication or user session required", status_code=401
+        )
 
     def test_removed_file_download(self) -> None:
-        '''
+        """
         Trying to download deleted files should return 404 error
-        '''
+        """
         self.login('hamlet')
         fp = StringIO("zulip!")
         fp.name = "zulip.txt"
@@ -304,12 +305,14 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         self.assertEqual(response.status_code, 404)
 
     def test_non_existing_file_download(self) -> None:
-        '''
+        """
         Trying to download a file that was never uploaded will return a json_error
-        '''
+        """
         hamlet = self.example_user("hamlet")
         self.login_user(hamlet)
-        response = self.client_get(f"http://localhost:9991/user_uploads/{hamlet.realm_id}/ff/gg/abc.py")
+        response = self.client_get(
+            f"http://localhost:9991/user_uploads/{hamlet.realm_id}/ff/gg/abc.py"
+        )
         self.assertEqual(response.status_code, 404)
         self.assert_in_response('File not found.', response)
 
@@ -327,34 +330,37 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         d2_path_id = re.sub('/user_uploads/', '', result.json()['uri'])
 
         two_week_ago = timezone_now() - datetime.timedelta(weeks=2)
-        d1_attachment = Attachment.objects.get(path_id = d1_path_id)
+        d1_attachment = Attachment.objects.get(path_id=d1_path_id)
         d1_attachment.create_time = two_week_ago
         d1_attachment.save()
         self.assertEqual(str(d1_attachment), '<Attachment: dummy_1.txt>')
-        d2_attachment = Attachment.objects.get(path_id = d2_path_id)
+        d2_attachment = Attachment.objects.get(path_id=d2_path_id)
         d2_attachment.create_time = two_week_ago
         d2_attachment.save()
 
         # Send message referring only dummy_1
         self.subscribe(self.example_user("hamlet"), "Denmark")
-        body = "Some files here ...[zulip.txt](http://localhost:9991/user_uploads/" + d1_path_id + ")"
+        body = (
+            "Some files here ...[zulip.txt](http://localhost:9991/user_uploads/" + d1_path_id + ")"
+        )
         self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test")
 
         # dummy_2 should not exist in database or the uploads folder
         do_delete_old_unclaimed_attachments(2)
-        self.assertTrue(not Attachment.objects.filter(path_id = d2_path_id).exists())
+        self.assertTrue(not Attachment.objects.filter(path_id=d2_path_id).exists())
         with self.assertLogs(level='WARNING') as warn_log:
             self.assertTrue(not delete_message_image(d2_path_id))
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:dummy_2.txt does not exist. Its entry in the database will be removed.'
-        ])
+        self.assertEqual(
+            warn_log.output,
+            ['WARNING:root:dummy_2.txt does not exist. Its entry in the database will be removed.'],
+        )
 
     def test_attachment_url_without_upload(self) -> None:
         hamlet = self.example_user("hamlet")
         self.login_user(hamlet)
         body = f"Test message ...[zulip.txt](http://localhost:9991/user_uploads/{hamlet.realm_id}/64/fake_path_id.txt)"
         self.send_stream_message(self.example_user("hamlet"), "Denmark", body, "test")
-        self.assertFalse(Attachment.objects.filter(path_id = "1/64/fake_path_id.txt").exists())
+        self.assertFalse(Attachment.objects.filter(path_id="1/64/fake_path_id.txt").exists())
 
     def test_multiple_claim_attachments(self) -> None:
         """
@@ -399,8 +405,10 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         body = f"Illegal message ...[zulip.txt](http://{host}/user_uploads/" + d1_path_id + ")"
         with self.assertLogs(level='WARNING') as warn_log:
             self.send_stream_message(self.example_user("cordelia"), "Denmark", body, "test")
-        self.assertTrue('WARNING:root:User 8 tried to share upload' in warn_log.output[0]
-                        and 'but lacks permission' in warn_log.output[0])
+        self.assertTrue(
+            'WARNING:root:User 8 tried to share upload' in warn_log.output[0]
+            and 'but lacks permission' in warn_log.output[0]
+        )
         self.assertEqual(Attachment.objects.get(path_id=d1_path_id).messages.count(), 1)
         self.assertFalse(Attachment.objects.get(path_id=d1_path_id).is_realm_public)
         self.assertFalse(Attachment.objects.get(path_id=d1_path_id).is_web_public)
@@ -444,19 +452,26 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         f2_path_id = re.sub('/user_uploads/', '', result.json()['uri'])
 
         self.subscribe(hamlet, "test")
-        body = (f"[f1.txt](http://{host}/user_uploads/" + f1_path_id + ") "
-                "[f2.txt](http://{}/user_uploads/".format(host) + f2_path_id + ")")
+        body = (
+            f"[f1.txt](http://{host}/user_uploads/" + f1_path_id + ") "
+            "[f2.txt](http://{}/user_uploads/".format(host) + f2_path_id + ")"
+        )
         msg_id = self.send_stream_message(hamlet, "test", body, "test")
 
         result = self.client_post("/json/user_uploads", {'file': f3})
         f3_path_id = re.sub('/user_uploads/', '', result.json()['uri'])
 
-        new_body = (f"[f3.txt](http://{host}/user_uploads/" + f3_path_id + ") "
-                    "[f2.txt](http://{}/user_uploads/".format(host) + f2_path_id + ")")
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': new_body,
-        })
+        new_body = (
+            f"[f3.txt](http://{host}/user_uploads/" + f3_path_id + ") "
+            "[f2.txt](http://{}/user_uploads/".format(host) + f2_path_id + ")"
+        )
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': new_body,
+            },
+        )
         self.assert_json_success(result)
 
         message = Message.objects.get(id=msg_id)
@@ -470,10 +485,13 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
 
         # Delete all the attachments from the message
         new_body = "(deleted)"
-        result = self.client_patch("/json/messages/" + str(msg_id), {
-            'message_id': msg_id,
-            'content': new_body,
-        })
+        result = self.client_patch(
+            "/json/messages/" + str(msg_id),
+            {
+                'message_id': msg_id,
+                'content': new_body,
+            },
+        )
         self.assert_json_success(result)
 
         message = Message.objects.get(id=msg_id)
@@ -506,7 +524,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         d1.name = "dummy_1.txt"
         result = self.client_post("/json/user_uploads", {'file': d1})
         d1_path_id = re.sub('/user_uploads/', '', result.json()['uri'])
-        d1_attachment = Attachment.objects.get(path_id = d1_path_id)
+        d1_attachment = Attachment.objects.get(path_id=d1_path_id)
         self.assert_json_success(result)
 
         realm = get_realm("zulip")
@@ -517,7 +535,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         # d1_attachment to realm.upload_quota_bytes() - 11 should allow
         # us to upload only one more attachment.
         quota = realm.upload_quota_bytes()
-        assert(quota is not None)
+        assert quota is not None
         d1_attachment.size = quota - 11
         d1_attachment.save(update_fields=['size'])
 
@@ -537,7 +555,6 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         self.assert_json_success(result)
 
     def test_cross_realm_file_access(self) -> None:
-
         def create_user(email: str, realm_id: str) -> UserProfile:
             password = initial_password(email)
             if password is not None:
@@ -565,7 +582,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         uri = result.json()['uri']
         fp_path_id = re.sub('/user_uploads/', '', uri)
         body = f"First message ...[zulip.txt](http://{host}/user_uploads/" + fp_path_id + ")"
-        with self.settings(CROSS_REALM_BOT_EMAILS = {user_2.email, user_3.email}):
+        with self.settings(CROSS_REALM_BOT_EMAILS={user_2.email, user_3.email}):
             internal_send_private_message(
                 realm=r1,
                 sender=get_system_bot(user_2.email),
@@ -593,7 +610,9 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         subscribed_users = [hamlet, cordelia]
         unsubscribed_users = [self.example_user("othello"), self.example_user("prospero")]
         stream_name = "test-subscribe"
-        self.make_stream(stream_name, realm=realm, invite_only=True, history_public_to_subscribers=False)
+        self.make_stream(
+            stream_name, realm=realm, invite_only=True, history_public_to_subscribers=False
+        )
 
         for subscribed_user in subscribed_users:
             self.subscribe(subscribed_user, stream_name)
@@ -647,7 +666,9 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         subscribed_users = [user, polonius]
         unsubscribed_users = [self.example_user("othello"), self.example_user("prospero")]
         stream_name = "test-subscribe"
-        self.make_stream(stream_name, realm=user.realm, invite_only=True, history_public_to_subscribers=True)
+        self.make_stream(
+            stream_name, realm=user.realm, invite_only=True, history_public_to_subscribers=True
+        )
 
         for subscribed_user in subscribed_users:
             self.subscribe(subscribed_user, stream_name)
@@ -658,7 +679,11 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         result = self.client_post("/json/user_uploads", {'file': fp})
         uri = result.json()['uri']
         fp_path_id = re.sub('/user_uploads/', '', uri)
-        body = f"First message ...[zulip.txt](http://{user.realm.host}/user_uploads/" + fp_path_id + ")"
+        body = (
+            f"First message ...[zulip.txt](http://{user.realm.host}/user_uploads/"
+            + fp_path_id
+            + ")"
+        )
         self.send_stream_message(user, stream_name, body, "test")
         self.logout()
 
@@ -716,7 +741,12 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         hamlet = self.example_user("hamlet")
         for i in range(0, 5):
             stream_name = f"test-subscribe {i}"
-            self.make_stream(stream_name, realm=hamlet.realm, invite_only=True, history_public_to_subscribers=True)
+            self.make_stream(
+                stream_name,
+                realm=hamlet.realm,
+                invite_only=True,
+                history_public_to_subscribers=True,
+            )
             self.subscribe(hamlet, stream_name)
 
         self.login_user(hamlet)
@@ -726,8 +756,14 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
         uri = result.json()['uri']
         fp_path_id = re.sub('/user_uploads/', '', uri)
         for i in range(20):
-            body = f"First message ...[zulip.txt](http://{hamlet.realm.host}/user_uploads/" + fp_path_id + ")"
-            self.send_stream_message(self.example_user("hamlet"), f"test-subscribe {i % 5}", body, "test")
+            body = (
+                f"First message ...[zulip.txt](http://{hamlet.realm.host}/user_uploads/"
+                + fp_path_id
+                + ")"
+            )
+            self.send_stream_message(
+                self.example_user("hamlet"), f"test-subscribe {i % 5}", body, "test"
+            )
         self.logout()
 
         user = self.example_user("aaron")
@@ -781,8 +817,9 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
             self.logout()
 
     def test_serve_local(self) -> None:
-        def check_xsend_links(name: str, name_str_for_test: str,
-                              content_disposition: str='') -> None:
+        def check_xsend_links(
+            name: str, name_str_for_test: str, content_disposition: str = ''
+        ) -> None:
             with self.settings(SENDFILE_BACKEND='django_sendfile.backends.nginx'):
                 _get_sendfile.cache_clear()  # To clearout cached version of backend from djangosendfile
                 self.login('hamlet')
@@ -795,19 +832,25 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
                 response = self.client_get(uri)
                 _get_sendfile.cache_clear()
                 test_run, worker = os.path.split(os.path.dirname(settings.LOCAL_UPLOADS_DIR))
-                self.assertEqual(response['X-Accel-Redirect'],
-                                 '/serve_uploads/' + fp_path + '/' + name_str_for_test)
+                self.assertEqual(
+                    response['X-Accel-Redirect'],
+                    '/serve_uploads/' + fp_path + '/' + name_str_for_test,
+                )
                 if content_disposition != '':
                     self.assertIn('attachment;', response['Content-disposition'])
                     self.assertIn(content_disposition, response['Content-disposition'])
                 else:
                     self.assertIn('inline;', response['Content-disposition'])
-                self.assertEqual(set(response["Cache-Control"].split(", ")),
-                                 {"private", "immutable"})
+                self.assertEqual(
+                    set(response["Cache-Control"].split(", ")), {"private", "immutable"}
+                )
 
         check_xsend_links('zulip.txt', 'zulip.txt', 'filename="zulip.txt"')
-        check_xsend_links('áéБД.txt', '%C3%A1%C3%A9%D0%91%D0%94.txt',
-                          "filename*=UTF-8''%C3%A1%C3%A9%D0%91%D0%94.txt")
+        check_xsend_links(
+            'áéБД.txt',
+            '%C3%A1%C3%A9%D0%91%D0%94.txt',
+            "filename*=UTF-8''%C3%A1%C3%A9%D0%91%D0%94.txt",
+        )
         check_xsend_links('zulip.html', 'zulip.html', 'filename="zulip.html"')
         check_xsend_links('zulip.sh', 'zulip.sh', 'filename="zulip.sh"')
         check_xsend_links('zulip.jpeg', 'zulip.jpeg')
@@ -820,7 +863,6 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
 
 
 class AvatarTest(UploadSerializeMixin, ZulipTestCase):
-
     def test_get_avatar_field(self) -> None:
         with self.settings(AVATAR_SALT="salt"):
             url = get_avatar_field(
@@ -868,37 +910,47 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
     def test_avatar_url(self) -> None:
         """Verifies URL schemes for avatars and realm icons."""
         backend: ZulipUploadBackend = LocalUploadBackend()
-        self.assertEqual(backend.get_avatar_url("hash", False),
-                         "/user_avatars/hash.png?x=x")
-        self.assertEqual(backend.get_avatar_url("hash", True),
-                         "/user_avatars/hash-medium.png?x=x")
-        self.assertEqual(backend.get_realm_icon_url(15, 1),
-                         "/user_avatars/15/realm/icon.png?version=1")
-        self.assertEqual(backend.get_realm_logo_url(15, 1, False),
-                         "/user_avatars/15/realm/logo.png?version=1")
-        self.assertEqual(backend.get_realm_logo_url(15, 1, True),
-                         "/user_avatars/15/realm/night_logo.png?version=1")
+        self.assertEqual(backend.get_avatar_url("hash", False), "/user_avatars/hash.png?x=x")
+        self.assertEqual(backend.get_avatar_url("hash", True), "/user_avatars/hash-medium.png?x=x")
+        self.assertEqual(
+            backend.get_realm_icon_url(15, 1), "/user_avatars/15/realm/icon.png?version=1"
+        )
+        self.assertEqual(
+            backend.get_realm_logo_url(15, 1, False), "/user_avatars/15/realm/logo.png?version=1"
+        )
+        self.assertEqual(
+            backend.get_realm_logo_url(15, 1, True),
+            "/user_avatars/15/realm/night_logo.png?version=1",
+        )
 
         with self.settings(S3_AVATAR_BUCKET="bucket"):
             backend = S3UploadBackend()
-            self.assertEqual(backend.get_avatar_url("hash", False),
-                             "https://bucket.s3.amazonaws.com/hash?x=x")
-            self.assertEqual(backend.get_avatar_url("hash", True),
-                             "https://bucket.s3.amazonaws.com/hash-medium.png?x=x")
-            self.assertEqual(backend.get_realm_icon_url(15, 1),
-                             "https://bucket.s3.amazonaws.com/15/realm/icon.png?version=1")
-            self.assertEqual(backend.get_realm_logo_url(15, 1, False),
-                             "https://bucket.s3.amazonaws.com/15/realm/logo.png?version=1")
-            self.assertEqual(backend.get_realm_logo_url(15, 1, True),
-                             "https://bucket.s3.amazonaws.com/15/realm/night_logo.png?version=1")
+            self.assertEqual(
+                backend.get_avatar_url("hash", False), "https://bucket.s3.amazonaws.com/hash?x=x"
+            )
+            self.assertEqual(
+                backend.get_avatar_url("hash", True),
+                "https://bucket.s3.amazonaws.com/hash-medium.png?x=x",
+            )
+            self.assertEqual(
+                backend.get_realm_icon_url(15, 1),
+                "https://bucket.s3.amazonaws.com/15/realm/icon.png?version=1",
+            )
+            self.assertEqual(
+                backend.get_realm_logo_url(15, 1, False),
+                "https://bucket.s3.amazonaws.com/15/realm/logo.png?version=1",
+            )
+            self.assertEqual(
+                backend.get_realm_logo_url(15, 1, True),
+                "https://bucket.s3.amazonaws.com/15/realm/night_logo.png?version=1",
+            )
 
     def test_multiple_upload_failure(self) -> None:
         """
         Attempting to upload two files should fail.
         """
         self.login('hamlet')
-        with get_test_image_file('img.png') as fp1, \
-                get_test_image_file('img.png') as fp2:
+        with get_test_image_file('img.png') as fp1, get_test_image_file('img.png') as fp2:
             result = self.client_post("/json/users/me/avatar", {'f1': fp1, 'f2': fp2})
         self.assert_json_error(result, "You must upload exactly one avatar.")
 
@@ -993,8 +1045,9 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
         self.assertTrue(redirect_url.endswith(str(avatar_url(cross_realm_bot)) + '&foo=bar'))
 
         response = self.client_get("/avatar/cordelia@zulip.com", {"foo": "bar"})
-        self.assert_json_error(response, "Not logged in: API authentication or user session required",
-                               status_code=401)
+        self.assert_json_error(
+            response, "Not logged in: API authentication or user session required", status_code=401
+        )
 
     def test_get_user_avatar_medium(self) -> None:
         hamlet = self.example_user("hamlet")
@@ -1025,8 +1078,9 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
         self.assertTrue(redirect_url.endswith(str(avatar_url(cordelia, True)) + '&foo=bar'))
 
         response = self.client_get("/avatar/cordelia@zulip.com/medium", {"foo": "bar"})
-        self.assert_json_error(response, "Not logged in: API authentication or user session required",
-                               status_code=401)
+        self.assert_json_error(
+            response, "Not logged in: API authentication or user session required", status_code=401
+        )
 
     def test_non_valid_user_avatar(self) -> None:
 
@@ -1055,7 +1109,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
             self.assertIn("avatar_url", result.json())
             base = '/user_avatars/'
             url = result.json()['avatar_url']
-            self.assertEqual(base, url[:len(base)])
+            self.assertEqual(base, url[: len(base)])
 
             if rfname is not None:
                 response = self.client_get(url)
@@ -1101,12 +1155,16 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
 
         source_original_path_id = avatar_disk_path(source_user_profile, original=True)
         target_original_path_id = avatar_disk_path(target_user_profile, original=True)
-        with open(source_original_path_id, "rb") as source, open(target_original_path_id, "rb") as target:
+        with open(source_original_path_id, "rb") as source, open(
+            target_original_path_id, "rb"
+        ) as target:
             self.assertEqual(source.read(), target.read())
 
         source_medium_path_id = avatar_disk_path(source_user_profile, medium=True)
         target_medium_path_id = avatar_disk_path(target_user_profile, medium=True)
-        with open(source_medium_path_id, "rb") as source, open(target_medium_path_id, "rb") as target:
+        with open(source_medium_path_id, "rb") as source, open(
+            target_medium_path_id, "rb"
+        ) as target:
             self.assertEqual(source.read(), target.read())
 
     def test_delete_avatar_image(self) -> None:
@@ -1181,6 +1239,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
         destroy_uploads()
         super().tearDown()
 
+
 class EmojiTest(UploadSerializeMixin, ZulipTestCase):
     # While testing GIF resizing, we can't test if the final GIF has the same
     # number of frames as the original one because PIL drops duplicate frames
@@ -1227,16 +1286,15 @@ class EmojiTest(UploadSerializeMixin, ZulipTestCase):
         destroy_uploads()
         super().tearDown()
 
-class RealmIconTest(UploadSerializeMixin, ZulipTestCase):
 
+class RealmIconTest(UploadSerializeMixin, ZulipTestCase):
     def test_multiple_upload_failure(self) -> None:
         """
         Attempting to upload two files should fail.
         """
         # Log in as admin
         self.login('iago')
-        with get_test_image_file('img.png') as fp1, \
-                get_test_image_file('img.png') as fp2:
+        with get_test_image_file('img.png') as fp1, get_test_image_file('img.png') as fp2:
             result = self.client_post("/json/realm/icon", {'f1': fp1, 'f2': fp2})
         self.assert_json_error(result, "You must upload exactly one icon.")
 
@@ -1303,7 +1361,7 @@ class RealmIconTest(UploadSerializeMixin, ZulipTestCase):
             self.assertIn("icon_url", result.json())
             base = f'/user_avatars/{realm.id}/realm/icon.png'
             url = result.json()['icon_url']
-            self.assertEqual(base, url[:len(base)])
+            self.assertEqual(base, url[: len(base)])
 
             if rfname is not None:
                 response = self.client_get(url)
@@ -1359,6 +1417,7 @@ class RealmIconTest(UploadSerializeMixin, ZulipTestCase):
         destroy_uploads()
         super().tearDown()
 
+
 class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
     night = False
 
@@ -1368,10 +1427,11 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
         """
         # Log in as admin
         self.login('iago')
-        with get_test_image_file('img.png') as fp1, \
-                get_test_image_file('img.png') as fp2:
-            result = self.client_post("/json/realm/logo", {'f1': fp1, 'f2': fp2,
-                                                           'night': orjson.dumps(self.night).decode()})
+        with get_test_image_file('img.png') as fp1, get_test_image_file('img.png') as fp2:
+            result = self.client_post(
+                "/json/realm/logo",
+                {'f1': fp1, 'f2': fp2, 'night': orjson.dumps(self.night).decode()},
+            )
         self.assert_json_error(result, "You must upload exactly one logo.")
 
     def test_no_file_upload_failure(self) -> None:
@@ -1395,7 +1455,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
     def test_no_admin_user_upload(self) -> None:
         self.login('hamlet')
         with get_test_image_file(self.correct_files[0][0]) as fp:
-            result = self.client_post("/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()})
+            result = self.client_post(
+                "/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()}
+            )
         self.assert_json_error(result, 'Must be an organization administrator')
 
     def test_upload_limited_plan_type(self) -> None:
@@ -1403,7 +1465,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
         do_change_plan_type(user_profile.realm, Realm.LIMITED)
         self.login_user(user_profile)
         with get_test_image_file(self.correct_files[0][0]) as fp:
-            result = self.client_post("/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()})
+            result = self.client_post(
+                "/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()}
+            )
         self.assert_json_error(result, 'Available on Zulip Standard. Upgrade to access.')
 
     def test_get_default_logo(self) -> None:
@@ -1414,7 +1478,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
         response = self.client_get("/json/realm/logo", {'night': orjson.dumps(self.night).decode()})
         redirect_url = response['Location']
         is_night_str = str(self.night).lower()
-        self.assertEqual(redirect_url, f"/static/images/logo/zulip-org-logo.svg?version=0&night={is_night_str}")
+        self.assertEqual(
+            redirect_url, f"/static/images/logo/zulip-org-logo.svg?version=0&night={is_night_str}"
+        )
 
     def test_get_realm_logo(self) -> None:
         user_profile = self.example_user("hamlet")
@@ -1423,8 +1489,11 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
         do_change_logo_source(realm, Realm.LOGO_UPLOADED, self.night, acting_user=user_profile)
         response = self.client_get("/json/realm/logo", {'night': orjson.dumps(self.night).decode()})
         redirect_url = response['Location']
-        self.assertTrue(redirect_url.endswith(get_realm_logo_url(realm, self.night) +
-                                              f'&night={str(self.night).lower()}'))
+        self.assertTrue(
+            redirect_url.endswith(
+                get_realm_logo_url(realm, self.night) + f'&night={str(self.night).lower()}'
+            )
+        )
 
         is_night_str = str(self.night).lower()
 
@@ -1432,7 +1501,10 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
             file_name = "night_logo.png"
         else:
             file_name = "logo.png"
-        self.assertEqual(redirect_url, f"/user_avatars/{realm.id}/realm/{file_name}?version=2&night={is_night_str}")
+        self.assertEqual(
+            redirect_url,
+            f"/user_avatars/{realm.id}/realm/{file_name}?version=2&night={is_night_str}",
+        )
 
         do_change_plan_type(realm, Realm.LIMITED)
         if self.night:
@@ -1441,7 +1513,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
             self.assertEqual(realm.logo_source, Realm.LOGO_UPLOADED)
         response = self.client_get("/json/realm/logo", {'night': orjson.dumps(self.night).decode()})
         redirect_url = response['Location']
-        self.assertEqual(redirect_url, f"/static/images/logo/zulip-org-logo.svg?version=0&night={is_night_str}")
+        self.assertEqual(
+            redirect_url, f"/static/images/logo/zulip-org-logo.svg?version=0&night={is_night_str}"
+        )
 
     def test_valid_logos(self) -> None:
         """
@@ -1453,7 +1527,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
             # with self.subTest(fname=fname):
             self.login('iago')
             with get_test_image_file(fname) as fp:
-                result = self.client_post("/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()})
+                result = self.client_post(
+                    "/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()}
+                )
             realm = get_realm('zulip')
             self.assert_json_success(result)
             logo_url = get_realm_logo_url(realm, self.night)
@@ -1473,7 +1549,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
             # with self.subTest(fname=fname):
             self.login('iago')
             with get_test_image_file(fname) as fp:
-                result = self.client_post("/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()})
+                result = self.client_post(
+                    "/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()}
+                )
 
             self.assert_json_error(result, "Could not decode image; did you upload an image file?")
 
@@ -1485,7 +1563,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
         self.login_user(user_profile)
         realm = user_profile.realm
         do_change_logo_source(realm, Realm.LOGO_UPLOADED, self.night, acting_user=user_profile)
-        result = self.client_delete("/json/realm/logo", {'night': orjson.dumps(self.night).decode()})
+        result = self.client_delete(
+            "/json/realm/logo", {'night': orjson.dumps(self.night).decode()}
+        )
         self.assert_json_success(result)
         realm = get_realm('zulip')
         if self.night:
@@ -1502,7 +1582,9 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
             version = realm.logo_version
         self.assertEqual(version, 1)
         with get_test_image_file(self.correct_files[0][0]) as fp:
-            self.client_post("/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()})
+            self.client_post(
+                "/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()}
+            )
         realm = get_realm('zulip')
         if self.night:
             self.assertEqual(realm.night_logo_version, version + 1)
@@ -1513,26 +1595,30 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
         self.login('iago')
         with get_test_image_file(self.correct_files[0][0]) as fp:
             with self.settings(MAX_LOGO_FILE_SIZE=0):
-                result = self.client_post("/json/realm/logo", {'file': fp, 'night':
-                                                               orjson.dumps(self.night).decode()})
+                result = self.client_post(
+                    "/json/realm/logo", {'file': fp, 'night': orjson.dumps(self.night).decode()}
+                )
         self.assert_json_error(result, "Uploaded file is larger than the allowed limit of 0 MiB")
 
     def tearDown(self) -> None:
         destroy_uploads()
         super().tearDown()
 
+
 class RealmNightLogoTest(RealmLogoTest):
     # Run the same tests as for RealmLogoTest, just with night mode enabled
     night = True
 
-class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
 
+class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
     def test_file_upload_local(self) -> None:
         user_profile = self.example_user('hamlet')
-        uri = upload_message_file('dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile)
+        uri = upload_message_file(
+            'dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile
+        )
 
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
         path_id = re.sub('/user_uploads/', '', uri)
         file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, 'files', path_id)
         self.assertTrue(os.path.isfile(file_path))
@@ -1562,7 +1648,9 @@ class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
         )
 
         file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", emoji_path)
-        with get_test_image_file("img.png") as image_file, open(file_path + ".original", "rb") as original_file:
+        with get_test_image_file("img.png") as image_file, open(
+            file_path + ".original", "rb"
+        ) as original_file:
             self.assertEqual(image_file.read(), original_file.read())
 
         expected_size = (DEFAULT_EMOJI_SIZE, DEFAULT_EMOJI_SIZE)
@@ -1588,15 +1676,14 @@ class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
         user_profile = self.example_user("iago")
         self.assertTrue(user_profile.is_realm_admin)
 
-        tarball_path = os.path.join(settings.TEST_WORKER_DIR,
-                                    'tarball.tar.gz')
+        tarball_path = os.path.join(settings.TEST_WORKER_DIR, 'tarball.tar.gz')
         with open(tarball_path, 'w') as f:
             f.write('dummy')
 
         uri = upload_export_tarball(user_profile.realm, tarball_path)
-        self.assertTrue(os.path.isfile(os.path.join(settings.LOCAL_UPLOADS_DIR,
-                                                    'avatars',
-                                                    tarball_path)))
+        self.assertTrue(
+            os.path.isfile(os.path.join(settings.LOCAL_UPLOADS_DIR, 'avatars', tarball_path))
+        )
 
         result = re.search(re.compile(r"([A-Za-z0-9\-_]{24})"), uri)
         if result is not None:
@@ -1607,9 +1694,10 @@ class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
         # Delete the tarball.
         with self.assertLogs(level='WARNING') as warn_log:
             self.assertIsNone(delete_export_tarball('/not_a_file'))
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:not_a_file does not exist. Its entry in the database will be removed.'
-        ])
+        self.assertEqual(
+            warn_log.output,
+            ['WARNING:root:not_a_file does not exist. Its entry in the database will be removed.'],
+        )
         path_id = urllib.parse.urlparse(uri).path
         self.assertEqual(delete_export_tarball(path_id), path_id)
 
@@ -1619,16 +1707,17 @@ class LocalStorageTest(UploadSerializeMixin, ZulipTestCase):
 
 
 class S3Test(ZulipTestCase):
-
     @use_s3_backend
     def test_file_upload_s3(self) -> None:
         bucket = create_s3_buckets(settings.S3_AUTH_UPLOADS_BUCKET)[0]
 
         user_profile = self.example_user('hamlet')
-        uri = upload_message_file('dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile)
+        uri = upload_message_file(
+            'dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile
+        )
 
         base = '/user_uploads/'
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
         path_id = re.sub('/user_uploads/', '', uri)
         content = bucket.Object(path_id).get()['Body'].read()
         self.assertEqual(b"zulip!", content)
@@ -1657,7 +1746,9 @@ class S3Test(ZulipTestCase):
         create_s3_buckets(settings.S3_AUTH_UPLOADS_BUCKET)
 
         user_profile = self.example_user('hamlet')
-        uri = upload_message_file('dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile)
+        uri = upload_message_file(
+            'dummy.txt', len(b'zulip!'), 'text/plain', b'zulip!', user_profile
+        )
 
         path_id = re.sub('/user_uploads/', '', uri)
         self.assertTrue(delete_message_image(path_id))
@@ -1666,9 +1757,12 @@ class S3Test(ZulipTestCase):
     def test_message_image_delete_when_file_doesnt_exist(self) -> None:
         with self.assertLogs(level='WARNING') as warn_log:
             self.assertEqual(False, delete_message_image('non-existant-file'))
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:non-existant-file does not exist. Its entry in the database will be removed.'
-        ])
+        self.assertEqual(
+            warn_log.output,
+            [
+                'WARNING:root:non-existant-file does not exist. Its entry in the database will be removed.'
+            ],
+        )
 
     @use_s3_backend
     def test_file_upload_authed(self) -> None:
@@ -1686,7 +1780,7 @@ class S3Test(ZulipTestCase):
         self.assertIn("uri", result.json())
         base = '/user_uploads/'
         uri = result.json()['uri']
-        self.assertEqual(base, uri[:len(base)])
+        self.assertEqual(base, uri[: len(base)])
 
         response = self.client_get(uri)
         redirect_url = response['Location']
@@ -1724,7 +1818,9 @@ class S3Test(ZulipTestCase):
         medium_path_id = path_id + "-medium.png"
 
         with get_test_image_file('img.png') as image_file:
-            zerver.lib.upload.upload_backend.upload_avatar_image(image_file, user_profile, user_profile)
+            zerver.lib.upload.upload_backend.upload_avatar_image(
+                image_file, user_profile, user_profile
+            )
         with open(get_test_image_file('img.png').name, 'rb') as f:
             test_image_data = f.read()
         test_medium_image_data = resize_avatar(test_image_data, MEDIUM_AVATAR_SIZE)
@@ -1773,7 +1869,9 @@ class S3Test(ZulipTestCase):
         target_original_image_key = bucket.Object(target_original_image_path_id)
         self.assertEqual(target_original_image_key.key, target_original_image_path_id)
         source_original_image_key = bucket.Object(source_original_image_path_id)
-        self.assertEqual(source_original_image_key.content_type, target_original_image_key.content_type)
+        self.assertEqual(
+            source_original_image_key.content_type, target_original_image_key.content_type
+        )
         source_image_data = source_original_image_key.get()['Body'].read()
         target_image_data = target_original_image_key.get()['Body'].read()
         self.assertEqual(source_image_data, target_image_data)
@@ -1844,9 +1942,13 @@ class S3Test(ZulipTestCase):
 
         user_profile = self.example_user("hamlet")
         with get_test_image_file("img.png") as image_file:
-            zerver.lib.upload.upload_backend.upload_realm_logo_image(image_file, user_profile, night)
+            zerver.lib.upload.upload_backend.upload_realm_logo_image(
+                image_file, user_profile, night
+            )
 
-        original_path_id = os.path.join(str(user_profile.realm.id), "realm", f"{file_name}.original")
+        original_path_id = os.path.join(
+            str(user_profile.realm.id), "realm", f"{file_name}.original"
+        )
         original_key = bucket.Object(original_path_id)
         with get_test_image_file("img.png") as image_file:
             self.assertEqual(image_file.read(), original_key.get()['Body'].read())
@@ -1857,8 +1959,8 @@ class S3Test(ZulipTestCase):
         self.assertEqual(resized_image, (DEFAULT_AVATAR_SIZE, DEFAULT_AVATAR_SIZE))
 
     def test_upload_realm_logo_image(self) -> None:
-        self._test_upload_logo_image(night = False, file_name = 'logo')
-        self._test_upload_logo_image(night = True, file_name = 'night_logo')
+        self._test_upload_logo_image(night=False, file_name='logo')
+        self._test_upload_logo_image(night=True, file_name='night_logo')
 
     @use_s3_backend
     def test_upload_emoji_image(self) -> None:
@@ -1867,7 +1969,9 @@ class S3Test(ZulipTestCase):
         user_profile = self.example_user("hamlet")
         emoji_name = "emoji.png"
         with get_test_image_file("img.png") as image_file:
-            zerver.lib.upload.upload_backend.upload_emoji_image(image_file, emoji_name, user_profile)
+            zerver.lib.upload.upload_backend.upload_emoji_image(
+                image_file, emoji_name, user_profile
+            )
 
         emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
             realm_id=user_profile.realm_id,
@@ -1900,8 +2004,7 @@ class S3Test(ZulipTestCase):
         user_profile = self.example_user("iago")
         self.assertTrue(user_profile.is_realm_admin)
 
-        tarball_path = os.path.join(settings.TEST_WORKER_DIR,
-                                    'tarball.tar.gz')
+        tarball_path = os.path.join(settings.TEST_WORKER_DIR, 'tarball.tar.gz')
         with open(tarball_path, 'w') as f:
             f.write('dummy')
 
@@ -1911,8 +2014,9 @@ class S3Test(ZulipTestCase):
             nonlocal total_bytes_transferred
             total_bytes_transferred += bytes_transferred
 
-        uri = upload_export_tarball(user_profile.realm, tarball_path,
-                                    percent_callback=percent_callback)
+        uri = upload_export_tarball(
+            user_profile.realm, tarball_path, percent_callback=percent_callback
+        )
         # Verify the percent_callback API works
         self.assertEqual(total_bytes_transferred, 5)
 
@@ -1925,12 +2029,14 @@ class S3Test(ZulipTestCase):
         # Delete the tarball.
         with self.assertLogs(level='WARNING') as warn_log:
             self.assertIsNone(delete_export_tarball('/not_a_file'))
-        self.assertEqual(warn_log.output, [
-            'WARNING:root:not_a_file does not exist. Its entry in the database will be removed.'
-        ])
+        self.assertEqual(
+            warn_log.output,
+            ['WARNING:root:not_a_file does not exist. Its entry in the database will be removed.'],
+        )
         path_id = urllib.parse.urlparse(uri).path
         self.assertEqual(delete_export_tarball(path_id), path_id)
 
+
 class SanitizeNameTests(ZulipTestCase):
     def test_file_name(self) -> None:
         self.assertEqual(sanitize_name('test.txt'), 'test.txt')
@@ -1942,7 +2048,9 @@ class SanitizeNameTests(ZulipTestCase):
         self.assertEqual(sanitize_name('*testingfile?*.txt'), 'testingfile.txt')
         self.assertEqual(sanitize_name('snowman☃.txt'), 'snowman.txt')
         self.assertEqual(sanitize_name('테스트.txt'), '테스트.txt')
-        self.assertEqual(sanitize_name('~/."\\`\\?*"u0`000ssh/test.t**{}ar.gz'), '.u0000sshtest.tar.gz')
+        self.assertEqual(
+            sanitize_name('~/."\\`\\?*"u0`000ssh/test.t**{}ar.gz'), '.u0000sshtest.tar.gz'
+        )
 
 
 class UploadSpaceTests(UploadSerializeMixin, ZulipTestCase):
@@ -1965,19 +2073,24 @@ class UploadSpaceTests(UploadSerializeMixin, ZulipTestCase):
 
         data2 = b'more-data!'
         upload_message_file('dummy2.txt', len(data2), 'text/plain', data2, self.user_profile)
-        self.assertEqual(len(data) + len(data2), cache_get(get_realm_used_upload_space_cache_key(self.realm))[0])
+        self.assertEqual(
+            len(data) + len(data2), cache_get(get_realm_used_upload_space_cache_key(self.realm))[0]
+        )
         self.assertEqual(len(data) + len(data2), self.realm.currently_used_upload_space_bytes())
 
         attachment = Attachment.objects.get(file_name="dummy.txt")
         attachment.file_name = "dummy1.txt"
         attachment.save(update_fields=["file_name"])
-        self.assertEqual(len(data) + len(data2), cache_get(get_realm_used_upload_space_cache_key(self.realm))[0])
+        self.assertEqual(
+            len(data) + len(data2), cache_get(get_realm_used_upload_space_cache_key(self.realm))[0]
+        )
         self.assertEqual(len(data) + len(data2), self.realm.currently_used_upload_space_bytes())
 
         attachment.delete()
         self.assertEqual(None, cache_get(get_realm_used_upload_space_cache_key(self.realm)))
         self.assertEqual(len(data2), self.realm.currently_used_upload_space_bytes())
 
+
 class ExifRotateTests(ZulipTestCase):
     def test_image_do_not_rotate(self) -> None:
         # Image does not have _getexif method.
@@ -2009,6 +2122,7 @@ class ExifRotateTests(ZulipTestCase):
                 exif_rotate(img)
                 rotate.assert_called_with(90, expand=True)
 
+
 class DecompressionBombTests(ZulipTestCase):
     def setUp(self) -> None:
         super().setUp()
@@ -2024,8 +2138,10 @@ class DecompressionBombTests(ZulipTestCase):
         with get_test_image_file("bomb.png") as fp:
             for url, error_string in self.test_urls.items():
                 fp.seek(0, 0)
-                if (url == "/json/realm/logo"):
-                    result = self.client_post(url, {'f1': fp, 'night': orjson.dumps(False).decode()})
+                if url == "/json/realm/logo":
+                    result = self.client_post(
+                        url, {'f1': fp, 'night': orjson.dumps(False).decode()}
+                    )
                 else:
                     result = self.client_post(url, {'f1': fp})
                 self.assert_json_error(result, error_string)
diff --git a/zerver/tests/test_urls.py b/zerver/tests/test_urls.py
index 9b4edb1d9a..710bd16baa 100644
--- a/zerver/tests/test_urls.py
+++ b/zerver/tests/test_urls.py
@@ -21,8 +21,11 @@ class PublicURLTest(ZulipTestCase):
         for url in urls:
             # e.g. self.client_post(url) if method is "post"
             response = getattr(self, method)(url)
-            self.assertEqual(response.status_code, expected_status,
-                             msg=f"Expected {expected_status}, received {response.status_code} for {method} to {url}")
+            self.assertEqual(
+                response.status_code,
+                expected_status,
+                msg=f"Expected {expected_status}, received {response.status_code} for {method} to {url}",
+            )
 
     def test_public_urls(self) -> None:
         """
@@ -32,20 +35,30 @@ class PublicURLTest(ZulipTestCase):
         # can't do so because this Django test mechanism doesn't go
         # through Tornado.
         denmark_stream_id = Stream.objects.get(name='Denmark').id
-        get_urls = {200: ["/accounts/home/", "/accounts/login/",
-                          "/en/accounts/home/", "/ru/accounts/home/",
-                          "/en/accounts/login/", "/ru/accounts/login/",
-                          "/help/", "/", "/en/", "/ru/"],
-                    400: ["/json/messages",
-                          ],
-                    401: [f"/json/streams/{denmark_stream_id}/members",
-                          "/api/v1/users/me/subscriptions",
-                          "/api/v1/messages",
-                          "/api/v1/streams",
-                          ],
-                    404: ["/help/nonexistent", "/help/include/admin",
-                          "/help/" + "z" * 1000],
-                    }
+        get_urls = {
+            200: [
+                "/accounts/home/",
+                "/accounts/login/",
+                "/en/accounts/home/",
+                "/ru/accounts/home/",
+                "/en/accounts/login/",
+                "/ru/accounts/login/",
+                "/help/",
+                "/",
+                "/en/",
+                "/ru/",
+            ],
+            400: [
+                "/json/messages",
+            ],
+            401: [
+                f"/json/streams/{denmark_stream_id}/members",
+                "/api/v1/users/me/subscriptions",
+                "/api/v1/messages",
+                "/api/v1/streams",
+            ],
+            404: ["/help/nonexistent", "/help/include/admin", "/help/" + "z" * 1000],
+        }
 
         # Add all files in 'templates/zerver/help' directory (except for 'main.html' and
         # 'index.md') to `get_urls['200']` list.
@@ -55,21 +68,24 @@ class PublicURLTest(ZulipTestCase):
             if doc not in {'main.html', 'index.md', 'include', 'missing.md'}:
                 get_urls[200].append('/help/' + os.path.splitext(doc)[0])  # Strip the extension.
 
-        post_urls = {200: ["/accounts/login/"],
-                     302: ["/accounts/logout/"],
-                     401: ["/json/messages",
-                           "/json/invites",
-                           "/json/subscriptions/exists",
-                           "/api/v1/users/me/subscriptions/properties",
-                           "/json/fetch_api_key",
-                           "/json/users/me/subscriptions",
-                           "/api/v1/users/me/subscriptions",
-                           "/json/export/realm",
-                           ],
-                     400: ["/api/v1/external/github",
-                           "/api/v1/fetch_api_key",
-                           ],
-                     }
+        post_urls = {
+            200: ["/accounts/login/"],
+            302: ["/accounts/logout/"],
+            401: [
+                "/json/messages",
+                "/json/invites",
+                "/json/subscriptions/exists",
+                "/api/v1/users/me/subscriptions/properties",
+                "/json/fetch_api_key",
+                "/json/users/me/subscriptions",
+                "/api/v1/users/me/subscriptions",
+                "/json/export/realm",
+            ],
+            400: [
+                "/api/v1/external/github",
+                "/api/v1/fetch_api_key",
+            ],
+        }
         patch_urls = {
             401: ["/json/settings"],
         }
@@ -84,37 +100,51 @@ class PublicURLTest(ZulipTestCase):
     def test_get_gcid_when_not_configured(self) -> None:
         with self.settings(GOOGLE_CLIENT_ID=None):
             resp = self.client_get("/api/v1/fetch_google_client_id")
-            self.assertEqual(400, resp.status_code,
-                             msg=f"Expected 400, received {resp.status_code} for GET /api/v1/fetch_google_client_id")
+            self.assertEqual(
+                400,
+                resp.status_code,
+                msg=f"Expected 400, received {resp.status_code} for GET /api/v1/fetch_google_client_id",
+            )
             self.assertEqual('error', resp.json()['result'])
 
     def test_get_gcid_when_configured(self) -> None:
         with self.settings(GOOGLE_CLIENT_ID="ABCD"):
             resp = self.client_get("/api/v1/fetch_google_client_id")
-            self.assertEqual(200, resp.status_code,
-                             msg=f"Expected 200, received {resp.status_code} for GET /api/v1/fetch_google_client_id")
+            self.assertEqual(
+                200,
+                resp.status_code,
+                msg=f"Expected 200, received {resp.status_code} for GET /api/v1/fetch_google_client_id",
+            )
             data = orjson.loads(resp.content)
             self.assertEqual('success', data['result'])
             self.assertEqual('ABCD', data['google_client_id'])
 
     def test_config_error_endpoints_dev_env(self) -> None:
-        '''
+        """
         The content of these pages is tested separately.
         Here we simply sanity-check that all the URLs load
         correctly.
-        '''
+        """
         auth_types = [auth.lower() for auth in Realm.AUTHENTICATION_FLAGS]
-        for auth in ['azuread', 'email', 'remoteuser']:  # We do not have configerror pages for AzureAD and Email.
+        for auth in [
+            'azuread',
+            'email',
+            'remoteuser',
+        ]:  # We do not have configerror pages for AzureAD and Email.
             auth_types.remove(auth)
 
-        auth_types += ['smtp', 'remoteuser/remote_user_backend_disabled',
-                       'remoteuser/remote_user_header_missing']
+        auth_types += [
+            'smtp',
+            'remoteuser/remote_user_backend_disabled',
+            'remoteuser/remote_user_header_missing',
+        ]
         urls = [f'/config-error/{auth_type}' for auth_type in auth_types]
         with self.settings(DEVELOPMENT=True):
             for url in urls:
                 response = self.client_get(url)
                 self.assert_in_success_response(['Configuration error'], response)
 
+
 class URLResolutionTest(ZulipTestCase):
     def get_callback_string(self, pattern: django.urls.resolvers.URLPattern) -> Optional[str]:
         callback_str = hasattr(pattern, 'lookup_str') and 'lookup_str'
@@ -135,6 +165,7 @@ class URLResolutionTest(ZulipTestCase):
                 (module_name, base_view) = callback_str.rsplit(".", 1)
                 self.check_function_exists(module_name, base_view)
 
+
 class ErrorPageTest(ZulipTestCase):
     def test_bogus_http_host(self) -> None:
         # This tests that we've successfully worked around a certain bug in
@@ -143,8 +174,7 @@ class ErrorPageTest(ZulipTestCase):
         # there to get us down just the right path for Django to blow up
         # when presented with an HTTP_HOST that's not a valid DNS name.
         client = Client(enforce_csrf_checks=True)
-        result = client.post('/json/users',
-                             secure=True,
-                             HTTP_REFERER='https://somewhere',
-                             HTTP_HOST='$nonsense')
+        result = client.post(
+            '/json/users', secure=True, HTTP_REFERER='https://somewhere', HTTP_HOST='$nonsense'
+        )
         self.assertEqual(result.status_code, 400)
diff --git a/zerver/tests/test_user_groups.py b/zerver/tests/test_user_groups.py
index 409fc28952..c97d26e9a1 100644
--- a/zerver/tests/test_user_groups.py
+++ b/zerver/tests/test_user_groups.py
@@ -18,8 +18,9 @@ from zerver.models import Realm, UserGroup, UserGroupMembership, get_realm
 
 
 class UserGroupTestCase(ZulipTestCase):
-    def create_user_group_for_test(self, group_name: str,
-                                   realm: Realm=get_realm('zulip')) -> UserGroup:
+    def create_user_group_for_test(
+        self, group_name: str, realm: Realm = get_realm('zulip')
+    ) -> UserGroup:
         members = [self.example_user('othello')]
         return create_user_group(group_name, members, realm)
 
@@ -70,10 +71,12 @@ class UserGroupTestCase(ZulipTestCase):
         self.assertTrue(check_remove_user_from_user_group(othello, user_group))
         self.assertFalse(check_remove_user_from_user_group(othello, user_group))
 
-        with mock.patch('zerver.lib.user_groups.remove_user_from_user_group',
-                        side_effect=Exception):
+        with mock.patch(
+            'zerver.lib.user_groups.remove_user_from_user_group', side_effect=Exception
+        ):
             self.assertFalse(check_remove_user_from_user_group(othello, user_group))
 
+
 class UserGroupAPITestCase(ZulipTestCase):
     def test_user_group_create(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -115,7 +118,9 @@ class UserGroupAPITestCase(ZulipTestCase):
         self.login_user(user_profile)
         result = self.client_get('/json/user_groups')
         self.assert_json_success(result)
-        self.assert_length(result.json()['user_groups'], UserGroup.objects.filter(realm=user_profile.realm).count())
+        self.assert_length(
+            result.json()['user_groups'], UserGroup.objects.filter(realm=user_profile.realm).count()
+        )
 
     def test_user_group_create_by_guest_user(self) -> None:
         guest_user = self.example_user('polonius')
@@ -166,7 +171,9 @@ class UserGroupAPITestCase(ZulipTestCase):
             'description': 'Troubleshooting',
         }
         result = self.client_patch(f'/json/user_groups/{user_group.id}', info=params)
-        self.assert_json_error(result, "Only group members and organization administrators can administer this group.")
+        self.assert_json_error(
+            result, "Only group members and organization administrators can administer this group."
+        )
 
         self.logout()
         # Test when organization admin tries to modify group
@@ -212,8 +219,7 @@ class UserGroupAPITestCase(ZulipTestCase):
             'name': marketing_user_group.name,
         }
         result = self.client_patch(f'/json/user_groups/{support_user_group.id}', info=params)
-        self.assert_json_error(
-            result, f"User group '{marketing_user_group.name}' already exists.")
+        self.assert_json_error(result, f"User group '{marketing_user_group.name}' already exists.")
 
     def test_user_group_delete(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -251,7 +257,9 @@ class UserGroupAPITestCase(ZulipTestCase):
         self.login_user(cordelia)
 
         result = self.client_delete(f'/json/user_groups/{user_group.id}')
-        self.assert_json_error(result, "Only group members and organization administrators can administer this group.")
+        self.assert_json_error(
+            result, "Only group members and organization administrators can administer this group."
+        )
         self.assertEqual(UserGroup.objects.count(), 2)
 
         self.logout()
@@ -298,16 +306,14 @@ class UserGroupAPITestCase(ZulipTestCase):
         othello = self.example_user('othello')
         add = [othello.id]
         params = {'add': orjson.dumps(add).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_success(result)
         self.assertEqual(UserGroupMembership.objects.count(), 4)
         members = get_memberships_of_users(user_group, [hamlet, othello])
         self.assertEqual(len(members), 2)
 
         # Test adding a member already there.
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_error(result, f"User {othello.id} is already a member of this group")
         self.assertEqual(UserGroupMembership.objects.count(), 4)
         members = get_memberships_of_users(user_group, [hamlet, othello])
@@ -319,9 +325,10 @@ class UserGroupAPITestCase(ZulipTestCase):
         self.login_user(cordelia)
         add = [cordelia.id]
         params = {'add': orjson.dumps(add).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
-        self.assert_json_error(result, "Only group members and organization administrators can administer this group.")
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
+        self.assert_json_error(
+            result, "Only group members and organization administrators can administer this group."
+        )
         self.assertEqual(UserGroupMembership.objects.count(), 4)
 
         self.logout()
@@ -331,8 +338,7 @@ class UserGroupAPITestCase(ZulipTestCase):
         aaron = self.example_user('aaron')
         add = [aaron.id]
         params = {'add': orjson.dumps(add).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_success(result)
         self.assertEqual(UserGroupMembership.objects.count(), 5)
         members = get_memberships_of_users(user_group, [hamlet, othello, aaron])
@@ -343,8 +349,7 @@ class UserGroupAPITestCase(ZulipTestCase):
         self.login_user(hamlet)
         # Test remove members
         params = {'delete': orjson.dumps([othello.id]).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_success(result)
         self.assertEqual(UserGroupMembership.objects.count(), 4)
         members = get_memberships_of_users(user_group, [hamlet, othello, aaron])
@@ -352,16 +357,14 @@ class UserGroupAPITestCase(ZulipTestCase):
 
         # Test remove a member that's already removed
         params = {'delete': orjson.dumps([othello.id]).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_error(result, f"There is no member '{othello.id}' in this user group")
         self.assertEqual(UserGroupMembership.objects.count(), 4)
         members = get_memberships_of_users(user_group, [hamlet, othello, aaron])
         self.assertEqual(len(members), 2)
 
         # Test when nothing is provided
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info={})
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info={})
         msg = 'Nothing to do. Specify at least one of "add" or "delete".'
         self.assert_json_error(result, msg)
 
@@ -369,17 +372,17 @@ class UserGroupAPITestCase(ZulipTestCase):
         self.logout()
         self.login_user(cordelia)
         params = {'delete': orjson.dumps([hamlet.id]).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
-        self.assert_json_error(result, "Only group members and organization administrators can administer this group.")
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
+        self.assert_json_error(
+            result, "Only group members and organization administrators can administer this group."
+        )
         self.assertEqual(UserGroupMembership.objects.count(), 4)
 
         self.logout()
         # Test when organization admin tries to remove members from group
         iago = self.example_user('iago')
         self.login_user(iago)
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_success(result)
         self.assertEqual(UserGroupMembership.objects.count(), 3)
         members = get_memberships_of_users(user_group, [hamlet, othello, aaron])
@@ -439,8 +442,9 @@ class UserGroupAPITestCase(ZulipTestCase):
         hamlet = self.example_user('hamlet')
         cordelia = self.example_user('cordelia')
         self.login_user(iago)
-        do_set_realm_property(iago.realm, 'user_group_edit_policy',
-                              Realm.USER_GROUP_EDIT_POLICY_ADMINS)
+        do_set_realm_property(
+            iago.realm, 'user_group_edit_policy', Realm.USER_GROUP_EDIT_POLICY_ADMINS
+        )
 
         params = {
             'name': 'support',
@@ -454,14 +458,12 @@ class UserGroupAPITestCase(ZulipTestCase):
 
         # Test add member
         params = {'add': orjson.dumps([cordelia.id]).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_success(result)
 
         # Test remove member
         params = {'delete': orjson.dumps([cordelia.id]).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_success(result)
 
         # Test changing groups name
@@ -476,10 +478,11 @@ class UserGroupAPITestCase(ZulipTestCase):
         result = self.client_delete(f'/json/user_groups/{user_group.id}')
         self.assert_json_success(result)
 
-        user_group = create_user_group(name='support',
-                                       members=[hamlet, iago],
-                                       realm=iago.realm,
-                                       )
+        user_group = create_user_group(
+            name='support',
+            members=[hamlet, iago],
+            realm=iago.realm,
+        )
 
         self.logout()
 
@@ -496,8 +499,7 @@ class UserGroupAPITestCase(ZulipTestCase):
 
         # Test add member
         params = {'add': orjson.dumps([cordelia.id]).decode()}
-        result = self.client_post(f'/json/user_groups/{user_group.id}/members',
-                                  info=params)
+        result = self.client_post(f'/json/user_groups/{user_group.id}/members', info=params)
         self.assert_json_error(result, "Must be an organization administrator")
 
         # Test delete a group
diff --git a/zerver/tests/test_user_status.py b/zerver/tests/test_user_status.py
index 2b3ab227fd..daf25b2c08 100644
--- a/zerver/tests/test_user_status.py
+++ b/zerver/tests/test_user_status.py
@@ -11,16 +11,14 @@ from zerver.models import UserProfile, UserStatus, get_client
 def get_away_user_ids(realm_id: int) -> Set[int]:
     user_dict = get_user_info_dict(realm_id)
 
-    return {
-        int(user_id)
-        for user_id in user_dict
-        if user_dict[user_id].get('away')
-    }
+    return {int(user_id) for user_id in user_dict if user_dict[user_id].get('away')}
+
 
 def user_info(user: UserProfile) -> Dict[str, Any]:
     user_dict = get_user_info_dict(user.realm_id)
     return user_dict.get(str(user.id), {})
 
+
 class UserStatusTest(ZulipTestCase):
     def test_basics(self) -> None:
         cordelia = self.example_user('cordelia')
diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py
index dce099283c..cc01405276 100644
--- a/zerver/tests/test_users.py
+++ b/zerver/tests/test_users.py
@@ -69,12 +69,15 @@ from zerver.models import (
 
 K = TypeVar('K')
 V = TypeVar('V')
+
+
 def find_dict(lst: Iterable[Dict[K, V]], k: K, v: V) -> Dict[K, V]:
     for dct in lst:
         if dct[k] == v:
             return dct
     raise AssertionError(f'Cannot find element in list where key {k} == {v}')
 
+
 class PermissionTest(ZulipTestCase):
     def test_role_setters(self) -> None:
         user_profile = self.example_user('hamlet')
@@ -189,7 +192,9 @@ class PermissionTest(ZulipTestCase):
         self.assertEqual(person['role'], UserProfile.ROLE_MEMBER)
         with tornado_redirected_to_list([]):
             result = self.client_patch(f'/json/users/{desdemona.id}', req)
-        self.assert_json_error(result, 'The owner permission cannot be removed from the only organization owner.')
+        self.assert_json_error(
+            result, 'The owner permission cannot be removed from the only organization owner.'
+        )
 
         do_change_user_role(iago, UserProfile.ROLE_REALM_ADMINISTRATOR)
         self.login('iago')
@@ -262,19 +267,19 @@ class PermissionTest(ZulipTestCase):
 
         # Also verify the /events code path.  This is a bit hacky, but
         # we need to verify client_gravatar is not being overridden.
-        with mock.patch('zerver.lib.events.request_event_queue',
-                        return_value=None) as mock_request_event_queue:
+        with mock.patch(
+            'zerver.lib.events.request_event_queue', return_value=None
+        ) as mock_request_event_queue:
             with self.assertRaises(JsonableError):
-                result = do_events_register(user, get_client("website"),
-                                            client_gravatar=True)
-            self.assertEqual(mock_request_event_queue.call_args_list[0][0][3],
-                             True)
+                result = do_events_register(user, get_client("website"), client_gravatar=True)
+            self.assertEqual(mock_request_event_queue.call_args_list[0][0][3], True)
 
         #############################################################
         # Now, switch email address visibility, check client_gravatar
         # is automatically disabled for the user.
-        do_set_realm_property(user.realm, "email_address_visibility",
-                              Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS)
+        do_set_realm_property(
+            user.realm, "email_address_visibility", Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS
+        )
         result = self.client_get("/json/users", {"client_gravatar": "true"})
         self.assert_json_success(result)
         members = result.json()['members']
@@ -289,13 +294,12 @@ class PermissionTest(ZulipTestCase):
         # Also verify the /events code path.  This is a bit hacky, but
         # basically we want to verify client_gravatar is being
         # overridden.
-        with mock.patch('zerver.lib.events.request_event_queue',
-                        return_value=None) as mock_request_event_queue:
+        with mock.patch(
+            'zerver.lib.events.request_event_queue', return_value=None
+        ) as mock_request_event_queue:
             with self.assertRaises(JsonableError):
-                result = do_events_register(user, get_client("website"),
-                                            client_gravatar=True)
-            self.assertEqual(mock_request_event_queue.call_args_list[0][0][3],
-                             False)
+                result = do_events_register(user, get_client("website"), client_gravatar=True)
+            self.assertEqual(mock_request_event_queue.call_args_list[0][0][3], False)
 
         # client_gravatar is still turned off for admins.  In theory,
         # it doesn't need to be, but client-side changes would be
@@ -403,9 +407,13 @@ class PermissionTest(ZulipTestCase):
 
         # Non-admin user can't admin another user
         with self.assertRaises(JsonableError):
-            access_user_by_id(self.example_user("cordelia"), self.example_user("aaron").id, for_admin=True)
+            access_user_by_id(
+                self.example_user("cordelia"), self.example_user("aaron").id, for_admin=True
+            )
         # But does have read-only access to it.
-        access_user_by_id(self.example_user("cordelia"), self.example_user("aaron").id, for_admin=False)
+        access_user_by_id(
+            self.example_user("cordelia"), self.example_user("aaron").id, for_admin=False
+        )
 
     def test_change_regular_member_to_guest(self) -> None:
         iago = self.example_user("iago")
@@ -608,13 +616,16 @@ class PermissionTest(ZulipTestCase):
 
         for field_name in fields:
             field = CustomProfileField.objects.get(name=field_name, realm=realm)
-            new_profile_data.append({
-                'id': field.id,
-                'value': fields[field_name],
-            })
+            new_profile_data.append(
+                {
+                    'id': field.id,
+                    'value': fields[field_name],
+                }
+            )
 
-        result = self.client_patch(f'/json/users/{cordelia.id}',
-                                   {'profile_data': orjson.dumps(new_profile_data).decode()})
+        result = self.client_patch(
+            f'/json/users/{cordelia.id}', {'profile_data': orjson.dumps(new_profile_data).decode()}
+        )
         self.assert_json_success(result)
 
         cordelia = self.example_user("cordelia")
@@ -624,7 +635,11 @@ class PermissionTest(ZulipTestCase):
 
         # Test admin user cannot set invalid profile data
         invalid_fields = [
-            ('Favorite editor', 'invalid choice', "'invalid choice' is not a valid choice for 'Favorite editor'."),
+            (
+                'Favorite editor',
+                'invalid choice',
+                "'invalid choice' is not a valid choice for 'Favorite editor'.",
+            ),
             ('Birthday', '1909-34-55', "Birthday is not a date"),
             ('Favorite website', 'not url', "Favorite website is not a URL"),
             ('Mentor', "not list of user ids", "User IDs is not a list"),
@@ -633,31 +648,43 @@ class PermissionTest(ZulipTestCase):
         for field_name, field_value, error_msg in invalid_fields:
             new_profile_data = []
             field = CustomProfileField.objects.get(name=field_name, realm=realm)
-            new_profile_data.append({
-                'id': field.id,
-                'value': field_value,
-            })
+            new_profile_data.append(
+                {
+                    'id': field.id,
+                    'value': field_value,
+                }
+            )
 
-            result = self.client_patch(f'/json/users/{cordelia.id}',
-                                       {'profile_data': orjson.dumps(new_profile_data).decode()})
+            result = self.client_patch(
+                f'/json/users/{cordelia.id}',
+                {'profile_data': orjson.dumps(new_profile_data).decode()},
+            )
             self.assert_json_error(result, error_msg)
 
         # non-existent field and no data
-        invalid_profile_data = [{
-            'id': 9001,
-            'value': '',
-        }]
-        result = self.client_patch(f'/json/users/{cordelia.id}',
-                                   {'profile_data': orjson.dumps(invalid_profile_data).decode()})
+        invalid_profile_data = [
+            {
+                'id': 9001,
+                'value': '',
+            }
+        ]
+        result = self.client_patch(
+            f'/json/users/{cordelia.id}',
+            {'profile_data': orjson.dumps(invalid_profile_data).decode()},
+        )
         self.assert_json_error(result, 'Field id 9001 not found.')
 
         # non-existent field and data
-        invalid_profile_data = [{
-            'id': 9001,
-            'value': 'some data',
-        }]
-        result = self.client_patch(f'/json/users/{cordelia.id}',
-                                   {'profile_data': orjson.dumps(invalid_profile_data).decode()})
+        invalid_profile_data = [
+            {
+                'id': 9001,
+                'value': 'some data',
+            }
+        ]
+        result = self.client_patch(
+            f'/json/users/{cordelia.id}',
+            {'profile_data': orjson.dumps(invalid_profile_data).decode()},
+        )
         self.assert_json_error(result, 'Field id 9001 not found.')
 
         # Test for clearing/resetting field values.
@@ -667,12 +694,16 @@ class PermissionTest(ZulipTestCase):
             value: Union[str, None, List[Any]] = ''
             if field.field_type == CustomProfileField.USER:
                 value = []
-            empty_profile_data.append({
-                'id': field.id,
-                'value': value,
-            })
-        result = self.client_patch(f'/json/users/{cordelia.id}',
-                                   {'profile_data': orjson.dumps(empty_profile_data).decode()})
+            empty_profile_data.append(
+                {
+                    'id': field.id,
+                    'value': value,
+                }
+            )
+        result = self.client_patch(
+            f'/json/users/{cordelia.id}',
+            {'profile_data': orjson.dumps(empty_profile_data).decode()},
+        )
         self.assert_json_success(result)
         for field_dict in cordelia.profile_data:
             with self.subTest(field_name=field_dict['name']):
@@ -696,12 +727,15 @@ class PermissionTest(ZulipTestCase):
             value = None
             if new_fields[field_name]:
                 value = new_fields[field_name]
-            new_profile_data.append({
-                'id': field.id,
-                'value': value,
-            })
-        result = self.client_patch(f'/json/users/{cordelia.id}',
-                                   {'profile_data': orjson.dumps(new_profile_data).decode()})
+            new_profile_data.append(
+                {
+                    'id': field.id,
+                    'value': value,
+                }
+            )
+        result = self.client_patch(
+            f'/json/users/{cordelia.id}', {'profile_data': orjson.dumps(new_profile_data).decode()}
+        )
         self.assert_json_success(result)
         for field_dict in cordelia.profile_data:
             with self.subTest(field_name=field_dict['name']):
@@ -714,18 +748,24 @@ class PermissionTest(ZulipTestCase):
 
         new_profile_data = []
         field = CustomProfileField.objects.get(name="Biography", realm=realm)
-        new_profile_data.append({
-            'id': field.id,
-            'value': "New hamlet Biography",
-        })
-        result = self.client_patch(f'/json/users/{hamlet.id}',
-                                   {'profile_data': orjson.dumps(new_profile_data).decode()})
+        new_profile_data.append(
+            {
+                'id': field.id,
+                'value': "New hamlet Biography",
+            }
+        )
+        result = self.client_patch(
+            f'/json/users/{hamlet.id}', {'profile_data': orjson.dumps(new_profile_data).decode()}
+        )
         self.assert_json_error(result, 'Insufficient permission')
 
-        result = self.client_patch('/json/users/{}'.format(self.example_user("cordelia").id),
-                                   {'profile_data': orjson.dumps(new_profile_data).decode()})
+        result = self.client_patch(
+            '/json/users/{}'.format(self.example_user("cordelia").id),
+            {'profile_data': orjson.dumps(new_profile_data).decode()},
+        )
         self.assert_json_error(result, 'Insufficient permission')
 
+
 class QueryCountTest(ZulipTestCase):
     def test_create_user_with_multiple_streams(self) -> None:
         # add_new_user_history needs messages to be current
@@ -747,10 +787,7 @@ class QueryCountTest(ZulipTestCase):
             "private_stream1",
             "private_stream2",
         ]
-        streams = [
-            get_stream(stream_name, realm)
-            for stream_name in stream_names
-        ]
+        streams = [get_stream(stream_name, realm) for stream_name in stream_names]
 
         do_invite_users(
             user_profile=self.example_user("hamlet"),
@@ -782,14 +819,14 @@ class QueryCountTest(ZulipTestCase):
         notifications = set()
         for event in peer_add_events:
             stream_ids = event["event"]["stream_ids"]
-            stream_names = sorted(
-                Stream.objects.get(id=stream_id).name
-                for stream_id in stream_ids
-            )
+            stream_names = sorted(Stream.objects.get(id=stream_id).name for stream_id in stream_ids)
             self.assertTrue(event["event"]["user_ids"], {fred.id})
             notifications.add(",".join(stream_names))
 
-        self.assertEqual(notifications, {"Denmark,Scotland,Verona", "private_stream1", "private_stream2"})
+        self.assertEqual(
+            notifications, {"Denmark,Scotland,Verona", "private_stream1", "private_stream2"}
+        )
+
 
 class BulkCreateUserTest(ZulipTestCase):
     def test_create_users(self) -> None:
@@ -831,6 +868,7 @@ class BulkCreateUserTest(ZulipTestCase):
         cher = get_user_by_delivery_email('cher@zulip.com', realm)
         self.assertEqual(cher.full_name, 'Cher')
 
+
 class AdminCreateUserTest(ZulipTestCase):
     def test_create_user_backend(self) -> None:
 
@@ -864,41 +902,57 @@ class AdminCreateUserTest(ZulipTestCase):
         result = self.client_post("/json/users", {})
         self.assert_json_error(result, "Missing 'email' argument")
 
-        result = self.client_post("/json/users", dict(
-            email='romeo@not-zulip.com',
-        ))
+        result = self.client_post(
+            "/json/users",
+            dict(
+                email='romeo@not-zulip.com',
+            ),
+        )
         self.assert_json_error(result, "Missing 'password' argument")
 
-        result = self.client_post("/json/users", dict(
-            email='romeo@not-zulip.com',
-            password='xxxx',
-        ))
+        result = self.client_post(
+            "/json/users",
+            dict(
+                email='romeo@not-zulip.com',
+                password='xxxx',
+            ),
+        )
         self.assert_json_error(result, "Missing 'full_name' argument")
 
         # Test short_name gets properly ignored
-        result = self.client_post("/json/users", dict(
-            email='romeo@zulip.com',
-            password='xxxx',
-            full_name='Romeo Montague',
-            short_name='DEPRECATED'
-        ))
+        result = self.client_post(
+            "/json/users",
+            dict(
+                email='romeo@zulip.com',
+                password='xxxx',
+                full_name='Romeo Montague',
+                short_name='DEPRECATED',
+            ),
+        )
         self.assert_json_success(result)
 
-        result = self.client_post("/json/users", dict(
-            email='broken',
-            password='xxxx',
-            full_name='Romeo Montague',
-        ))
+        result = self.client_post(
+            "/json/users",
+            dict(
+                email='broken',
+                password='xxxx',
+                full_name='Romeo Montague',
+            ),
+        )
         self.assert_json_error(result, "Bad name or username")
 
         do_set_realm_property(realm, 'emails_restricted_to_domains', True)
-        result = self.client_post("/json/users", dict(
-            email='romeo@not-zulip.com',
-            password='xxxx',
-            full_name='Romeo Montague',
-        ))
-        self.assert_json_error(result,
-                               "Email 'romeo@not-zulip.com' not allowed in this organization")
+        result = self.client_post(
+            "/json/users",
+            dict(
+                email='romeo@not-zulip.com',
+                password='xxxx',
+                full_name='Romeo Montague',
+            ),
+        )
+        self.assert_json_error(
+            result, "Email 'romeo@not-zulip.com' not allowed in this organization"
+        )
 
         RealmDomain.objects.create(realm=get_realm('zulip'), domain='zulip.net')
         # Check can't use a bad password with zxcvbn enabled
@@ -916,13 +970,13 @@ class AdminCreateUserTest(ZulipTestCase):
         self.assertEqual(new_user.id, result['user_id'])
 
         # Make sure the recipient field is set correctly.
-        self.assertEqual(new_user.recipient, Recipient.objects.get(type=Recipient.PERSONAL,
-                                                                   type_id=new_user.id))
+        self.assertEqual(
+            new_user.recipient, Recipient.objects.get(type=Recipient.PERSONAL, type_id=new_user.id)
+        )
 
         # we can't create the same user twice.
         result = self.client_post("/json/users", valid_params)
-        self.assert_json_error(result,
-                               "Email 'romeo@zulip.net' already in use")
+        self.assert_json_error(result, "Email 'romeo@zulip.net' already in use")
 
         # Don't allow user to sign up with disposable email.
         realm.emails_restricted_to_domains = False
@@ -931,7 +985,9 @@ class AdminCreateUserTest(ZulipTestCase):
 
         valid_params["email"] = "abc@mailnator.com"
         result = self.client_post("/json/users", valid_params)
-        self.assert_json_error(result, "Disposable email addresses are not allowed in this organization")
+        self.assert_json_error(
+            result, "Disposable email addresses are not allowed in this organization"
+        )
 
         # Don't allow creating a user with + in their email address when realm
         # is restricted to a domain.
@@ -951,6 +1007,7 @@ class AdminCreateUserTest(ZulipTestCase):
         result = self.client_post("/json/users", valid_params)
         self.assert_json_success(result)
 
+
 class UserProfileTest(ZulipTestCase):
     def test_get_emails_from_user_ids(self) -> None:
         hamlet = self.example_user('hamlet')
@@ -1019,8 +1076,13 @@ class UserProfileTest(ZulipTestCase):
         ]
 
         self.assertEqual(user_ids_to_users([], get_realm("zulip")), [])
-        self.assertEqual({user_profile.id for user_profile in user_ids_to_users(real_user_ids, get_realm("zulip"))},
-                         set(real_user_ids))
+        self.assertEqual(
+            {
+                user_profile.id
+                for user_profile in user_ids_to_users(real_user_ids, get_realm("zulip"))
+            },
+            set(real_user_ids),
+        )
         with self.assertRaises(JsonableError):
             user_ids_to_users([1234], get_realm("zephyr"))
         with self.assertRaises(JsonableError):
@@ -1028,6 +1090,7 @@ class UserProfileTest(ZulipTestCase):
 
     def test_bulk_get_users(self) -> None:
         from zerver.lib.users import bulk_get_users
+
         hamlet = self.example_user("hamlet")
         cordelia = self.example_user("cordelia")
         webhook_bot = self.example_user("webhook_bot")
@@ -1050,11 +1113,17 @@ class UserProfileTest(ZulipTestCase):
     def test_get_accounts_for_email(self) -> None:
         reset_emails_in_zulip_realm()
 
-        def check_account_present_in_accounts(user: UserProfile, accounts: List[Dict[str, Optional[str]]]) -> None:
+        def check_account_present_in_accounts(
+            user: UserProfile, accounts: List[Dict[str, Optional[str]]]
+        ) -> None:
             for account in accounts:
                 realm = user.realm
-                if account["avatar"] == avatar_url(user) and account["full_name"] == user.full_name \
-                        and account["realm_name"] == realm.name and account["string_id"] == realm.string_id:
+                if (
+                    account["avatar"] == avatar_url(user)
+                    and account["full_name"] == user.full_name
+                    and account["realm_name"] == realm.name
+                    and account["string_id"] == realm.string_id
+                ):
                     return
             raise AssertionError("Account not found")
 
@@ -1185,29 +1254,25 @@ class UserProfileTest(ZulipTestCase):
         bot = get_system_bot(settings.WELCOME_BOT)
 
         # Pass in the ID of a cross-realm bot and a valid realm
-        cross_realm_bot = get_user_by_id_in_realm_including_cross_realm(
-            bot.id, realm)
+        cross_realm_bot = get_user_by_id_in_realm_including_cross_realm(bot.id, realm)
         self.assertEqual(cross_realm_bot.email, bot.email)
         self.assertEqual(cross_realm_bot.id, bot.id)
 
         # Pass in the ID of a cross-realm bot but with a invalid realm,
         # note that the realm should be irrelevant here
-        cross_realm_bot = get_user_by_id_in_realm_including_cross_realm(
-            bot.id, None)
+        cross_realm_bot = get_user_by_id_in_realm_including_cross_realm(bot.id, None)
         self.assertEqual(cross_realm_bot.email, bot.email)
         self.assertEqual(cross_realm_bot.id, bot.id)
 
         # Pass in the ID of a non-cross-realm user with a realm
-        user_profile = get_user_by_id_in_realm_including_cross_realm(
-            othello.id, realm)
+        user_profile = get_user_by_id_in_realm_including_cross_realm(othello.id, realm)
         self.assertEqual(user_profile.email, othello.email)
         self.assertEqual(user_profile.id, othello.id)
 
         # If the realm doesn't match, or if the ID is not that of a
         # cross-realm bot, UserProfile.DoesNotExist is raised
         with self.assertRaises(UserProfile.DoesNotExist):
-            get_user_by_id_in_realm_including_cross_realm(
-                hamlet.id, None)
+            get_user_by_id_in_realm_including_cross_realm(hamlet.id, None)
 
     def test_get_user_subscription_status(self) -> None:
         self.login('hamlet')
@@ -1222,13 +1287,17 @@ class UserProfileTest(ZulipTestCase):
         result = self.client_get(f"/json/users/{iago.id}/subscriptions/25")
         self.assert_json_error(result, "Invalid stream id")
 
-        result = orjson.loads(self.client_get(f"/json/users/{iago.id}/subscriptions/{stream.id}").content)
+        result = orjson.loads(
+            self.client_get(f"/json/users/{iago.id}/subscriptions/{stream.id}").content
+        )
         self.assertFalse(result['is_subscribed'])
 
         # Subscribe to the stream.
         self.subscribe(iago, stream.name)
         with queries_captured() as queries:
-            result = orjson.loads(self.client_get(f"/json/users/{iago.id}/subscriptions/{stream.id}").content)
+            result = orjson.loads(
+                self.client_get(f"/json/users/{iago.id}/subscriptions/{stream.id}").content
+            )
 
         self.assert_length(queries, 6)
         self.assertTrue(result['is_subscribed'])
@@ -1239,9 +1308,12 @@ class UserProfileTest(ZulipTestCase):
         self.assertTrue(polonius.is_guest)
         self.assertTrue(stream.is_web_public)
 
-        result = orjson.loads(self.client_get(f"/json/users/{iago.id}/subscriptions/{stream.id}").content)
+        result = orjson.loads(
+            self.client_get(f"/json/users/{iago.id}/subscriptions/{stream.id}").content
+        )
         self.assertTrue(result['is_subscribed'])
 
+
 class ActivateTest(ZulipTestCase):
     def test_basics(self) -> None:
         user = self.example_user('hamlet')
@@ -1312,13 +1384,19 @@ class ActivateTest(ZulipTestCase):
         self.assert_json_error(result, 'Insufficient permission')
 
         # Cannot reactivate a user
-        result = self.client_post('/json/users/{}/reactivate'.format(self.example_user("hamlet").id))
+        result = self.client_post(
+            '/json/users/{}/reactivate'.format(self.example_user("hamlet").id)
+        )
         self.assert_json_error(result, 'Insufficient permission')
 
     def test_clear_scheduled_jobs(self) -> None:
         user = self.example_user('hamlet')
-        send_future_email('zerver/emails/followup_day1', user.realm,
-                          to_user_ids=[user.id], delay=datetime.timedelta(hours=1))
+        send_future_email(
+            'zerver/emails/followup_day1',
+            user.realm,
+            to_user_ids=[user.id],
+            delay=datetime.timedelta(hours=1),
+        )
         self.assertEqual(ScheduledEmail.objects.count(), 1)
         do_deactivate_user(user)
         self.assertEqual(ScheduledEmail.objects.count(), 0)
@@ -1326,17 +1404,27 @@ class ActivateTest(ZulipTestCase):
     def test_send_future_email_with_multiple_recipients(self) -> None:
         hamlet = self.example_user('hamlet')
         iago = self.example_user('iago')
-        send_future_email('zerver/emails/followup_day1', iago.realm,
-                          to_user_ids=[hamlet.id, iago.id], delay=datetime.timedelta(hours=1))
-        self.assertEqual(ScheduledEmail.objects.filter(users__in=[hamlet, iago]).distinct().count(), 1)
+        send_future_email(
+            'zerver/emails/followup_day1',
+            iago.realm,
+            to_user_ids=[hamlet.id, iago.id],
+            delay=datetime.timedelta(hours=1),
+        )
+        self.assertEqual(
+            ScheduledEmail.objects.filter(users__in=[hamlet, iago]).distinct().count(), 1
+        )
         email = ScheduledEmail.objects.all().first()
         self.assertEqual(email.users.count(), 2)
 
     def test_clear_scheduled_emails_with_multiple_user_ids(self) -> None:
         hamlet = self.example_user('hamlet')
         iago = self.example_user('iago')
-        send_future_email('zerver/emails/followup_day1', iago.realm,
-                          to_user_ids=[hamlet.id, iago.id], delay=datetime.timedelta(hours=1))
+        send_future_email(
+            'zerver/emails/followup_day1',
+            iago.realm,
+            to_user_ids=[hamlet.id, iago.id],
+            delay=datetime.timedelta(hours=1),
+        )
         self.assertEqual(ScheduledEmail.objects.count(), 1)
         clear_scheduled_emails([hamlet.id, iago.id])
         self.assertEqual(ScheduledEmail.objects.count(), 0)
@@ -1344,8 +1432,12 @@ class ActivateTest(ZulipTestCase):
     def test_clear_schedule_emails_with_one_user_id(self) -> None:
         hamlet = self.example_user('hamlet')
         iago = self.example_user('iago')
-        send_future_email('zerver/emails/followup_day1', iago.realm,
-                          to_user_ids=[hamlet.id, iago.id], delay=datetime.timedelta(hours=1))
+        send_future_email(
+            'zerver/emails/followup_day1',
+            iago.realm,
+            to_user_ids=[hamlet.id, iago.id],
+            delay=datetime.timedelta(hours=1),
+        )
         self.assertEqual(ScheduledEmail.objects.count(), 1)
         clear_scheduled_emails([hamlet.id])
         self.assertEqual(ScheduledEmail.objects.count(), 1)
@@ -1355,12 +1447,17 @@ class ActivateTest(ZulipTestCase):
     def test_deliver_email(self) -> None:
         iago = self.example_user('iago')
         hamlet = self.example_user('hamlet')
-        send_future_email('zerver/emails/followup_day1', iago.realm,
-                          to_user_ids=[hamlet.id, iago.id], delay=datetime.timedelta(hours=1))
+        send_future_email(
+            'zerver/emails/followup_day1',
+            iago.realm,
+            to_user_ids=[hamlet.id, iago.id],
+            delay=datetime.timedelta(hours=1),
+        )
         self.assertEqual(ScheduledEmail.objects.count(), 1)
         email = ScheduledEmail.objects.all().first()
         deliver_email(email)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 1)
         for message in outbox:
             self.assertEqual(
@@ -1376,8 +1473,12 @@ class ActivateTest(ZulipTestCase):
         iago = self.example_user('iago')
         hamlet = self.example_user('hamlet')
         to_user_ids = [hamlet.id, iago.id]
-        send_future_email('zerver/emails/followup_day1', iago.realm,
-                          to_user_ids=to_user_ids, delay=datetime.timedelta(hours=1))
+        send_future_email(
+            'zerver/emails/followup_day1',
+            iago.realm,
+            to_user_ids=to_user_ids,
+            delay=datetime.timedelta(hours=1),
+        )
         self.assertEqual(ScheduledEmail.objects.count(), 1)
         email = ScheduledEmail.objects.all().first()
         email.users.remove(*to_user_ids)
@@ -1385,11 +1486,16 @@ class ActivateTest(ZulipTestCase):
         with self.assertLogs('zulip.send_email', level='INFO') as info_log:
             deliver_email(email)
         from django.core.mail import outbox
+
         self.assertEqual(len(outbox), 0)
         self.assertEqual(ScheduledEmail.objects.count(), 1)
-        self.assertEqual(info_log.output, [
-            f'WARNING:zulip.send_email:ScheduledEmail id {email.id} has empty users and address attributes.'
-        ])
+        self.assertEqual(
+            info_log.output,
+            [
+                f'WARNING:zulip.send_email:ScheduledEmail id {email.id} has empty users and address attributes.'
+            ],
+        )
+
 
 class RecipientInfoTest(ZulipTestCase):
     def test_stream_recipient_info(self) -> None:
@@ -1560,9 +1666,12 @@ class RecipientInfoTest(ZulipTestCase):
             stream_topic=stream_topic,
             possibly_mentioned_user_ids={service_bot.id},
         )
-        self.assertEqual(info['service_bot_tuples'], [
-            (service_bot.id, UserProfile.EMBEDDED_BOT),
-        ])
+        self.assertEqual(
+            info['service_bot_tuples'],
+            [
+                (service_bot.id, UserProfile.EMBEDDED_BOT),
+            ],
+        )
 
         # Add a normal bot.
         normal_bot = do_create_user(
@@ -1600,6 +1709,7 @@ class RecipientInfoTest(ZulipTestCase):
                 stream_topic=stream_topic,
             )
 
+
 class BulkUsersTest(ZulipTestCase):
     def test_client_gravatar_option(self) -> None:
         reset_emails_in_zulip_realm()
@@ -1612,10 +1722,7 @@ class BulkUsersTest(ZulipTestCase):
             result = self.client_get('/json/users', data)
             self.assert_json_success(result)
             rows = result.json()['members']
-            hamlet_data = [
-                row for row in rows
-                if row['user_id'] == hamlet.id
-            ][0]
+            hamlet_data = [row for row in rows if row['user_id'] == hamlet.id][0]
             return hamlet_data['avatar_url']
 
         self.assertEqual(
@@ -1635,8 +1742,8 @@ class BulkUsersTest(ZulipTestCase):
             get_hamlet_avatar(client_gravatar=False),
         )
 
-class GetProfileTest(ZulipTestCase):
 
+class GetProfileTest(ZulipTestCase):
     def test_cache_behavior(self) -> None:
         """Tests whether fetching a user object the normal way, with
         `get_user`, makes 1 cache query and 1 database query.
@@ -1693,7 +1800,11 @@ class GetProfileTest(ZulipTestCase):
         self.assertFalse(result['user']['is_admin'])
         self.assertFalse(result['user']['is_owner'])
 
-        result = orjson.loads(self.client_get(f"/json/users/{user.id}", {"include_custom_profile_fields": "true"}).content)
+        result = orjson.loads(
+            self.client_get(
+                f"/json/users/{user.id}", {"include_custom_profile_fields": "true"}
+            ).content
+        )
 
         self.assertIn('profile_data', result['user'])
         result = self.client_get("/json/users/30")
@@ -1709,16 +1820,14 @@ class GetProfileTest(ZulipTestCase):
         result = self.api_get(hamlet, "/api/v1/users")
         self.assert_json_success(result)
 
-        (my_user,) = [
-            user for user in result.json()['members']
-            if user['email'] == hamlet.email
-        ]
+        (my_user,) = [user for user in result.json()['members'] if user['email'] == hamlet.email]
 
         self.assertEqual(
             my_user['avatar_url'],
             avatar_url(hamlet),
         )
 
+
 class DeleteUserTest(ZulipTestCase):
     def test_do_delete_user(self) -> None:
         realm = get_realm("zulip")
@@ -1731,29 +1840,23 @@ class DeleteUserTest(ZulipTestCase):
         self.send_personal_message(cordelia, hamlet)
         self.send_personal_message(hamlet, cordelia)
 
-        personal_message_ids_to_hamlet = Message.objects.filter(recipient=hamlet_personal_recipient) \
-            .values_list('id', flat=True)
+        personal_message_ids_to_hamlet = Message.objects.filter(
+            recipient=hamlet_personal_recipient
+        ).values_list('id', flat=True)
         self.assertTrue(len(personal_message_ids_to_hamlet) > 0)
         self.assertTrue(Message.objects.filter(sender=hamlet).exists())
 
         huddle_message_ids_from_cordelia = [
-            self.send_huddle_message(
-                cordelia,
-                [hamlet, othello]
-            )
-            for i in range(3)
+            self.send_huddle_message(cordelia, [hamlet, othello]) for i in range(3)
         ]
         huddle_message_ids_from_hamlet = [
-            self.send_huddle_message(
-                hamlet,
-                [cordelia, othello]
-            )
-            for i in range(3)
+            self.send_huddle_message(hamlet, [cordelia, othello]) for i in range(3)
         ]
 
         huddle_with_hamlet_recipient_ids = list(
-            Subscription.objects.filter(user_profile=hamlet, recipient__type=Recipient.HUDDLE)
-            .values_list('recipient_id', flat=True)
+            Subscription.objects.filter(
+                user_profile=hamlet, recipient__type=Recipient.HUDDLE
+            ).values_list('recipient_id', flat=True)
         )
         self.assertTrue(len(huddle_with_hamlet_recipient_ids) > 0)
 
@@ -1761,7 +1864,9 @@ class DeleteUserTest(ZulipTestCase):
 
         replacement_dummy_user = UserProfile.objects.get(id=hamlet_user_id, realm=realm)
 
-        self.assertEqual(replacement_dummy_user.delivery_email, f"deleteduser{hamlet_user_id}@{realm.uri}")
+        self.assertEqual(
+            replacement_dummy_user.delivery_email, f"deleteduser{hamlet_user_id}@{realm.uri}"
+        )
         self.assertEqual(replacement_dummy_user.is_mirror_dummy, True)
 
         self.assertEqual(Message.objects.filter(id__in=personal_message_ids_to_hamlet).count(), 0)
@@ -1775,8 +1880,12 @@ class DeleteUserTest(ZulipTestCase):
         # Verify that the dummy user is subscribed to the deleted user's huddles, to keep huddle data
         # in a correct state.
         for recipient_id in huddle_with_hamlet_recipient_ids:
-            self.assertTrue(Subscription.objects.filter(user_profile=replacement_dummy_user,
-                                                        recipient_id=recipient_id).exists())
+            self.assertTrue(
+                Subscription.objects.filter(
+                    user_profile=replacement_dummy_user, recipient_id=recipient_id
+                ).exists()
+            )
+
 
 class FakeEmailDomainTest(ZulipTestCase):
     def test_get_fake_email_domain(self) -> None:
diff --git a/zerver/tests/test_webhooks_common.py b/zerver/tests/test_webhooks_common.py
index ef064c3496..13b9b7c556 100644
--- a/zerver/tests/test_webhooks_common.py
+++ b/zerver/tests/test_webhooks_common.py
@@ -28,8 +28,9 @@ class WebhooksCommonTestCase(ZulipTestCase):
         request.META['HTTP_X_CUSTOM_HEADER'] = 'custom_value'
         request.user = webhook_bot
 
-        header_value = validate_extract_webhook_http_header(request, 'X_CUSTOM_HEADER',
-                                                            'test_webhook')
+        header_value = validate_extract_webhook_http_header(
+            request, 'X_CUSTOM_HEADER', 'test_webhook'
+        )
 
         self.assertEqual(header_value, 'custom_value')
 
@@ -43,8 +44,7 @@ class WebhooksCommonTestCase(ZulipTestCase):
 
         exception_msg = "Missing the HTTP event header 'X_CUSTOM_HEADER'"
         with self.assertRaisesRegex(MissingHTTPEventHeader, exception_msg):
-            validate_extract_webhook_http_header(request, 'X_CUSTOM_HEADER',
-                                                 'test_webhook')
+            validate_extract_webhook_http_header(request, 'X_CUSTOM_HEADER', 'test_webhook')
 
         msg = self.get_last_message()
         expected_message = MISSING_EVENT_HEADER_MESSAGE.format(
@@ -133,6 +133,7 @@ class WebhooksCommonTestCase(ZulipTestCase):
         expected_djangoified_headers = {"CONTENT_TYPE": "text/plain", "HTTP_X_EVENT_TYPE": "ping"}
         self.assertEqual(djangoified_headers, expected_djangoified_headers)
 
+
 class MissingEventHeaderTestCase(WebhookTestCase):
     STREAM_NAME = 'groove'
     URL_TEMPLATE = '/api/v1/external/groove?stream={stream}&api_key={api_key}'
@@ -141,8 +142,11 @@ class MissingEventHeaderTestCase(WebhookTestCase):
     # an actual webhook, instead of just making a mock
     def test_missing_event_header(self) -> None:
         self.subscribe(self.test_user, self.STREAM_NAME)
-        result = self.client_post(self.url, self.get_body('ticket_state_changed'),
-                                  content_type="application/x-www-form-urlencoded")
+        result = self.client_post(
+            self.url,
+            self.get_body('ticket_state_changed'),
+            content_type="application/x-www-form-urlencoded",
+        )
         self.assert_json_error(result, "Missing the HTTP event header 'X_GROOVE_EVENT'")
 
         webhook_bot = get_user('webhook-bot@zulip.com', get_realm('zulip'))
diff --git a/zerver/tests/test_widgets.py b/zerver/tests/test_widgets.py
index 15c4a25865..1d8f0af249 100644
--- a/zerver/tests/test_widgets.py
+++ b/zerver/tests/test_widgets.py
@@ -16,20 +16,15 @@ class WidgetContentTestCase(ZulipTestCase):
             with self.assertRaisesRegex(ValidationError, re.escape(msg)):
                 check_widget_content(obj)
 
-        assert_error(5,
-                     'widget_content is not a dict')
+        assert_error(5, 'widget_content is not a dict')
 
-        assert_error({},
-                     'widget_type is not in widget_content')
+        assert_error({}, 'widget_type is not in widget_content')
 
-        assert_error(dict(widget_type='whatever'),
-                     'extra_data is not in widget_content')
+        assert_error(dict(widget_type='whatever'), 'extra_data is not in widget_content')
 
-        assert_error(dict(widget_type='zform', extra_data=4),
-                     'extra_data is not a dict')
+        assert_error(dict(widget_type='zform', extra_data=4), 'extra_data is not a dict')
 
-        assert_error(dict(widget_type='bogus', extra_data={}),
-                     'unknown widget type: bogus')
+        assert_error(dict(widget_type='bogus', extra_data={}), 'unknown widget type: bogus')
 
         extra_data: Dict[str, Any] = {}
         obj = dict(widget_type='zform', extra_data=extra_data)
diff --git a/zerver/tests/test_zcommand.py b/zerver/tests/test_zcommand.py
index abf2afc134..fd1e799754 100644
--- a/zerver/tests/test_zcommand.py
+++ b/zerver/tests/test_zcommand.py
@@ -3,7 +3,6 @@ from zerver.models import UserProfile
 
 
 class ZcommandTest(ZulipTestCase):
-
     def test_invalid_zcommand(self) -> None:
         self.login('hamlet')
 
diff --git a/zerver/tests/test_zephyr.py b/zerver/tests/test_zephyr.py
index e99022870c..0aa95846d4 100644
--- a/zerver/tests/test_zephyr.py
+++ b/zerver/tests/test_zephyr.py
@@ -17,8 +17,9 @@ class ZephyrTest(ZulipTestCase):
 
         def post(subdomain: Any, **kwargs: Any) -> HttpResponse:
             params = {k: orjson.dumps(v).decode() for k, v in kwargs.items()}
-            return self.client_post('/accounts/webathena_kerberos_login/', params,
-                                    subdomain=subdomain)
+            return self.client_post(
+                '/accounts/webathena_kerberos_login/', params, subdomain=subdomain
+            )
 
         result = post("zulip")
         self.assert_json_error(result, 'Could not find Kerberos credential')
@@ -47,10 +48,9 @@ class ZephyrTest(ZulipTestCase):
             result = post("zephyr", cred=cred)
         self.assert_json_error(result, 'Invalid Kerberos cache')
 
-        with \
-                ccache_mock(return_value=b'1234'), \
-                ssh_mock(side_effect=subprocess.CalledProcessError(1, [])), \
-                self.assertLogs(level='ERROR') as log:
+        with ccache_mock(return_value=b'1234'), ssh_mock(
+            side_effect=subprocess.CalledProcessError(1, [])
+        ), self.assertLogs(level='ERROR') as log:
             result = post("zephyr", cred=cred)
 
         self.assert_json_error(result, 'We were unable to setup mirroring for you')
@@ -60,31 +60,35 @@ class ZephyrTest(ZulipTestCase):
             result = post("zephyr", cred=cred)
 
         self.assert_json_success(result)
-        ssh.assert_called_with([
-            'ssh',
-            'server',
-            '--',
-            f'/home/zulip/python-zulip-api/zulip/integrations/zephyr/process_ccache starnine {api_key} MTIzNA=='])
+        ssh.assert_called_with(
+            [
+                'ssh',
+                'server',
+                '--',
+                f'/home/zulip/python-zulip-api/zulip/integrations/zephyr/process_ccache starnine {api_key} MTIzNA==',
+            ]
+        )
 
         # Accounts whose Kerberos usernames are known not to match their
         # zephyr accounts are hardcoded, and should be handled properly.
 
         def kerberos_alter_egos_mock() -> Any:
             return patch(
-                'zerver.views.zephyr.kerberos_alter_egos',
-                {'kerberos_alter_ego': 'starnine'})
+                'zerver.views.zephyr.kerberos_alter_egos', {'kerberos_alter_ego': 'starnine'}
+            )
 
         cred = dict(cname=dict(nameString=['kerberos_alter_ego']))
-        with \
-                ccache_mock(return_value=b'1234'), \
-                mirror_mock(), \
-                ssh_mock() as ssh, \
-                kerberos_alter_egos_mock():
+        with ccache_mock(
+            return_value=b'1234'
+        ), mirror_mock(), ssh_mock() as ssh, kerberos_alter_egos_mock():
             result = post("zephyr", cred=cred)
 
         self.assert_json_success(result)
-        ssh.assert_called_with([
-            'ssh',
-            'server',
-            '--',
-            f'/home/zulip/python-zulip-api/zulip/integrations/zephyr/process_ccache starnine {api_key} MTIzNA=='])
+        ssh.assert_called_with(
+            [
+                'ssh',
+                'server',
+                '--',
+                f'/home/zulip/python-zulip-api/zulip/integrations/zephyr/process_ccache starnine {api_key} MTIzNA==',
+            ]
+        )
diff --git a/zerver/tornado/application.py b/zerver/tornado/application.py
index 10361fcfe9..e77840e1d9 100644
--- a/zerver/tornado/application.py
+++ b/zerver/tornado/application.py
@@ -15,6 +15,7 @@ def setup_tornado_rabbitmq() -> None:  # nocoverage
         atexit.register(lambda: queue_client.close())
         autoreload.add_reload_hook(lambda: queue_client.close())
 
+
 def create_tornado_application() -> tornado.web.Application:
     urls = (
         r"/notify_tornado",
@@ -28,5 +29,5 @@ def create_tornado_application() -> tornado.web.Application:
         debug=settings.DEBUG,
         autoreload=False,
         # Disable Tornado's own request logging, since we have our own
-        log_function=lambda x: None
+        log_function=lambda x: None,
     )
diff --git a/zerver/tornado/autoreload.py b/zerver/tornado/autoreload.py
index 568a19049d..d2d1bbc359 100644
--- a/zerver/tornado/autoreload.py
+++ b/zerver/tornado/autoreload.py
@@ -80,6 +80,7 @@ _reload_attempted = False
 _io_loops = weakref.WeakKeyDictionary()
 needs_to_reload = False
 
+
 def start(io_loop=None, check_time=500):
     """Begins watching source files for changes.
 
@@ -180,8 +181,7 @@ def _check_file(modify_times, module, path):
     else:
         return
 
-    if path == __file__ or path == os.path.join(os.path.dirname(__file__),
-                                                "event_queue.py"):
+    if path == __file__ or path == os.path.join(os.path.dirname(__file__), "event_queue.py"):
         # Assume that the autoreload library itself imports correctly,
         # because reloading this file will destroy its state,
         # including _reload_hooks
@@ -195,6 +195,7 @@ def _check_file(modify_times, module, path):
         return False
     return True
 
+
 def _reload():
     global _reload_attempted
     _reload_attempted = True
@@ -212,10 +213,8 @@ def _reload():
     # is about to change on re-exec.  Add the current directory to $PYTHONPATH
     # to ensure that the new process sees the same path we did.
     path_prefix = '.' + os.pathsep
-    if (sys.path[0] == '' and
-            not os.environ.get("PYTHONPATH", "").startswith(path_prefix)):
-        os.environ["PYTHONPATH"] = (path_prefix +
-                                    os.environ.get("PYTHONPATH", ""))
+    if sys.path[0] == '' and not os.environ.get("PYTHONPATH", "").startswith(path_prefix):
+        os.environ["PYTHONPATH"] = path_prefix + os.environ.get("PYTHONPATH", "")
     if not _has_execv:
         subprocess.Popen([sys.executable] + sys.argv)
         sys.exit(0)
@@ -234,8 +233,7 @@ def _reload():
             # Unfortunately the errno returned in this case does not
             # appear to be consistent, so we can't easily check for
             # this error specifically.
-            os.spawnv(os.P_NOWAIT, sys.executable,
-                      [sys.executable] + sys.argv)
+            os.spawnv(os.P_NOWAIT, sys.executable, [sys.executable] + sys.argv)
             # At this point the IOLoop has been closed and finally
             # blocks will experience errors if we allow the stack to
             # unwind, so just exit uncleanly.
diff --git a/zerver/tornado/descriptors.py b/zerver/tornado/descriptors.py
index 336b050d16..c4910af877 100644
--- a/zerver/tornado/descriptors.py
+++ b/zerver/tornado/descriptors.py
@@ -5,12 +5,14 @@ if TYPE_CHECKING:
 
 descriptors_by_handler_id: Dict[int, "ClientDescriptor"] = {}
 
+
 def get_descriptor_by_handler_id(handler_id: int) -> Optional['ClientDescriptor']:
     return descriptors_by_handler_id.get(handler_id)
 
-def set_descriptor_by_handler_id(handler_id: int,
-                                 client_descriptor: 'ClientDescriptor') -> None:
+
+def set_descriptor_by_handler_id(handler_id: int, client_descriptor: 'ClientDescriptor') -> None:
     descriptors_by_handler_id[handler_id] = client_descriptor
 
+
 def clear_descriptor_by_handler_id(handler_id: int) -> None:
     del descriptors_by_handler_id[handler_id]
diff --git a/zerver/tornado/django_api.py b/zerver/tornado/django_api.py
index 8203792c93..a9921862b0 100644
--- a/zerver/tornado/django_api.py
+++ b/zerver/tornado/django_api.py
@@ -36,10 +36,16 @@ class TornadoAdapter(HTTPAdapter):
         # requests to external hosts.
         proxies = {}
         try:
-            resp = super().send(request, stream=stream, timeout=timeout, verify=verify, cert=cert, proxies=proxies)
+            resp = super().send(
+                request, stream=stream, timeout=timeout, verify=verify, cert=cert, proxies=proxies
+            )
         except ConnectionError:
             parsed_url = urlparse(request.url)
-            logfile = f"tornado-{parsed_url.port}.log" if settings.TORNADO_PROCESSES > 1 else "tornado.log"
+            logfile = (
+                f"tornado-{parsed_url.port}.log"
+                if settings.TORNADO_PROCESSES > 1
+                else "tornado.log"
+            )
             raise ConnectionError(
                 f"Django cannot connect to Tornado server ({request.url}); "
                 f"check {settings.ERROR_FILE_LOG_PATH} and {logfile}"
@@ -47,6 +53,7 @@ class TornadoAdapter(HTTPAdapter):
         resp.raise_for_status()
         return resp
 
+
 @lru_cache(None)
 def requests_client() -> requests.Session:
     c = requests.Session()
@@ -55,40 +62,49 @@ def requests_client() -> requests.Session:
         c.mount(scheme, adapter)
     return c
 
-def request_event_queue(user_profile: UserProfile, user_client: Client, apply_markdown: bool,
-                        client_gravatar: bool, slim_presence: bool, queue_lifespan_secs: int,
-                        event_types: Optional[Iterable[str]]=None,
-                        all_public_streams: bool=False,
-                        narrow: Iterable[Sequence[str]]=[],
-                        bulk_message_deletion: bool=False) -> Optional[str]:
+
+def request_event_queue(
+    user_profile: UserProfile,
+    user_client: Client,
+    apply_markdown: bool,
+    client_gravatar: bool,
+    slim_presence: bool,
+    queue_lifespan_secs: int,
+    event_types: Optional[Iterable[str]] = None,
+    all_public_streams: bool = False,
+    narrow: Iterable[Sequence[str]] = [],
+    bulk_message_deletion: bool = False,
+) -> Optional[str]:
 
     if not settings.USING_TORNADO:
         return None
 
     tornado_uri = get_tornado_uri(user_profile.realm)
-    req = {'dont_block': 'true',
-           'apply_markdown': orjson.dumps(apply_markdown),
-           'client_gravatar': orjson.dumps(client_gravatar),
-           'slim_presence': orjson.dumps(slim_presence),
-           'all_public_streams': orjson.dumps(all_public_streams),
-           'client': 'internal',
-           'user_profile_id': user_profile.id,
-           'user_client': user_client.name,
-           'narrow': orjson.dumps(narrow),
-           'secret': settings.SHARED_SECRET,
-           'lifespan_secs': queue_lifespan_secs,
-           'bulk_message_deletion': orjson.dumps(bulk_message_deletion)}
+    req = {
+        'dont_block': 'true',
+        'apply_markdown': orjson.dumps(apply_markdown),
+        'client_gravatar': orjson.dumps(client_gravatar),
+        'slim_presence': orjson.dumps(slim_presence),
+        'all_public_streams': orjson.dumps(all_public_streams),
+        'client': 'internal',
+        'user_profile_id': user_profile.id,
+        'user_client': user_client.name,
+        'narrow': orjson.dumps(narrow),
+        'secret': settings.SHARED_SECRET,
+        'lifespan_secs': queue_lifespan_secs,
+        'bulk_message_deletion': orjson.dumps(bulk_message_deletion),
+    }
 
     if event_types is not None:
         req['event_types'] = orjson.dumps(event_types)
 
-    resp = requests_client().post(
-        tornado_uri + '/api/v1/events/internal',
-        data=req
-    )
+    resp = requests_client().post(tornado_uri + '/api/v1/events/internal', data=req)
     return resp.json()['queue_id']
 
-def get_user_events(user_profile: UserProfile, queue_id: str, last_event_id: int) -> List[Dict[str, Any]]:
+
+def get_user_events(
+    user_profile: UserProfile, queue_id: str, last_event_id: int
+) -> List[Dict[str, Any]]:
     if not settings.USING_TORNADO:
         return []
 
@@ -101,12 +117,10 @@ def get_user_events(user_profile: UserProfile, queue_id: str, last_event_id: int
         'secret': settings.SHARED_SECRET,
         'client': 'internal',
     }
-    resp = requests_client().post(
-        tornado_uri + '/api/v1/events/internal',
-        data=post_data
-    )
+    resp = requests_client().post(tornado_uri + '/api/v1/events/internal', data=post_data)
     return resp.json()['events']
 
+
 def send_notification_http(realm: Realm, data: Mapping[str, Any]) -> None:
     if not settings.USING_TORNADO or settings.RUNNING_INSIDE_TORNADO:
         process_notification(data)
@@ -117,6 +131,7 @@ def send_notification_http(realm: Realm, data: Mapping[str, Any]) -> None:
             data=dict(data=orjson.dumps(data), secret=settings.SHARED_SECRET),
         )
 
+
 # The core function for sending an event from Django to Tornado (which
 # will then push it to web and mobile clients for the target users).
 # By convention, send_event should only be called from
@@ -127,12 +142,15 @@ def send_notification_http(realm: Realm, data: Mapping[str, Any]) -> None:
 # with the schema verified in `zerver/lib/event_schema.py`.
 #
 # See https://zulip.readthedocs.io/en/latest/subsystems/events-system.html
-def send_event(realm: Realm, event: Mapping[str, Any],
-               users: Union[Iterable[int], Iterable[Mapping[str, Any]]]) -> None:
+def send_event(
+    realm: Realm, event: Mapping[str, Any], users: Union[Iterable[int], Iterable[Mapping[str, Any]]]
+) -> None:
     """`users` is a list of user IDs, or in the case of `message` type
     events, a list of dicts describing the users and metadata about
     the user/message pair."""
     port = get_tornado_port(realm)
-    queue_json_publish(notify_tornado_queue_name(port),
-                       dict(event=event, users=list(users)),
-                       lambda *args, **kwargs: send_notification_http(realm, *args, **kwargs))
+    queue_json_publish(
+        notify_tornado_queue_name(port),
+        dict(event=event, users=list(users)),
+        lambda *args, **kwargs: send_notification_http(realm, *args, **kwargs),
+    )
diff --git a/zerver/tornado/event_queue.py b/zerver/tornado/event_queue.py
index 4526e53cf3..8caf77c9c2 100644
--- a/zerver/tornado/event_queue.py
+++ b/zerver/tornado/event_queue.py
@@ -70,19 +70,23 @@ MAX_QUEUE_TIMEOUT_SECS = 7 * 24 * 60 * 60
 # wireless routers that kill "inactive" http connections.
 HEARTBEAT_MIN_FREQ_SECS = 45
 
+
 class ClientDescriptor:
-    def __init__(self,
-                 user_profile_id: int,
-                 realm_id: int, event_queue: 'EventQueue',
-                 event_types: Optional[Sequence[str]],
-                 client_type_name: str,
-                 apply_markdown: bool=True,
-                 client_gravatar: bool=True,
-                 slim_presence: bool=False,
-                 all_public_streams: bool=False,
-                 lifespan_secs: int=0,
-                 narrow: Iterable[Sequence[str]]=[],
-                 bulk_message_deletion: bool=False) -> None:
+    def __init__(
+        self,
+        user_profile_id: int,
+        realm_id: int,
+        event_queue: 'EventQueue',
+        event_types: Optional[Sequence[str]],
+        client_type_name: str,
+        apply_markdown: bool = True,
+        client_gravatar: bool = True,
+        slim_presence: bool = False,
+        all_public_streams: bool = False,
+        lifespan_secs: int = 0,
+        narrow: Iterable[Sequence[str]] = [],
+        bulk_message_deletion: bool = False,
+    ) -> None:
         # These objects are serialized on shutdown and restored on restart.
         # If fields are added or semantics are changed, temporary code must be
         # added to load_event_queues() to update the restored objects.
@@ -114,19 +118,21 @@ class ClientDescriptor:
         # If you add a new key to this dict, make sure you add appropriate
         # migration code in from_dict or load_event_queues to account for
         # loading event queues that lack that key.
-        return dict(user_profile_id=self.user_profile_id,
-                    realm_id=self.realm_id,
-                    event_queue=self.event_queue.to_dict(),
-                    queue_timeout=self.queue_timeout,
-                    event_types=self.event_types,
-                    last_connection_time=self.last_connection_time,
-                    apply_markdown=self.apply_markdown,
-                    client_gravatar=self.client_gravatar,
-                    slim_presence=self.slim_presence,
-                    all_public_streams=self.all_public_streams,
-                    narrow=self.narrow,
-                    client_type_name=self.client_type_name,
-                    bulk_message_deletion=self.bulk_message_deletion)
+        return dict(
+            user_profile_id=self.user_profile_id,
+            realm_id=self.realm_id,
+            event_queue=self.event_queue.to_dict(),
+            queue_timeout=self.queue_timeout,
+            event_types=self.event_types,
+            last_connection_time=self.last_connection_time,
+            apply_markdown=self.apply_markdown,
+            client_gravatar=self.client_gravatar,
+            slim_presence=self.slim_presence,
+            all_public_streams=self.all_public_streams,
+            narrow=self.narrow,
+            client_type_name=self.client_type_name,
+            bulk_message_deletion=self.bulk_message_deletion,
+        )
 
     def __repr__(self) -> str:
         return f"ClientDescriptor<{self.event_queue.id}>"
@@ -176,8 +182,12 @@ class ClientDescriptor:
         if self.current_handler_id is not None:
             err_msg = f"Got error finishing handler for queue {self.event_queue.id}"
             try:
-                finish_handler(self.current_handler_id, self.event_queue.id,
-                               self.event_queue.contents(), self.apply_markdown)
+                finish_handler(
+                    self.current_handler_id,
+                    self.event_queue.id,
+                    self.event_queue.contents(),
+                    self.apply_markdown,
+                )
             except Exception:
                 logging.exception(err_msg, stack_info=True)
             finally:
@@ -197,8 +207,10 @@ class ClientDescriptor:
         return self.event_types is None or "message" in self.event_types
 
     def expired(self, now: float) -> bool:
-        return (self.current_handler_id is None and
-                now - self.last_connection_time >= self.queue_timeout)
+        return (
+            self.current_handler_id is None
+            and now - self.last_connection_time >= self.queue_timeout
+        )
 
     def connect_handler(self, handler_id: int, client_name: str) -> None:
         self.current_handler_id = handler_id
@@ -210,19 +222,23 @@ class ClientDescriptor:
             self._timeout_handle = None
             # All clients get heartbeat events
             self.add_event(dict(type='heartbeat'))
+
         ioloop = tornado.ioloop.IOLoop.instance()
         interval = HEARTBEAT_MIN_FREQ_SECS + random.randint(0, 10)
         if self.client_type_name != 'API: heartbeat test':
             self._timeout_handle = ioloop.call_later(interval, timeout_callback)
 
-    def disconnect_handler(self, client_closed: bool=False) -> None:
+    def disconnect_handler(self, client_closed: bool = False) -> None:
         if self.current_handler_id:
             clear_descriptor_by_handler_id(self.current_handler_id)
             clear_handler_by_id(self.current_handler_id)
             if client_closed:
-                logging.info("Client disconnected for queue %s (%s via %s)",
-                             self.event_queue.id, self.user_profile_id,
-                             self.current_client_name)
+                logging.info(
+                    "Client disconnected for queue %s (%s via %s)",
+                    self.event_queue.id,
+                    self.user_profile_id,
+                    self.current_client_name,
+                )
         self.current_handler_id = None
         self.current_client_name = None
         if self._timeout_handle is not None:
@@ -238,8 +254,8 @@ class ClientDescriptor:
         # invariant that event queues are idle when passed to
         # `do_gc_event_queues` is preserved.
         self.finish_current_handler()
-        do_gc_event_queues({self.event_queue.id}, {self.user_profile_id},
-                           {self.realm_id})
+        do_gc_event_queues({self.event_queue.id}, {self.user_profile_id}, {self.realm_id})
+
 
 def compute_full_event_type(event: Mapping[str, Any]) -> str:
     if event["type"] == "update_message_flags":
@@ -249,6 +265,7 @@ def compute_full_event_type(event: Mapping[str, Any]) -> str:
         return "flags/{}/{}".format(event["operation"], event["flag"])
     return event["type"]
 
+
 class EventQueue:
     def __init__(self, id: str) -> None:
         # When extending this list of properties, one must be sure to
@@ -295,8 +312,7 @@ class EventQueue:
         event['id'] = self.next_event_id
         self.next_event_id += 1
         full_event_type = compute_full_event_type(event)
-        if (full_event_type == "restart" or
-                full_event_type.startswith("flags/")):
+        if full_event_type == "restart" or full_event_type.startswith("flags/"):
             if full_event_type not in self.virtual_events:
                 self.virtual_events[full_event_type] = copy.deepcopy(event)
                 return
@@ -351,6 +367,7 @@ class EventQueue:
         self.queue = deque(contents)
         return contents
 
+
 # maps queue ids to client descriptors
 clients: Dict[str, ClientDescriptor] = {}
 # maps user id to list of client descriptors
@@ -367,8 +384,9 @@ gc_hooks: List[Callable[[int, ClientDescriptor, bool], None]] = []
 
 next_queue_id = 0
 
+
 def clear_client_event_queues_for_testing() -> None:
-    assert(settings.TEST_SUITE)
+    assert settings.TEST_SUITE
     clients.clear()
     user_clients.clear()
     realm_clients_all_streams.clear()
@@ -376,26 +394,32 @@ def clear_client_event_queues_for_testing() -> None:
     global next_queue_id
     next_queue_id = 0
 
+
 def add_client_gc_hook(hook: Callable[[int, ClientDescriptor, bool], None]) -> None:
     gc_hooks.append(hook)
 
+
 def get_client_descriptor(queue_id: str) -> ClientDescriptor:
     try:
         return clients[queue_id]
     except KeyError:
         raise BadEventQueueIdError(queue_id)
 
+
 def get_client_descriptors_for_user(user_profile_id: int) -> List[ClientDescriptor]:
     return user_clients.get(user_profile_id, [])
 
+
 def get_client_descriptors_for_realm_all_streams(realm_id: int) -> List[ClientDescriptor]:
     return realm_clients_all_streams.get(realm_id, [])
 
+
 def add_to_client_dicts(client: ClientDescriptor) -> None:
     user_clients.setdefault(client.user_profile_id, []).append(client)
     if client.all_public_streams or client.narrow != []:
         realm_clients_all_streams.setdefault(client.realm_id, []).append(client)
 
+
 def allocate_client_descriptor(new_queue_data: MutableMapping[str, Any]) -> ClientDescriptor:
     global next_queue_id
     queue_id = str(settings.SERVER_GENERATION) + ':' + str(next_queue_id)
@@ -406,9 +430,13 @@ def allocate_client_descriptor(new_queue_data: MutableMapping[str, Any]) -> Clie
     add_to_client_dicts(client)
     return client
 
-def do_gc_event_queues(to_remove: AbstractSet[str], affected_users: AbstractSet[int],
-                       affected_realms: AbstractSet[int]) -> None:
-    def filter_client_dict(client_dict: MutableMapping[int, List[ClientDescriptor]], key: int) -> None:
+
+def do_gc_event_queues(
+    to_remove: AbstractSet[str], affected_users: AbstractSet[int], affected_realms: AbstractSet[int]
+) -> None:
+    def filter_client_dict(
+        client_dict: MutableMapping[int, List[ClientDescriptor]], key: int
+    ) -> None:
         if key not in client_dict:
             return
 
@@ -426,9 +454,14 @@ def do_gc_event_queues(to_remove: AbstractSet[str], affected_users: AbstractSet[
 
     for id in to_remove:
         for cb in gc_hooks:
-            cb(clients[id].user_profile_id, clients[id], clients[id].user_profile_id not in user_clients)
+            cb(
+                clients[id].user_profile_id,
+                clients[id],
+                clients[id].user_profile_id not in user_clients,
+            )
         del clients[id]
 
+
 def gc_event_queues(port: int) -> None:
     start = time.time()
     to_remove: Set[str] = set()
@@ -446,14 +479,21 @@ def gc_event_queues(port: int) -> None:
     do_gc_event_queues(to_remove, affected_users, affected_realms)
 
     if settings.PRODUCTION:
-        logging.info('Tornado %d removed %d expired event queues owned by %d users in %.3fs.'
-                     '  Now %d active queues, %s',
-                     port, len(to_remove), len(affected_users), time.time() - start,
-                     len(clients), handler_stats_string())
+        logging.info(
+            'Tornado %d removed %d expired event queues owned by %d users in %.3fs.'
+            '  Now %d active queues, %s',
+            port,
+            len(to_remove),
+            len(affected_users),
+            time.time() - start,
+            len(clients),
+            handler_stats_string(),
+        )
     statsd.gauge('tornado.active_queues', len(clients))
     statsd.gauge('tornado.active_users', len(user_clients))
 
-def persistent_queue_filename(port: int, last: bool=False) -> str:
+
+def persistent_queue_filename(port: int, last: bool = False) -> str:
     if settings.TORNADO_PROCESSES == 1:
         # Use non-port-aware, legacy version.
         if last:
@@ -463,6 +503,7 @@ def persistent_queue_filename(port: int, last: bool=False) -> str:
         return settings.JSON_PERSISTENT_QUEUE_FILENAME_PATTERN % ('.' + str(port) + '.last',)
     return settings.JSON_PERSISTENT_QUEUE_FILENAME_PATTERN % ('.' + str(port),)
 
+
 def dump_event_queues(port: int) -> None:
     start = time.time()
 
@@ -472,8 +513,10 @@ def dump_event_queues(port: int) -> None:
         )
 
     if len(clients) > 0 or settings.PRODUCTION:
-        logging.info('Tornado %d dumped %d event queues in %.3fs',
-                     port, len(clients), time.time() - start)
+        logging.info(
+            'Tornado %d dumped %d event queues in %.3fs', port, len(clients), time.time() - start
+        )
+
 
 def load_event_queues(port: int) -> None:
     global clients
@@ -488,11 +531,11 @@ def load_event_queues(port: int) -> None:
         logging.exception("Tornado %d could not deserialize event queues", port, stack_info=True)
     else:
         try:
-            clients = {
-                qid: ClientDescriptor.from_dict(client) for (qid, client) in data
-            }
+            clients = {qid: ClientDescriptor.from_dict(client) for (qid, client) in data}
         except Exception:
-            logging.exception("Tornado %d could not deserialize event queues", port, stack_info=True)
+            logging.exception(
+                "Tornado %d could not deserialize event queues", port, stack_info=True
+            )
 
     for client in clients.values():
         # Put code for migrations due to event queue data format changes here
@@ -500,10 +543,12 @@ def load_event_queues(port: int) -> None:
         add_to_client_dicts(client)
 
     if len(clients) > 0 or settings.PRODUCTION:
-        logging.info('Tornado %d loaded %d event queues in %.3fs',
-                     port, len(clients), time.time() - start)
+        logging.info(
+            'Tornado %d loaded %d event queues in %.3fs', port, len(clients), time.time() - start
+        )
 
-def send_restart_events(immediate: bool=False) -> None:
+
+def send_restart_events(immediate: bool = False) -> None:
     event: Dict[str, Any] = dict(type='restart', server_generation=settings.SERVER_GENERATION)
     if immediate:
         event['immediate'] = True
@@ -511,6 +556,7 @@ def send_restart_events(immediate: bool=False) -> None:
         if client.accepts_event(event):
             client.add_event(event)
 
+
 def setup_event_queue(port: int) -> None:
     if not settings.TEST_SUITE:
         load_event_queues(port)
@@ -526,12 +572,14 @@ def setup_event_queue(port: int) -> None:
 
     # Set up event queue garbage collection
     ioloop = tornado.ioloop.IOLoop.instance()
-    pc = tornado.ioloop.PeriodicCallback(lambda: gc_event_queues(port),
-                                         EVENT_QUEUE_GC_FREQ_MSECS, ioloop)
+    pc = tornado.ioloop.PeriodicCallback(
+        lambda: gc_event_queues(port), EVENT_QUEUE_GC_FREQ_MSECS, ioloop
+    )
     pc.start()
 
     send_restart_events(immediate=settings.DEVELOPMENT)
 
+
 def fetch_events(query: Mapping[str, Any]) -> Dict[str, Any]:
     queue_id: Optional[str] = query["queue_id"]
     dont_block: bool = query["dont_block"]
@@ -562,17 +610,21 @@ def fetch_events(query: Mapping[str, Any]) -> Dict[str, Any]:
                 client.event_queue.newest_pruned_id is not None
                 and last_event_id < client.event_queue.newest_pruned_id
             ):
-                raise JsonableError(_("An event newer than {event_id} has already been pruned!").format(
-                    event_id=last_event_id,
-                ))
+                raise JsonableError(
+                    _("An event newer than {event_id} has already been pruned!").format(
+                        event_id=last_event_id,
+                    )
+                )
             client.event_queue.prune(last_event_id)
             if (
                 client.event_queue.newest_pruned_id is not None
                 and last_event_id != client.event_queue.newest_pruned_id
             ):
-                raise JsonableError(_("Event {event_id} was not in this queue").format(
-                    event_id=last_event_id,
-                ))
+                raise JsonableError(
+                    _("Event {event_id} was not in this queue").format(
+                        event_id=last_event_id,
+                    )
+                )
             was_connected = client.finish_current_handler()
 
         if not client.event_queue.empty() or dont_block:
@@ -583,8 +635,9 @@ def fetch_events(query: Mapping[str, Any]) -> Dict[str, Any]:
             if orig_queue_id is None:
                 response['queue_id'] = queue_id
             if len(response["events"]) == 1:
-                extra_log_data = "[{}/{}/{}]".format(queue_id, len(response["events"]),
-                                                     response["events"][0]["type"])
+                extra_log_data = "[{}/{}/{}]".format(
+                    queue_id, len(response["events"]), response["events"][0]["type"]
+                )
             else:
                 extra_log_data = "[{}/{}]".format(queue_id, len(response["events"]))
             if was_connected:
@@ -594,24 +647,36 @@ def fetch_events(query: Mapping[str, Any]) -> Dict[str, Any]:
         # After this point, dont_block=False, the queue is empty, and we
         # have a pre-existing queue, so we wait for new events.
         if was_connected:
-            logging.info("Disconnected handler for queue %s (%s/%s)",
-                         queue_id, user_profile_id, client_type_name)
+            logging.info(
+                "Disconnected handler for queue %s (%s/%s)",
+                queue_id,
+                user_profile_id,
+                client_type_name,
+            )
     except JsonableError as e:
         return dict(type="error", exception=e)
 
     client.connect_handler(handler_id, client_type_name)
     return dict(type="async")
 
+
 # Send email notifications to idle users
 # after they are idle for 1 hour
 NOTIFY_AFTER_IDLE_HOURS = 1
-def build_offline_notification(user_profile_id: int, message_id: int) -> Dict[str, Any]:
-    return {"user_profile_id": user_profile_id,
-            "message_id": message_id,
-            "type": "add",
-            "timestamp": time.time()}
 
-def missedmessage_hook(user_profile_id: int, client: ClientDescriptor, last_for_client: bool) -> None:
+
+def build_offline_notification(user_profile_id: int, message_id: int) -> Dict[str, Any]:
+    return {
+        "user_profile_id": user_profile_id,
+        "message_id": message_id,
+        "type": "add",
+        "timestamp": time.time(),
+    }
+
+
+def missedmessage_hook(
+    user_profile_id: int, client: ClientDescriptor, last_for_client: bool
+) -> None:
     """The receiver_is_off_zulip logic used to determine whether a user
     has no active client suffers from a somewhat fundamental race
     condition.  If the client is no longer on the Internet,
@@ -649,8 +714,11 @@ def missedmessage_hook(user_profile_id: int, client: ClientDescriptor, last_for_
         # stream_push_notify is set in process_message_event.
         stream_push_notify = event.get('stream_push_notify', False)
         stream_email_notify = event.get('stream_email_notify', False)
-        wildcard_mention_notify = (event.get('wildcard_mention_notify', False) and
-                                   'read' not in flags and 'wildcard_mentioned' in flags)
+        wildcard_mention_notify = (
+            event.get('wildcard_mention_notify', False)
+            and 'read' not in flags
+            and 'wildcard_mentioned' in flags
+        )
 
         stream_name = None
         if not private_message:
@@ -664,36 +732,56 @@ def missedmessage_hook(user_profile_id: int, client: ClientDescriptor, last_for_
         message_id = event['message']['id']
         # Pass on the information on whether a push or email notification was already sent.
         already_notified = dict(
-            push_notified = event.get("push_notified", False),
-            email_notified = event.get("email_notified", False),
+            push_notified=event.get("push_notified", False),
+            email_notified=event.get("email_notified", False),
         )
-        maybe_enqueue_notifications(user_profile_id, message_id, private_message, mentioned,
-                                    wildcard_mention_notify, stream_push_notify,
-                                    stream_email_notify, stream_name,
-                                    always_push_notify, idle, already_notified)
+        maybe_enqueue_notifications(
+            user_profile_id,
+            message_id,
+            private_message,
+            mentioned,
+            wildcard_mention_notify,
+            stream_push_notify,
+            stream_email_notify,
+            stream_name,
+            always_push_notify,
+            idle,
+            already_notified,
+        )
+
 
 def receiver_is_off_zulip(user_profile_id: int) -> bool:
     # If a user has no message-receiving event queues, they've got no open zulip
     # session so we notify them
     all_client_descriptors = get_client_descriptors_for_user(user_profile_id)
-    message_event_queues = [client for client in all_client_descriptors if client.accepts_messages()]
+    message_event_queues = [
+        client for client in all_client_descriptors if client.accepts_messages()
+    ]
     off_zulip = len(message_event_queues) == 0
     return off_zulip
 
-def maybe_enqueue_notifications(user_profile_id: int, message_id: int, private_message: bool,
-                                mentioned: bool,
-                                wildcard_mention_notify: bool,
-                                stream_push_notify: bool,
-                                stream_email_notify: bool, stream_name: Optional[str],
-                                always_push_notify: bool, idle: bool,
-                                already_notified: Dict[str, bool]) -> Dict[str, bool]:
+
+def maybe_enqueue_notifications(
+    user_profile_id: int,
+    message_id: int,
+    private_message: bool,
+    mentioned: bool,
+    wildcard_mention_notify: bool,
+    stream_push_notify: bool,
+    stream_email_notify: bool,
+    stream_name: Optional[str],
+    always_push_notify: bool,
+    idle: bool,
+    already_notified: Dict[str, bool],
+) -> Dict[str, bool]:
     """This function has a complete unit test suite in
     `test_enqueue_notifications` that should be expanded as we add
     more features here."""
     notified: Dict[str, bool] = {}
 
-    if (idle or always_push_notify) and (private_message or mentioned or
-                                         wildcard_mention_notify or stream_push_notify):
+    if (idle or always_push_notify) and (
+        private_message or mentioned or wildcard_mention_notify or stream_push_notify
+    ):
         notice = build_offline_notification(user_profile_id, message_id)
         if private_message:
             notice['trigger'] = 'private_message'
@@ -733,19 +821,22 @@ def maybe_enqueue_notifications(user_profile_id: int, message_id: int, private_m
 
     return notified
 
+
 class ClientInfo(TypedDict):
     client: ClientDescriptor
     flags: Iterable[str]
     is_sender: bool
 
-def get_client_info_for_message_event(event_template: Mapping[str, Any],
-                                      users: Iterable[Mapping[str, Any]]) -> Dict[str, ClientInfo]:
-    '''
+
+def get_client_info_for_message_event(
+    event_template: Mapping[str, Any], users: Iterable[Mapping[str, Any]]
+) -> Dict[str, ClientInfo]:
+    """
     Return client info for all the clients interested in a message.
     This basically includes clients for users who are recipients
     of the message, with some nuances for bots that auto-subscribe
     to all streams, plus users who may be mentioned, etc.
-    '''
+    """
 
     send_to_clients: Dict[str, ClientInfo] = {}
 
@@ -779,7 +870,9 @@ def get_client_info_for_message_event(event_template: Mapping[str, Any],
     return send_to_clients
 
 
-def process_message_event(event_template: Mapping[str, Any], users: Iterable[Mapping[str, Any]]) -> None:
+def process_message_event(
+    event_template: Mapping[str, Any], users: Iterable[Mapping[str, Any]]
+) -> None:
     """See
     https://zulip.readthedocs.io/en/latest/subsystems/sending-messages.html
     for high-level documentation on this subsystem.
@@ -824,21 +917,39 @@ def process_message_event(event_template: Mapping[str, Any], users: Iterable[Map
         mentioned = 'mentioned' in flags and 'read' not in flags
         stream_push_notify = user_data.get('stream_push_notify', False)
         stream_email_notify = user_data.get('stream_email_notify', False)
-        wildcard_mention_notify = (user_data.get('wildcard_mention_notify', False) and
-                                   'wildcard_mentioned' in flags and 'read' not in flags)
+        wildcard_mention_notify = (
+            user_data.get('wildcard_mention_notify', False)
+            and 'wildcard_mentioned' in flags
+            and 'read' not in flags
+        )
 
         # We first check if a message is potentially mentionable,
         # since receiver_is_off_zulip is somewhat expensive.
-        if (private_message or mentioned or wildcard_mention_notify
-                or stream_push_notify or stream_email_notify):
-            idle = receiver_is_off_zulip(user_profile_id) or (user_profile_id in presence_idle_user_ids)
+        if (
+            private_message
+            or mentioned
+            or wildcard_mention_notify
+            or stream_push_notify
+            or stream_email_notify
+        ):
+            idle = receiver_is_off_zulip(user_profile_id) or (
+                user_profile_id in presence_idle_user_ids
+            )
             always_push_notify = user_data.get('always_push_notify', False)
             stream_name = event_template.get('stream_name')
-            result = maybe_enqueue_notifications(user_profile_id, message_id, private_message,
-                                                 mentioned,
-                                                 wildcard_mention_notify,
-                                                 stream_push_notify, stream_email_notify,
-                                                 stream_name, always_push_notify, idle, {})
+            result = maybe_enqueue_notifications(
+                user_profile_id,
+                message_id,
+                private_message,
+                mentioned,
+                wildcard_mention_notify,
+                stream_push_notify,
+                stream_email_notify,
+                stream_name,
+                always_push_notify,
+                idle,
+                {},
+            )
             result['stream_push_notify'] = stream_push_notify
             result['stream_email_notify'] = stream_email_notify
             result['wildcard_mention_notify'] = wildcard_mention_notify
@@ -876,12 +987,12 @@ def process_message_event(event_template: Mapping[str, Any], users: Iterable[Map
             continue
 
         # The below prevents (Zephyr) mirroring loops.
-        if ('mirror' in sending_client and
-                sending_client.lower() == client.client_type_name.lower()):
+        if 'mirror' in sending_client and sending_client.lower() == client.client_type_name.lower():
             continue
 
         client.add_event(user_event)
 
+
 def process_presence_event(event: Mapping[str, Any], users: Iterable[int]) -> None:
     if 'user_id' not in event:
         # We only recently added `user_id` to presence data.
@@ -912,12 +1023,14 @@ def process_presence_event(event: Mapping[str, Any], users: Iterable[int]) -> No
                 else:
                     client.add_event(legacy_event)
 
+
 def process_event(event: Mapping[str, Any], users: Iterable[int]) -> None:
     for user_profile_id in users:
         for client in get_client_descriptors_for_user(user_profile_id):
             if client.accepts_event(event):
                 client.add_event(event)
 
+
 def process_deletion_event(event: Mapping[str, Any], users: Iterable[int]) -> None:
     for user_profile_id in users:
         for client in get_client_descriptors_for_user(user_profile_id):
@@ -941,8 +1054,10 @@ def process_deletion_event(event: Mapping[str, Any], users: Iterable[int]) -> No
                 del compatibility_event['message_ids']
                 client.add_event(compatibility_event)
 
-def process_message_update_event(orig_event: Mapping[str, Any],
-                                 users: Iterable[Mapping[str, Any]]) -> None:
+
+def process_message_update_event(
+    orig_event: Mapping[str, Any], users: Iterable[Mapping[str, Any]]
+) -> None:
     # Extract the parameters passed via the event object that don't
     # belong in the actual events.
     event_template = dict(orig_event)
@@ -965,7 +1080,8 @@ def process_message_update_event(orig_event: Mapping[str, Any],
                 user_event[key] = user_data[key]
         wildcard_mentioned = 'wildcard_mentioned' in user_event['flags']
         wildcard_mention_notify = wildcard_mentioned and (
-            user_profile_id in wildcard_mention_user_ids)
+            user_profile_id in wildcard_mention_user_ids
+        )
 
         maybe_enqueue_notifications_for_message_update(
             user_profile_id=user_profile_id,
@@ -973,7 +1089,7 @@ def process_message_update_event(orig_event: Mapping[str, Any],
             stream_name=stream_name,
             prior_mention_user_ids=prior_mention_user_ids,
             mention_user_ids=mention_user_ids,
-            wildcard_mention_notify = wildcard_mention_notify,
+            wildcard_mention_notify=wildcard_mention_notify,
             presence_idle_user_ids=presence_idle_user_ids,
             stream_push_user_ids=stream_push_user_ids,
             stream_email_user_ids=stream_email_user_ids,
@@ -986,24 +1102,27 @@ def process_message_update_event(orig_event: Mapping[str, Any],
                 # sending the same event to multiple clients.
                 client.add_event(user_event)
 
-def maybe_enqueue_notifications_for_message_update(user_profile_id: UserProfile,
-                                                   message_id: int,
-                                                   stream_name: Optional[str],
-                                                   prior_mention_user_ids: Set[int],
-                                                   mention_user_ids: Set[int],
-                                                   wildcard_mention_notify: bool,
-                                                   presence_idle_user_ids: Set[int],
-                                                   stream_push_user_ids: Set[int],
-                                                   stream_email_user_ids: Set[int],
-                                                   push_notify_user_ids: Set[int]) -> None:
-    private_message = (stream_name is None)
+
+def maybe_enqueue_notifications_for_message_update(
+    user_profile_id: UserProfile,
+    message_id: int,
+    stream_name: Optional[str],
+    prior_mention_user_ids: Set[int],
+    mention_user_ids: Set[int],
+    wildcard_mention_notify: bool,
+    presence_idle_user_ids: Set[int],
+    stream_push_user_ids: Set[int],
+    stream_email_user_ids: Set[int],
+    push_notify_user_ids: Set[int],
+) -> None:
+    private_message = stream_name is None
 
     if private_message:
         # We don't do offline notifications for PMs, because
         # we already notified the user of the original message
         return
 
-    if (user_profile_id in prior_mention_user_ids):
+    if user_profile_id in prior_mention_user_ids:
         # Don't spam people with duplicate mentions.  This is
         # especially important considering that most message
         # edits are simple typo corrections.
@@ -1019,8 +1138,8 @@ def maybe_enqueue_notifications_for_message_update(user_profile_id: UserProfile,
         # without extending the UserMessage data model.
         return
 
-    stream_push_notify = (user_profile_id in stream_push_user_ids)
-    stream_email_notify = (user_profile_id in stream_email_user_ids)
+    stream_push_notify = user_profile_id in stream_push_user_ids
+    stream_email_notify = user_profile_id in stream_email_user_ids
 
     if stream_push_notify or stream_email_notify:
         # Currently we assume that if this flag is set to True, then
@@ -1031,12 +1150,11 @@ def maybe_enqueue_notifications_for_message_update(user_profile_id: UserProfile,
         return
 
     # We can have newly mentioned people in an updated message.
-    mentioned = (user_profile_id in mention_user_ids)
+    mentioned = user_profile_id in mention_user_ids
 
     always_push_notify = user_profile_id in push_notify_user_ids
 
-    idle = (user_profile_id in presence_idle_user_ids) or \
-        receiver_is_off_zulip(user_profile_id)
+    idle = (user_profile_id in presence_idle_user_ids) or receiver_is_off_zulip(user_profile_id)
 
     maybe_enqueue_notifications(
         user_profile_id=user_profile_id,
@@ -1052,6 +1170,7 @@ def maybe_enqueue_notifications_for_message_update(user_profile_id: UserProfile,
         already_notified={},
     )
 
+
 def process_notification(notice: Mapping[str, Any]) -> None:
     event: Mapping[str, Any] = notice['event']
     users: Union[List[int], List[Mapping[str, Any]]] = notice['users']
@@ -1069,8 +1188,7 @@ def process_notification(notice: Mapping[str, Any]) -> None:
             # queue at the time of upgrade.
             #
             # TODO: Remove this block in release >= 4.0.
-            user_ids: List[int] = [user['id'] for user in
-                                   cast(List[Mapping[str, int]], users)]
+            user_ids: List[int] = [user['id'] for user in cast(List[Mapping[str, int]], users)]
         else:
             user_ids = cast(List[int], users)
         process_deletion_event(event, user_ids)
@@ -1080,14 +1198,19 @@ def process_notification(notice: Mapping[str, Any]) -> None:
         process_event(event, cast(Iterable[int], users))
     logging.debug(
         "Tornado: Event %s for %s users took %sms",
-        event['type'], len(users), int(1000 * (time.time() - start_time)),
+        event['type'],
+        len(users),
+        int(1000 * (time.time() - start_time)),
     )
 
+
 def get_wrapped_process_notification(queue_name: str) -> Callable[[List[Dict[str, Any]]], None]:
     def failure_processor(notice: Dict[str, Any]) -> None:
         logging.error(
             "Maximum retries exceeded for Tornado notice:%s\nStack trace:\n%s\n",
-            notice, traceback.format_exc())
+            notice,
+            traceback.format_exc(),
+        )
 
     def wrapped_process_notification(notices: List[Dict[str, Any]]) -> None:
         for notice in notices:
diff --git a/zerver/tornado/handlers.py b/zerver/tornado/handlers.py
index 33d6a352a4..d629985571 100644
--- a/zerver/tornado/handlers.py
+++ b/zerver/tornado/handlers.py
@@ -21,9 +21,11 @@ handlers: Dict[int, 'AsyncDjangoHandler'] = {}
 # Copied from django.core.handlers.base
 logger = logging.getLogger('django.request')
 
+
 def get_handler_by_id(handler_id: int) -> 'AsyncDjangoHandler':
     return handlers[handler_id]
 
+
 def allocate_handler_id(handler: 'AsyncDjangoHandler') -> int:
     global current_handler_id
     handlers[current_handler_id] = handler
@@ -31,14 +33,18 @@ def allocate_handler_id(handler: 'AsyncDjangoHandler') -> int:
     current_handler_id += 1
     return handler.handler_id
 
+
 def clear_handler_by_id(handler_id: int) -> None:
     del handlers[handler_id]
 
+
 def handler_stats_string() -> str:
     return f"{len(handlers)} handlers, latest ID {current_handler_id}"
 
-def finish_handler(handler_id: int, event_queue_id: str,
-                   contents: List[Dict[str, Any]], apply_markdown: bool) -> None:
+
+def finish_handler(
+    handler_id: int, event_queue_id: str, contents: List[Dict[str, Any]], apply_markdown: bool
+) -> None:
     err_msg = f"Got error finishing handler for queue {event_queue_id}"
     try:
         # We call async_request_timer_restart here in case we are
@@ -52,10 +58,11 @@ def finish_handler(handler_id: int, event_queue_id: str,
         else:
             request._log_data['extra'] = "[{}/1/{}]".format(event_queue_id, contents[0]["type"])
 
-        handler.zulip_finish(dict(result='success', msg='',
-                                  events=contents,
-                                  queue_id=event_queue_id),
-                             request, apply_markdown=apply_markdown)
+        handler.zulip_finish(
+            dict(result='success', msg='', events=contents, queue_id=event_queue_id),
+            request,
+            apply_markdown=apply_markdown,
+        )
     except OSError as e:
         if str(e) != 'Stream is closed':
             logging.exception(err_msg, stack_info=True)
@@ -183,8 +190,9 @@ class AsyncDjangoHandler(tornado.web.RequestHandler, base.BaseHandler):
         if client_descriptor is not None:
             client_descriptor.disconnect_handler(client_closed=True)
 
-    def zulip_finish(self, result_dict: Dict[str, Any], old_request: HttpRequest,
-                     apply_markdown: bool) -> None:
+    def zulip_finish(
+        self, result_dict: Dict[str, Any], old_request: HttpRequest, apply_markdown: bool
+    ) -> None:
         # Function called when we want to break a long-polled
         # get_events request and return a response to the client.
 
@@ -229,8 +237,9 @@ class AsyncDjangoHandler(tornado.web.RequestHandler, base.BaseHandler):
         # request/middleware system to run unmodified while avoiding
         # running expensive things like Zulip's authentication code a
         # second time.
-        request.saved_response = json_response(res_type=result_dict['result'],
-                                               data=result_dict, status=self.get_status())
+        request.saved_response = json_response(
+            res_type=result_dict['result'], data=result_dict, status=self.get_status()
+        )
 
         try:
             response = self.get_response(request)
diff --git a/zerver/tornado/ioloop_logging.py b/zerver/tornado/ioloop_logging.py
index 497475ddd5..b33f8eda41 100644
--- a/zerver/tornado/ioloop_logging.py
+++ b/zerver/tornado/ioloop_logging.py
@@ -15,13 +15,16 @@ orig_poll_impl = select.epoll
 # into this early-initialized module.
 logging_data: Dict[str, str] = {}
 
+
 class InstrumentedPollIOLoop(PollIOLoop):
     def initialize(self, **kwargs):  # type: ignore[no-untyped-def] # TODO investigate likely buggy monkey patching here
         super().initialize(impl=InstrumentedPoll(), **kwargs)
 
+
 def instrument_tornado_ioloop() -> None:
     IOLoop.configure(InstrumentedPollIOLoop)
 
+
 # A hack to keep track of how much time we spend working, versus sleeping in
 # the event loop.
 #
@@ -30,6 +33,7 @@ def instrument_tornado_ioloop() -> None:
 # the default poll implementation.  We need to do this before any Tornado code
 # runs that might instantiate the default event loop.
 
+
 class InstrumentedPoll:
     def __init__(self) -> None:
         self._underlying = orig_poll_impl()
@@ -64,12 +68,16 @@ class InstrumentedPoll:
         # outside poll
         if self._times and t1 - self._last_print >= 5:
             total = t1 - self._times[0][0]
-            in_poll = sum(b-a for a, b in self._times)
+            in_poll = sum(b - a for a, b in self._times)
             if total > 0:
                 percent_busy = 100 * (1 - in_poll / total)
                 if settings.PRODUCTION:
-                    logging.info('Tornado %s %5.1f%% busy over the past %4.1f seconds',
-                                 logging_data.get('port', 'unknown'), percent_busy, total)
+                    logging.info(
+                        'Tornado %s %5.1f%% busy over the past %4.1f seconds',
+                        logging_data.get('port', 'unknown'),
+                        percent_busy,
+                        total,
+                    )
                     self._last_print = t1
 
         return result
diff --git a/zerver/tornado/sharding.py b/zerver/tornado/sharding.py
index 940f1b0de0..0cc38c823b 100644
--- a/zerver/tornado/sharding.py
+++ b/zerver/tornado/sharding.py
@@ -10,13 +10,16 @@ if os.path.exists("/etc/zulip/sharding.json"):
     with open("/etc/zulip/sharding.json") as f:
         shard_map = json.loads(f.read())
 
+
 def get_tornado_port(realm: Realm) -> int:
     return shard_map.get(realm.host, settings.TORNADO_PORTS[0])
 
+
 def get_tornado_uri(realm: Realm) -> str:
     port = get_tornado_port(realm)
     return f"http://127.0.0.1:{port}"
 
+
 def notify_tornado_queue_name(port: int) -> str:
     if settings.TORNADO_PROCESSES == 1:
         return "notify_tornado"
diff --git a/zerver/tornado/views.py b/zerver/tornado/views.py
index 70c71c348e..e78227cd13 100644
--- a/zerver/tornado/views.py
+++ b/zerver/tornado/views.py
@@ -25,9 +25,11 @@ def notify(request: HttpRequest) -> HttpResponse:
     process_notification(orjson.loads(request.POST['data']))
     return json_success()
 
+
 @has_request_variables
-def cleanup_event_queue(request: HttpRequest, user_profile: UserProfile,
-                        queue_id: str=REQ()) -> HttpResponse:
+def cleanup_event_queue(
+    request: HttpRequest, user_profile: UserProfile, queue_id: str = REQ()
+) -> HttpResponse:
     client = get_client_descriptor(str(queue_id))
     if client is None:
         raise BadEventQueueIdError(queue_id)
@@ -37,48 +39,61 @@ def cleanup_event_queue(request: HttpRequest, user_profile: UserProfile,
     client.cleanup()
     return json_success()
 
+
 @internal_notify_view(True)
 @has_request_variables
-def get_events_internal(request: HttpRequest,
-                        user_profile_id: int = REQ(validator=check_int)) -> HttpResponse:
+def get_events_internal(
+    request: HttpRequest, user_profile_id: int = REQ(validator=check_int)
+) -> HttpResponse:
     user_profile = get_user_profile_by_id(user_profile_id)
     request._requestor_for_logs = user_profile.format_requestor_for_logs()
     process_client(request, user_profile, client_name="internal")
     return get_events_backend(request, user_profile)
 
+
 def get_events(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     return get_events_backend(request, user_profile)
 
+
 @has_request_variables
-def get_events_backend(request: HttpRequest, user_profile: UserProfile,
-                       # user_client is intended only for internal Django=>Tornado requests
-                       # and thus shouldn't be documented for external use.
-                       user_client: Optional[Client]=REQ(converter=get_client, default=None,
-                                                         intentionally_undocumented=True),
-                       last_event_id: Optional[int]=REQ(converter=int, default=None),
-                       queue_id: Optional[str]=REQ(default=None),
-                       # apply_markdown, client_gravatar, all_public_streams, and various
-                       # other parameters are only used when registering a new queue via this
-                       # endpoint.  This is a feature used primarily by get_events_internal
-                       # and not expected to be used by third-party clients.
-                       apply_markdown: bool=REQ(default=False, validator=check_bool,
-                                                intentionally_undocumented=True),
-                       client_gravatar: bool=REQ(default=False, validator=check_bool,
-                                                 intentionally_undocumented=True),
-                       slim_presence: bool=REQ(default=False, validator=check_bool,
-                                               intentionally_undocumented=True),
-                       all_public_streams: bool=REQ(default=False, validator=check_bool,
-                                                    intentionally_undocumented=True),
-                       event_types: Optional[Sequence[str]]=REQ(default=None, validator=check_list(check_string),
-                                                                intentionally_undocumented=True),
-                       dont_block: bool=REQ(default=False, validator=check_bool),
-                       narrow: Iterable[Sequence[str]]=REQ(default=[], validator=check_list(check_list(check_string)),
-                                                           intentionally_undocumented=True),
-                       lifespan_secs: int=REQ(default=0, converter=to_non_negative_int,
-                                              intentionally_undocumented=True),
-                       bulk_message_deletion: bool=REQ(default=False, validator=check_bool,
-                                                       intentionally_undocumented=True)
-                       ) -> HttpResponse:
+def get_events_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    # user_client is intended only for internal Django=>Tornado requests
+    # and thus shouldn't be documented for external use.
+    user_client: Optional[Client] = REQ(
+        converter=get_client, default=None, intentionally_undocumented=True
+    ),
+    last_event_id: Optional[int] = REQ(converter=int, default=None),
+    queue_id: Optional[str] = REQ(default=None),
+    # apply_markdown, client_gravatar, all_public_streams, and various
+    # other parameters are only used when registering a new queue via this
+    # endpoint.  This is a feature used primarily by get_events_internal
+    # and not expected to be used by third-party clients.
+    apply_markdown: bool = REQ(
+        default=False, validator=check_bool, intentionally_undocumented=True
+    ),
+    client_gravatar: bool = REQ(
+        default=False, validator=check_bool, intentionally_undocumented=True
+    ),
+    slim_presence: bool = REQ(default=False, validator=check_bool, intentionally_undocumented=True),
+    all_public_streams: bool = REQ(
+        default=False, validator=check_bool, intentionally_undocumented=True
+    ),
+    event_types: Optional[Sequence[str]] = REQ(
+        default=None, validator=check_list(check_string), intentionally_undocumented=True
+    ),
+    dont_block: bool = REQ(default=False, validator=check_bool),
+    narrow: Iterable[Sequence[str]] = REQ(
+        default=[], validator=check_list(check_list(check_string)), intentionally_undocumented=True
+    ),
+    lifespan_secs: int = REQ(
+        default=0, converter=to_non_negative_int, intentionally_undocumented=True
+    ),
+    bulk_message_deletion: bool = REQ(
+        default=False, validator=check_bool, intentionally_undocumented=True
+    ),
+) -> HttpResponse:
     # Extract the Tornado handler from the request
     handler: AsyncDjangoHandler = request._tornado_handler
 
@@ -88,31 +103,33 @@ def get_events_backend(request: HttpRequest, user_profile: UserProfile,
         valid_user_client = user_client
 
     events_query = dict(
-        user_profile_id = user_profile.id,
-        queue_id = queue_id,
-        last_event_id = last_event_id,
-        event_types = event_types,
-        client_type_name = valid_user_client.name,
-        all_public_streams = all_public_streams,
-        lifespan_secs = lifespan_secs,
-        narrow = narrow,
-        dont_block = dont_block,
-        handler_id = handler.handler_id)
+        user_profile_id=user_profile.id,
+        queue_id=queue_id,
+        last_event_id=last_event_id,
+        event_types=event_types,
+        client_type_name=valid_user_client.name,
+        all_public_streams=all_public_streams,
+        lifespan_secs=lifespan_secs,
+        narrow=narrow,
+        dont_block=dont_block,
+        handler_id=handler.handler_id,
+    )
 
     if queue_id is None:
         events_query['new_queue_data'] = dict(
-            user_profile_id = user_profile.id,
-            realm_id = user_profile.realm_id,
-            event_types = event_types,
-            client_type_name = valid_user_client.name,
-            apply_markdown = apply_markdown,
-            client_gravatar = client_gravatar,
-            slim_presence = slim_presence,
-            all_public_streams = all_public_streams,
-            queue_timeout = lifespan_secs,
-            last_connection_time = time.time(),
-            narrow = narrow,
-            bulk_message_deletion = bulk_message_deletion)
+            user_profile_id=user_profile.id,
+            realm_id=user_profile.realm_id,
+            event_types=event_types,
+            client_type_name=valid_user_client.name,
+            apply_markdown=apply_markdown,
+            client_gravatar=client_gravatar,
+            slim_presence=slim_presence,
+            all_public_streams=all_public_streams,
+            queue_timeout=lifespan_secs,
+            last_connection_time=time.time(),
+            narrow=narrow,
+            bulk_message_deletion=bulk_message_deletion,
+        )
 
     result = fetch_events(events_query)
     if "extra_log_data" in result:
diff --git a/zerver/views/alert_words.py b/zerver/views/alert_words.py
index 1f6ba2d23a..194c3ab41e 100644
--- a/zerver/views/alert_words.py
+++ b/zerver/views/alert_words.py
@@ -13,20 +13,27 @@ from zerver.models import UserProfile
 def list_alert_words(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     return json_success({'alert_words': user_alert_words(user_profile)})
 
+
 def clean_alert_words(alert_words: List[str]) -> List[str]:
     alert_words = [w.strip() for w in alert_words]
     return [w for w in alert_words if w != ""]
 
+
 @has_request_variables
-def add_alert_words(request: HttpRequest, user_profile: UserProfile,
-                    alert_words: List[str]=REQ(validator=check_list(check_capped_string(100))),
-                    ) -> HttpResponse:
+def add_alert_words(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    alert_words: List[str] = REQ(validator=check_list(check_capped_string(100))),
+) -> HttpResponse:
     do_add_alert_words(user_profile, clean_alert_words(alert_words))
     return json_success({'alert_words': user_alert_words(user_profile)})
 
+
 @has_request_variables
-def remove_alert_words(request: HttpRequest, user_profile: UserProfile,
-                       alert_words: List[str]=REQ(validator=check_list(check_string)),
-                       ) -> HttpResponse:
+def remove_alert_words(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    alert_words: List[str] = REQ(validator=check_list(check_string)),
+) -> HttpResponse:
     do_remove_alert_words(user_profile, alert_words)
     return json_success({'alert_words': user_alert_words(user_profile)})
diff --git a/zerver/views/archive.py b/zerver/views/archive.py
index f4f2ae5eab..5d4875a318 100644
--- a/zerver/views/archive.py
+++ b/zerver/views/archive.py
@@ -13,13 +13,10 @@ from zerver.lib.topic import get_topic_history_for_public_stream, messages_for_t
 from zerver.models import Message, UserProfile
 
 
-def archive(request: HttpRequest,
-            stream_id: int,
-            topic_name: str) -> HttpResponse:
-
-    def get_response(rendered_message_list: List[str],
-                     is_web_public: bool,
-                     stream_name: str) -> HttpResponse:
+def archive(request: HttpRequest, stream_id: int, topic_name: str) -> HttpResponse:
+    def get_response(
+        rendered_message_list: List[str], is_web_public: bool, stream_name: str
+    ) -> HttpResponse:
         return render(
             request,
             'zerver/archive/index.html',
@@ -43,7 +40,9 @@ def archive(request: HttpRequest,
         messages_for_topic(
             stream_recipient_id=stream.recipient_id,
             topic_name=topic_name,
-        ).select_related('sender').order_by('date_sent'),
+        )
+        .select_related('sender')
+        .order_by('date_sent'),
     )
 
     if not all_messages:
@@ -61,12 +60,12 @@ def archive(request: HttpRequest,
                 prev_sender = msg.sender
             include_sender = True
         if status_message:
-            status_message = msg.rendered_content[4+3: -4]
+            status_message = msg.rendered_content[4 + 3 : -4]
         context = {
             'sender_full_name': msg.sender.full_name,
-            'timestampstr': datetime_to_timestamp(msg.last_edit_time
-                                                  if msg.last_edit_time
-                                                  else msg.date_sent),
+            'timestampstr': datetime_to_timestamp(
+                msg.last_edit_time if msg.last_edit_time else msg.date_sent
+            ),
             'message_content': msg.rendered_content,
             'avatar_url': get_gravatar_url(msg.sender.delivery_email, 1),
             'include_sender': include_sender,
@@ -76,6 +75,7 @@ def archive(request: HttpRequest,
         rendered_message_list.append(rendered_msg)
     return get_response(rendered_message_list, True, stream.name)
 
+
 def get_web_public_topics_backend(request: HttpRequest, stream_id: int) -> HttpResponse:
     try:
         stream = get_stream_by_id(stream_id)
diff --git a/zerver/views/attachments.py b/zerver/views/attachments.py
index e6a6cace8b..c9c14167a8 100644
--- a/zerver/views/attachments.py
+++ b/zerver/views/attachments.py
@@ -7,14 +7,16 @@ from zerver.models import UserProfile
 
 
 def list_by_user(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
-    return json_success({
-        "attachments": user_attachments(user_profile),
-        "upload_space_used": user_profile.realm.currently_used_upload_space_bytes(),
-    })
+    return json_success(
+        {
+            "attachments": user_attachments(user_profile),
+            "upload_space_used": user_profile.realm.currently_used_upload_space_bytes(),
+        }
+    )
+
 
 def remove(request: HttpRequest, user_profile: UserProfile, attachment_id: str) -> HttpResponse:
-    attachment = access_attachment_by_id(user_profile, int(attachment_id),
-                                         needs_owner=True)
+    attachment = access_attachment_by_id(user_profile, int(attachment_id), needs_owner=True)
     remove_attachment(user_profile, attachment)
     notify_attachment_update(user_profile, "remove", {"id": int(attachment_id)})
     return json_success()
diff --git a/zerver/views/auth.py b/zerver/views/auth.py
index 6edfa54822..8999e46fe0 100644
--- a/zerver/views/auth.py
+++ b/zerver/views/auth.py
@@ -77,6 +77,7 @@ from zproject.backends import (
 
 ExtraContext = Optional[Dict[str, Any]]
 
+
 def get_safe_redirect_to(url: str, redirect_host: str) -> str:
     is_url_safe = is_safe_url(url=url, allowed_hosts=None)
     if is_url_safe:
@@ -87,9 +88,15 @@ def get_safe_redirect_to(url: str, redirect_host: str) -> str:
     else:
         return redirect_host
 
-def create_preregistration_user(email: str, request: HttpRequest, realm_creation: bool=False,
-                                password_required: bool=True, full_name: Optional[str]=None,
-                                full_name_validated: bool=False) -> HttpResponse:
+
+def create_preregistration_user(
+    email: str,
+    request: HttpRequest,
+    realm_creation: bool = False,
+    password_required: bool = True,
+    full_name: Optional[str] = None,
+    full_name_validated: bool = False,
+) -> HttpResponse:
     realm = None
     if not realm_creation:
         try:
@@ -105,12 +112,18 @@ def create_preregistration_user(email: str, request: HttpRequest, realm_creation
         full_name_validated=full_name_validated,
     )
 
-def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str='',
-                               mobile_flow_otp: Optional[str]=None,
-                               desktop_flow_otp: Optional[str]=None,
-                               is_signup: bool=False, password_required: bool=True,
-                               multiuse_object_key: str='',
-                               full_name_validated: bool=False) -> HttpResponse:
+
+def maybe_send_to_registration(
+    request: HttpRequest,
+    email: str,
+    full_name: str = '',
+    mobile_flow_otp: Optional[str] = None,
+    desktop_flow_otp: Optional[str] = None,
+    is_signup: bool = False,
+    password_required: bool = True,
+    multiuse_object_key: str = '',
+    full_name_validated: bool = False,
+) -> HttpResponse:
     """Given a successful authentication for an email address (i.e. we've
     confirmed the user controls the email address) that does not
     currently have a Zulip account in the target realm, send them to
@@ -137,11 +150,13 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
     # devices, e.g. just creating an account on the web on their laptop.
     assert not (mobile_flow_otp and desktop_flow_otp)
     if mobile_flow_otp:
-        set_expirable_session_var(request.session, 'registration_mobile_flow_otp', mobile_flow_otp,
-                                  expiry_seconds=3600)
+        set_expirable_session_var(
+            request.session, 'registration_mobile_flow_otp', mobile_flow_otp, expiry_seconds=3600
+        )
     elif desktop_flow_otp:
-        set_expirable_session_var(request.session, 'registration_desktop_flow_otp', desktop_flow_otp,
-                                  expiry_seconds=3600)
+        set_expirable_session_var(
+            request.session, 'registration_desktop_flow_otp', desktop_flow_otp, expiry_seconds=3600
+        )
 
     if multiuse_object_key:
         from_multiuse_invite = True
@@ -165,8 +180,9 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
         # creation or confirm-continue-registration depending on
         # is_signup.
         try:
-            prereg_user = filter_to_valid_prereg_users(PreregistrationUser.objects.filter(
-                email__iexact=email, realm=realm)).latest("invited_at")
+            prereg_user = filter_to_valid_prereg_users(
+                PreregistrationUser.objects.filter(email__iexact=email, realm=realm)
+            ).latest("invited_at")
 
             # password_required and full_name data passed here as argument should take precedence
             # over the defaults with which the existing PreregistrationUser that we've just fetched
@@ -180,7 +196,8 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
             prereg_user.save(update_fields=update_fields)
         except PreregistrationUser.DoesNotExist:
             prereg_user = create_preregistration_user(
-                email, request,
+                email,
+                request,
                 password_required=password_required,
                 full_name=full_name,
                 full_name_validated=full_name_validated,
@@ -193,24 +210,20 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
             prereg_user.invited_as = invited_as
             prereg_user.save()
 
-        confirmation_link = create_confirmation_link(prereg_user,
-                                                     Confirmation.USER_REGISTRATION)
+        confirmation_link = create_confirmation_link(prereg_user, Confirmation.USER_REGISTRATION)
         if is_signup:
             return redirect(confirmation_link)
 
-        context = {'email': email,
-                   'continue_link': confirmation_link,
-                   'full_name': full_name}
-        return render(request,
-                      'zerver/confirm_continue_registration.html',
-                      context=context)
+        context = {'email': email, 'continue_link': confirmation_link, 'full_name': full_name}
+        return render(request, 'zerver/confirm_continue_registration.html', context=context)
 
     # This email address it not allowed to join this organization, so
     # just send the user back to the registration page.
     url = reverse('register')
     context = login_context(request)
     extra_context: Mapping[str, Any] = {
-        'form': form, 'current_url': lambda: url,
+        'form': form,
+        'current_url': lambda: url,
         'from_multiuse_invite': from_multiuse_invite,
         'multiuse_object_key': multiuse_object_key,
         'mobile_flow_otp': mobile_flow_otp,
@@ -219,6 +232,7 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
     context.update(extra_context)
     return render(request, 'zerver/accounts_home.html', context=context)
 
+
 def register_remote_user(request: HttpRequest, result: ExternalAuthResult) -> HttpResponse:
     # We have verified the user controls an email address, but
     # there's no associated Zulip user account.  Consider sending
@@ -232,6 +246,7 @@ def register_remote_user(request: HttpRequest, result: ExternalAuthResult) -> Ht
     kwargs["password_required"] = False
     return maybe_send_to_registration(request, **kwargs)
 
+
 def login_or_register_remote_user(request: HttpRequest, result: ExternalAuthResult) -> HttpResponse:
     """Given a successful authentication showing the user controls given
     email address (email) and potentially a UserProfile
@@ -274,8 +289,8 @@ def login_or_register_remote_user(request: HttpRequest, result: ExternalAuthResu
     redirect_to = get_safe_redirect_to(redirect_to, user_profile.realm.uri)
     return HttpResponseRedirect(redirect_to)
 
-def finish_desktop_flow(request: HttpRequest, user_profile: UserProfile,
-                        otp: str) -> HttpResponse:
+
+def finish_desktop_flow(request: HttpRequest, user_profile: UserProfile, otp: str) -> HttpResponse:
     """
     The desktop otp flow returns to the app (through the clipboard)
     a token that allows obtaining (through log_into_subdomain) a logged in session
@@ -289,18 +304,21 @@ def finish_desktop_flow(request: HttpRequest, user_profile: UserProfile,
     key = bytes.fromhex(otp)
     iv = secrets.token_bytes(12)
     desktop_data = (iv + AESGCM(key).encrypt(iv, token.encode(), b"")).hex()
-    context = {'desktop_data': desktop_data,
-               'browser_url': reverse('login_page',
-                                      kwargs = {'template_name': 'zerver/login.html'}),
-               'realm_icon_url': realm_icon_url(user_profile.realm)}
+    context = {
+        'desktop_data': desktop_data,
+        'browser_url': reverse('login_page', kwargs={'template_name': 'zerver/login.html'}),
+        'realm_icon_url': realm_icon_url(user_profile.realm),
+    }
     return render(request, 'zerver/desktop_redirect.html', context=context)
 
+
 def finish_mobile_flow(request: HttpRequest, user_profile: UserProfile, otp: str) -> HttpResponse:
     # For the mobile OAuth flow, we send the API key and other
     # necessary details in a redirect to a zulip:// URI scheme.
     api_key = get_api_key(user_profile)
-    response = create_response_for_otp_flow(api_key, otp, user_profile,
-                                            encrypted_key_field_name='otp_encrypted_api_key')
+    response = create_response_for_otp_flow(
+        api_key, otp, user_profile, encrypted_key_field_name='otp_encrypted_api_key'
+    )
 
     # Since we are returning an API key instead of going through
     # the Django login() function (which creates a browser
@@ -318,8 +336,10 @@ def finish_mobile_flow(request: HttpRequest, user_profile: UserProfile, otp: str
 
     return response
 
-def create_response_for_otp_flow(key: str, otp: str, user_profile: UserProfile,
-                                 encrypted_key_field_name: str) -> HttpResponse:
+
+def create_response_for_otp_flow(
+    key: str, otp: str, user_profile: UserProfile, encrypted_key_field_name: str
+) -> HttpResponse:
     realm_uri = user_profile.realm.uri
 
     # Check if the mobile URI is overridden in settings, if so, replace it
@@ -335,10 +355,13 @@ def create_response_for_otp_flow(key: str, otp: str, user_profile: UserProfile,
     }
     # We can't use HttpResponseRedirect, since it only allows HTTP(S) URLs
     response = HttpResponse(status=302)
-    response['Location'] = add_query_to_redirect_url('zulip://login', urllib.parse.urlencode(params))
+    response['Location'] = add_query_to_redirect_url(
+        'zulip://login', urllib.parse.urlencode(params)
+    )
 
     return response
 
+
 @log_view_func
 @has_request_variables
 def remote_user_sso(
@@ -391,6 +414,7 @@ def remote_user_sso(
     result = ExternalAuthResult(user_profile=user_profile, data_dict=data_dict)
     return login_or_register_remote_user(request, result)
 
+
 @csrf_exempt
 @log_view_func
 def remote_user_jwt(request: HttpRequest) -> HttpResponse:
@@ -424,32 +448,34 @@ def remote_user_jwt(request: HttpRequest) -> HttpResponse:
     except Realm.DoesNotExist:
         raise JsonableError(_("Wrong subdomain"))
 
-    user_profile = authenticate(username=email,
-                                realm=realm,
-                                use_dummy_backend=True)
+    user_profile = authenticate(username=email, realm=realm, use_dummy_backend=True)
     if user_profile is None:
-        result = ExternalAuthResult(data_dict={"email": email, "full_name": remote_user,
-                                               "subdomain": realm.subdomain})
+        result = ExternalAuthResult(
+            data_dict={"email": email, "full_name": remote_user, "subdomain": realm.subdomain}
+        )
     else:
         result = ExternalAuthResult(user_profile=user_profile)
 
     return login_or_register_remote_user(request, result)
 
+
 @has_request_variables
 def oauth_redirect_to_root(
     request: HttpRequest,
     url: str,
     sso_type: str,
-    is_signup: bool=False,
-    extra_url_params: Dict[str, str]={},
+    is_signup: bool = False,
+    extra_url_params: Dict[str, str] = {},
     next: Optional[str] = REQ(default=None),
 ) -> HttpResponse:
     main_site_uri = settings.ROOT_DOMAIN_URI + url
     if settings.SOCIAL_AUTH_SUBDOMAIN is not None and sso_type == 'social':
-        main_site_uri = (settings.EXTERNAL_URI_SCHEME +
-                         settings.SOCIAL_AUTH_SUBDOMAIN +
-                         "." +
-                         settings.EXTERNAL_HOST) + url
+        main_site_uri = (
+            settings.EXTERNAL_URI_SCHEME
+            + settings.SOCIAL_AUTH_SUBDOMAIN
+            + "."
+            + settings.EXTERNAL_HOST
+        ) + url
 
     params = {
         'subdomain': get_subdomain(request),
@@ -476,6 +502,7 @@ def oauth_redirect_to_root(
 
     return redirect(add_query_to_redirect_url(main_site_uri, urllib.parse.urlencode(params)))
 
+
 def handle_desktop_flow(func: ViewFuncT) -> ViewFuncT:
     @wraps(func)
     def wrapper(request: HttpRequest, *args: object, **kwargs: object) -> HttpResponse:
@@ -484,8 +511,10 @@ def handle_desktop_flow(func: ViewFuncT) -> ViewFuncT:
             return render(request, "zerver/desktop_login.html")
 
         return func(request, *args, **kwargs)
+
     return cast(ViewFuncT, wrapper)  # https://github.com/python/mypy/issues/1927
 
+
 @handle_desktop_flow
 def start_remote_user_sso(request: HttpRequest) -> HttpResponse:
     """
@@ -497,9 +526,13 @@ def start_remote_user_sso(request: HttpRequest) -> HttpResponse:
     query = request.META['QUERY_STRING']
     return redirect(add_query_to_redirect_url(reverse(remote_user_sso), query))
 
+
 @handle_desktop_flow
-def start_social_login(request: HttpRequest, backend: str, extra_arg: Optional[str]=None,
-                       ) -> HttpResponse:
+def start_social_login(
+    request: HttpRequest,
+    backend: str,
+    extra_arg: Optional[str] = None,
+) -> HttpResponse:
     backend_url = reverse('social:begin', args=[backend])
     extra_url_params: Dict[str, str] = {}
     if backend == "saml":
@@ -509,8 +542,9 @@ def start_social_login(request: HttpRequest, backend: str, extra_arg: Optional[s
         # This backend requires the name of the IdP (from the list of configured ones)
         # to be passed as the parameter.
         if not extra_arg or extra_arg not in settings.SOCIAL_AUTH_SAML_ENABLED_IDPS:
-            logging.info("Attempted to initiate SAML authentication with wrong idp argument: %s",
-                         extra_arg)
+            logging.info(
+                "Attempted to initiate SAML authentication with wrong idp argument: %s", extra_arg
+            )
             return config_error(request, "saml")
         extra_url_params = {'idp': extra_arg}
 
@@ -526,9 +560,13 @@ def start_social_login(request: HttpRequest, backend: str, extra_arg: Optional[s
 
     return oauth_redirect_to_root(request, backend_url, 'social', extra_url_params=extra_url_params)
 
+
 @handle_desktop_flow
-def start_social_signup(request: HttpRequest, backend: str, extra_arg: Optional[str]=None,
-                        ) -> HttpResponse:
+def start_social_signup(
+    request: HttpRequest,
+    backend: str,
+    extra_arg: Optional[str] = None,
+) -> HttpResponse:
     backend_url = reverse('social:begin', args=[backend])
     extra_url_params: Dict[str, str] = {}
     if backend == "saml":
@@ -536,15 +574,19 @@ def start_social_signup(request: HttpRequest, backend: str, extra_arg: Optional[
             return config_error(request, 'saml')
 
         if not extra_arg or extra_arg not in settings.SOCIAL_AUTH_SAML_ENABLED_IDPS:
-            logging.info("Attempted to initiate SAML authentication with wrong idp argument: %s",
-                         extra_arg)
+            logging.info(
+                "Attempted to initiate SAML authentication with wrong idp argument: %s", extra_arg
+            )
             return config_error(request, "saml")
         extra_url_params = {'idp': extra_arg}
-    return oauth_redirect_to_root(request, backend_url, 'social', is_signup=True,
-                                  extra_url_params=extra_url_params)
+    return oauth_redirect_to_root(
+        request, backend_url, 'social', is_signup=True, extra_url_params=extra_url_params
+    )
+
 
 _subdomain_token_salt = 'zerver.views.auth.log_into_subdomain'
 
+
 @log_view_func
 def log_into_subdomain(request: HttpRequest, token: str) -> HttpResponse:
     """Given a valid authentication token (generated by
@@ -569,19 +611,22 @@ def log_into_subdomain(request: HttpRequest, token: str) -> HttpResponse:
 
     return login_or_register_remote_user(request, result)
 
+
 def redirect_and_log_into_subdomain(result: ExternalAuthResult) -> HttpResponse:
     token = result.store_data()
     realm = get_realm(result.data_dict["subdomain"])
-    subdomain_login_uri = (realm.uri
-                           + reverse(log_into_subdomain, args=[token]))
+    subdomain_login_uri = realm.uri + reverse(log_into_subdomain, args=[token])
     return redirect(subdomain_login_uri)
 
-def get_dev_users(realm: Optional[Realm]=None, extra_users_count: int=10) -> List[UserProfile]:
+
+def get_dev_users(realm: Optional[Realm] = None, extra_users_count: int = 10) -> List[UserProfile]:
     # Development environments usually have only a few users, but
     # it still makes sense to limit how many extra users we render to
     # support performance testing with DevAuthBackend.
     if realm is not None:
-        users_query = UserProfile.objects.select_related().filter(is_bot=False, is_active=True, realm=realm)
+        users_query = UserProfile.objects.select_related().filter(
+            is_bot=False, is_active=True, realm=realm
+        )
     else:
         users_query = UserProfile.objects.select_related().filter(is_bot=False, is_active=True)
 
@@ -592,26 +637,29 @@ def get_dev_users(realm: Optional[Realm]=None, extra_users_count: int=10) -> Lis
     users = list(shakespearian_users) + list(extra_users)
     return users
 
+
 def redirect_to_misconfigured_ldap_notice(request: HttpResponse, error_type: int) -> HttpResponse:
     if error_type == ZulipLDAPAuthBackend.REALM_IS_NONE_ERROR:
         return config_error(request, 'ldap')
     else:
         raise AssertionError("Invalid error type")
 
+
 def show_deactivation_notice(request: HttpRequest) -> HttpResponse:
     realm = get_realm_from_request(request)
     if realm and realm.deactivated:
         context = {"deactivated_domain_name": realm.name}
         if realm.deactivated_redirect is not None:
             context["deactivated_redirect"] = realm.deactivated_redirect
-        return render(request, "zerver/deactivated.html",
-                      context=context)
+        return render(request, "zerver/deactivated.html", context=context)
 
     return HttpResponseRedirect(reverse('login_page'))
 
+
 def redirect_to_deactivation_notice() -> HttpResponse:
     return HttpResponseRedirect(reverse(show_deactivation_notice))
 
+
 def add_dev_login_context(realm: Optional[Realm], context: Dict[str, Any]) -> None:
     users = get_dev_users(realm)
     context['current_realm'] = realm
@@ -625,6 +673,7 @@ def add_dev_login_context(realm: Optional[Realm], context: Dict[str, Any]) -> No
     context['guest_users'] = sort([u for u in users if u.is_guest])
     context['direct_users'] = sort([u for u in users if not (u.is_realm_admin or u.is_guest)])
 
+
 def update_login_page_context(request: HttpRequest, context: Dict[str, Any]) -> None:
     for key in ('email', 'already_registered', 'is_deactivated'):
         try:
@@ -634,6 +683,7 @@ def update_login_page_context(request: HttpRequest, context: Dict[str, Any]) ->
 
     context['deactivated_account_error'] = DEACTIVATED_ACCOUNT_ERROR
 
+
 class TwoFactorLoginView(BaseTwoFactorLoginView):
     extra_context: ExtraContext = None
     form_list = (
@@ -642,8 +692,7 @@ class TwoFactorLoginView(BaseTwoFactorLoginView):
         ('backup', BackupTokenForm),
     )
 
-    def __init__(self, extra_context: ExtraContext=None,
-                 *args: Any, **kwargs: Any) -> None:
+    def __init__(self, extra_context: ExtraContext = None, *args: Any, **kwargs: Any) -> None:
         self.extra_context = extra_context
         super().__init__(*args, **kwargs)
 
@@ -656,7 +705,8 @@ class TwoFactorLoginView(BaseTwoFactorLoginView):
         realm = get_realm_from_request(self.request)
         redirect_to = realm.uri if realm else '/'
         context['next'] = self.request.POST.get(
-            'next', self.request.GET.get('next', redirect_to),
+            'next',
+            self.request.GET.get('next', redirect_to),
         )
         return context
 
@@ -675,12 +725,16 @@ class TwoFactorLoginView(BaseTwoFactorLoginView):
         # import mock.patch here because mock has an expensive import
         # process involving pbr -> pkgresources (which is really slow).
         from unittest.mock import patch
+
         with patch.object(settings, 'LOGIN_REDIRECT_URL', realm_uri):
             return super().done(form_list, **kwargs)
 
+
 @has_request_variables
 def login_page(
-    request: HttpRequest, next: str = REQ(default="/"), **kwargs: Any,
+    request: HttpRequest,
+    next: str = REQ(default="/"),
+    **kwargs: Any,
 ) -> HttpResponse:
     # To support previewing the Zulip login pages, we have a special option
     # that disables the default behavior of redirecting logged-in users to the
@@ -721,13 +775,12 @@ def login_page(
     extra_context.update(login_context(request))
 
     if settings.TWO_FACTOR_AUTHENTICATION_ENABLED:
-        return start_two_factor_auth(request, extra_context=extra_context,
-                                     **kwargs)
+        return start_two_factor_auth(request, extra_context=extra_context, **kwargs)
 
     try:
         template_response = DjangoLoginView.as_view(
-            authentication_form=OurAuthenticationForm,
-            extra_context=extra_context, **kwargs)(request)
+            authentication_form=OurAuthenticationForm, extra_context=extra_context, **kwargs
+        )(request)
     except ZulipLDAPConfigurationError as e:
         assert len(e.args) > 1
         return redirect_to_misconfigured_ldap_notice(request, e.args[1])
@@ -742,9 +795,10 @@ def login_page(
 
     return template_response
 
-def start_two_factor_auth(request: HttpRequest,
-                          extra_context: ExtraContext=None,
-                          **kwargs: Any) -> HttpResponse:
+
+def start_two_factor_auth(
+    request: HttpRequest, extra_context: ExtraContext = None, **kwargs: Any
+) -> HttpResponse:
     two_fa_form_field = 'two_factor_login_view-current_step'
     if two_fa_form_field not in request.POST:
         # Here we inject the 2FA step in the request context if it's missing to
@@ -769,10 +823,10 @@ def start_two_factor_auth(request: HttpRequest,
 
         return view
     """
-    two_fa_view = TwoFactorLoginView.as_view(extra_context=extra_context,
-                                             **kwargs)
+    two_fa_view = TwoFactorLoginView.as_view(extra_context=extra_context, **kwargs)
     return two_fa_view(request, **kwargs)
 
+
 @csrf_exempt
 @has_request_variables
 def dev_direct_login(
@@ -797,16 +851,18 @@ def dev_direct_login(
     redirect_to = get_safe_redirect_to(next, user_profile.realm.uri)
     return HttpResponseRedirect(redirect_to)
 
+
 def check_dev_auth_backend() -> None:
     if settings.PRODUCTION:
         raise JsonableError(_("Endpoint not available in production."))
     if not dev_auth_enabled():
         raise JsonableError(_("DevAuthBackend not enabled."))
 
+
 @csrf_exempt
 @require_post
 @has_request_variables
-def api_dev_fetch_api_key(request: HttpRequest, username: str=REQ()) -> HttpResponse:
+def api_dev_fetch_api_key(request: HttpRequest, username: str = REQ()) -> HttpResponse:
     """This function allows logging in without a password on the Zulip
     mobile apps when connecting to a Zulip development environment.  It
     requires DevAuthBackend to be included in settings.AUTHENTICATION_BACKENDS.
@@ -822,36 +878,53 @@ def api_dev_fetch_api_key(request: HttpRequest, username: str=REQ()) -> HttpResp
     if realm is None:
         return json_error(_("Invalid subdomain"))
     return_data: Dict[str, bool] = {}
-    user_profile = authenticate(dev_auth_username=username,
-                                realm=realm,
-                                return_data=return_data)
+    user_profile = authenticate(dev_auth_username=username, realm=realm, return_data=return_data)
     if return_data.get("inactive_realm"):
-        return json_error(_("This organization has been deactivated."),
-                          data={"reason": "realm deactivated"}, status=403)
+        return json_error(
+            _("This organization has been deactivated."),
+            data={"reason": "realm deactivated"},
+            status=403,
+        )
     if return_data.get("inactive_user"):
-        return json_error(_("Your account has been disabled."),
-                          data={"reason": "user disable"}, status=403)
+        return json_error(
+            _("Your account has been disabled."), data={"reason": "user disable"}, status=403
+        )
     if user_profile is None:
-        return json_error(_("This user is not registered."),
-                          data={"reason": "unregistered"}, status=403)
+        return json_error(
+            _("This user is not registered."), data={"reason": "unregistered"}, status=403
+        )
     do_login(request, user_profile)
     api_key = get_api_key(user_profile)
     return json_success({"api_key": api_key, "email": user_profile.delivery_email})
 
+
 @csrf_exempt
 def api_dev_list_users(request: HttpRequest) -> HttpResponse:
     check_dev_auth_backend()
 
     users = get_dev_users()
-    return json_success(dict(direct_admins=[dict(email=u.delivery_email, realm_uri=u.realm.uri)
-                                            for u in users if u.is_realm_admin],
-                             direct_users=[dict(email=u.delivery_email, realm_uri=u.realm.uri)
-                                           for u in users if not u.is_realm_admin]))
+    return json_success(
+        dict(
+            direct_admins=[
+                dict(email=u.delivery_email, realm_uri=u.realm.uri)
+                for u in users
+                if u.is_realm_admin
+            ],
+            direct_users=[
+                dict(email=u.delivery_email, realm_uri=u.realm.uri)
+                for u in users
+                if not u.is_realm_admin
+            ],
+        )
+    )
+
 
 @csrf_exempt
 @require_post
 @has_request_variables
-def api_fetch_api_key(request: HttpRequest, username: str=REQ(), password: str=REQ()) -> HttpResponse:
+def api_fetch_api_key(
+    request: HttpRequest, username: str = REQ(), password: str = REQ()
+) -> HttpResponse:
     return_data: Dict[str, bool] = {}
 
     realm = get_realm_from_request(request)
@@ -862,23 +935,31 @@ def api_fetch_api_key(request: HttpRequest, username: str=REQ(), password: str=R
         # In case we don't authenticate against LDAP, check for a valid
         # email. LDAP backend can authenticate against a non-email.
         validate_login_email(username)
-    user_profile = authenticate(request=request,
-                                username=username,
-                                password=password,
-                                realm=realm,
-                                return_data=return_data)
+    user_profile = authenticate(
+        request=request, username=username, password=password, realm=realm, return_data=return_data
+    )
     if return_data.get("inactive_user"):
-        return json_error(_("Your account has been disabled."),
-                          data={"reason": "user disable"}, status=403)
+        return json_error(
+            _("Your account has been disabled."), data={"reason": "user disable"}, status=403
+        )
     if return_data.get("inactive_realm"):
-        return json_error(_("This organization has been deactivated."),
-                          data={"reason": "realm deactivated"}, status=403)
+        return json_error(
+            _("This organization has been deactivated."),
+            data={"reason": "realm deactivated"},
+            status=403,
+        )
     if return_data.get("password_auth_disabled"):
-        return json_error(_("Password auth is disabled in your team."),
-                          data={"reason": "password auth disabled"}, status=403)
+        return json_error(
+            _("Password auth is disabled in your team."),
+            data={"reason": "password auth disabled"},
+            status=403,
+        )
     if user_profile is None:
-        return json_error(_("Your username or password is incorrect."),
-                          data={"reason": "incorrect_creds"}, status=403)
+        return json_error(
+            _("Your username or password is incorrect."),
+            data={"reason": "incorrect_creds"},
+            status=403,
+        )
 
     # Maybe sending 'user_logged_in' signal is the better approach:
     #   user_logged_in.send(sender=user_profile.__class__, request=request, user=user_profile)
@@ -894,6 +975,7 @@ def api_fetch_api_key(request: HttpRequest, username: str=REQ(), password: str=R
     api_key = get_api_key(user_profile)
     return json_success({"api_key": api_key, "email": user_profile.delivery_email})
 
+
 def get_auth_backends_data(request: HttpRequest) -> Dict[str, Any]:
     """Returns which authentication methods are enabled on the server"""
     subdomain = get_subdomain(request)
@@ -919,10 +1001,12 @@ def get_auth_backends_data(request: HttpRequest) -> Dict[str, Any]:
         result[key] = auth_enabled_helper([auth_backend_name], realm)
     return result
 
+
 def check_server_incompatibility(request: HttpRequest) -> bool:
     user_agent = parse_user_agent(request.META.get("HTTP_USER_AGENT", "Missing User-Agent"))
     return user_agent['name'] == "ZulipInvalid"
 
+
 @require_safe
 @csrf_exempt
 def api_get_server_settings(request: HttpRequest) -> HttpResponse:
@@ -943,47 +1027,57 @@ def api_get_server_settings(request: HttpRequest) -> HttpResponse:
     # * If they don't, the server has multiple realms, and it's not clear which is
     #   the requested realm, so we can't send back these data.
     for settings_item in [
-            "email_auth_enabled",
-            "require_email_format_usernames",
-            "realm_uri",
-            "realm_name",
-            "realm_icon",
-            "realm_description",
-            "external_authentication_methods"]:
+        "email_auth_enabled",
+        "require_email_format_usernames",
+        "realm_uri",
+        "realm_name",
+        "realm_icon",
+        "realm_description",
+        "external_authentication_methods",
+    ]:
         if context[settings_item] is not None:
             result[settings_item] = context[settings_item]
     return json_success(result)
 
+
 @has_request_variables
-def json_fetch_api_key(request: HttpRequest, user_profile: UserProfile,
-                       password: str=REQ(default='')) -> HttpResponse:
+def json_fetch_api_key(
+    request: HttpRequest, user_profile: UserProfile, password: str = REQ(default='')
+) -> HttpResponse:
     realm = get_realm_from_request(request)
     if realm is None:
         return json_error(_("Invalid subdomain"))
     if password_auth_enabled(user_profile.realm):
-        if not authenticate(request=request, username=user_profile.delivery_email, password=password,
-                            realm=realm):
+        if not authenticate(
+            request=request, username=user_profile.delivery_email, password=password, realm=realm
+        ):
             return json_error(_("Your username or password is incorrect."))
 
     api_key = get_api_key(user_profile)
     return json_success({"api_key": api_key, "email": user_profile.delivery_email})
 
+
 @csrf_exempt
 def api_fetch_google_client_id(request: HttpRequest) -> HttpResponse:
     if not settings.GOOGLE_CLIENT_ID:
         return json_error(_("GOOGLE_CLIENT_ID is not configured"), status=400)
     return json_success({"google_client_id": settings.GOOGLE_CLIENT_ID})
 
+
 @require_post
 def logout_then_login(request: HttpRequest, **kwargs: Any) -> HttpResponse:
     return django_logout_then_login(request, kwargs)
 
+
 def password_reset(request: HttpRequest) -> HttpResponse:
-    view_func = DjangoPasswordResetView.as_view(template_name='zerver/reset.html',
-                                                form_class=ZulipPasswordResetForm,
-                                                success_url='/accounts/password/reset/done/')
+    view_func = DjangoPasswordResetView.as_view(
+        template_name='zerver/reset.html',
+        form_class=ZulipPasswordResetForm,
+        success_url='/accounts/password/reset/done/',
+    )
     return view_func(request)
 
+
 @csrf_exempt
 def saml_sp_metadata(request: HttpRequest, **kwargs: Any) -> HttpResponse:  # nocoverage
     """
@@ -997,15 +1091,14 @@ def saml_sp_metadata(request: HttpRequest, **kwargs: Any) -> HttpResponse:  # no
         return config_error(request, "saml")
 
     complete_url = reverse('social:complete', args=("saml",))
-    saml_backend = load_backend(load_strategy(request), "saml",
-                                complete_url)
+    saml_backend = load_backend(load_strategy(request), "saml", complete_url)
     metadata, errors = saml_backend.generate_metadata_xml()
     if not errors:
-        return HttpResponse(content=metadata,
-                            content_type='text/xml')
+        return HttpResponse(content=metadata, content_type='text/xml')
 
     return HttpResponseServerError(content=', '.join(errors))
 
+
 def config_error(request: HttpRequest, error_category_name: str) -> HttpResponse:
     contexts = {
         'apple': {'social_backend_name': 'apple', 'has_markdown_file': True},
diff --git a/zerver/views/camo.py b/zerver/views/camo.py
index 3f3991adf7..c082038d92 100644
--- a/zerver/views/camo.py
+++ b/zerver/views/camo.py
@@ -7,8 +7,7 @@ from zerver.lib.camo import is_camo_url_valid
 from zerver.lib.thumbnail import generate_thumbnail_url
 
 
-def handle_camo_url(request: HttpRequest, digest: str,
-                    received_url: str) -> HttpResponse:
+def handle_camo_url(request: HttpRequest, digest: str, received_url: str) -> HttpResponse:
     if not settings.THUMBOR_SERVES_CAMO:
         return HttpResponseNotFound()
 
diff --git a/zerver/views/compatibility.py b/zerver/views/compatibility.py
index 55b9d4890e..8415cfef1c 100644
--- a/zerver/views/compatibility.py
+++ b/zerver/views/compatibility.py
@@ -18,8 +18,9 @@ def pop_numerals(ver: str) -> Tuple[List[int], str]:
     numbers = [int(n) for n in numerals.split('.')]
     return numbers, rest
 
+
 def version_lt(ver1: str, ver2: str) -> Optional[bool]:
-    '''
+    """
     Compare two Zulip-style version strings.
 
     Versions are dot-separated sequences of decimal integers,
@@ -32,7 +33,7 @@ def version_lt(ver1: str, ver2: str) -> Optional[bool]:
       True if ver1 < ver2
       False if ver1 >= ver2
       None if can't tell.
-    '''
+    """
     num1, rest1 = pop_numerals(ver1)
     num2, rest2 = pop_numerals(ver2)
     if not num1 or not num2:
@@ -74,6 +75,7 @@ def find_mobile_os(user_agent: str) -> Optional[str]:
 # enabled on the user's Zulip server.
 android_min_app_version = '16.2.96'
 
+
 def check_global_compatibility(request: HttpRequest) -> HttpResponse:
     if request.META.get('HTTP_USER_AGENT') is None:
         return json_error(_('User-Agent header missing from request'))
@@ -86,11 +88,11 @@ def check_global_compatibility(request: HttpRequest) -> HttpResponse:
         return json_error(legacy_compatibility_error_message)
     if user_agent['name'] == "ZulipMobile":
         user_os = find_mobile_os(request.META["HTTP_USER_AGENT"])
-        if (user_os == 'android'
-                and version_lt(user_agent['version'], android_min_app_version)):
+        if user_os == 'android' and version_lt(user_agent['version'], android_min_app_version):
             return json_error(legacy_compatibility_error_message)
     return json_success()
 
+
 def is_outdated_desktop_app(user_agent_str: str) -> Tuple[bool, bool, bool]:
     # Returns (insecure, banned, auto_update_broken)
     user_agent = parse_user_agent(user_agent_str)
@@ -118,6 +120,7 @@ def is_outdated_desktop_app(user_agent_str: str) -> Tuple[bool, bool, bool]:
 
     return (False, False, False)
 
+
 def is_unsupported_browser(user_agent: str) -> Tuple[bool, Optional[str]]:
     browser_name = get_device_browser(user_agent)
     if browser_name == "Internet Explorer":
diff --git a/zerver/views/custom_profile_fields.py b/zerver/views/custom_profile_fields.py
index e9ea376777..854d94801e 100644
--- a/zerver/views/custom_profile_fields.py
+++ b/zerver/views/custom_profile_fields.py
@@ -34,13 +34,17 @@ from zerver.lib.validator import (
 from zerver.models import CustomProfileField, UserProfile, custom_profile_fields_for_realm
 
 
-def list_realm_custom_profile_fields(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
+def list_realm_custom_profile_fields(
+    request: HttpRequest, user_profile: UserProfile
+) -> HttpResponse:
     fields = custom_profile_fields_for_realm(user_profile.realm_id)
     return json_success({'custom_fields': [f.as_dict() for f in fields]})
 
+
 hint_validator = check_capped_string(CustomProfileField.HINT_MAX_LENGTH)
 name_validator = check_capped_string(CustomProfileField.NAME_MAX_LENGTH)
 
+
 def validate_field_name_and_hint(name: str, hint: str) -> None:
     if not name.strip():
         raise JsonableError(_("Label cannot be blank."))
@@ -51,8 +55,8 @@ def validate_field_name_and_hint(name: str, hint: str) -> None:
     except ValidationError as error:
         raise JsonableError(error.message)
 
-def validate_custom_field_data(field_type: int,
-                               field_data: ProfileFieldData) -> None:
+
+def validate_custom_field_data(field_type: int, field_data: ProfileFieldData) -> None:
     try:
         if field_type == CustomProfileField.CHOICE:
             # Choice type field must have at least have one choice
@@ -64,6 +68,7 @@ def validate_custom_field_data(field_type: int,
     except ValidationError as error:
         raise JsonableError(error.message)
 
+
 def is_default_external_field(field_type: int, field_data: ProfileFieldData) -> bool:
     if field_type != CustomProfileField.EXTERNAL_ACCOUNT:
         return False
@@ -71,8 +76,10 @@ def is_default_external_field(field_type: int, field_data: ProfileFieldData) ->
         return False
     return True
 
-def validate_custom_profile_field(name: str, hint: str, field_type: int,
-                                  field_data: ProfileFieldData) -> None:
+
+def validate_custom_profile_field(
+    name: str, hint: str, field_type: int, field_data: ProfileFieldData
+) -> None:
     # Validate field data
     validate_custom_field_data(field_type, field_data)
 
@@ -86,15 +93,17 @@ def validate_custom_profile_field(name: str, hint: str, field_type: int,
     if field_type not in field_types:
         raise JsonableError(_("Invalid field type."))
 
+
 @require_realm_admin
 @has_request_variables
-def create_realm_custom_profile_field(request: HttpRequest,
-                                      user_profile: UserProfile,
-                                      name: str=REQ(default='', converter=lambda x: x.strip()),
-                                      hint: str=REQ(default=''),
-                                      field_data: ProfileFieldData=REQ(default={},
-                                                                       converter=orjson.loads),
-                                      field_type: int=REQ(validator=check_int)) -> HttpResponse:
+def create_realm_custom_profile_field(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    name: str = REQ(default='', converter=lambda x: x.strip()),
+    hint: str = REQ(default=''),
+    field_data: ProfileFieldData = REQ(default={}, converter=orjson.loads),
+    field_type: int = REQ(validator=check_int),
+) -> HttpResponse:
     validate_custom_profile_field(name, hint, field_type, field_data)
     try:
         if is_default_external_field(field_type, field_data):
@@ -117,27 +126,30 @@ def create_realm_custom_profile_field(request: HttpRequest,
     except IntegrityError:
         return json_error(_("A field with that label already exists."))
 
+
 @require_realm_admin
-def delete_realm_custom_profile_field(request: HttpRequest, user_profile: UserProfile,
-                                      field_id: int) -> HttpResponse:
+def delete_realm_custom_profile_field(
+    request: HttpRequest, user_profile: UserProfile, field_id: int
+) -> HttpResponse:
     try:
         field = CustomProfileField.objects.get(id=field_id)
     except CustomProfileField.DoesNotExist:
         return json_error(_('Field id {id} not found.').format(id=field_id))
 
-    do_remove_realm_custom_profile_field(realm=user_profile.realm,
-                                         field=field)
+    do_remove_realm_custom_profile_field(realm=user_profile.realm, field=field)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def update_realm_custom_profile_field(request: HttpRequest, user_profile: UserProfile,
-                                      field_id: int,
-                                      name: str=REQ(default='', converter=lambda x: x.strip()),
-                                      hint: str=REQ(default=''),
-                                      field_data: ProfileFieldData=REQ(default={},
-                                                                       converter=orjson.loads),
-                                      ) -> HttpResponse:
+def update_realm_custom_profile_field(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    field_id: int,
+    name: str = REQ(default='', converter=lambda x: x.strip()),
+    hint: str = REQ(default=''),
+    field_data: ProfileFieldData = REQ(default={}, converter=orjson.loads),
+) -> HttpResponse:
     realm = user_profile.realm
     try:
         field = CustomProfileField.objects.get(realm=realm, id=field_id)
@@ -150,29 +162,35 @@ def update_realm_custom_profile_field(request: HttpRequest, user_profile: UserPr
 
     validate_custom_profile_field(name, hint, field.field_type, field_data)
     try:
-        try_update_realm_custom_profile_field(realm, field, name, hint=hint,
-                                              field_data=field_data)
+        try_update_realm_custom_profile_field(realm, field, name, hint=hint, field_data=field_data)
     except IntegrityError:
         return json_error(_('A field with that label already exists.'))
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def reorder_realm_custom_profile_fields(request: HttpRequest, user_profile: UserProfile,
-                                        order: List[int]=REQ(validator=check_list(
-                                            check_int))) -> HttpResponse:
+def reorder_realm_custom_profile_fields(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    order: List[int] = REQ(validator=check_list(check_int)),
+) -> HttpResponse:
     try_reorder_realm_custom_profile_fields(user_profile.realm, order)
     return json_success()
 
+
 @human_users_only
 @has_request_variables
-def remove_user_custom_profile_data(request: HttpRequest, user_profile: UserProfile,
-                                    data: List[int]=REQ(validator=check_list(
-                                                        check_int))) -> HttpResponse:
+def remove_user_custom_profile_data(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    data: List[int] = REQ(validator=check_list(check_int)),
+) -> HttpResponse:
     for field_id in data:
         check_remove_custom_profile_field_value(user_profile, field_id)
     return json_success()
 
+
 @human_users_only
 @has_request_variables
 def update_user_custom_profile_data(
@@ -180,10 +198,12 @@ def update_user_custom_profile_data(
     user_profile: UserProfile,
     data: List[Dict[str, Union[int, str, List[int]]]] = REQ(
         validator=check_list(
-            check_dict_only([
-                ('id', check_int),
-                ('value', check_union([check_int, check_string, check_list(check_int)])),
-            ]),
+            check_dict_only(
+                [
+                    ('id', check_int),
+                    ('value', check_union([check_int, check_string, check_list(check_int)])),
+                ]
+            ),
         )
     ),
 ) -> HttpResponse:
diff --git a/zerver/views/development/email_log.py b/zerver/views/development/email_log.py
index 457773b3e6..d0fe30c82d 100755
--- a/zerver/views/development/email_log.py
+++ b/zerver/views/development/email_log.py
@@ -17,6 +17,7 @@ from zproject.email_backends import get_forward_address, set_forward_address
 
 ZULIP_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../')
 
+
 def email_page(request: HttpRequest) -> HttpResponse:
     if request.method == 'POST':
         set_forward_address(request.POST["forward_address"])
@@ -26,9 +27,10 @@ def email_page(request: HttpRequest) -> HttpResponse:
             content = f.read()
     except FileNotFoundError:
         content = ""
-    return render(request, 'zerver/email_log.html',
-                  {'log': content,
-                   'forward_address': get_forward_address()})
+    return render(
+        request, 'zerver/email_log.html', {'log': content, 'forward_address': get_forward_address()}
+    )
+
 
 def clear_emails(request: HttpRequest) -> HttpResponse:
     try:
@@ -37,6 +39,7 @@ def clear_emails(request: HttpRequest) -> HttpResponse:
         pass
     return redirect(email_page)
 
+
 @require_safe
 def generate_all_emails(request: HttpRequest) -> HttpResponse:
     if not settings.TEST_SUITE:  # nocoverage
@@ -51,6 +54,7 @@ def generate_all_emails(request: HttpRequest) -> HttpResponse:
     # importing it saves ~50ms of unnecessary manage.py startup time.
 
     from django.test import Client
+
     client = Client()
 
     # write fake data for all variables
@@ -74,11 +78,14 @@ def generate_all_emails(request: HttpRequest) -> HttpResponse:
     user.is_active = True
     user.save(update_fields=['is_active'])
     # account on different realm
-    result = client.post('/accounts/password/reset/', {'email': registered_email},
-                         HTTP_HOST=other_realm.host)
+    result = client.post(
+        '/accounts/password/reset/', {'email': registered_email}, HTTP_HOST=other_realm.host
+    )
     assert result.status_code == 302
     # no account anywhere
-    result = client.post('/accounts/password/reset/', {'email': unregistered_email_1}, **host_kwargs)
+    result = client.post(
+        '/accounts/password/reset/', {'email': unregistered_email_1}, **host_kwargs
+    )
     assert result.status_code == 302
 
     # Confirm account email
@@ -95,16 +102,17 @@ def generate_all_emails(request: HttpRequest) -> HttpResponse:
 
     # New user invite and reminder emails
     stream = get_realm_stream("Denmark", user.realm.id)
-    result = client.post("/json/invites",
-                         {"invitee_emails": unregistered_email_2,
-                          "stream_ids": orjson.dumps([stream.id]).decode()},
-                         **host_kwargs)
+    result = client.post(
+        "/json/invites",
+        {"invitee_emails": unregistered_email_2, "stream_ids": orjson.dumps([stream.id]).decode()},
+        **host_kwargs,
+    )
     assert result.status_code == 200
 
     # Verification for new email
-    result = client.patch('/json/settings',
-                          urllib.parse.urlencode({'email': 'hamlets-new@zulip.com'}),
-                          **host_kwargs)
+    result = client.patch(
+        '/json/settings', urllib.parse.urlencode({'email': 'hamlets-new@zulip.com'}), **host_kwargs
+    )
     assert result.status_code == 200
 
     # Email change successful
diff --git a/zerver/views/development/integrations.py b/zerver/views/development/integrations.py
index 06a6db2129..448b7b2c85 100644
--- a/zerver/views/development/integrations.py
+++ b/zerver/views/development/integrations.py
@@ -19,22 +19,24 @@ ZULIP_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../
 def get_webhook_integrations() -> List[str]:
     return [integration.name for integration in WEBHOOK_INTEGRATIONS]
 
+
 def get_valid_integration_name(name: str) -> Optional[str]:
     for integration_name in get_webhook_integrations():
         if name == integration_name:
             return integration_name
     return None
 
+
 def dev_panel(request: HttpRequest) -> HttpResponse:
     integrations = get_webhook_integrations()
     bots = UserProfile.objects.filter(is_bot=True, bot_type=UserProfile.INCOMING_WEBHOOK_BOT)
     context = {"integrations": integrations, "bots": bots}
     return render(request, "zerver/integrations/development/dev_panel.html", context)
 
-def send_webhook_fixture_message(url: str,
-                                 body: str,
-                                 is_json: bool,
-                                 custom_headers: Dict[str, Any]) -> HttpResponse:
+
+def send_webhook_fixture_message(
+    url: str, body: str, is_json: bool, custom_headers: Dict[str, Any]
+) -> HttpResponse:
     client = Client()
     realm = get_realm("zulip")
     standardized_headers = standardize_headers(custom_headers)
@@ -43,12 +45,13 @@ def send_webhook_fixture_message(url: str,
         content_type = standardized_headers.pop("HTTP_CONTENT_TYPE", "application/json")
     else:
         content_type = standardized_headers.pop("HTTP_CONTENT_TYPE", "text/plain")
-    return client.post(url, body, content_type=content_type, HTTP_HOST=http_host,
-                       **standardized_headers)
+    return client.post(
+        url, body, content_type=content_type, HTTP_HOST=http_host, **standardized_headers
+    )
+
 
 @has_request_variables
-def get_fixtures(request: HttpResponse,
-                 integration_name: str=REQ()) -> HttpResponse:
+def get_fixtures(request: HttpResponse, integration_name: str = REQ()) -> HttpResponse:
     valid_integration_name = get_valid_integration_name(integration_name)
     if not valid_integration_name:
         return json_error(f"\"{integration_name}\" is not a valid webhook integration.", status=404)
@@ -57,7 +60,8 @@ def get_fixtures(request: HttpResponse,
     fixtures_dir = os.path.join(ZULIP_PATH, f"zerver/webhooks/{valid_integration_name}/fixtures")
     if not os.path.exists(fixtures_dir):
         msg = ("The integration \"{valid_integration_name}\" does not have fixtures.").format(
-            valid_integration_name=valid_integration_name)
+            valid_integration_name=valid_integration_name
+        )
         return json_error(msg, status=404)
 
     for fixture in os.listdir(fixtures_dir):
@@ -69,12 +73,13 @@ def get_fixtures(request: HttpResponse,
         except orjson.JSONDecodeError:
             pass  # The file extension will be used to determine the type.
 
-        headers_raw = get_fixture_http_headers(valid_integration_name,
-                                               "".join(fixture.split(".")[:-1]))
+        headers_raw = get_fixture_http_headers(
+            valid_integration_name, "".join(fixture.split(".")[:-1])
+        )
 
         def fix_name(header: str) -> str:
             if header.startswith("HTTP_"):  # HTTP_ is a prefix intended for Django.
-                return header[len("HTTP_"):]
+                return header[len("HTTP_") :]
             return header
 
         headers = {fix_name(k): v for k, v in headers_raw.items()}
@@ -84,30 +89,30 @@ def get_fixtures(request: HttpResponse,
 
 
 @has_request_variables
-def check_send_webhook_fixture_message(request: HttpRequest,
-                                       url: str=REQ(),
-                                       body: str=REQ(),
-                                       is_json: bool=REQ(validator=check_bool),
-                                       custom_headers: str=REQ()) -> HttpResponse:
+def check_send_webhook_fixture_message(
+    request: HttpRequest,
+    url: str = REQ(),
+    body: str = REQ(),
+    is_json: bool = REQ(validator=check_bool),
+    custom_headers: str = REQ(),
+) -> HttpResponse:
     try:
         custom_headers_dict = orjson.loads(custom_headers)
     except orjson.JSONDecodeError as ve:
         return json_error(f"Custom HTTP headers are not in a valid JSON format. {ve}")  # nolint
 
-    response = send_webhook_fixture_message(url, body, is_json,
-                                            custom_headers_dict)
+    response = send_webhook_fixture_message(url, body, is_json, custom_headers_dict)
     if response.status_code == 200:
-        responses = [{"status_code": response.status_code,
-                      "message": response.content.decode()}]
+        responses = [{"status_code": response.status_code, "message": response.content.decode()}]
         return json_success({"responses": responses})
     else:
         return response
 
 
 @has_request_variables
-def send_all_webhook_fixture_messages(request: HttpRequest,
-                                      url: str=REQ(),
-                                      integration_name: str=REQ()) -> HttpResponse:
+def send_all_webhook_fixture_messages(
+    request: HttpRequest, url: str = REQ(), integration_name: str = REQ()
+) -> HttpResponse:
     valid_integration_name = get_valid_integration_name(integration_name)
     if not valid_integration_name:
         return json_error(f"\"{integration_name}\" is not a valid webhook integration.", status=404)
@@ -115,7 +120,8 @@ def send_all_webhook_fixture_messages(request: HttpRequest,
     fixtures_dir = os.path.join(ZULIP_PATH, f"zerver/webhooks/{valid_integration_name}/fixtures")
     if not os.path.exists(fixtures_dir):
         msg = ("The integration \"{valid_integration_name}\" does not have fixtures.").format(
-            valid_integration_name=valid_integration_name)
+            valid_integration_name=valid_integration_name
+        )
         return json_error(msg, status=404)
 
     responses = []
@@ -131,7 +137,11 @@ def send_all_webhook_fixture_messages(request: HttpRequest,
         else:
             is_json = False
         response = send_webhook_fixture_message(url, content, is_json, headers)
-        responses.append({"status_code": response.status_code,
-                          "fixture_name": fixture,
-                          "message": response.content.decode()})
+        responses.append(
+            {
+                "status_code": response.status_code,
+                "fixture_name": fixture,
+                "message": response.content.decode(),
+            }
+        )
     return json_success({"responses": responses})
diff --git a/zerver/views/development/registration.py b/zerver/views/development/registration.py
index ad2295279b..146961e985 100644
--- a/zerver/views/development/registration.py
+++ b/zerver/views/development/registration.py
@@ -16,12 +16,14 @@ from zerver.views.registration import accounts_register
 def confirmation_key(request: HttpRequest) -> HttpResponse:
     return json_success(request.session.get('confirmation_key'))
 
+
 def modify_postdata(request: HttpRequest, **kwargs: Any) -> None:
     request.POST._mutable = True
     for key, value in kwargs.items():
         request.POST[key] = value
     request.POST._mutable = False
 
+
 @csrf_exempt
 def register_development_user(request: HttpRequest) -> HttpResponse:
     if get_subdomain(request) == '':
@@ -29,29 +31,37 @@ def register_development_user(request: HttpRequest) -> HttpResponse:
     count = UserProfile.objects.count()
     name = f'user-{count}'
     email = f'{name}@zulip.com'
-    prereg = create_preregistration_user(email, request, realm_creation=False,
-                                         password_required=False)
-    activation_url = create_confirmation_link(prereg,
-                                              Confirmation.USER_REGISTRATION)
+    prereg = create_preregistration_user(
+        email, request, realm_creation=False, password_required=False
+    )
+    activation_url = create_confirmation_link(prereg, Confirmation.USER_REGISTRATION)
     key = activation_url.split('/')[-1]
     # Need to add test data to POST request as it doesn't originally contain the required parameters
     modify_postdata(request, key=key, full_name=name, password='test', terms='true')
 
     return accounts_register(request)
 
+
 @csrf_exempt
 def register_development_realm(request: HttpRequest) -> HttpResponse:
     count = UserProfile.objects.count()
     name = f'user-{count}'
     email = f'{name}@zulip.com'
     realm_name = f'realm-{count}'
-    prereg = create_preregistration_user(email, request, realm_creation=True,
-                                         password_required=False)
-    activation_url = create_confirmation_link(prereg,
-                                              Confirmation.REALM_CREATION)
+    prereg = create_preregistration_user(
+        email, request, realm_creation=True, password_required=False
+    )
+    activation_url = create_confirmation_link(prereg, Confirmation.REALM_CREATION)
     key = activation_url.split('/')[-1]
     # Need to add test data to POST request as it doesn't originally contain the required parameters
-    modify_postdata(request, key=key, realm_name=realm_name, full_name=name, password='test',
-                    realm_subdomain=realm_name, terms='true')
+    modify_postdata(
+        request,
+        key=key,
+        realm_name=realm_name,
+        full_name=name,
+        password='test',
+        realm_subdomain=realm_name,
+        terms='true',
+    )
 
     return accounts_register(request)
diff --git a/zerver/views/documentation.py b/zerver/views/documentation.py
index 71938c1080..7a11290e83 100644
--- a/zerver/views/documentation.py
+++ b/zerver/views/documentation.py
@@ -22,8 +22,7 @@ def add_api_uri_context(context: Dict[str, Any], request: HttpRequest) -> None:
     context.update(zulip_default_context(request))
 
     subdomain = get_subdomain(request)
-    if (subdomain != Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
-            or not settings.ROOT_DOMAIN_LANDING_PAGE):
+    if subdomain != Realm.SUBDOMAIN_FOR_ROOT_DOMAIN or not settings.ROOT_DOMAIN_LANDING_PAGE:
         display_subdomain = subdomain
         html_settings_links = True
     else:
@@ -50,6 +49,7 @@ def add_api_uri_context(context: Dict[str, Any], request: HttpRequest) -> None:
     context['settings_html'] = settings_html
     context['subscriptions_html'] = subscriptions_html
 
+
 class ApiURLView(TemplateView):
     def get_context_data(self, **kwargs: Any) -> Dict[str, str]:
         context = super().get_context_data(**kwargs)
@@ -111,7 +111,8 @@ class MarkdownDirectoryView(ApiURLView):
             else:
                 context["OPEN_GRAPH_TITLE"] = title_base
             self.request.placeholder_open_graph_description = (
-                f"REPLACMENT_OPEN_GRAPH_DESCRIPTION_{int(2**24 * random.random())}")
+                f"REPLACMENT_OPEN_GRAPH_DESCRIPTION_{int(2**24 * random.random())}"
+            )
             context["OPEN_GRAPH_DESCRIPTION"] = self.request.placeholder_open_graph_description
 
         context["sidebar_index"] = sidebar_index
@@ -123,13 +124,14 @@ class MarkdownDirectoryView(ApiURLView):
         add_google_analytics_context(context)
         return context
 
-    def get(self, request: HttpRequest, article: str="") -> HttpResponse:
+    def get(self, request: HttpRequest, article: str = "") -> HttpResponse:
         (path, http_status) = self.get_path(article)
         result = super().get(self, article=article)
         if http_status != 200:
             result.status_code = http_status
         return result
 
+
 def add_integrations_context(context: Dict[str, Any]) -> None:
     alphabetical_sorted_categories = OrderedDict(sorted(CATEGORIES.items()))
     alphabetical_sorted_integration = OrderedDict(sorted(INTEGRATIONS.items()))
@@ -141,11 +143,14 @@ def add_integrations_context(context: Dict[str, Any]) -> None:
     context['integrations_dict'] = alphabetical_sorted_integration
     context['integrations_count_display'] = integrations_count_display
 
+
 def add_integrations_open_graph_context(context: Dict[str, Any], request: HttpRequest) -> None:
     path_name = request.path.rstrip('/').split('/')[-1]
-    description = ('Zulip comes with over a hundred native integrations out of the box, '
-                   'and integrates with Zapier, IFTTT, and Hubot to provide hundreds more. '
-                   'Connect the apps you use everyday to Zulip.')
+    description = (
+        'Zulip comes with over a hundred native integrations out of the box, '
+        'and integrates with Zapier, IFTTT, and Hubot to provide hundreds more. '
+        'Connect the apps you use everyday to Zulip.'
+    )
 
     if path_name in INTEGRATIONS:
         integration = INTEGRATIONS[path_name]
@@ -161,6 +166,7 @@ def add_integrations_open_graph_context(context: Dict[str, Any], request: HttpRe
         context['OPEN_GRAPH_TITLE'] = 'Connect the tools you use to Zulip'
         context['OPEN_GRAPH_DESCRIPTION'] = description
 
+
 class IntegrationView(ApiURLView):
     template_name = 'zerver/integrations/index.html'
 
@@ -173,7 +179,7 @@ class IntegrationView(ApiURLView):
 
 
 @has_request_variables
-def integration_doc(request: HttpRequest, integration_name: str=REQ()) -> HttpResponse:
+def integration_doc(request: HttpRequest, integration_name: str = REQ()) -> HttpResponse:
     if not request.is_ajax():
         return HttpResponseNotFound()
     try:
diff --git a/zerver/views/drafts.py b/zerver/views/drafts.py
index 3969c73e5e..2f1fcaf1ed 100644
--- a/zerver/views/drafts.py
+++ b/zerver/views/drafts.py
@@ -38,15 +38,17 @@ draft_dict_validator = check_dict_only(
     ],
     optional_keys=[
         ("timestamp", check_union([check_int, check_float])),  # A Unix timestamp.
-    ]
+    ],
 )
 
-def further_validated_draft_dict(draft_dict: Dict[str, Any],
-                                 user_profile: UserProfile) -> Dict[str, Any]:
-    """ Take a draft_dict that was already validated by draft_dict_validator then
+
+def further_validated_draft_dict(
+    draft_dict: Dict[str, Any], user_profile: UserProfile
+) -> Dict[str, Any]:
+    """Take a draft_dict that was already validated by draft_dict_validator then
     further sanitize, validate, and transform it. Ultimately return this "further
     validated" draft dict. It will have a slightly different set of keys the values
-    for which can be used to directly create a Draft object. """
+    for which can be used to directly create a Draft object."""
 
     content = normalize_body(draft_dict["content"])
 
@@ -83,35 +85,44 @@ def further_validated_draft_dict(draft_dict: Dict[str, Any],
         "last_edit_time": last_edit_time,
     }
 
+
 def fetch_drafts(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     user_drafts = Draft.objects.filter(user_profile=user_profile).order_by("last_edit_time")
     draft_dicts = [draft.to_dict() for draft in user_drafts]
     return json_success({"count": user_drafts.count(), "drafts": draft_dicts})
 
+
 @has_request_variables
-def create_drafts(request: HttpRequest, user_profile: UserProfile,
-                  draft_dicts: List[Dict[str, Any]]=REQ("drafts",
-                                                        validator=check_list(draft_dict_validator)),
-                  ) -> HttpResponse:
+def create_drafts(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    draft_dicts: List[Dict[str, Any]] = REQ("drafts", validator=check_list(draft_dict_validator)),
+) -> HttpResponse:
     draft_objects = []
     for draft_dict in draft_dicts:
         valid_draft_dict = further_validated_draft_dict(draft_dict, user_profile)
-        draft_objects.append(Draft(
-            user_profile=user_profile,
-            recipient=valid_draft_dict["recipient"],
-            topic=valid_draft_dict["topic"],
-            content=valid_draft_dict["content"],
-            last_edit_time=valid_draft_dict["last_edit_time"],
-        ))
+        draft_objects.append(
+            Draft(
+                user_profile=user_profile,
+                recipient=valid_draft_dict["recipient"],
+                topic=valid_draft_dict["topic"],
+                content=valid_draft_dict["content"],
+                last_edit_time=valid_draft_dict["last_edit_time"],
+            )
+        )
 
     created_draft_objects = Draft.objects.bulk_create(draft_objects)
     draft_ids = [draft_object.id for draft_object in created_draft_objects]
     return json_success({"ids": draft_ids})
 
+
 @has_request_variables
-def edit_draft(request: HttpRequest, user_profile: UserProfile, draft_id: int,
-               draft_dict: Dict[str, Any]=REQ("draft", validator=draft_dict_validator),
-               ) -> HttpResponse:
+def edit_draft(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    draft_id: int,
+    draft_dict: Dict[str, Any] = REQ("draft", validator=draft_dict_validator),
+) -> HttpResponse:
     try:
         draft_object = Draft.objects.get(id=draft_id, user_profile=user_profile)
     except Draft.DoesNotExist:
@@ -126,6 +137,7 @@ def edit_draft(request: HttpRequest, user_profile: UserProfile, draft_id: int,
 
     return json_success()
 
+
 def delete_draft(request: HttpRequest, user_profile: UserProfile, draft_id: int) -> HttpResponse:
     try:
         draft_object = Draft.objects.get(id=draft_id, user_profile=user_profile)
diff --git a/zerver/views/email_mirror.py b/zerver/views/email_mirror.py
index 6814a2c423..87c6dc2004 100644
--- a/zerver/views/email_mirror.py
+++ b/zerver/views/email_mirror.py
@@ -9,7 +9,9 @@ from zerver.lib.response import json_error, json_success
 @internal_notify_view(False)
 @has_request_variables
 def email_mirror_message(
-    request: HttpRequest, rcpt_to: str = REQ(), msg_base64: str = REQ(),
+    request: HttpRequest,
+    rcpt_to: str = REQ(),
+    msg_base64: str = REQ(),
 ) -> HttpResponse:
     result = mirror_email_message(rcpt_to, msg_base64)
     if result["status"] == "error":
diff --git a/zerver/views/events_register.py b/zerver/views/events_register.py
index dee9074b57..6bd60787f4 100644
--- a/zerver/views/events_register.py
+++ b/zerver/views/events_register.py
@@ -9,43 +9,59 @@ from zerver.lib.validator import check_bool, check_dict, check_list, check_strin
 from zerver.models import Stream, UserProfile
 
 
-def _default_all_public_streams(user_profile: UserProfile,
-                                all_public_streams: Optional[bool]) -> bool:
+def _default_all_public_streams(
+    user_profile: UserProfile, all_public_streams: Optional[bool]
+) -> bool:
     if all_public_streams is not None:
         return all_public_streams
     else:
         return user_profile.default_all_public_streams
 
-def _default_narrow(user_profile: UserProfile,
-                    narrow: Iterable[Sequence[str]]) -> Iterable[Sequence[str]]:
+
+def _default_narrow(
+    user_profile: UserProfile, narrow: Iterable[Sequence[str]]
+) -> Iterable[Sequence[str]]:
     default_stream: Optional[Stream] = user_profile.default_events_register_stream
     if not narrow and default_stream is not None:
         narrow = [['stream', default_stream.name]]
     return narrow
 
+
 NarrowT = Iterable[Sequence[str]]
+
+
 @has_request_variables
 def events_register_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        apply_markdown: bool=REQ(default=False, validator=check_bool),
-        client_gravatar: bool=REQ(default=False, validator=check_bool),
-        slim_presence: bool=REQ(default=False, validator=check_bool),
-        all_public_streams: Optional[bool]=REQ(default=None, validator=check_bool),
-        include_subscribers: bool=REQ(default=False, validator=check_bool),
-        client_capabilities: Optional[Dict[str, bool]]=REQ(validator=check_dict([
-            # This field was accidentally made required when it was added in v2.0.0-781;
-            # this was not realized until after the release of Zulip 2.1.2. (It remains
-            # required to help ensure backwards compatibility of client code.)
-            ("notification_settings_null", check_bool),
-        ], [
-            # Any new fields of `client_capabilities` should be optional. Add them here.
-            ("bulk_message_deletion", check_bool),
-            ('user_avatar_url_field_optional', check_bool),
-        ], value_validator=check_bool), default=None),
-        event_types: Optional[Iterable[str]]=REQ(validator=check_list(check_string), default=None),
-        fetch_event_types: Optional[Iterable[str]]=REQ(validator=check_list(check_string), default=None),
-        narrow: NarrowT=REQ(validator=check_list(check_list(check_string, length=2)), default=[]),
-        queue_lifespan_secs: int=REQ(converter=int, default=0, documentation_pending=True),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    apply_markdown: bool = REQ(default=False, validator=check_bool),
+    client_gravatar: bool = REQ(default=False, validator=check_bool),
+    slim_presence: bool = REQ(default=False, validator=check_bool),
+    all_public_streams: Optional[bool] = REQ(default=None, validator=check_bool),
+    include_subscribers: bool = REQ(default=False, validator=check_bool),
+    client_capabilities: Optional[Dict[str, bool]] = REQ(
+        validator=check_dict(
+            [
+                # This field was accidentally made required when it was added in v2.0.0-781;
+                # this was not realized until after the release of Zulip 2.1.2. (It remains
+                # required to help ensure backwards compatibility of client code.)
+                ("notification_settings_null", check_bool),
+            ],
+            [
+                # Any new fields of `client_capabilities` should be optional. Add them here.
+                ("bulk_message_deletion", check_bool),
+                ('user_avatar_url_field_optional', check_bool),
+            ],
+            value_validator=check_bool,
+        ),
+        default=None,
+    ),
+    event_types: Optional[Iterable[str]] = REQ(validator=check_list(check_string), default=None),
+    fetch_event_types: Optional[Iterable[str]] = REQ(
+        validator=check_list(check_string), default=None
+    ),
+    narrow: NarrowT = REQ(validator=check_list(check_list(check_string, length=2)), default=[]),
+    queue_lifespan_secs: int = REQ(converter=int, default=0, documentation_pending=True),
 ) -> HttpResponse:
     all_public_streams = _default_all_public_streams(user_profile, all_public_streams)
     narrow = _default_narrow(user_profile, narrow)
@@ -53,10 +69,18 @@ def events_register_backend(
     if client_capabilities is None:
         client_capabilities = {}
 
-    ret = do_events_register(user_profile, request.client,
-                             apply_markdown, client_gravatar, slim_presence,
-                             event_types, queue_lifespan_secs, all_public_streams,
-                             narrow=narrow, include_subscribers=include_subscribers,
-                             client_capabilities=client_capabilities,
-                             fetch_event_types=fetch_event_types)
+    ret = do_events_register(
+        user_profile,
+        request.client,
+        apply_markdown,
+        client_gravatar,
+        slim_presence,
+        event_types,
+        queue_lifespan_secs,
+        all_public_streams,
+        narrow=narrow,
+        include_subscribers=include_subscribers,
+        client_capabilities=client_capabilities,
+        fetch_event_types=fetch_event_types,
+    )
     return json_success(ret)
diff --git a/zerver/views/home.py b/zerver/views/home.py
index cd177760e3..2ed71cd767 100644
--- a/zerver/views/home.py
+++ b/zerver/views/home.py
@@ -39,6 +39,7 @@ def need_accept_tos(user_profile: Optional[UserProfile]) -> bool:
 
     return int(settings.TOS_VERSION.split('.')[0]) > user_profile.major_tos_version()
 
+
 @zulip_login_required
 def accounts_accept_terms(request: HttpRequest) -> HttpResponse:
     if request.method == "POST":
@@ -56,15 +57,17 @@ def accounts_accept_terms(request: HttpRequest) -> HttpResponse:
     return render(
         request,
         'zerver/accounts_accept_terms.html',
-        context={'form': form,
-                 'email': email,
-                 'special_message_template': special_message_template},
+        context={
+            'form': form,
+            'email': email,
+            'special_message_template': special_message_template,
+        },
     )
 
-def detect_narrowed_window(request: HttpRequest,
-                           user_profile: Optional[UserProfile]) -> Tuple[List[List[str]],
-                                                                         Optional[Stream],
-                                                                         Optional[str]]:
+
+def detect_narrowed_window(
+    request: HttpRequest, user_profile: Optional[UserProfile]
+) -> Tuple[List[List[str]], Optional[Stream], Optional[str]]:
     """This function implements Zulip's support for a mini Zulip window
     that just handles messages from a single narrow"""
     if user_profile is None:
@@ -78,8 +81,7 @@ def detect_narrowed_window(request: HttpRequest,
         try:
             # TODO: We should support stream IDs and PMs here as well.
             narrow_stream_name = request.GET.get("stream")
-            (narrow_stream, ignored_sub) = access_stream_by_name(
-                user_profile, narrow_stream_name)
+            (narrow_stream, ignored_sub) = access_stream_by_name(user_profile, narrow_stream_name)
             narrow = [["stream", narrow_stream.name]]
         except Exception:
             logging.warning("Invalid narrow requested, ignoring", extra=dict(request=request))
@@ -87,6 +89,7 @@ def detect_narrowed_window(request: HttpRequest,
             narrow.append(["topic", narrow_topic])
     return narrow, narrow_stream, narrow_topic
 
+
 def update_last_reminder(user_profile: Optional[UserProfile]) -> None:
     """Reset our don't-spam-users-with-email counter since the
     user has since logged in
@@ -100,13 +103,18 @@ def update_last_reminder(user_profile: Optional[UserProfile]) -> None:
         user_profile.last_reminder = None
         user_profile.save(update_fields=["last_reminder"])
 
+
 def compute_navbar_logo_url(page_params: Dict[str, Any]) -> str:
-    if page_params["color_scheme"] == 2 and page_params["realm_night_logo_source"] != Realm.LOGO_DEFAULT:
+    if (
+        page_params["color_scheme"] == 2
+        and page_params["realm_night_logo_source"] != Realm.LOGO_DEFAULT
+    ):
         navbar_logo_url = page_params["realm_night_logo_url"]
     else:
         navbar_logo_url = page_params["realm_logo_url"]
     return navbar_logo_url
 
+
 def home(request: HttpRequest) -> HttpResponse:
     if not settings.ROOT_DOMAIN_LANDING_PAGE:
         return home_real(request)
@@ -120,12 +128,14 @@ def home(request: HttpRequest) -> HttpResponse:
 
     return hello_view(request)
 
+
 @web_public_view
 def home_real(request: HttpRequest) -> HttpResponse:
     # Before we do any real work, check if the app is banned.
     client_user_agent = request.META.get("HTTP_USER_AGENT", "")
     (insecure_desktop_app, banned_desktop_app, auto_update_broken) = is_outdated_desktop_app(
-        client_user_agent)
+        client_user_agent
+    )
     if banned_desktop_app:
         return render(
             request,
@@ -172,8 +182,8 @@ def home_real(request: HttpRequest) -> HttpResponse:
         # If you are the only person in the realm and you didn't invite
         # anyone, we'll continue to encourage you to do so on the frontend.
         prompt_for_invites = (
-            first_in_realm and
-            not PreregistrationUser.objects.filter(referred_by=user_profile).count()
+            first_in_realm
+            and not PreregistrationUser.objects.filter(referred_by=user_profile).count()
         )
         needs_tutorial = user_profile.tutorial_status == UserProfile.TUTORIAL_WAITING
 
@@ -211,29 +221,34 @@ def home_real(request: HttpRequest) -> HttpResponse:
 
     navbar_logo_url = compute_navbar_logo_url(page_params)
 
-    response = render(request, 'zerver/app/index.html',
-                      context={'user_profile': user_profile,
-                               'page_params': page_params,
-                               'csp_nonce': csp_nonce,
-                               'search_pills_enabled': settings.SEARCH_PILLS_ENABLED,
-                               'show_invites': show_invites,
-                               'show_add_streams': show_add_streams,
-                               'show_billing': billing_info.show_billing,
-                               'corporate_enabled': settings.CORPORATE_ENABLED,
-                               'show_plans': billing_info.show_plans,
-                               'is_owner': user_permission_info.is_realm_owner,
-                               'is_admin': user_permission_info.is_realm_admin,
-                               'is_guest': user_permission_info.is_guest,
-                               'color_scheme': user_permission_info.color_scheme,
-                               'navbar_logo_url': navbar_logo_url,
-                               'show_webathena': user_permission_info.show_webathena,
-                               'embedded': narrow_stream is not None,
-                               'invite_as': PreregistrationUser.INVITE_AS,
-                               'max_file_upload_size_mib': settings.MAX_FILE_UPLOAD_SIZE,
-                               })
+    response = render(
+        request,
+        'zerver/app/index.html',
+        context={
+            'user_profile': user_profile,
+            'page_params': page_params,
+            'csp_nonce': csp_nonce,
+            'search_pills_enabled': settings.SEARCH_PILLS_ENABLED,
+            'show_invites': show_invites,
+            'show_add_streams': show_add_streams,
+            'show_billing': billing_info.show_billing,
+            'corporate_enabled': settings.CORPORATE_ENABLED,
+            'show_plans': billing_info.show_plans,
+            'is_owner': user_permission_info.is_realm_owner,
+            'is_admin': user_permission_info.is_realm_admin,
+            'is_guest': user_permission_info.is_guest,
+            'color_scheme': user_permission_info.color_scheme,
+            'navbar_logo_url': navbar_logo_url,
+            'show_webathena': user_permission_info.show_webathena,
+            'embedded': narrow_stream is not None,
+            'invite_as': PreregistrationUser.INVITE_AS,
+            'max_file_upload_size_mib': settings.MAX_FILE_UPLOAD_SIZE,
+        },
+    )
     patch_cache_control(response, no_cache=True, no_store=True, must_revalidate=True)
     return response
 
+
 @zulip_login_required
 def desktop_home(request: HttpRequest) -> HttpResponse:
     return HttpResponseRedirect(reverse(home))
diff --git a/zerver/views/hotspots.py b/zerver/views/hotspots.py
index 7a8d5f2abe..d73259a891 100644
--- a/zerver/views/hotspots.py
+++ b/zerver/views/hotspots.py
@@ -12,8 +12,9 @@ from zerver.models import UserProfile
 
 @human_users_only
 @has_request_variables
-def mark_hotspot_as_read(request: HttpRequest, user: UserProfile,
-                         hotspot: str=REQ(validator=check_string)) -> HttpResponse:
+def mark_hotspot_as_read(
+    request: HttpRequest, user: UserProfile, hotspot: str = REQ(validator=check_string)
+) -> HttpResponse:
     if hotspot not in ALL_HOTSPOTS:
         return json_error(_('Unknown hotspot: {}').format(hotspot))
     do_mark_hotspot_as_read(user, hotspot)
diff --git a/zerver/views/invite.py b/zerver/views/invite.py
index e99f6d17c5..653e411112 100644
--- a/zerver/views/invite.py
+++ b/zerver/views/invite.py
@@ -22,24 +22,32 @@ from zerver.models import MultiuseInvite, PreregistrationUser, Stream, UserProfi
 
 
 def check_if_owner_required(invited_as: int, user_profile: UserProfile) -> None:
-    if invited_as == PreregistrationUser.INVITE_AS['REALM_OWNER'] and not user_profile.is_realm_owner:
+    if (
+        invited_as == PreregistrationUser.INVITE_AS['REALM_OWNER']
+        and not user_profile.is_realm_owner
+    ):
         raise OrganizationOwnerRequired()
 
+
 @require_member_or_admin
 @has_request_variables
-def invite_users_backend(request: HttpRequest, user_profile: UserProfile,
-                         invitee_emails_raw: str=REQ("invitee_emails"),
-                         invite_as: int=REQ(
-                             validator=check_int, default=PreregistrationUser.INVITE_AS['MEMBER']),
-                         stream_ids: List[int]=REQ(validator=check_list(check_int)),
-                         ) -> HttpResponse:
+def invite_users_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    invitee_emails_raw: str = REQ("invitee_emails"),
+    invite_as: int = REQ(validator=check_int, default=PreregistrationUser.INVITE_AS['MEMBER']),
+    stream_ids: List[int] = REQ(validator=check_list(check_int)),
+) -> HttpResponse:
 
     if user_profile.realm.invite_by_admins_only and not user_profile.is_realm_admin:
         raise OrganizationAdministratorRequired()
     if invite_as not in PreregistrationUser.INVITE_AS.values():
         return json_error(_("Must be invited as an valid type of user"))
     check_if_owner_required(invite_as, user_profile)
-    if invite_as == PreregistrationUser.INVITE_AS['REALM_ADMIN'] and not user_profile.is_realm_admin:
+    if (
+        invite_as == PreregistrationUser.INVITE_AS['REALM_ADMIN']
+        and not user_profile.is_realm_admin
+    ):
         return json_error(_("Must be an organization administrator"))
     if not invitee_emails_raw:
         return json_error(_("You must specify at least one email address."))
@@ -54,12 +62,14 @@ def invite_users_backend(request: HttpRequest, user_profile: UserProfile,
             (stream, sub) = access_stream_by_id(user_profile, stream_id)
         except JsonableError:
             return json_error(
-                _("Stream does not exist with id: {}. No invites were sent.").format(stream_id))
+                _("Stream does not exist with id: {}. No invites were sent.").format(stream_id)
+            )
         streams.append(stream)
 
     do_invite_users(user_profile, invitee_emails, streams, invite_as)
     return json_success()
 
+
 def get_invitee_emails_set(invitee_emails_raw: str) -> Set[str]:
     invitee_emails_list = set(re.split(r'[,\n]', invitee_emails_raw))
     invitee_emails = set()
@@ -70,15 +80,18 @@ def get_invitee_emails_set(invitee_emails_raw: str) -> Set[str]:
         invitee_emails.add(email.strip())
     return invitee_emails
 
+
 @require_member_or_admin
 def get_user_invites(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     all_users = do_get_user_invites(user_profile)
     return json_success({'invites': all_users})
 
+
 @require_member_or_admin
 @has_request_variables
-def revoke_user_invite(request: HttpRequest, user_profile: UserProfile,
-                       prereg_id: int) -> HttpResponse:
+def revoke_user_invite(
+    request: HttpRequest, user_profile: UserProfile, prereg_id: int
+) -> HttpResponse:
     try:
         prereg_user = PreregistrationUser.objects.get(id=prereg_id)
     except PreregistrationUser.DoesNotExist:
@@ -95,10 +108,12 @@ def revoke_user_invite(request: HttpRequest, user_profile: UserProfile,
     do_revoke_user_invite(prereg_user)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def revoke_multiuse_invite(request: HttpRequest, user_profile: UserProfile,
-                           invite_id: int) -> HttpResponse:
+def revoke_multiuse_invite(
+    request: HttpRequest, user_profile: UserProfile, invite_id: int
+) -> HttpResponse:
 
     try:
         invite = MultiuseInvite.objects.get(id=invite_id)
@@ -113,10 +128,12 @@ def revoke_multiuse_invite(request: HttpRequest, user_profile: UserProfile,
     do_revoke_multi_use_invite(invite)
     return json_success()
 
+
 @require_member_or_admin
 @has_request_variables
-def resend_user_invite_email(request: HttpRequest, user_profile: UserProfile,
-                             prereg_id: int) -> HttpResponse:
+def resend_user_invite_email(
+    request: HttpRequest, user_profile: UserProfile, prereg_id: int
+) -> HttpResponse:
     try:
         prereg_user = PreregistrationUser.objects.get(id=prereg_id)
     except PreregistrationUser.DoesNotExist:
@@ -135,12 +152,15 @@ def resend_user_invite_email(request: HttpRequest, user_profile: UserProfile,
     timestamp = do_resend_user_invite_email(prereg_user)
     return json_success({'timestamp': timestamp})
 
+
 @require_realm_admin
 @has_request_variables
 def generate_multiuse_invite_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        invite_as: int=REQ(validator=check_int, default=PreregistrationUser.INVITE_AS['MEMBER']),
-        stream_ids: Sequence[int]=REQ(validator=check_list(check_int), default=[])) -> HttpResponse:
+    request: HttpRequest,
+    user_profile: UserProfile,
+    invite_as: int = REQ(validator=check_int, default=PreregistrationUser.INVITE_AS['MEMBER']),
+    stream_ids: Sequence[int] = REQ(validator=check_list(check_int), default=[]),
+) -> HttpResponse:
     check_if_owner_required(invite_as, user_profile)
 
     streams = []
diff --git a/zerver/views/message_edit.py b/zerver/views/message_edit.py
index cd26942737..284adef481 100644
--- a/zerver/views/message_edit.py
+++ b/zerver/views/message_edit.py
@@ -44,8 +44,7 @@ def fill_edit_history_entries(message_history: List[Dict[str, Any]], message: Me
     # message's last edit time
     if len(message_history) > 0:
         assert message.last_edit_time is not None
-        assert(datetime_to_timestamp(message.last_edit_time) ==
-               message_history[0]['timestamp'])
+        assert datetime_to_timestamp(message.last_edit_time) == message_history[0]['timestamp']
 
     for entry in message_history:
         entry['topic'] = prev_topic
@@ -62,22 +61,26 @@ def fill_edit_history_entries(message_history: List[Dict[str, Any]], message: Me
             prev_rendered_content = entry['prev_rendered_content']
             assert prev_rendered_content is not None
             entry['content_html_diff'] = highlight_html_differences(
-                prev_rendered_content,
-                entry['rendered_content'],
-                message.id)
+                prev_rendered_content, entry['rendered_content'], message.id
+            )
+
+    message_history.append(
+        dict(
+            topic=prev_topic,
+            content=prev_content,
+            rendered_content=prev_rendered_content,
+            timestamp=datetime_to_timestamp(message.date_sent),
+            user_id=message.sender_id,
+        )
+    )
 
-    message_history.append(dict(
-        topic = prev_topic,
-        content = prev_content,
-        rendered_content = prev_rendered_content,
-        timestamp = datetime_to_timestamp(message.date_sent),
-        user_id = message.sender_id,
-    ))
 
 @has_request_variables
-def get_message_edit_history(request: HttpRequest, user_profile: UserProfile,
-                             message_id: int=REQ(converter=to_non_negative_int,
-                                                 path_only=True)) -> HttpResponse:
+def get_message_edit_history(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_id: int = REQ(converter=to_non_negative_int, path_only=True),
+) -> HttpResponse:
     if not user_profile.realm.allow_edit_history:
         return json_error(_("Message edit history is disabled in this organization"))
     message, ignored_user_message = access_message(user_profile, message_id)
@@ -92,18 +95,24 @@ def get_message_edit_history(request: HttpRequest, user_profile: UserProfile,
     fill_edit_history_entries(message_edit_history, message)
     return json_success({"message_history": list(reversed(message_edit_history))})
 
+
 PROPAGATE_MODE_VALUES = ["change_later", "change_one", "change_all"]
+
+
 @has_request_variables
-def update_message_backend(request: HttpRequest, user_profile: UserMessage,
-                           message_id: int=REQ(converter=to_non_negative_int, path_only=True),
-                           stream_id: Optional[int]=REQ(converter=to_non_negative_int, default=None),
-                           topic_name: Optional[str]=REQ_topic(),
-                           propagate_mode: Optional[str]=REQ(
-                               default="change_one",
-                               str_validator=check_string_in(PROPAGATE_MODE_VALUES)),
-                           send_notification_to_old_thread: bool=REQ(default=True, validator=check_bool),
-                           send_notification_to_new_thread: bool=REQ(default=True, validator=check_bool),
-                           content: Optional[str]=REQ(default=None)) -> HttpResponse:
+def update_message_backend(
+    request: HttpRequest,
+    user_profile: UserMessage,
+    message_id: int = REQ(converter=to_non_negative_int, path_only=True),
+    stream_id: Optional[int] = REQ(converter=to_non_negative_int, default=None),
+    topic_name: Optional[str] = REQ_topic(),
+    propagate_mode: Optional[str] = REQ(
+        default="change_one", str_validator=check_string_in(PROPAGATE_MODE_VALUES)
+    ),
+    send_notification_to_old_thread: bool = REQ(default=True, validator=check_bool),
+    send_notification_to_new_thread: bool = REQ(default=True, validator=check_bool),
+    content: Optional[str] = REQ(default=None),
+) -> HttpResponse:
     if not user_profile.realm.allow_message_editing:
         return json_error(_("Your organization has turned off message editing"))
 
@@ -111,7 +120,7 @@ def update_message_backend(request: HttpRequest, user_profile: UserMessage,
         return json_error(_("Invalid propagate_mode without topic edit"))
 
     message, ignored_user_message = access_message(user_profile, message_id)
-    is_no_topic_msg = (message.topic_name() == "(no topic)")
+    is_no_topic_msg = message.topic_name() == "(no topic)"
 
     # You only have permission to edit a message if:
     # you change this value also change those two parameters in message_edit.js.
@@ -121,9 +130,11 @@ def update_message_backend(request: HttpRequest, user_profile: UserMessage,
     # 4. This is a topic-only edit and your realm allows users to edit topics.
     if message.sender == user_profile:
         pass
-    elif (content is None) and (is_no_topic_msg or
-                                user_profile.is_realm_admin or
-                                user_profile.realm.allow_community_topic_editing):
+    elif (content is None) and (
+        is_no_topic_msg
+        or user_profile.is_realm_admin
+        or user_profile.realm.allow_community_topic_editing
+    ):
         pass
     else:
         raise JsonableError(_("You don't have permission to edit this message"))
@@ -143,8 +154,12 @@ def update_message_backend(request: HttpRequest, user_profile: UserMessage,
     # edit it and that it has not been too long. If this is not the user who
     # sent the message, they are not the admin, and the time limit for editing
     # topics is passed, raise an error.
-    if content is None and message.sender != user_profile and not user_profile.is_realm_admin and \
-            not is_no_topic_msg:
+    if (
+        content is None
+        and message.sender != user_profile
+        and not user_profile.is_realm_admin
+        and not is_no_topic_msg
+    ):
         deadline_seconds = Realm.DEFAULT_COMMUNITY_TOPIC_EDITING_LIMIT_SECONDS + edit_limit_buffer
         if (timezone_now() - message.date_sent) > datetime.timedelta(seconds=deadline_seconds):
             raise JsonableError(_("The time limit for editing this message has passed"))
@@ -176,11 +191,13 @@ def update_message_backend(request: HttpRequest, user_profile: UserMessage,
         # the cross-realm bots never edit messages, this should be
         # always correct.
         # Note: If rendering fails, the called code will raise a JsonableError.
-        rendered_content = render_incoming_message(message,
-                                                   content,
-                                                   user_info['message_user_ids'],
-                                                   user_profile.realm,
-                                                   mention_data=mention_data)
+        rendered_content = render_incoming_message(
+            message,
+            content,
+            user_info['message_user_ids'],
+            user_profile.realm,
+            mention_data=mention_data,
+        )
         links_for_embed |= message.links_for_preview
 
         mention_user_ids = message.mentions_user_ids
@@ -196,13 +213,20 @@ def update_message_backend(request: HttpRequest, user_profile: UserMessage,
 
         new_stream = get_stream_by_id(stream_id)
 
-    number_changed = do_update_message(user_profile, message, new_stream,
-                                       topic_name, propagate_mode,
-                                       send_notification_to_old_thread,
-                                       send_notification_to_new_thread,
-                                       content, rendered_content,
-                                       prior_mention_user_ids,
-                                       mention_user_ids, mention_data)
+    number_changed = do_update_message(
+        user_profile,
+        message,
+        new_stream,
+        topic_name,
+        propagate_mode,
+        send_notification_to_old_thread,
+        send_notification_to_new_thread,
+        content,
+        rendered_content,
+        prior_mention_user_ids,
+        mention_user_ids,
+        mention_data,
+    )
 
     # Include the number of messages changed in the logs
     request._log_data['extra'] = f"[{number_changed}]"
@@ -214,7 +238,8 @@ def update_message_backend(request: HttpRequest, user_profile: UserMessage,
             # `sender.realm_id` must match the decision made in the
             # `render_incoming_message` call earlier in this function.
             'message_realm_id': user_profile.realm_id,
-            'urls': list(links_for_embed)}
+            'urls': list(links_for_embed),
+        }
         queue_json_publish('embed_links', event_data)
     return json_success()
 
@@ -239,10 +264,13 @@ def validate_can_delete_message(user_profile: UserProfile, message: Message) ->
         raise JsonableError(_("The time limit for deleting this message has passed"))
     return
 
+
 @has_request_variables
-def delete_message_backend(request: HttpRequest, user_profile: UserProfile,
-                           message_id: int=REQ(converter=to_non_negative_int,
-                                               path_only=True)) -> HttpResponse:
+def delete_message_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_id: int = REQ(converter=to_non_negative_int, path_only=True),
+) -> HttpResponse:
     message, ignored_user_message = access_message(user_profile, message_id)
     validate_can_delete_message(user_profile, message)
     try:
@@ -251,9 +279,12 @@ def delete_message_backend(request: HttpRequest, user_profile: UserProfile,
         raise JsonableError(_("Message already deleted"))
     return json_success()
 
+
 @has_request_variables
-def json_fetch_raw_message(request: HttpRequest, user_profile: UserProfile,
-                           message_id: int=REQ(converter=to_non_negative_int,
-                                               path_only=True)) -> HttpResponse:
+def json_fetch_raw_message(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_id: int = REQ(converter=to_non_negative_int, path_only=True),
+) -> HttpResponse:
     (message, user_message) = access_message(user_profile, message_id)
     return json_success({"raw_content": message.content})
diff --git a/zerver/views/message_fetch.py b/zerver/views/message_fetch.py
index 2b6a0a6894..5accdc3f91 100644
--- a/zerver/views/message_fetch.py
+++ b/zerver/views/message_fetch.py
@@ -77,6 +77,7 @@ from zerver.models import (
 LARGER_THAN_MAX_MESSAGE_ID = 10000000000000000
 MAX_MESSAGES_PER_FETCH = 5000
 
+
 class BadNarrowOperator(JsonableError):
     code = ErrorCode.BAD_NARROW
     data_fields = ['desc']
@@ -88,6 +89,7 @@ class BadNarrowOperator(JsonableError):
     def msg_format() -> str:
         return _('Invalid narrow operator: {desc}')
 
+
 ConditionTransform = Callable[[ClauseElement], ClauseElement]
 
 OptionalNarrowListT = Optional[List[Dict[str, Any]]]
@@ -96,8 +98,11 @@ OptionalNarrowListT = Optional[List[Dict[str, Any]]]
 TS_START = "<ts-match>"
 TS_STOP = "</ts-match>"
 
+
 def ts_locs_array(
-    config: "ColumnElement[str]", text: "ColumnElement[str]", tsquery: "ColumnElement[object]",
+    config: "ColumnElement[str]",
+    text: "ColumnElement[str]",
+    tsquery: "ColumnElement[object]",
 ) -> "ColumnElement[List[List[int]]]":
     options = f"HighlightAll = TRUE, StartSel = {TS_START}, StopSel = {TS_STOP}"
     delimited = func.ts_headline(config, text, tsquery, options)
@@ -107,20 +112,23 @@ def ts_locs_array(
     match_pos = func.sum(part_len).over(rows=(None, -1)) + len(TS_STOP)
     match_len = func.strpos(part, TS_STOP) - 1
     ret = func.array(
-        select([
-            postgresql.array([match_pos, match_len]),  # type: ignore[call-overload] # https://github.com/dropbox/sqlalchemy-stubs/issues/188
-        ])
+        select(
+            [
+                postgresql.array([match_pos, match_len]),  # type: ignore[call-overload] # https://github.com/dropbox/sqlalchemy-stubs/issues/188
+            ]
+        )
         .select_from(parts)
         .offset(1)
         .as_scalar(),
     )
     return ret
 
+
 # When you add a new operator to this, also update zerver/lib/narrow.py
 class NarrowBuilder:
-    '''
+    """
     Build up a SQLAlchemy query to find messages matching a narrow.
-    '''
+    """
 
     # This class has an important security invariant:
     #
@@ -139,8 +147,13 @@ class NarrowBuilder:
     #  * anything that would pull in additional rows, or information on
     #    other messages.
 
-    def __init__(self, user_profile: Optional[UserProfile], msg_id_column: "ColumnElement[int]",
-                 realm: Realm, is_web_public_query: bool=False) -> None:
+    def __init__(
+        self,
+        user_profile: Optional[UserProfile],
+        msg_id_column: "ColumnElement[int]",
+        realm: Realm,
+        is_web_public_query: bool = False,
+    ) -> None:
         self.user_profile = user_profile
         self.msg_id_column = msg_id_column
         self.realm = realm
@@ -223,8 +236,7 @@ class NarrowBuilder:
             return query.where(maybe_negate(cond))
         raise BadNarrowOperator("unknown 'is' operand " + operand)
 
-    _alphanum = frozenset(
-        'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
+    _alphanum = frozenset('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
 
     def _pg_re_escape(self, pattern: str) -> str:
         """
@@ -245,7 +257,9 @@ class NarrowBuilder:
                     s[i] = '\\' + c
         return ''.join(s)
 
-    def by_stream(self, query: Select, operand: Union[str, int], maybe_negate: ConditionTransform) -> Select:
+    def by_stream(
+        self, query: Select, operand: Union[str, int], maybe_negate: ConditionTransform
+    ) -> Select:
         try:
             # Because you can see your own message history for
             # private streams you are no longer subscribed to, we
@@ -266,16 +280,17 @@ class NarrowBuilder:
             # that specific stream.  So it would be a bug to hit this
             # codepath after relying on this term there.  But all streams in
             # a Zephyr realm are private, so that doesn't happen.
-            assert(not stream.is_public())
+            assert not stream.is_public()
 
             m = re.search(r'^(?:un)*(.+?)(?:\.d)*$', stream.name, re.IGNORECASE)
             # Since the regex has a `.+` in it and "" is invalid as a
             # stream name, this will always match
-            assert(m is not None)
+            assert m is not None
             base_stream_name = m.group(1)
 
             matching_streams = get_active_streams(self.realm).filter(
-                name__iregex=fr'^(un)*{self._pg_re_escape(base_stream_name)}(\.d)*$')
+                name__iregex=fr'^(un)*{self._pg_re_escape(base_stream_name)}(\.d)*$'
+            )
             recipient_ids = [matching_stream.recipient_id for matching_stream in matching_streams]
             cond = column("recipient_id", Integer).in_(recipient_ids)
             return query.where(maybe_negate(cond))
@@ -304,7 +319,7 @@ class NarrowBuilder:
             # (foo, foo.d, foo.d.d, etc)
             m = re.search(r'^(.*?)(?:\.d)*$', operand, re.IGNORECASE)
             # Since the regex has a `.*` in it, this will always match
-            assert(m is not None)
+            assert m is not None
             base_topic = m.group(1)
 
             # Additionally, MIT users expect the empty instance and
@@ -343,7 +358,9 @@ class NarrowBuilder:
         cond = topic_match_sa(operand)
         return query.where(maybe_negate(cond))
 
-    def by_sender(self, query: Select, operand: Union[str, int], maybe_negate: ConditionTransform) -> Select:
+    def by_sender(
+        self, query: Select, operand: Union[str, int], maybe_negate: ConditionTransform
+    ) -> Select:
         try:
             if isinstance(operand, str):
                 sender = get_user_including_cross_realm(operand, self.realm)
@@ -358,14 +375,17 @@ class NarrowBuilder:
     def by_near(self, query: Select, operand: str, maybe_negate: ConditionTransform) -> Select:
         return query
 
-    def by_id(self, query: Select, operand: Union[int, str], maybe_negate: ConditionTransform) -> Select:
+    def by_id(
+        self, query: Select, operand: Union[int, str], maybe_negate: ConditionTransform
+    ) -> Select:
         if not str(operand).isdigit():
             raise BadNarrowOperator("Invalid message ID")
         cond = self.msg_id_column == literal(operand)
         return query.where(maybe_negate(cond))
 
-    def by_pm_with(self, query: Select, operand: Union[str, Iterable[int]],
-                   maybe_negate: ConditionTransform) -> Select:
+    def by_pm_with(
+        self, query: Select, operand: Union[str, Iterable[int]], maybe_negate: ConditionTransform
+    ) -> Select:
         # This operator does not support is_web_public_query.
         assert not self.is_web_public_query
         assert self.user_profile is not None
@@ -387,11 +407,13 @@ class NarrowBuilder:
                     realm=self.realm,
                 )
 
-            recipient = recipient_for_user_profiles(user_profiles=user_profiles,
-                                                    forwarded_mirror_message=False,
-                                                    forwarder_user_profile=None,
-                                                    sender=self.user_profile,
-                                                    allow_deactivated=True)
+            recipient = recipient_for_user_profiles(
+                user_profiles=user_profiles,
+                forwarded_mirror_message=False,
+                forwarder_user_profile=None,
+                sender=self.user_profile,
+                allow_deactivated=True,
+            )
         except (JsonableError, ValidationError):
             raise BadNarrowOperator('unknown user in ' + str(operand))
 
@@ -417,19 +439,28 @@ class NarrowBuilder:
             # complex query to get messages between these two users
             # with either of them as the sender.
             self_recipient_id = self.user_profile.recipient_id
-            cond = or_(and_(column("sender_id", Integer) == other_participant.id,
-                            column("recipient_id", Integer) == self_recipient_id),
-                       and_(column("sender_id", Integer) == self.user_profile.id,
-                            column("recipient_id", Integer) == recipient.id))
+            cond = or_(
+                and_(
+                    column("sender_id", Integer) == other_participant.id,
+                    column("recipient_id", Integer) == self_recipient_id,
+                ),
+                and_(
+                    column("sender_id", Integer) == self.user_profile.id,
+                    column("recipient_id", Integer) == recipient.id,
+                ),
+            )
             return query.where(maybe_negate(cond))
 
         # PM with self
-        cond = and_(column("sender_id", Integer) == self.user_profile.id,
-                    column("recipient_id", Integer) == recipient.id)
+        cond = and_(
+            column("sender_id", Integer) == self.user_profile.id,
+            column("recipient_id", Integer) == recipient.id,
+        )
         return query.where(maybe_negate(cond))
 
-    def by_group_pm_with(self, query: Select, operand: Union[str, int],
-                         maybe_negate: ConditionTransform) -> Select:
+    def by_group_pm_with(
+        self, query: Select, operand: Union[str, int], maybe_negate: ConditionTransform
+    ) -> Select:
         # This operator does not support is_web_public_query.
         assert not self.is_web_public_query
         assert self.user_profile is not None
@@ -443,17 +474,19 @@ class NarrowBuilder:
             raise BadNarrowOperator('unknown user ' + str(operand))
 
         self_recipient_ids = [
-            recipient_tuple['recipient_id'] for recipient_tuple
-            in Subscription.objects.filter(
+            recipient_tuple['recipient_id']
+            for recipient_tuple in Subscription.objects.filter(
                 user_profile=self.user_profile,
                 recipient__type=Recipient.HUDDLE,
-            ).values("recipient_id")]
+            ).values("recipient_id")
+        ]
         narrow_recipient_ids = [
-            recipient_tuple['recipient_id'] for recipient_tuple
-            in Subscription.objects.filter(
+            recipient_tuple['recipient_id']
+            for recipient_tuple in Subscription.objects.filter(
                 user_profile=narrow_profile,
                 recipient__type=Recipient.HUDDLE,
-            ).values("recipient_id")]
+            ).values("recipient_id")
+        ]
 
         recipient_ids = set(self_recipient_ids) & set(narrow_recipient_ids)
         cond = column("recipient_id", Integer).in_(recipient_ids)
@@ -465,29 +498,41 @@ class NarrowBuilder:
         else:
             return self._by_search_tsearch(query, operand, maybe_negate)
 
-    def _by_search_pgroonga(self, query: Select, operand: str,
-                            maybe_negate: ConditionTransform) -> Select:
+    def _by_search_pgroonga(
+        self, query: Select, operand: str, maybe_negate: ConditionTransform
+    ) -> Select:
         match_positions_character = func.pgroonga_match_positions_character
         query_extract_keywords = func.pgroonga_query_extract_keywords
         operand_escaped = func.escape_html(operand)
         keywords = query_extract_keywords(operand_escaped)
-        query = query.column(match_positions_character(column("rendered_content", Text),
-                                                       keywords).label("content_matches"))
-        query = query.column(match_positions_character(func.escape_html(topic_column_sa()),
-                                                       keywords).label("topic_matches"))
+        query = query.column(
+            match_positions_character(column("rendered_content", Text), keywords).label(
+                "content_matches"
+            )
+        )
+        query = query.column(
+            match_positions_character(func.escape_html(topic_column_sa()), keywords).label(
+                "topic_matches"
+            )
+        )
         condition = column("search_pgroonga").op("&@~")(operand_escaped)
         return query.where(maybe_negate(condition))
 
-    def _by_search_tsearch(self, query: Select, operand: str,
-                           maybe_negate: ConditionTransform) -> Select:
+    def _by_search_tsearch(
+        self, query: Select, operand: str, maybe_negate: ConditionTransform
+    ) -> Select:
         tsquery = func.plainto_tsquery(literal("zulip.english_us_search"), literal(operand))
-        query = query.column(ts_locs_array(literal("zulip.english_us_search"),
-                                           column("rendered_content", Text),
-                                           tsquery).label("content_matches"))
+        query = query.column(
+            ts_locs_array(
+                literal("zulip.english_us_search"), column("rendered_content", Text), tsquery
+            ).label("content_matches")
+        )
         # We HTML-escape the topic in PostgreSQL to avoid doing a server round-trip
-        query = query.column(ts_locs_array(literal("zulip.english_us_search"),
-                                           func.escape_html(topic_column_sa()),
-                                           tsquery).label("topic_matches"))
+        query = query.column(
+            ts_locs_array(
+                literal("zulip.english_us_search"), func.escape_html(topic_column_sa()), tsquery
+            ).label("topic_matches")
+        )
 
         # Do quoted string matching.  We really want phrase
         # search here so we can ignore punctuation and do
@@ -497,13 +542,13 @@ class NarrowBuilder:
             if term[0] == '"' and term[-1] == '"':
                 term = term[1:-1]
                 term = '%' + connection.ops.prep_for_like_query(term) + '%'
-                cond = or_(column("content", Text).ilike(term),
-                           topic_column_sa().ilike(term))
+                cond = or_(column("content", Text).ilike(term), topic_column_sa().ilike(term))
                 query = query.where(maybe_negate(cond))
 
         cond = column("search_tsvector", postgresql.TSVECTOR).op("@@")(tsquery)
         return query.where(maybe_negate(cond))
 
+
 def highlight_string(text: str, locs: Iterable[Tuple[int, int]]) -> str:
     highlight_start = '<span class="highlight">'
     highlight_stop = '</span>'
@@ -522,7 +567,7 @@ def highlight_string(text: str, locs: Iterable[Tuple[int, int]]) -> str:
         prefix = text[prefix_start:prefix_end]
         match = text[match_start:match_end]
 
-        for character in (prefix + match):
+        for character in prefix + match:
             if character == '<':
                 in_tag = True
             elif character == '>':
@@ -540,13 +585,19 @@ def highlight_string(text: str, locs: Iterable[Tuple[int, int]]) -> str:
     result += text[pos:]
     return result
 
-def get_search_fields(rendered_content: str, topic_name: str, content_matches: Iterable[Tuple[int, int]],
-                      topic_matches: Iterable[Tuple[int, int]]) -> Dict[str, str]:
+
+def get_search_fields(
+    rendered_content: str,
+    topic_name: str,
+    content_matches: Iterable[Tuple[int, int]],
+    topic_matches: Iterable[Tuple[int, int]],
+) -> Dict[str, str]:
     return {
         'match_content': highlight_string(rendered_content, content_matches),
         MATCH_TOPIC: highlight_string(escape_html(topic_name), topic_matches),
     }
 
+
 def narrow_parameter(json: str) -> OptionalNarrowListT:
 
     data = orjson.loads(json)
@@ -560,7 +611,7 @@ def narrow_parameter(json: str) -> OptionalNarrowListT:
 
         # We have to support a legacy tuple format.
         if isinstance(elem, list):
-            if (len(elem) != 2 or any(not isinstance(x, str) for x in elem)):
+            if len(elem) != 2 or any(not isinstance(x, str) for x in elem):
                 raise ValueError("element is not a string pair")
             return dict(operator=elem[0], operand=elem[1])
 
@@ -609,8 +660,10 @@ def narrow_parameter(json: str) -> OptionalNarrowListT:
 
     return list(map(convert_term, data))
 
-def ok_to_include_history(narrow: OptionalNarrowListT, user_profile: Optional[UserProfile],
-                          is_web_public_query: bool) -> bool:
+
+def ok_to_include_history(
+    narrow: OptionalNarrowListT, user_profile: Optional[UserProfile], is_web_public_query: bool
+) -> bool:
     # There are occasions where we need to find Message rows that
     # have no corresponding UserMessage row, because the user is
     # reading a public stream that might include messages that
@@ -641,8 +694,12 @@ def ok_to_include_history(narrow: OptionalNarrowListT, user_profile: Optional[Us
                     include_history = can_access_stream_history_by_name(user_profile, operand)
                 else:
                     include_history = can_access_stream_history_by_id(user_profile, operand)
-            elif (term['operator'] == "streams" and term['operand'] == "public"
-                    and not term.get('negated', False) and user_profile.can_access_public_streams()):
+            elif (
+                term['operator'] == "streams"
+                and term['operand'] == "public"
+                and not term.get('negated', False)
+                and user_profile.can_access_public_streams()
+            ):
                 include_history = True
         # Disable historical messages if the user is narrowing on anything
         # that's a property on the UserMessage table.  There cannot be
@@ -653,15 +710,20 @@ def ok_to_include_history(narrow: OptionalNarrowListT, user_profile: Optional[Us
 
     return include_history
 
-def get_stream_from_narrow_access_unchecked(narrow: OptionalNarrowListT, realm: Realm) -> Optional[Stream]:
+
+def get_stream_from_narrow_access_unchecked(
+    narrow: OptionalNarrowListT, realm: Realm
+) -> Optional[Stream]:
     if narrow is not None:
         for term in narrow:
             if term['operator'] == 'stream':
                 return get_stream_by_narrow_operand_access_unchecked(term['operand'], realm)
     return None
 
-def exclude_muting_conditions(user_profile: UserProfile,
-                              narrow: OptionalNarrowListT) -> List[ClauseElement]:
+
+def exclude_muting_conditions(
+    user_profile: UserProfile, narrow: OptionalNarrowListT
+) -> List[ClauseElement]:
     conditions = []
     stream_id = None
     try:
@@ -691,41 +753,50 @@ def exclude_muting_conditions(user_profile: UserProfile,
 
     return conditions
 
-def get_base_query_for_search(user_profile: Optional[UserProfile],
-                              need_message: bool,
-                              need_user_message: bool) -> Tuple[Select, "ColumnElement[int]"]:
+
+def get_base_query_for_search(
+    user_profile: Optional[UserProfile], need_message: bool, need_user_message: bool
+) -> Tuple[Select, "ColumnElement[int]"]:
     # Handle the simple case where user_message isn't involved first.
     if not need_user_message:
-        assert(need_message)
-        query = select([column("id", Integer).label("message_id")],
-                       None,
-                       table("zerver_message"))
+        assert need_message
+        query = select([column("id", Integer).label("message_id")], None, table("zerver_message"))
         inner_msg_id_col: ColumnElement[int]
         inner_msg_id_col = literal_column("zerver_message.id", Integer)  # type: ignore[assignment] # https://github.com/dropbox/sqlalchemy-stubs/pull/189
         return (query, inner_msg_id_col)
 
     assert user_profile is not None
     if need_message:
-        query = select([column("message_id"), column("flags", Integer)],
-                       column("user_profile_id") == literal(user_profile.id),
-                       join(table("zerver_usermessage"), table("zerver_message"),
-                            literal_column("zerver_usermessage.message_id", Integer) ==
-                            literal_column("zerver_message.id", Integer)))
+        query = select(
+            [column("message_id"), column("flags", Integer)],
+            column("user_profile_id") == literal(user_profile.id),
+            join(
+                table("zerver_usermessage"),
+                table("zerver_message"),
+                literal_column("zerver_usermessage.message_id", Integer)
+                == literal_column("zerver_message.id", Integer),
+            ),
+        )
         inner_msg_id_col = column("message_id", Integer)
         return (query, inner_msg_id_col)
 
-    query = select([column("message_id"), column("flags", Integer)],
-                   column("user_profile_id") == literal(user_profile.id),
-                   table("zerver_usermessage"))
+    query = select(
+        [column("message_id"), column("flags", Integer)],
+        column("user_profile_id") == literal(user_profile.id),
+        table("zerver_usermessage"),
+    )
     inner_msg_id_col = column("message_id", Integer)
     return (query, inner_msg_id_col)
 
-def add_narrow_conditions(user_profile: Optional[UserProfile],
-                          inner_msg_id_col: "ColumnElement[int]",
-                          query: Select,
-                          narrow: OptionalNarrowListT,
-                          is_web_public_query: bool,
-                          realm: Realm) -> Tuple[Select, bool]:
+
+def add_narrow_conditions(
+    user_profile: Optional[UserProfile],
+    inner_msg_id_col: "ColumnElement[int]",
+    query: Select,
+    narrow: OptionalNarrowListT,
+    is_web_public_query: bool,
+    realm: Realm,
+) -> Tuple[Select, bool]:
     is_search = False  # for now
 
     if narrow is None:
@@ -755,9 +826,10 @@ def add_narrow_conditions(user_profile: Optional[UserProfile],
 
     return (query, is_search)
 
-def find_first_unread_anchor(sa_conn: Connection,
-                             user_profile: Optional[UserProfile],
-                             narrow: OptionalNarrowListT) -> int:
+
+def find_first_unread_anchor(
+    sa_conn: Connection, user_profile: Optional[UserProfile], narrow: OptionalNarrowListT
+) -> int:
     # For anonymous web users, all messages are treated as read, and so
     # always return LARGER_THAN_MAX_MESSAGE_ID.
     if user_profile is None:
@@ -807,8 +879,8 @@ def find_first_unread_anchor(sa_conn: Connection,
 
     return anchor
 
-def parse_anchor_value(anchor_val: Optional[str],
-                       use_first_unread_anchor: bool) -> Optional[int]:
+
+def parse_anchor_value(anchor_val: Optional[str], use_first_unread_anchor: bool) -> Optional[int]:
     """Given the anchor and use_first_unread_anchor parameters passed by
     the client, computes what anchor value the client requested,
     handling backwards-compatibility and the various string-valued
@@ -845,23 +917,28 @@ def parse_anchor_value(anchor_val: Optional[str],
     except ValueError:
         raise JsonableError(_("Invalid anchor"))
 
+
 @has_request_variables
-def get_messages_backend(request: HttpRequest,
-                         maybe_user_profile: Union[UserProfile, AnonymousUser],
-                         anchor_val: Optional[str]=REQ(
-                             'anchor', str_validator=check_string, default=None),
-                         num_before: int=REQ(converter=to_non_negative_int),
-                         num_after: int=REQ(converter=to_non_negative_int),
-                         narrow: OptionalNarrowListT=REQ('narrow', converter=narrow_parameter, default=None),
-                         use_first_unread_anchor_val: bool=REQ('use_first_unread_anchor',
-                                                               validator=check_bool, default=False),
-                         client_gravatar: bool=REQ(validator=check_bool, default=False),
-                         apply_markdown: bool=REQ(validator=check_bool, default=True)) -> HttpResponse:
+def get_messages_backend(
+    request: HttpRequest,
+    maybe_user_profile: Union[UserProfile, AnonymousUser],
+    anchor_val: Optional[str] = REQ('anchor', str_validator=check_string, default=None),
+    num_before: int = REQ(converter=to_non_negative_int),
+    num_after: int = REQ(converter=to_non_negative_int),
+    narrow: OptionalNarrowListT = REQ('narrow', converter=narrow_parameter, default=None),
+    use_first_unread_anchor_val: bool = REQ(
+        'use_first_unread_anchor', validator=check_bool, default=False
+    ),
+    client_gravatar: bool = REQ(validator=check_bool, default=False),
+    apply_markdown: bool = REQ(validator=check_bool, default=True),
+) -> HttpResponse:
     anchor = parse_anchor_value(anchor_val, use_first_unread_anchor_val)
     if num_before + num_after > MAX_MESSAGES_PER_FETCH:
-        return json_error(_("Too many messages requested (maximum {}).").format(
-            MAX_MESSAGES_PER_FETCH,
-        ))
+        return json_error(
+            _("Too many messages requested (maximum {}).").format(
+                MAX_MESSAGES_PER_FETCH,
+            )
+        )
 
     if not maybe_user_profile.is_authenticated:
         # If user is not authenticated, clients must include
@@ -891,8 +968,10 @@ def get_messages_backend(request: HttpRequest,
 
     assert realm is not None
 
-    if is_web_public_query or \
-            realm.email_address_visibility != Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE:
+    if (
+        is_web_public_query
+        or realm.email_address_visibility != Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE
+    ):
         # If email addresses are only available to administrators,
         # clients cannot compute gravatars, so we force-set it to false.
         client_gravatar = False
@@ -955,11 +1034,11 @@ def get_messages_backend(request: HttpRequest,
             narrow,
         )
 
-    anchored_to_left = (anchor == 0)
+    anchored_to_left = anchor == 0
 
     # Set value that will be used to short circuit the after_query
     # altogether and avoid needless conditions in the before_query.
-    anchored_to_right = (anchor >= LARGER_THAN_MAX_MESSAGE_ID)
+    anchored_to_right = anchor >= LARGER_THAN_MAX_MESSAGE_ID
     if anchored_to_right:
         num_after = 0
 
@@ -1014,8 +1093,7 @@ def get_messages_backend(request: HttpRequest,
         message_ids = [row[0] for row in rows]
 
         # TODO: This could be done with an outer join instead of two queries
-        um_rows = UserMessage.objects.filter(user_profile=user_profile,
-                                             message__id__in=message_ids)
+        um_rows = UserMessage.objects.filter(user_profile=user_profile, message__id__in=message_ids)
         user_message_flags = {um.message_id: um.flags_list() for um in um_rows}
 
         for message_id in message_ids:
@@ -1035,8 +1113,9 @@ def get_messages_backend(request: HttpRequest,
             (topic_name, rendered_content, content_matches, topic_matches) = row[-4:]
 
             try:
-                search_fields[message_id] = get_search_fields(rendered_content, topic_name,
-                                                              content_matches, topic_matches)
+                search_fields[message_id] = get_search_fields(
+                    rendered_content, topic_name, content_matches, topic_matches
+                )
             except UnicodeDecodeError as err:  # nocoverage
                 # No coverage for this block since it should be
                 # impossible, and we plan to remove it once we've
@@ -1066,18 +1145,21 @@ def get_messages_backend(request: HttpRequest,
     )
     return json_success(ret)
 
-def limit_query_to_range(query: Select,
-                         num_before: int,
-                         num_after: int,
-                         anchor: int,
-                         anchored_to_left: bool,
-                         anchored_to_right: bool,
-                         id_col: "ColumnElement[int]",
-                         first_visible_message_id: int) -> FromClause:
-    '''
+
+def limit_query_to_range(
+    query: Select,
+    num_before: int,
+    num_after: int,
+    anchor: int,
+    anchored_to_left: bool,
+    anchored_to_right: bool,
+    id_col: "ColumnElement[int]",
+    first_visible_message_id: int,
+) -> FromClause:
+    """
     This code is actually generic enough that we could move it to a
     library, but our only caller for now is message search.
-    '''
+    """
     need_before_query = (not anchored_to_left) and (num_before > 0)
     need_after_query = (not anchored_to_right) and (num_after > 0)
 
@@ -1144,13 +1226,16 @@ def limit_query_to_range(query: Select,
         # return at most one row here.
         return query.where(id_col == anchor)
 
-def post_process_limited_query(rows: Sequence[Union[RowProxy, Sequence[Any]]],
-                               num_before: int,
-                               num_after: int,
-                               anchor: int,
-                               anchored_to_left: bool,
-                               anchored_to_right: bool,
-                               first_visible_message_id: int) -> Dict[str, Any]:
+
+def post_process_limited_query(
+    rows: Sequence[Union[RowProxy, Sequence[Any]]],
+    num_before: int,
+    num_after: int,
+    anchor: int,
+    anchored_to_left: bool,
+    anchored_to_right: bool,
+    first_visible_message_id: int,
+) -> Dict[str, Any]:
     # Our queries may have fetched extra rows if they added
     # "headroom" to the limits, but we want to truncate those
     # rows.
@@ -1179,7 +1264,7 @@ def post_process_limited_query(rows: Sequence[Union[RowProxy, Sequence[Any]]],
         after_rows = [r for r in visible_rows if r[0] > anchor]
 
     if num_before:
-        before_rows = before_rows[-1 * num_before:]
+        before_rows = before_rows[-1 * num_before :]
 
     if num_after:
         after_rows = after_rows[:num_after]
@@ -1210,22 +1295,32 @@ def post_process_limited_query(rows: Sequence[Union[RowProxy, Sequence[Any]]],
         history_limited=history_limited,
     )
 
+
 @has_request_variables
-def messages_in_narrow_backend(request: HttpRequest, user_profile: UserProfile,
-                               msg_ids: List[int]=REQ(validator=check_list(check_int)),
-                               narrow: OptionalNarrowListT=REQ(converter=narrow_parameter),
-                               ) -> HttpResponse:
+def messages_in_narrow_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    msg_ids: List[int] = REQ(validator=check_list(check_int)),
+    narrow: OptionalNarrowListT = REQ(converter=narrow_parameter),
+) -> HttpResponse:
 
     first_visible_message_id = get_first_visible_message_id(user_profile.realm)
     msg_ids = [message_id for message_id in msg_ids if message_id >= first_visible_message_id]
     # This query is limited to messages the user has access to because they
     # actually received them, as reflected in `zerver_usermessage`.
-    query = select([column("message_id", Integer), topic_column_sa(), column("rendered_content", Text)],
-                   and_(column("user_profile_id", Integer) == literal(user_profile.id),
-                        column("message_id", Integer).in_(msg_ids)),
-                   join(table("zerver_usermessage"), table("zerver_message"),
-                        literal_column("zerver_usermessage.message_id", Integer) ==
-                        literal_column("zerver_message.id", Integer)))
+    query = select(
+        [column("message_id", Integer), topic_column_sa(), column("rendered_content", Text)],
+        and_(
+            column("user_profile_id", Integer) == literal(user_profile.id),
+            column("message_id", Integer).in_(msg_ids),
+        ),
+        join(
+            table("zerver_usermessage"),
+            table("zerver_message"),
+            literal_column("zerver_usermessage.message_id", Integer)
+            == literal_column("zerver_message.id", Integer),
+        ),
+    )
 
     builder = NarrowBuilder(user_profile, column("message_id", Integer), user_profile.realm)
     if narrow is not None:
@@ -1246,7 +1341,10 @@ def messages_in_narrow_backend(request: HttpRequest, user_profile: UserProfile,
         else:
             content_matches = topic_matches = []
         search_fields[str(message_id)] = get_search_fields(
-            rendered_content, topic_name, content_matches, topic_matches,
+            rendered_content,
+            topic_name,
+            content_matches,
+            topic_matches,
         )
 
     return json_success({"messages": search_fields})
diff --git a/zerver/views/message_flags.py b/zerver/views/message_flags.py
index 0e639678f8..52db70bf8c 100644
--- a/zerver/views/message_flags.py
+++ b/zerver/views/message_flags.py
@@ -18,15 +18,23 @@ from zerver.models import UserActivity, UserProfile
 
 
 def get_latest_update_message_flag_activity(user_profile: UserProfile) -> Optional[UserActivity]:
-    return UserActivity.objects.filter(user_profile=user_profile,
-                                       query='update_message_flags').order_by("last_visit").last()
+    return (
+        UserActivity.objects.filter(user_profile=user_profile, query='update_message_flags')
+        .order_by("last_visit")
+        .last()
+    )
+
 
 # NOTE: If this function name is changed, add the new name to the
 # query in get_latest_update_message_flag_activity
 @has_request_variables
-def update_message_flags(request: HttpRequest, user_profile: UserProfile,
-                         messages: List[int]=REQ(validator=check_list(check_int)),
-                         operation: str=REQ('op'), flag: str=REQ()) -> HttpResponse:
+def update_message_flags(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    messages: List[int] = REQ(validator=check_list(check_int)),
+    operation: str = REQ('op'),
+    flag: str = REQ(),
+) -> HttpResponse:
 
     count = do_update_message_flags(user_profile, request.client, operation, flag, messages)
 
@@ -34,9 +42,8 @@ def update_message_flags(request: HttpRequest, user_profile: UserProfile,
     log_data_str = f"[{operation} {flag}/{target_count_str}] actually {count}"
     request._log_data["extra"] = log_data_str
 
-    return json_success({'result': 'success',
-                         'messages': messages,
-                         'msg': ''})
+    return json_success({'result': 'success', 'messages': messages, 'msg': ''})
+
 
 @has_request_variables
 def mark_all_as_read(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
@@ -45,27 +52,29 @@ def mark_all_as_read(request: HttpRequest, user_profile: UserProfile) -> HttpRes
     log_data_str = f"[{count} updated]"
     request._log_data["extra"] = log_data_str
 
-    return json_success({'result': 'success',
-                         'msg': ''})
+    return json_success({'result': 'success', 'msg': ''})
+
 
 @has_request_variables
-def mark_stream_as_read(request: HttpRequest,
-                        user_profile: UserProfile,
-                        stream_id: int=REQ(validator=check_int)) -> HttpResponse:
+def mark_stream_as_read(
+    request: HttpRequest, user_profile: UserProfile, stream_id: int = REQ(validator=check_int)
+) -> HttpResponse:
     stream, sub = access_stream_by_id(user_profile, stream_id)
     count = do_mark_stream_messages_as_read(user_profile, stream.recipient_id)
 
     log_data_str = f"[{count} updated]"
     request._log_data["extra"] = log_data_str
 
-    return json_success({'result': 'success',
-                         'msg': ''})
+    return json_success({'result': 'success', 'msg': ''})
+
 
 @has_request_variables
-def mark_topic_as_read(request: HttpRequest,
-                       user_profile: UserProfile,
-                       stream_id: int=REQ(validator=check_int),
-                       topic_name: str=REQ()) -> HttpResponse:
+def mark_topic_as_read(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_id: int = REQ(validator=check_int),
+    topic_name: str = REQ(),
+) -> HttpResponse:
     stream, sub = access_stream_by_id(user_profile, stream_id)
 
     if topic_name:
@@ -83,5 +92,4 @@ def mark_topic_as_read(request: HttpRequest,
     log_data_str = f"[{count} updated]"
     request._log_data["extra"] = log_data_str
 
-    return json_success({'result': 'success',
-                         'msg': ''})
+    return json_success({'result': 'success', 'msg': ''})
diff --git a/zerver/views/message_send.py b/zerver/views/message_send.py
index c293d19463..5161948a95 100644
--- a/zerver/views/message_send.py
+++ b/zerver/views/message_send.py
@@ -39,8 +39,10 @@ from zerver.models import (
 class InvalidMirrorInput(Exception):
     pass
 
-def create_mirrored_message_users(request: HttpRequest, user_profile: UserProfile,
-                                  recipients: Iterable[str]) -> UserProfile:
+
+def create_mirrored_message_users(
+    request: HttpRequest, user_profile: UserProfile, recipients: Iterable[str]
+) -> UserProfile:
     if "sender" not in request.POST:
         raise InvalidMirrorInput("No sender")
 
@@ -74,6 +76,7 @@ def create_mirrored_message_users(request: HttpRequest, user_profile: UserProfil
     sender = get_user_including_cross_realm(sender_email, user_profile.realm)
     return sender
 
+
 def same_realm_zephyr_user(user_profile: UserProfile, email: str) -> bool:
     #
     # Are the sender and recipient both addresses in the same Zephyr
@@ -90,8 +93,11 @@ def same_realm_zephyr_user(user_profile: UserProfile, email: str) -> bool:
 
     # Assumes allow_subdomains=False for all RealmDomain's corresponding to
     # these realms.
-    return user_profile.realm.is_zephyr_mirror_realm and \
-        RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists()
+    return (
+        user_profile.realm.is_zephyr_mirror_realm
+        and RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists()
+    )
+
 
 def same_realm_irc_user(user_profile: UserProfile, email: str) -> bool:
     # Check whether the target email address is an IRC user in the
@@ -108,6 +114,7 @@ def same_realm_irc_user(user_profile: UserProfile, email: str) -> bool:
     # these realms.
     return RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists()
 
+
 def same_realm_jabber_user(user_profile: UserProfile, email: str) -> bool:
     try:
         validators.validate_email(email)
@@ -122,14 +129,20 @@ def same_realm_jabber_user(user_profile: UserProfile, email: str) -> bool:
     # these realms.
     return RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists()
 
-def handle_deferred_message(sender: UserProfile, client: Client,
-                            message_type_name: str,
-                            message_to: Union[Sequence[str], Sequence[int]],
-                            topic_name: Optional[str],
-                            message_content: str, delivery_type: str,
-                            defer_until: str, tz_guess: Optional[str],
-                            forwarder_user_profile: UserProfile,
-                            realm: Optional[Realm]) -> HttpResponse:
+
+def handle_deferred_message(
+    sender: UserProfile,
+    client: Client,
+    message_type_name: str,
+    message_to: Union[Sequence[str], Sequence[int]],
+    topic_name: Optional[str],
+    message_content: str,
+    delivery_type: str,
+    defer_until: str,
+    tz_guess: Optional[str],
+    forwarder_user_profile: UserProfile,
+    realm: Optional[Realm],
+) -> HttpResponse:
     deliver_at = None
     local_tz = 'UTC'
     if tz_guess:
@@ -150,34 +163,38 @@ def handle_deferred_message(sender: UserProfile, client: Client,
     if deliver_at <= timezone_now():
         return json_error(_("Time must be in the future."))
 
-    check_schedule_message(sender, client, message_type_name, message_to,
-                           topic_name, message_content, delivery_type,
-                           deliver_at, realm=realm,
-                           forwarder_user_profile=forwarder_user_profile)
+    check_schedule_message(
+        sender,
+        client,
+        message_type_name,
+        message_to,
+        topic_name,
+        message_content,
+        delivery_type,
+        deliver_at,
+        realm=realm,
+        forwarder_user_profile=forwarder_user_profile,
+    )
     return json_success({"deliver_at": str(deliver_at_usertz)})
 
+
 @has_request_variables
-def send_message_backend(request: HttpRequest, user_profile: UserProfile,
-                         message_type_name: str=REQ('type'),
-                         req_to: Optional[str]=REQ('to', default=None),
-                         forged_str: Optional[str]=REQ("forged",
-                                                       default=None,
-                                                       documentation_pending=True),
-                         topic_name: Optional[str]=REQ_topic(),
-                         message_content: str=REQ('content'),
-                         widget_content: Optional[str]=REQ(default=None,
-                                                           documentation_pending=True),
-                         realm_str: Optional[str]=REQ('realm_str', default=None,
-                                                      documentation_pending=True),
-                         local_id: Optional[str]=REQ(default=None),
-                         queue_id: Optional[str]=REQ(default=None),
-                         delivery_type: str=REQ('delivery_type', default='send_now',
-                                                documentation_pending=True),
-                         defer_until: Optional[str]=REQ('deliver_at', default=None,
-                                                        documentation_pending=True),
-                         tz_guess: Optional[str]=REQ('tz_guess', default=None,
-                                                     documentation_pending=True),
-                         ) -> HttpResponse:
+def send_message_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_type_name: str = REQ('type'),
+    req_to: Optional[str] = REQ('to', default=None),
+    forged_str: Optional[str] = REQ("forged", default=None, documentation_pending=True),
+    topic_name: Optional[str] = REQ_topic(),
+    message_content: str = REQ('content'),
+    widget_content: Optional[str] = REQ(default=None, documentation_pending=True),
+    realm_str: Optional[str] = REQ('realm_str', default=None, documentation_pending=True),
+    local_id: Optional[str] = REQ(default=None),
+    queue_id: Optional[str] = REQ(default=None),
+    delivery_type: str = REQ('delivery_type', default='send_now', documentation_pending=True),
+    defer_until: Optional[str] = REQ('deliver_at', default=None, documentation_pending=True),
+    tz_guess: Optional[str] = REQ('tz_guess', default=None, documentation_pending=True),
+) -> HttpResponse:
 
     # If req_to is None, then we default to an
     # empty list of recipients.
@@ -266,28 +283,49 @@ def send_message_backend(request: HttpRequest, user_profile: UserProfile,
         return json_error(_("Missing deliver_at in a request for delayed message delivery"))
 
     if (delivery_type == 'send_later' or delivery_type == 'remind') and defer_until is not None:
-        return handle_deferred_message(sender, client, message_type_name,
-                                       message_to, topic_name, message_content,
-                                       delivery_type, defer_until, tz_guess,
-                                       forwarder_user_profile=user_profile,
-                                       realm=realm)
+        return handle_deferred_message(
+            sender,
+            client,
+            message_type_name,
+            message_to,
+            topic_name,
+            message_content,
+            delivery_type,
+            defer_until,
+            tz_guess,
+            forwarder_user_profile=user_profile,
+            realm=realm,
+        )
 
-    ret = check_send_message(sender, client, message_type_name, message_to,
-                             topic_name, message_content, forged=forged,
-                             forged_timestamp = request.POST.get('time'),
-                             forwarder_user_profile=user_profile, realm=realm,
-                             local_id=local_id, sender_queue_id=queue_id,
-                             widget_content=widget_content)
+    ret = check_send_message(
+        sender,
+        client,
+        message_type_name,
+        message_to,
+        topic_name,
+        message_content,
+        forged=forged,
+        forged_timestamp=request.POST.get('time'),
+        forwarder_user_profile=user_profile,
+        realm=realm,
+        local_id=local_id,
+        sender_queue_id=queue_id,
+        widget_content=widget_content,
+    )
     return json_success({"id": ret})
 
-@has_request_variables
-def zcommand_backend(request: HttpRequest, user_profile: UserProfile,
-                     command: str=REQ('command')) -> HttpResponse:
-    return json_success(process_zcommands(command, user_profile))
 
 @has_request_variables
-def render_message_backend(request: HttpRequest, user_profile: UserProfile,
-                           content: str=REQ()) -> HttpResponse:
+def zcommand_backend(
+    request: HttpRequest, user_profile: UserProfile, command: str = REQ('command')
+) -> HttpResponse:
+    return json_success(process_zcommands(command, user_profile))
+
+
+@has_request_variables
+def render_message_backend(
+    request: HttpRequest, user_profile: UserProfile, content: str = REQ()
+) -> HttpResponse:
     message = Message()
     message.sender = user_profile
     message.content = content
diff --git a/zerver/views/muting.py b/zerver/views/muting.py
index 09c871b933..c2386f9f16 100644
--- a/zerver/views/muting.py
+++ b/zerver/views/muting.py
@@ -20,11 +20,13 @@ from zerver.lib.validator import check_int
 from zerver.models import UserProfile
 
 
-def mute_topic(user_profile: UserProfile,
-               stream_id: Optional[int],
-               stream_name: Optional[str],
-               topic_name: str,
-               date_muted: datetime.datetime) -> HttpResponse:
+def mute_topic(
+    user_profile: UserProfile,
+    stream_id: Optional[int],
+    stream_name: Optional[str],
+    topic_name: str,
+    date_muted: datetime.datetime,
+) -> HttpResponse:
     if stream_name is not None:
         (stream, sub) = access_stream_by_name(user_profile, stream_name)
     else:
@@ -37,10 +39,10 @@ def mute_topic(user_profile: UserProfile,
     do_mute_topic(user_profile, stream, topic_name, date_muted)
     return json_success()
 
-def unmute_topic(user_profile: UserProfile,
-                 stream_id: Optional[int],
-                 stream_name: Optional[str],
-                 topic_name: str) -> HttpResponse:
+
+def unmute_topic(
+    user_profile: UserProfile, stream_id: Optional[int], stream_name: Optional[str], topic_name: str
+) -> HttpResponse:
     error = _("Topic is not muted")
 
     if stream_name is not None:
@@ -55,13 +57,16 @@ def unmute_topic(user_profile: UserProfile,
     do_unmute_topic(user_profile, stream, topic_name)
     return json_success()
 
+
 @has_request_variables
-def update_muted_topic(request: HttpRequest,
-                       user_profile: UserProfile,
-                       stream_id: Optional[int]=REQ(validator=check_int, default=None),
-                       stream: Optional[str]=REQ(default=None),
-                       topic: str=REQ(),
-                       op: str=REQ()) -> HttpResponse:
+def update_muted_topic(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_id: Optional[int] = REQ(validator=check_int, default=None),
+    stream: Optional[str] = REQ(default=None),
+    topic: str = REQ(),
+    op: str = REQ(),
+) -> HttpResponse:
 
     check_for_exactly_one_stream_arg(stream_id=stream_id, stream=stream)
 
diff --git a/zerver/views/portico.py b/zerver/views/portico.py
index 6519c86378..adcdbb9873 100644
--- a/zerver/views/portico.py
+++ b/zerver/views/portico.py
@@ -21,6 +21,7 @@ def apps_view(request: HttpRequest, platform: Optional[str] = None) -> HttpRespo
         )
     return HttpResponseRedirect('https://zulip.com/apps/', status=301)
 
+
 def app_download_link_redirect(request: HttpRequest, platform: str) -> HttpResponse:
     try:
         download_link = get_latest_github_release_download_link_for_platform(platform)
@@ -28,6 +29,7 @@ def app_download_link_redirect(request: HttpRequest, platform: str) -> HttpRespo
     except InvalidPlatform:
         return TemplateResponse(request, "404.html", status=404)
 
+
 @add_google_analytics
 def plans_view(request: HttpRequest) -> HttpResponse:
     realm = get_realm_from_request(request)
@@ -45,6 +47,7 @@ def plans_view(request: HttpRequest) -> HttpResponse:
             return TemplateResponse(request, "404.html", status=404)
         if settings.CORPORATE_ENABLED:
             from corporate.models import get_customer_by_realm
+
             customer = get_customer_by_realm(realm)
             if customer is not None:
                 sponsorship_pending = customer.sponsorship_pending
@@ -52,9 +55,14 @@ def plans_view(request: HttpRequest) -> HttpResponse:
     return TemplateResponse(
         request,
         "zerver/plans.html",
-        context={"realm_plan_type": realm_plan_type, 'free_trial_days': free_trial_days, 'sponsorship_pending': sponsorship_pending},
+        context={
+            "realm_plan_type": realm_plan_type,
+            'free_trial_days': free_trial_days,
+            'sponsorship_pending': sponsorship_pending,
+        },
     )
 
+
 @add_google_analytics
 def team_view(request: HttpRequest) -> HttpResponse:
     if not settings.ZILENCER_ENABLED:
@@ -77,28 +85,35 @@ def team_view(request: HttpRequest) -> HttpResponse:
         },
     )
 
+
 def get_isolated_page(request: HttpRequest) -> bool:
     '''Accept a GET param `?nav=no` to render an isolated, navless page.'''
     return request.GET.get('nav') == 'no'
 
+
 @add_google_analytics
 def landing_view(request: HttpRequest, template_name: str) -> HttpResponse:
     return TemplateResponse(request, template_name)
 
+
 @add_google_analytics
 def hello_view(request: HttpRequest) -> HttpResponse:
     return TemplateResponse(request, 'zerver/hello.html', latest_info_context())
 
+
 @add_google_analytics
 def terms_view(request: HttpRequest) -> HttpResponse:
     return TemplateResponse(
-        request, 'zerver/terms.html',
+        request,
+        'zerver/terms.html',
         context={'isolated_page': get_isolated_page(request)},
     )
 
+
 @add_google_analytics
 def privacy_view(request: HttpRequest) -> HttpResponse:
     return TemplateResponse(
-        request, 'zerver/privacy.html',
+        request,
+        'zerver/privacy.html',
         context={'isolated_page': get_isolated_page(request)},
     )
diff --git a/zerver/views/presence.py b/zerver/views/presence.py
index 0bb30ece03..77faf35b5b 100644
--- a/zerver/views/presence.py
+++ b/zerver/views/presence.py
@@ -16,8 +16,9 @@ from zerver.lib.validator import check_bool, check_capped_string
 from zerver.models import UserActivity, UserPresence, UserProfile, get_active_user
 
 
-def get_presence_backend(request: HttpRequest, user_profile: UserProfile,
-                         email: str) -> HttpResponse:
+def get_presence_backend(
+    request: HttpRequest, user_profile: UserProfile, email: str
+) -> HttpResponse:
     # This isn't used by the webapp; it's available for API use by
     # bots and other clients.  We may want to add slim_presence
     # support for it (or just migrate its API wholesale) later.
@@ -43,14 +44,15 @@ def get_presence_backend(request: HttpRequest, user_profile: UserProfile,
         val.pop('pushable', None)
     return json_success(result)
 
+
 @human_users_only
 @has_request_variables
-def update_user_status_backend(request: HttpRequest,
-                               user_profile: UserProfile,
-                               away: Optional[bool]=REQ(validator=check_bool, default=None),
-                               status_text: Optional[str]=REQ(str_validator=check_capped_string(60),
-                                                              default=None),
-                               ) -> HttpResponse:
+def update_user_status_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    away: Optional[bool] = REQ(validator=check_bool, default=None),
+    status_text: Optional[str] = REQ(str_validator=check_capped_string(60), default=None),
+) -> HttpResponse:
 
     if status_text is not None:
         status_text = status_text.strip()
@@ -67,20 +69,24 @@ def update_user_status_backend(request: HttpRequest,
 
     return json_success()
 
+
 @human_users_only
 @has_request_variables
-def update_active_status_backend(request: HttpRequest, user_profile: UserProfile,
-                                 status: str=REQ(),
-                                 ping_only: bool=REQ(validator=check_bool, default=False),
-                                 new_user_input: bool=REQ(validator=check_bool, default=False),
-                                 slim_presence: bool=REQ(validator=check_bool, default=False),
-                                 ) -> HttpResponse:
+def update_active_status_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    status: str = REQ(),
+    ping_only: bool = REQ(validator=check_bool, default=False),
+    new_user_input: bool = REQ(validator=check_bool, default=False),
+    slim_presence: bool = REQ(validator=check_bool, default=False),
+) -> HttpResponse:
     status_val = UserPresence.status_from_string(status)
     if status_val is None:
         raise JsonableError(_("Invalid status: {}").format(status))
     elif user_profile.presence_enabled:
-        update_user_presence(user_profile, request.client, timezone_now(),
-                             status_val, new_user_input)
+        update_user_presence(
+            user_profile, request.client, timezone_now(), status_val, new_user_input
+        )
 
     if ping_only:
         ret: Dict[str, Any] = {}
@@ -92,17 +98,19 @@ def update_active_status_backend(request: HttpRequest, user_profile: UserProfile
         # users, but each user **is** interested in whether their mirror bot
         # (running as their user) has been active.
         try:
-            activity = UserActivity.objects.get(user_profile = user_profile,
-                                                query="get_events",
-                                                client__name="zephyr_mirror")
+            activity = UserActivity.objects.get(
+                user_profile=user_profile, query="get_events", client__name="zephyr_mirror"
+            )
 
-            ret['zephyr_mirror_active'] = \
-                (activity.last_visit > timezone_now() - datetime.timedelta(minutes=5))
+            ret['zephyr_mirror_active'] = activity.last_visit > timezone_now() - datetime.timedelta(
+                minutes=5
+            )
         except UserActivity.DoesNotExist:
             ret['zephyr_mirror_active'] = False
 
     return json_success(ret)
 
+
 def get_statuses_for_realm(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     # This isn't used by the webapp; it's available for API use by
     # bots and other clients.  We may want to add slim_presence
diff --git a/zerver/views/push_notifications.py b/zerver/views/push_notifications.py
index 67083211c7..a82061fe0f 100644
--- a/zerver/views/push_notifications.py
+++ b/zerver/views/push_notifications.py
@@ -23,36 +23,45 @@ def validate_token(token_str: str, kind: int) -> None:
         except Exception:
             raise JsonableError(_('Invalid APNS token'))
 
+
 @human_users_only
 @has_request_variables
-def add_apns_device_token(request: HttpRequest, user_profile: UserProfile,
-                          token: str=REQ(),
-                          appid: str=REQ(default=settings.ZULIP_IOS_APP_ID),
-                          ) -> HttpResponse:
+def add_apns_device_token(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    token: str = REQ(),
+    appid: str = REQ(default=settings.ZULIP_IOS_APP_ID),
+) -> HttpResponse:
     validate_token(token, PushDeviceToken.APNS)
     add_push_device_token(user_profile, token, PushDeviceToken.APNS, ios_app_id=appid)
     return json_success()
 
+
 @human_users_only
 @has_request_variables
-def add_android_reg_id(request: HttpRequest, user_profile: UserProfile,
-                       token: str=REQ()) -> HttpResponse:
+def add_android_reg_id(
+    request: HttpRequest, user_profile: UserProfile, token: str = REQ()
+) -> HttpResponse:
     validate_token(token, PushDeviceToken.GCM)
     add_push_device_token(user_profile, token, PushDeviceToken.GCM)
     return json_success()
 
+
 @human_users_only
 @has_request_variables
-def remove_apns_device_token(request: HttpRequest, user_profile: UserProfile,
-                             token: str=REQ()) -> HttpResponse:
+def remove_apns_device_token(
+    request: HttpRequest, user_profile: UserProfile, token: str = REQ()
+) -> HttpResponse:
     validate_token(token, PushDeviceToken.APNS)
     remove_push_device_token(user_profile, token, PushDeviceToken.APNS)
     return json_success()
 
+
 @human_users_only
 @has_request_variables
-def remove_android_reg_id(request: HttpRequest, user_profile: UserProfile,
-                          token: str=REQ()) -> HttpResponse:
+def remove_android_reg_id(
+    request: HttpRequest, user_profile: UserProfile, token: str = REQ()
+) -> HttpResponse:
     validate_token(token, PushDeviceToken.GCM)
     remove_push_device_token(user_profile, token, PushDeviceToken.GCM)
     return json_success()
diff --git a/zerver/views/reactions.py b/zerver/views/reactions.py
index a52395f211..ea08728783 100644
--- a/zerver/views/reactions.py
+++ b/zerver/views/reactions.py
@@ -18,15 +18,22 @@ def create_historical_message(user_profile: UserProfile, message: Message) -> No
     # those, we give the user a `historical` UserMessage objects
     # for the message.  This is the same trick we use for starring
     # messages.
-    UserMessage.objects.create(user_profile=user_profile,
-                               message=message,
-                               flags=UserMessage.flags.historical | UserMessage.flags.read)
+    UserMessage.objects.create(
+        user_profile=user_profile,
+        message=message,
+        flags=UserMessage.flags.historical | UserMessage.flags.read,
+    )
+
 
 @has_request_variables
-def add_reaction(request: HttpRequest, user_profile: UserProfile, message_id: int,
-                 emoji_name: str=REQ(),
-                 emoji_code: Optional[str]=REQ(default=None),
-                 reaction_type: Optional[str]=REQ(default=None)) -> HttpResponse:
+def add_reaction(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_id: int,
+    emoji_name: str = REQ(),
+    emoji_code: Optional[str] = REQ(default=None),
+    reaction_type: Optional[str] = REQ(default=None),
+) -> HttpResponse:
     message, user_message = access_message(user_profile, message_id)
 
     if emoji_code is None:
@@ -34,22 +41,22 @@ def add_reaction(request: HttpRequest, user_profile: UserProfile, message_id: in
         # cases discussed in the long block comment below.  For simple
         # API clients, we allow specifying just the name, and just
         # look up the code using the current name->code mapping.
-        emoji_code = emoji_name_to_emoji_code(message.sender.realm,
-                                              emoji_name)[0]
+        emoji_code = emoji_name_to_emoji_code(message.sender.realm, emoji_name)[0]
 
     if reaction_type is None:
-        reaction_type = emoji_name_to_emoji_code(message.sender.realm,
-                                                 emoji_name)[1]
+        reaction_type = emoji_name_to_emoji_code(message.sender.realm, emoji_name)[1]
 
-    if Reaction.objects.filter(user_profile=user_profile,
-                               message=message,
-                               emoji_code=emoji_code,
-                               reaction_type=reaction_type).exists():
+    if Reaction.objects.filter(
+        user_profile=user_profile,
+        message=message,
+        emoji_code=emoji_code,
+        reaction_type=reaction_type,
+    ).exists():
         raise JsonableError(_("Reaction already exists."))
 
-    query = Reaction.objects.filter(message=message,
-                                    emoji_code=emoji_code,
-                                    reaction_type=reaction_type)
+    query = Reaction.objects.filter(
+        message=message, emoji_code=emoji_code, reaction_type=reaction_type
+    )
     if query.exists():
         # If another user has already reacted to this message with
         # same emoji code, we treat the new reaction as a vote for the
@@ -73,8 +80,7 @@ def add_reaction(request: HttpRequest, user_profile: UserProfile, message_id: in
         # Otherwise, use the name provided in this request, but verify
         # it is valid in the user's realm (e.g. not a deactivated
         # realm emoji).
-        check_emoji_request(user_profile.realm, emoji_name,
-                            emoji_code, reaction_type)
+        check_emoji_request(user_profile.realm, emoji_name, emoji_code, reaction_type)
 
     if user_message is None:
         create_historical_message(user_profile, message)
@@ -83,17 +89,26 @@ def add_reaction(request: HttpRequest, user_profile: UserProfile, message_id: in
 
     return json_success()
 
+
 @has_request_variables
-def remove_reaction(request: HttpRequest, user_profile: UserProfile, message_id: int,
-                    emoji_name: Optional[str]=REQ(default=None),
-                    emoji_code: Optional[str]=REQ(default=None),
-                    reaction_type: str=REQ(default="unicode_emoji")) -> HttpResponse:
+def remove_reaction(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_id: int,
+    emoji_name: Optional[str] = REQ(default=None),
+    emoji_code: Optional[str] = REQ(default=None),
+    reaction_type: str = REQ(default="unicode_emoji"),
+) -> HttpResponse:
     message, user_message = access_message(user_profile, message_id)
 
     if emoji_code is None:
         if emoji_name is None:
-            raise JsonableError(_('At least one of the following arguments '
-                                  'must be present: emoji_name, emoji_code'))
+            raise JsonableError(
+                _(
+                    'At least one of the following arguments '
+                    'must be present: emoji_name, emoji_code'
+                )
+            )
         # A correct full Zulip client implementation should always
         # pass an emoji_code, because of the corner cases discussed in
         # the long block comments elsewhere in this file.  However, to
@@ -103,10 +118,12 @@ def remove_reaction(request: HttpRequest, user_profile: UserProfile, message_id:
         # corresponding code using the current data.
         emoji_code = emoji_name_to_emoji_code(message.sender.realm, emoji_name)[0]
 
-    if not Reaction.objects.filter(user_profile=user_profile,
-                                   message=message,
-                                   emoji_code=emoji_code,
-                                   reaction_type=reaction_type).exists():
+    if not Reaction.objects.filter(
+        user_profile=user_profile,
+        message=message,
+        emoji_code=emoji_code,
+        reaction_type=reaction_type,
+    ).exists():
         raise JsonableError(_("Reaction doesn't exist."))
 
     # Unlike adding reactions, while deleting a reaction, we don't
diff --git a/zerver/views/realm.py b/zerver/views/realm.py
index df42e994c6..5b08e427c5 100644
--- a/zerver/views/realm.py
+++ b/zerver/views/realm.py
@@ -39,55 +39,71 @@ from zerver.models import Realm, UserProfile
 @require_realm_admin
 @has_request_variables
 def update_realm(
-        request: HttpRequest, user_profile: UserProfile,
-        name: Optional[str]=REQ(validator=check_string, default=None),
-        description: Optional[str]=REQ(validator=check_string, default=None),
-        emails_restricted_to_domains: Optional[bool]=REQ(validator=check_bool, default=None),
-        disallow_disposable_email_addresses: Optional[bool]=REQ(validator=check_bool, default=None),
-        invite_required: Optional[bool]=REQ(validator=check_bool, default=None),
-        invite_by_admins_only: Optional[bool]=REQ(validator=check_bool, default=None),
-        name_changes_disabled: Optional[bool]=REQ(validator=check_bool, default=None),
-        email_changes_disabled: Optional[bool]=REQ(validator=check_bool, default=None),
-        avatar_changes_disabled: Optional[bool]=REQ(validator=check_bool, default=None),
-        inline_image_preview: Optional[bool]=REQ(validator=check_bool, default=None),
-        inline_url_embed_preview: Optional[bool]=REQ(validator=check_bool, default=None),
-        add_emoji_by_admins_only: Optional[bool]=REQ(validator=check_bool, default=None),
-        allow_message_deleting: Optional[bool]=REQ(validator=check_bool, default=None),
-        message_content_delete_limit_seconds: Optional[int]=REQ(converter=to_non_negative_int, default=None),
-        allow_message_editing: Optional[bool]=REQ(validator=check_bool, default=None),
-        allow_community_topic_editing: Optional[bool]=REQ(validator=check_bool, default=None),
-        mandatory_topics: Optional[bool]=REQ(validator=check_bool, default=None),
-        message_content_edit_limit_seconds: Optional[int]=REQ(converter=to_non_negative_int, default=None),
-        allow_edit_history: Optional[bool]=REQ(validator=check_bool, default=None),
-        default_language: Optional[str]=REQ(validator=check_string, default=None),
-        waiting_period_threshold: Optional[int]=REQ(converter=to_non_negative_int, default=None),
-        authentication_methods: Optional[Dict[str, Any]]=REQ(validator=check_dict([]), default=None),
-        notifications_stream_id: Optional[int]=REQ(validator=check_int, default=None),
-        signup_notifications_stream_id: Optional[int]=REQ(validator=check_int, default=None),
-        message_retention_days_raw: Optional[Union[int, str]] = REQ(
-            "message_retention_days", validator=check_string_or_int, default=None),
-        send_welcome_emails: Optional[bool]=REQ(validator=check_bool, default=None),
-        digest_emails_enabled: Optional[bool]=REQ(validator=check_bool, default=None),
-        message_content_allowed_in_email_notifications: Optional[bool]=REQ(
-            validator=check_bool, default=None),
-        bot_creation_policy: Optional[int]=REQ(validator=check_int_in(
-            Realm.BOT_CREATION_POLICY_TYPES), default=None),
-        create_stream_policy: Optional[int]=REQ(validator=check_int_in(
-            Realm.COMMON_POLICY_TYPES), default=None),
-        invite_to_stream_policy: Optional[int]=REQ(validator=check_int_in(
-            Realm.COMMON_POLICY_TYPES), default=None),
-        user_group_edit_policy: Optional[int]=REQ(validator=check_int_in(
-            Realm.USER_GROUP_EDIT_POLICY_TYPES), default=None),
-        private_message_policy: Optional[int]=REQ(validator=check_int_in(
-            Realm.PRIVATE_MESSAGE_POLICY_TYPES), default=None),
-        wildcard_mention_policy: Optional[int]=REQ(validator=check_int_in(
-            Realm.WILDCARD_MENTION_POLICY_TYPES), default=None),
-        email_address_visibility: Optional[int]=REQ(validator=check_int_in(
-            Realm.EMAIL_ADDRESS_VISIBILITY_TYPES), default=None),
-        default_twenty_four_hour_time: Optional[bool]=REQ(validator=check_bool, default=None),
-        video_chat_provider: Optional[int]=REQ(validator=check_int, default=None),
-        default_code_block_language: Optional[str]=REQ(validator=check_string, default=None),
-        digest_weekday: Optional[int]=REQ(validator=check_int_in(Realm.DIGEST_WEEKDAY_VALUES), default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    name: Optional[str] = REQ(validator=check_string, default=None),
+    description: Optional[str] = REQ(validator=check_string, default=None),
+    emails_restricted_to_domains: Optional[bool] = REQ(validator=check_bool, default=None),
+    disallow_disposable_email_addresses: Optional[bool] = REQ(validator=check_bool, default=None),
+    invite_required: Optional[bool] = REQ(validator=check_bool, default=None),
+    invite_by_admins_only: Optional[bool] = REQ(validator=check_bool, default=None),
+    name_changes_disabled: Optional[bool] = REQ(validator=check_bool, default=None),
+    email_changes_disabled: Optional[bool] = REQ(validator=check_bool, default=None),
+    avatar_changes_disabled: Optional[bool] = REQ(validator=check_bool, default=None),
+    inline_image_preview: Optional[bool] = REQ(validator=check_bool, default=None),
+    inline_url_embed_preview: Optional[bool] = REQ(validator=check_bool, default=None),
+    add_emoji_by_admins_only: Optional[bool] = REQ(validator=check_bool, default=None),
+    allow_message_deleting: Optional[bool] = REQ(validator=check_bool, default=None),
+    message_content_delete_limit_seconds: Optional[int] = REQ(
+        converter=to_non_negative_int, default=None
+    ),
+    allow_message_editing: Optional[bool] = REQ(validator=check_bool, default=None),
+    allow_community_topic_editing: Optional[bool] = REQ(validator=check_bool, default=None),
+    mandatory_topics: Optional[bool] = REQ(validator=check_bool, default=None),
+    message_content_edit_limit_seconds: Optional[int] = REQ(
+        converter=to_non_negative_int, default=None
+    ),
+    allow_edit_history: Optional[bool] = REQ(validator=check_bool, default=None),
+    default_language: Optional[str] = REQ(validator=check_string, default=None),
+    waiting_period_threshold: Optional[int] = REQ(converter=to_non_negative_int, default=None),
+    authentication_methods: Optional[Dict[str, Any]] = REQ(validator=check_dict([]), default=None),
+    notifications_stream_id: Optional[int] = REQ(validator=check_int, default=None),
+    signup_notifications_stream_id: Optional[int] = REQ(validator=check_int, default=None),
+    message_retention_days_raw: Optional[Union[int, str]] = REQ(
+        "message_retention_days", validator=check_string_or_int, default=None
+    ),
+    send_welcome_emails: Optional[bool] = REQ(validator=check_bool, default=None),
+    digest_emails_enabled: Optional[bool] = REQ(validator=check_bool, default=None),
+    message_content_allowed_in_email_notifications: Optional[bool] = REQ(
+        validator=check_bool, default=None
+    ),
+    bot_creation_policy: Optional[int] = REQ(
+        validator=check_int_in(Realm.BOT_CREATION_POLICY_TYPES), default=None
+    ),
+    create_stream_policy: Optional[int] = REQ(
+        validator=check_int_in(Realm.COMMON_POLICY_TYPES), default=None
+    ),
+    invite_to_stream_policy: Optional[int] = REQ(
+        validator=check_int_in(Realm.COMMON_POLICY_TYPES), default=None
+    ),
+    user_group_edit_policy: Optional[int] = REQ(
+        validator=check_int_in(Realm.USER_GROUP_EDIT_POLICY_TYPES), default=None
+    ),
+    private_message_policy: Optional[int] = REQ(
+        validator=check_int_in(Realm.PRIVATE_MESSAGE_POLICY_TYPES), default=None
+    ),
+    wildcard_mention_policy: Optional[int] = REQ(
+        validator=check_int_in(Realm.WILDCARD_MENTION_POLICY_TYPES), default=None
+    ),
+    email_address_visibility: Optional[int] = REQ(
+        validator=check_int_in(Realm.EMAIL_ADDRESS_VISIBILITY_TYPES), default=None
+    ),
+    default_twenty_four_hour_time: Optional[bool] = REQ(validator=check_bool, default=None),
+    video_chat_provider: Optional[int] = REQ(validator=check_int, default=None),
+    default_code_block_language: Optional[str] = REQ(validator=check_string, default=None),
+    digest_weekday: Optional[int] = REQ(
+        validator=check_int_in(Realm.DIGEST_WEEKDAY_VALUES), default=None
+    ),
 ) -> HttpResponse:
     realm = user_profile.realm
 
@@ -104,8 +120,9 @@ def update_realm(
             raise OrganizationOwnerRequired()
         if True not in list(authentication_methods.values()):
             return json_error(_("At least one authentication method must be enabled."))
-    if (video_chat_provider is not None and
-            video_chat_provider not in {p['id'] for p in Realm.VIDEO_CHAT_PROVIDERS.values()}):
+    if video_chat_provider is not None and video_chat_provider not in {
+        p['id'] for p in Realm.VIDEO_CHAT_PROVIDERS.values()
+    }:
         return json_error(_("Invalid video_chat_provider {}").format(video_chat_provider))
 
     message_retention_days: Optional[int] = None
@@ -114,7 +131,8 @@ def update_realm(
             raise OrganizationOwnerRequired()
         realm.ensure_not_on_limited_plan()
         message_retention_days = parse_message_retention_days(
-            message_retention_days_raw, Realm.MESSAGE_RETENTION_SPECIAL_VALUES_MAP)
+            message_retention_days_raw, Realm.MESSAGE_RETENTION_SPECIAL_VALUES_MAP
+        )
 
     # The user of `locals()` here is a bit of a code smell, but it's
     # restricted to the elements present in realm.property_types.
@@ -136,27 +154,37 @@ def update_realm(
     # The following realm properties do not fit the pattern above
     # authentication_methods is not supported by the do_set_realm_property
     # framework because of its bitfield.
-    if authentication_methods is not None and (realm.authentication_methods_dict() !=
-                                               authentication_methods):
+    if authentication_methods is not None and (
+        realm.authentication_methods_dict() != authentication_methods
+    ):
         do_set_realm_authentication_methods(realm, authentication_methods, acting_user=user_profile)
         data['authentication_methods'] = authentication_methods
     # The message_editing settings are coupled to each other, and thus don't fit
     # into the do_set_realm_property framework.
-    if ((allow_message_editing is not None and realm.allow_message_editing != allow_message_editing) or
-        (message_content_edit_limit_seconds is not None and
-            realm.message_content_edit_limit_seconds != message_content_edit_limit_seconds) or
-        (allow_community_topic_editing is not None and
-            realm.allow_community_topic_editing != allow_community_topic_editing)):
+    if (
+        (allow_message_editing is not None and realm.allow_message_editing != allow_message_editing)
+        or (
+            message_content_edit_limit_seconds is not None
+            and realm.message_content_edit_limit_seconds != message_content_edit_limit_seconds
+        )
+        or (
+            allow_community_topic_editing is not None
+            and realm.allow_community_topic_editing != allow_community_topic_editing
+        )
+    ):
         if allow_message_editing is None:
             allow_message_editing = realm.allow_message_editing
         if message_content_edit_limit_seconds is None:
             message_content_edit_limit_seconds = realm.message_content_edit_limit_seconds
         if allow_community_topic_editing is None:
             allow_community_topic_editing = realm.allow_community_topic_editing
-        do_set_realm_message_editing(realm, allow_message_editing,
-                                     message_content_edit_limit_seconds,
-                                     allow_community_topic_editing,
-                                     acting_user=user_profile)
+        do_set_realm_message_editing(
+            realm,
+            allow_message_editing,
+            message_content_edit_limit_seconds,
+            allow_community_topic_editing,
+            acting_user=user_profile,
+        )
         data['allow_message_editing'] = allow_message_editing
         data['message_content_edit_limit_seconds'] = message_content_edit_limit_seconds
         data['allow_community_topic_editing'] = allow_community_topic_editing
@@ -164,27 +192,34 @@ def update_realm(
     # Realm.notifications_stream and Realm.signup_notifications_stream are not boolean,
     # str or integer field, and thus doesn't fit into the do_set_realm_property framework.
     if notifications_stream_id is not None:
-        if realm.notifications_stream is None or (realm.notifications_stream.id !=
-                                                  notifications_stream_id):
+        if realm.notifications_stream is None or (
+            realm.notifications_stream.id != notifications_stream_id
+        ):
             new_notifications_stream = None
             if notifications_stream_id >= 0:
                 (new_notifications_stream, sub) = access_stream_by_id(
-                    user_profile, notifications_stream_id)
-            do_set_realm_notifications_stream(realm, new_notifications_stream,
-                                              notifications_stream_id,
-                                              acting_user=user_profile)
+                    user_profile, notifications_stream_id
+                )
+            do_set_realm_notifications_stream(
+                realm, new_notifications_stream, notifications_stream_id, acting_user=user_profile
+            )
             data['notifications_stream_id'] = notifications_stream_id
 
     if signup_notifications_stream_id is not None:
-        if realm.signup_notifications_stream is None or (realm.signup_notifications_stream.id !=
-                                                         signup_notifications_stream_id):
+        if realm.signup_notifications_stream is None or (
+            realm.signup_notifications_stream.id != signup_notifications_stream_id
+        ):
             new_signup_notifications_stream = None
             if signup_notifications_stream_id >= 0:
                 (new_signup_notifications_stream, sub) = access_stream_by_id(
-                    user_profile, signup_notifications_stream_id)
-            do_set_realm_signup_notifications_stream(realm, new_signup_notifications_stream,
-                                                     signup_notifications_stream_id,
-                                                     acting_user=user_profile)
+                    user_profile, signup_notifications_stream_id
+                )
+            do_set_realm_signup_notifications_stream(
+                realm,
+                new_signup_notifications_stream,
+                signup_notifications_stream_id,
+                acting_user=user_profile,
+            )
             data['signup_notifications_stream_id'] = signup_notifications_stream_id
 
     if default_code_block_language is not None:
@@ -196,6 +231,7 @@ def update_realm(
 
     return json_success(data)
 
+
 @require_realm_owner
 @has_request_variables
 def deactivate_realm(request: HttpRequest, user: UserProfile) -> HttpResponse:
@@ -203,6 +239,7 @@ def deactivate_realm(request: HttpRequest, user: UserProfile) -> HttpResponse:
     do_deactivate_realm(realm, user)
     return json_success()
 
+
 @require_safe
 def check_subdomain_available(request: HttpRequest, subdomain: str) -> HttpResponse:
     try:
@@ -211,6 +248,7 @@ def check_subdomain_available(request: HttpRequest, subdomain: str) -> HttpRespo
     except ValidationError as e:
         return json_success({"msg": e.message})
 
+
 def realm_reactivation(request: HttpRequest, confirmation_key: str) -> HttpResponse:
     try:
         realm = get_object_from_key(confirmation_key, Confirmation.REALM_REACTIVATION)
diff --git a/zerver/views/realm_domains.py b/zerver/views/realm_domains.py
index 8a588fec1b..cdfc8a06e6 100644
--- a/zerver/views/realm_domains.py
+++ b/zerver/views/realm_domains.py
@@ -15,25 +15,36 @@ def list_realm_domains(request: HttpRequest, user_profile: UserProfile) -> HttpR
     domains = get_realm_domains(user_profile.realm)
     return json_success({'domains': domains})
 
+
 @require_realm_admin
 @has_request_variables
-def create_realm_domain(request: HttpRequest, user_profile: UserProfile,
-                        domain: str=REQ(validator=check_string),
-                        allow_subdomains: bool=REQ(validator=check_bool)) -> HttpResponse:
+def create_realm_domain(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    domain: str = REQ(validator=check_string),
+    allow_subdomains: bool = REQ(validator=check_bool),
+) -> HttpResponse:
     domain = domain.strip().lower()
     try:
         validate_domain(domain)
     except ValidationError as e:
         return json_error(_('Invalid domain: {}').format(e.messages[0]))
     if RealmDomain.objects.filter(realm=user_profile.realm, domain=domain).exists():
-        return json_error(_("The domain {domain} is already a part of your organization.").format(domain=domain))
+        return json_error(
+            _("The domain {domain} is already a part of your organization.").format(domain=domain)
+        )
     realm_domain = do_add_realm_domain(user_profile.realm, domain, allow_subdomains)
     return json_success({'new_domain': [realm_domain.id, realm_domain.domain]})
 
+
 @require_realm_admin
 @has_request_variables
-def patch_realm_domain(request: HttpRequest, user_profile: UserProfile, domain: str,
-                       allow_subdomains: bool=REQ(validator=check_bool)) -> HttpResponse:
+def patch_realm_domain(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    domain: str,
+    allow_subdomains: bool = REQ(validator=check_bool),
+) -> HttpResponse:
     try:
         realm_domain = RealmDomain.objects.get(realm=user_profile.realm, domain=domain)
         do_change_realm_domain(realm_domain, allow_subdomains)
@@ -41,10 +52,12 @@ def patch_realm_domain(request: HttpRequest, user_profile: UserProfile, domain:
         return json_error(_('No entry found for domain {domain}.').format(domain=domain))
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def delete_realm_domain(request: HttpRequest, user_profile: UserProfile,
-                        domain: str) -> HttpResponse:
+def delete_realm_domain(
+    request: HttpRequest, user_profile: UserProfile, domain: str
+) -> HttpResponse:
     try:
         realm_domain = RealmDomain.objects.get(realm=user_profile.realm, domain=domain)
         do_remove_realm_domain(realm_domain, acting_user=user_profile)
diff --git a/zerver/views/realm_emoji.py b/zerver/views/realm_emoji.py
index 911a702788..40c3fed847 100644
--- a/zerver/views/realm_emoji.py
+++ b/zerver/views/realm_emoji.py
@@ -19,37 +19,36 @@ def list_emoji(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
 
 @require_member_or_admin
 @has_request_variables
-def upload_emoji(request: HttpRequest, user_profile: UserProfile,
-                 emoji_name: str=REQ(path_only=True)) -> HttpResponse:
+def upload_emoji(
+    request: HttpRequest, user_profile: UserProfile, emoji_name: str = REQ(path_only=True)
+) -> HttpResponse:
     emoji_name = emoji_name.strip().replace(' ', '_')
     check_valid_emoji_name(emoji_name)
     check_emoji_admin(user_profile)
-    if RealmEmoji.objects.filter(realm=user_profile.realm,
-                                 name=emoji_name,
-                                 deactivated=False).exists():
+    if RealmEmoji.objects.filter(
+        realm=user_profile.realm, name=emoji_name, deactivated=False
+    ).exists():
         return json_error(_("A custom emoji with this name already exists."))
     if len(request.FILES) != 1:
         return json_error(_("You must upload exactly one file."))
     emoji_file = list(request.FILES.values())[0]
     if (settings.MAX_EMOJI_FILE_SIZE * 1024 * 1024) < emoji_file.size:
-        return json_error(_("Uploaded file is larger than the allowed limit of {} MiB").format(
-            settings.MAX_EMOJI_FILE_SIZE,
-        ))
+        return json_error(
+            _("Uploaded file is larger than the allowed limit of {} MiB").format(
+                settings.MAX_EMOJI_FILE_SIZE,
+            )
+        )
 
-    realm_emoji = check_add_realm_emoji(user_profile.realm,
-                                        emoji_name,
-                                        user_profile,
-                                        emoji_file)
+    realm_emoji = check_add_realm_emoji(user_profile.realm, emoji_name, user_profile, emoji_file)
     if realm_emoji is None:
         return json_error(_("Image file upload failed."))
     return json_success()
 
 
-def delete_emoji(request: HttpRequest, user_profile: UserProfile,
-                 emoji_name: str) -> HttpResponse:
-    if not RealmEmoji.objects.filter(realm=user_profile.realm,
-                                     name=emoji_name,
-                                     deactivated=False).exists():
+def delete_emoji(request: HttpRequest, user_profile: UserProfile, emoji_name: str) -> HttpResponse:
+    if not RealmEmoji.objects.filter(
+        realm=user_profile.realm, name=emoji_name, deactivated=False
+    ).exists():
         raise JsonableError(_("Emoji '{}' does not exist").format(emoji_name))
     check_emoji_admin(user_profile, emoji_name)
     do_remove_realm_emoji(user_profile.realm, emoji_name)
diff --git a/zerver/views/realm_export.py b/zerver/views/realm_export.py
index 09086cfc38..bb59cb6751 100644
--- a/zerver/views/realm_export.py
+++ b/zerver/views/realm_export.py
@@ -32,50 +32,60 @@ def export_realm(request: HttpRequest, user: UserProfile) -> HttpResponse:
     # Filter based upon the number of events that have occurred in the delta
     # If we are at the limit, the incoming request is rejected
     event_time_delta = event_time - timedelta(days=7)
-    limit_check = RealmAuditLog.objects.filter(realm=realm,
-                                               event_type=event_type,
-                                               event_time__gte=event_time_delta)
+    limit_check = RealmAuditLog.objects.filter(
+        realm=realm, event_type=event_type, event_time__gte=event_time_delta
+    )
     if len(limit_check) >= EXPORT_LIMIT:
         return json_error(_('Exceeded rate limit.'))
 
-    total_messages = sum(realm_count.value for realm_count in
-                         RealmCount.objects.filter(realm=user.realm,
-                                                   property='messages_sent:client:day'))
-    if (total_messages > MAX_MESSAGE_HISTORY or
-            user.realm.currently_used_upload_space_bytes() > MAX_UPLOAD_QUOTA):
-        return json_error(_('Please request a manual export from {email}.').format(
-            email=settings.ZULIP_ADMINISTRATOR,
-        ))
+    total_messages = sum(
+        realm_count.value
+        for realm_count in RealmCount.objects.filter(
+            realm=user.realm, property='messages_sent:client:day'
+        )
+    )
+    if (
+        total_messages > MAX_MESSAGE_HISTORY
+        or user.realm.currently_used_upload_space_bytes() > MAX_UPLOAD_QUOTA
+    ):
+        return json_error(
+            _('Please request a manual export from {email}.').format(
+                email=settings.ZULIP_ADMINISTRATOR,
+            )
+        )
 
-    row = RealmAuditLog.objects.create(realm=realm,
-                                       event_type=event_type,
-                                       event_time=event_time,
-                                       acting_user=user)
+    row = RealmAuditLog.objects.create(
+        realm=realm, event_type=event_type, event_time=event_time, acting_user=user
+    )
 
     # Allow for UI updates on a pending export
     notify_realm_export(user)
 
     # Using the deferred_work queue processor to avoid
     # killing the process after 60s
-    event = {'type': "realm_export",
-             'time': event_time,
-             'realm_id': realm.id,
-             'user_profile_id': user.id,
-             'id': row.id}
+    event = {
+        'type': "realm_export",
+        'time': event_time,
+        'realm_id': realm.id,
+        'user_profile_id': user.id,
+        'id': row.id,
+    }
     queue_json_publish('deferred_work', event)
     return json_success()
 
+
 @require_realm_admin
 def get_realm_exports(request: HttpRequest, user: UserProfile) -> HttpResponse:
     realm_exports = get_realm_exports_serialized(user)
     return json_success({"exports": realm_exports})
 
+
 @require_realm_admin
 def delete_realm_export(request: HttpRequest, user: UserProfile, export_id: int) -> HttpResponse:
     try:
-        audit_log_entry = RealmAuditLog.objects.get(id=export_id,
-                                                    realm=user.realm,
-                                                    event_type=RealmAuditLog.REALM_EXPORTED)
+        audit_log_entry = RealmAuditLog.objects.get(
+            id=export_id, realm=user.realm, event_type=RealmAuditLog.REALM_EXPORTED
+        )
     except RealmAuditLog.DoesNotExist:
         return json_error(_("Invalid data export ID"))
 
diff --git a/zerver/views/realm_filters.py b/zerver/views/realm_filters.py
index 366cb66bdb..15aa8c7d4c 100644
--- a/zerver/views/realm_filters.py
+++ b/zerver/views/realm_filters.py
@@ -17,8 +17,12 @@ def list_filters(request: HttpRequest, user_profile: UserProfile) -> HttpRespons
 
 @require_realm_admin
 @has_request_variables
-def create_filter(request: HttpRequest, user_profile: UserProfile, pattern: str=REQ(),
-                  url_format_string: str=REQ()) -> HttpResponse:
+def create_filter(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    pattern: str = REQ(),
+    url_format_string: str = REQ(),
+) -> HttpResponse:
     try:
         filter_id = do_add_realm_filter(
             realm=user_profile.realm,
@@ -31,8 +35,7 @@ def create_filter(request: HttpRequest, user_profile: UserProfile, pattern: str=
 
 
 @require_realm_admin
-def delete_filter(request: HttpRequest, user_profile: UserProfile,
-                  filter_id: int) -> HttpResponse:
+def delete_filter(request: HttpRequest, user_profile: UserProfile, filter_id: int) -> HttpResponse:
     try:
         do_remove_realm_filter(realm=user_profile.realm, id=filter_id)
     except RealmFilter.DoesNotExist:
diff --git a/zerver/views/realm_icon.py b/zerver/views/realm_icon.py
index 25eae53d36..20fa17161b 100644
--- a/zerver/views/realm_icon.py
+++ b/zerver/views/realm_icon.py
@@ -19,12 +19,16 @@ def upload_icon(request: HttpRequest, user_profile: UserProfile) -> HttpResponse
         return json_error(_("You must upload exactly one icon."))
 
     icon_file = list(request.FILES.values())[0]
-    if ((settings.MAX_ICON_FILE_SIZE * 1024 * 1024) < icon_file.size):
-        return json_error(_("Uploaded file is larger than the allowed limit of {} MiB").format(
-            settings.MAX_ICON_FILE_SIZE,
-        ))
+    if (settings.MAX_ICON_FILE_SIZE * 1024 * 1024) < icon_file.size:
+        return json_error(
+            _("Uploaded file is larger than the allowed limit of {} MiB").format(
+                settings.MAX_ICON_FILE_SIZE,
+            )
+        )
     upload_icon_image(icon_file, user_profile)
-    do_change_icon_source(user_profile.realm, user_profile.realm.ICON_UPLOADED, acting_user=user_profile)
+    do_change_icon_source(
+        user_profile.realm, user_profile.realm.ICON_UPLOADED, acting_user=user_profile
+    )
     icon_url = realm_icon_url(user_profile.realm)
 
     json_result = dict(
@@ -38,7 +42,9 @@ def delete_icon_backend(request: HttpRequest, user_profile: UserProfile) -> Http
     # We don't actually delete the icon because it might still
     # be needed if the URL was cached and it is rewritten
     # in any case after next update.
-    do_change_icon_source(user_profile.realm, user_profile.realm.ICON_FROM_GRAVATAR, acting_user=user_profile)
+    do_change_icon_source(
+        user_profile.realm, user_profile.realm.ICON_FROM_GRAVATAR, acting_user=user_profile
+    )
     gravatar_url = realm_icon_url(user_profile.realm)
     json_result = dict(
         icon_url=gravatar_url,
diff --git a/zerver/views/realm_logo.py b/zerver/views/realm_logo.py
index cb00357ee2..4f43c828ca 100644
--- a/zerver/views/realm_logo.py
+++ b/zerver/views/realm_logo.py
@@ -16,34 +16,45 @@ from zerver.models import UserProfile
 
 @require_realm_admin
 @has_request_variables
-def upload_logo(request: HttpRequest, user_profile: UserProfile,
-                night: bool=REQ(validator=check_bool)) -> HttpResponse:
+def upload_logo(
+    request: HttpRequest, user_profile: UserProfile, night: bool = REQ(validator=check_bool)
+) -> HttpResponse:
     user_profile.realm.ensure_not_on_limited_plan()
 
     if len(request.FILES) != 1:
         return json_error(_("You must upload exactly one logo."))
     logo_file = list(request.FILES.values())[0]
-    if ((settings.MAX_LOGO_FILE_SIZE * 1024 * 1024) < logo_file.size):
-        return json_error(_("Uploaded file is larger than the allowed limit of {} MiB").format(
-            settings.MAX_LOGO_FILE_SIZE,
-        ))
+    if (settings.MAX_LOGO_FILE_SIZE * 1024 * 1024) < logo_file.size:
+        return json_error(
+            _("Uploaded file is larger than the allowed limit of {} MiB").format(
+                settings.MAX_LOGO_FILE_SIZE,
+            )
+        )
     upload_logo_image(logo_file, user_profile, night)
-    do_change_logo_source(user_profile.realm, user_profile.realm.LOGO_UPLOADED, night, acting_user=user_profile)
+    do_change_logo_source(
+        user_profile.realm, user_profile.realm.LOGO_UPLOADED, night, acting_user=user_profile
+    )
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def delete_logo_backend(request: HttpRequest, user_profile: UserProfile,
-                        night: bool=REQ(validator=check_bool)) -> HttpResponse:
+def delete_logo_backend(
+    request: HttpRequest, user_profile: UserProfile, night: bool = REQ(validator=check_bool)
+) -> HttpResponse:
     # We don't actually delete the logo because it might still
     # be needed if the URL was cached and it is rewritten
     # in any case after next update.
-    do_change_logo_source(user_profile.realm, user_profile.realm.LOGO_DEFAULT, night, acting_user=user_profile)
+    do_change_logo_source(
+        user_profile.realm, user_profile.realm.LOGO_DEFAULT, night, acting_user=user_profile
+    )
     return json_success()
 
+
 @has_request_variables
-def get_logo_backend(request: HttpRequest, user_profile: UserProfile,
-                     night: bool=REQ(validator=check_bool)) -> HttpResponse:
+def get_logo_backend(
+    request: HttpRequest, user_profile: UserProfile, night: bool = REQ(validator=check_bool)
+) -> HttpResponse:
     url = get_realm_logo_url(user_profile.realm, night)
 
     # We can rely on the URL already having query parameters. Because
diff --git a/zerver/views/registration.py b/zerver/views/registration.py
index eafbcd8d3e..295a51bcab 100644
--- a/zerver/views/registration.py
+++ b/zerver/views/registration.py
@@ -92,9 +92,13 @@ from zproject.backends import (
 def check_prereg_key_and_redirect(request: HttpRequest, confirmation_key: str) -> HttpResponse:
     confirmation = Confirmation.objects.filter(confirmation_key=confirmation_key).first()
     if confirmation is None or confirmation.type not in [
-            Confirmation.USER_REGISTRATION, Confirmation.INVITATION, Confirmation.REALM_CREATION]:
+        Confirmation.USER_REGISTRATION,
+        Confirmation.INVITATION,
+        Confirmation.REALM_CREATION,
+    ]:
         return render_confirmation_key_error(
-            request, ConfirmationKeyException(ConfirmationKeyException.DOES_NOT_EXIST))
+            request, ConfirmationKeyException(ConfirmationKeyException.DOES_NOT_EXIST)
+        )
 
     prereg_user = confirmation.content_object
     if prereg_user.status == confirmation_settings.STATUS_REVOKED:
@@ -108,10 +112,12 @@ def check_prereg_key_and_redirect(request: HttpRequest, confirmation_key: str) -
     # confirm_preregistrationuser.html just extracts the confirmation_key
     # (and GET parameters) and redirects to /accounts/register, so that the
     # user can enter their information on a cleaner URL.
-    return render(request, 'confirmation/confirm_preregistrationuser.html',
-                  context={
-                      'key': confirmation_key,
-                      'full_name': request.GET.get("full_name", None)})
+    return render(
+        request,
+        'confirmation/confirm_preregistrationuser.html',
+        context={'key': confirmation_key, 'full_name': request.GET.get("full_name", None)},
+    )
+
 
 @require_post
 def accounts_register(request: HttpRequest) -> HttpResponse:
@@ -141,19 +147,29 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
     else:
         if get_subdomain(request) != prereg_user.realm.string_id:
             return render_confirmation_key_error(
-                request, ConfirmationKeyException(ConfirmationKeyException.DOES_NOT_EXIST))
+                request, ConfirmationKeyException(ConfirmationKeyException.DOES_NOT_EXIST)
+            )
         realm = prereg_user.realm
         try:
             email_allowed_for_realm(email, realm)
         except DomainNotAllowedForRealmError:
-            return render(request, "zerver/invalid_email.html",
-                          context={"realm_name": realm.name, "closed_domain": True})
+            return render(
+                request,
+                "zerver/invalid_email.html",
+                context={"realm_name": realm.name, "closed_domain": True},
+            )
         except DisposableEmailError:
-            return render(request, "zerver/invalid_email.html",
-                          context={"realm_name": realm.name, "disposable_emails_not_allowed": True})
+            return render(
+                request,
+                "zerver/invalid_email.html",
+                context={"realm_name": realm.name, "disposable_emails_not_allowed": True},
+            )
         except EmailContainsPlusError:
-            return render(request, "zerver/invalid_email.html",
-                          context={"realm_name": realm.name, "email_contains_plus": True})
+            return render(
+                request,
+                "zerver/invalid_email.html",
+                context={"realm_name": realm.name, "email_contains_plus": True},
+            )
 
         if realm.deactivated:
             # The user is trying to register for a deactivated realm. Advise them to
@@ -220,8 +236,7 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
             # filled out by the user) we want the form to validate,
             # so they can be directly registered without having to
             # go through this interstitial.
-            form = RegistrationForm({'full_name': ldap_full_name},
-                                    realm_creation=realm_creation)
+            form = RegistrationForm({'full_name': ldap_full_name}, realm_creation=realm_creation)
             request.session['authenticated_full_name'] = ldap_full_name
             name_validated = True
         elif realm is not None and realm.is_zephyr_mirror_realm:
@@ -232,17 +247,20 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
             hesiod_name = compute_mit_user_fullname(email)
             form = RegistrationForm(
                 initial={'full_name': hesiod_name if "@" not in hesiod_name else ""},
-                realm_creation=realm_creation)
+                realm_creation=realm_creation,
+            )
             name_validated = True
         elif prereg_user.full_name:
             if prereg_user.full_name_validated:
                 request.session['authenticated_full_name'] = prereg_user.full_name
                 name_validated = True
-                form = RegistrationForm({'full_name': prereg_user.full_name},
-                                        realm_creation=realm_creation)
+                form = RegistrationForm(
+                    {'full_name': prereg_user.full_name}, realm_creation=realm_creation
+                )
             else:
-                form = RegistrationForm(initial={'full_name': prereg_user.full_name},
-                                        realm_creation=realm_creation)
+                form = RegistrationForm(
+                    initial={'full_name': prereg_user.full_name}, realm_creation=realm_creation
+                )
         elif 'full_name' in request.POST:
             form = RegistrationForm(
                 initial={'full_name': request.POST.get('full_name')},
@@ -282,7 +300,7 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
             realm_name = form.cleaned_data['realm_name']
             realm = do_create_realm(string_id, realm_name)
             setup_realm_internal_bots(realm)
-        assert(realm is not None)
+        assert realm is not None
 
         full_name = form.cleaned_data['full_name']
         default_stream_group_names = request.POST.getlist('default_stream_group')
@@ -299,7 +317,9 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
 
         if not realm_creation:
             try:
-                existing_user_profile: Optional[UserProfile] = get_user_by_delivery_email(email, realm)
+                existing_user_profile: Optional[UserProfile] = get_user_by_delivery_email(
+                    email, realm
+                )
             except UserProfile.DoesNotExist:
                 existing_user_profile = None
         else:
@@ -323,19 +343,24 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
             # pregeg_user.realm_creation carries the information about whether
             # we're in realm creation mode, and the ldap flow will handle
             # that and create the user with the appropriate parameters.
-            user_profile = authenticate(request=request,
-                                        username=email,
-                                        password=password,
-                                        realm=realm,
-                                        prereg_user=prereg_user,
-                                        return_data=return_data)
+            user_profile = authenticate(
+                request=request,
+                username=email,
+                password=password,
+                realm=realm,
+                prereg_user=prereg_user,
+                return_data=return_data,
+            )
             if user_profile is None:
-                can_use_different_backend = email_auth_enabled(realm) or any_social_backend_enabled(realm)
+                can_use_different_backend = email_auth_enabled(realm) or any_social_backend_enabled(
+                    realm
+                )
                 if settings.LDAP_APPEND_DOMAIN:
                     # In LDAP_APPEND_DOMAIN configurations, we don't allow making a non-LDAP account
                     # if the email matches the ldap domain.
                     can_use_different_backend = can_use_different_backend and (
-                        not email_belongs_to_ldap(realm, email))
+                        not email_belongs_to_ldap(realm, email)
+                    )
                 if return_data.get("no_matching_ldap_user") and can_use_different_backend:
                     # If both the LDAP and Email or Social auth backends are
                     # enabled, and there's no matching user in the LDAP
@@ -372,15 +397,20 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
             # make it respect invited_as_admin / is_realm_admin.
 
         if user_profile is None:
-            user_profile = do_create_user(email, password, realm, full_name,
-                                          prereg_user=prereg_user,
-                                          role=role,
-                                          tos_version=settings.TOS_VERSION,
-                                          timezone=timezone,
-                                          default_stream_groups=default_stream_groups,
-                                          source_profile=source_profile,
-                                          realm_creation=realm_creation,
-                                          acting_user=None)
+            user_profile = do_create_user(
+                email,
+                password,
+                realm,
+                full_name,
+                prereg_user=prereg_user,
+                role=role,
+                tos_version=settings.TOS_VERSION,
+                timezone=timezone,
+                default_stream_groups=default_stream_groups,
+                source_profile=source_profile,
+                realm_creation=realm_creation,
+                acting_user=None,
+            )
 
         if realm_creation:
             bulk_add_subscriptions(realm, [realm.signup_notifications_stream], [user_profile])
@@ -389,20 +419,24 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
             # Because for realm creation, registration happens on the
             # root domain, we need to log them into the subdomain for
             # their new realm.
-            return redirect_and_log_into_subdomain(ExternalAuthResult(user_profile=user_profile,
-                                                                      data_dict={'is_realm_creation': True}))
+            return redirect_and_log_into_subdomain(
+                ExternalAuthResult(user_profile=user_profile, data_dict={'is_realm_creation': True})
+            )
 
         # This dummy_backend check below confirms the user is
         # authenticating to the correct subdomain.
-        auth_result = authenticate(username=user_profile.delivery_email,
-                                   realm=realm,
-                                   return_data=return_data,
-                                   use_dummy_backend=True)
+        auth_result = authenticate(
+            username=user_profile.delivery_email,
+            realm=realm,
+            return_data=return_data,
+            use_dummy_backend=True,
+        )
         if return_data.get('invalid_subdomain'):
             # By construction, this should never happen.
             logging.error(
                 "Subdomain mismatch in registration %s: %s",
-                realm.subdomain, user_profile.delivery_email,
+                realm.subdomain,
+                user_profile.delivery_email,
             )
             return redirect('/')
 
@@ -411,33 +445,37 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
     return render(
         request,
         'zerver/register.html',
-        context={'form': form,
-                 'email': email,
-                 'key': key,
-                 'full_name': request.session.get('authenticated_full_name', None),
-                 'lock_name': name_validated and name_changes_disabled(realm),
-                 # password_auth_enabled is normally set via our context processor,
-                 # but for the registration form, there is no logged in user yet, so
-                 # we have to set it here.
-                 'creating_new_team': realm_creation,
-                 'password_required': password_auth_enabled(realm) and password_required,
-                 'require_ldap_password': require_ldap_password,
-                 'password_auth_enabled': password_auth_enabled(realm),
-                 'root_domain_available': is_root_domain_available(),
-                 'default_stream_groups': [] if realm is None else get_default_stream_groups(realm),
-                 'accounts': get_accounts_for_email(email),
-                 'MAX_REALM_NAME_LENGTH': str(Realm.MAX_REALM_NAME_LENGTH),
-                 'MAX_NAME_LENGTH': str(UserProfile.MAX_NAME_LENGTH),
-                 'MAX_PASSWORD_LENGTH': str(form.MAX_PASSWORD_LENGTH),
-                 'MAX_REALM_SUBDOMAIN_LENGTH': str(Realm.MAX_REALM_SUBDOMAIN_LENGTH),
-                 },
+        context={
+            'form': form,
+            'email': email,
+            'key': key,
+            'full_name': request.session.get('authenticated_full_name', None),
+            'lock_name': name_validated and name_changes_disabled(realm),
+            # password_auth_enabled is normally set via our context processor,
+            # but for the registration form, there is no logged in user yet, so
+            # we have to set it here.
+            'creating_new_team': realm_creation,
+            'password_required': password_auth_enabled(realm) and password_required,
+            'require_ldap_password': require_ldap_password,
+            'password_auth_enabled': password_auth_enabled(realm),
+            'root_domain_available': is_root_domain_available(),
+            'default_stream_groups': [] if realm is None else get_default_stream_groups(realm),
+            'accounts': get_accounts_for_email(email),
+            'MAX_REALM_NAME_LENGTH': str(Realm.MAX_REALM_NAME_LENGTH),
+            'MAX_NAME_LENGTH': str(UserProfile.MAX_NAME_LENGTH),
+            'MAX_PASSWORD_LENGTH': str(form.MAX_PASSWORD_LENGTH),
+            'MAX_REALM_SUBDOMAIN_LENGTH': str(Realm.MAX_REALM_SUBDOMAIN_LENGTH),
+        },
     )
 
+
 def login_and_go_to_home(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
-    mobile_flow_otp = get_expirable_session_var(request.session, 'registration_mobile_flow_otp',
-                                                delete=True)
-    desktop_flow_otp = get_expirable_session_var(request.session, 'registration_desktop_flow_otp',
-                                                 delete=True)
+    mobile_flow_otp = get_expirable_session_var(
+        request.session, 'registration_mobile_flow_otp', delete=True
+    )
+    desktop_flow_otp = get_expirable_session_var(
+        request.session, 'registration_desktop_flow_otp', delete=True
+    )
     if mobile_flow_otp is not None:
         return finish_mobile_flow(request, user_profile, mobile_flow_otp)
     elif desktop_flow_otp is not None:
@@ -448,10 +486,14 @@ def login_and_go_to_home(request: HttpRequest, user_profile: UserProfile) -> Htt
     # that 'user_profile' is user-controlled
     return HttpResponseRedirect(mark_sanitized(user_profile.realm.uri) + reverse('home'))
 
-def prepare_activation_url(email: str, request: HttpRequest,
-                           realm_creation: bool=False,
-                           streams: Optional[List[Stream]]=None,
-                           invited_as: Optional[int]=None) -> str:
+
+def prepare_activation_url(
+    email: str,
+    request: HttpRequest,
+    realm_creation: bool = False,
+    streams: Optional[List[Stream]] = None,
+    invited_as: Optional[int] = None,
+) -> str:
     """
     Send an email with a confirmation link to the provided e-mail so the user
     can complete their registration.
@@ -474,29 +516,46 @@ def prepare_activation_url(email: str, request: HttpRequest,
         request.session['confirmation_key'] = {'confirmation_key': activation_url.split('/')[-1]}
     return activation_url
 
-def send_confirm_registration_email(email: str, activation_url: str, language: str,
-                                    realm: Optional[Realm]=None) -> None:
-    send_email('zerver/emails/confirm_registration', to_emails=[email],
-               from_address=FromAddress.tokenized_no_reply_address(),
-               language=language, context={'activate_url': activation_url},
-               realm=realm)
+
+def send_confirm_registration_email(
+    email: str, activation_url: str, language: str, realm: Optional[Realm] = None
+) -> None:
+    send_email(
+        'zerver/emails/confirm_registration',
+        to_emails=[email],
+        from_address=FromAddress.tokenized_no_reply_address(),
+        language=language,
+        context={'activate_url': activation_url},
+        realm=realm,
+    )
+
 
 def redirect_to_email_login_url(email: str) -> HttpResponseRedirect:
     login_url = reverse('login')
-    redirect_url = add_query_to_redirect_url(login_url, urlencode({"email": email, "already_registered": 1}))
+    redirect_url = add_query_to_redirect_url(
+        login_url, urlencode({"email": email, "already_registered": 1})
+    )
     return HttpResponseRedirect(redirect_url)
 
-def create_realm(request: HttpRequest, creation_key: Optional[str]=None) -> HttpResponse:
+
+def create_realm(request: HttpRequest, creation_key: Optional[str] = None) -> HttpResponse:
     try:
         key_record = validate_key(creation_key)
     except RealmCreationKey.Invalid:
-        return render(request, "zerver/realm_creation_failed.html",
-                      context={'message': _('The organization creation link has expired'
-                                            ' or is not valid.')})
+        return render(
+            request,
+            "zerver/realm_creation_failed.html",
+            context={
+                'message': _('The organization creation link has expired' ' or is not valid.')
+            },
+        )
     if not settings.OPEN_REALM_CREATION:
         if key_record is None:
-            return render(request, "zerver/realm_creation_failed.html",
-                          context={'message': _('New organization creation disabled')})
+            return render(
+                request,
+                "zerver/realm_creation_failed.html",
+                context={'message': _('New organization creation disabled')},
+            )
 
     # When settings.OPEN_REALM_CREATION is enabled, anyone can create a new realm,
     # with a few restrictions on their email address.
@@ -524,13 +583,18 @@ def create_realm(request: HttpRequest, creation_key: Optional[str]=None) -> Http
             return HttpResponseRedirect(reverse('new_realm_send_confirm', kwargs={'email': email}))
     else:
         form = RealmCreationForm()
-    return render(request,
-                  'zerver/create_realm.html',
-                  context={'form': form, 'current_url': request.get_full_path},
-                  )
+    return render(
+        request,
+        'zerver/create_realm.html',
+        context={'form': form, 'current_url': request.get_full_path},
+    )
 
-def accounts_home(request: HttpRequest, multiuse_object_key: str="",
-                  multiuse_object: Optional[MultiuseInvite]=None) -> HttpResponse:
+
+def accounts_home(
+    request: HttpRequest,
+    multiuse_object_key: str = "",
+    multiuse_object: Optional[MultiuseInvite] = None,
+) -> HttpResponse:
     try:
         realm = get_realm(get_subdomain(request))
     except Realm.DoesNotExist:
@@ -558,10 +622,13 @@ def accounts_home(request: HttpRequest, multiuse_object_key: str="",
             except ValidationError:
                 return redirect_to_email_login_url(email)
 
-            activation_url = prepare_activation_url(email, request, streams=streams_to_subscribe,
-                                                    invited_as=invited_as)
+            activation_url = prepare_activation_url(
+                email, request, streams=streams_to_subscribe, invited_as=invited_as
+            )
             try:
-                send_confirm_registration_email(email, activation_url, request.LANGUAGE_CODE, realm=realm)
+                send_confirm_registration_email(
+                    email, activation_url, request.LANGUAGE_CODE, realm=realm
+                )
             except smtplib.SMTPException as e:
                 logging.error('Error in accounts_home: %s', str(e))
                 return HttpResponseRedirect("/config-error/smtp")
@@ -571,11 +638,15 @@ def accounts_home(request: HttpRequest, multiuse_object_key: str="",
     else:
         form = HomepageForm(realm=realm)
     context = login_context(request)
-    context.update(form=form, current_url=request.get_full_path,
-                   multiuse_object_key=multiuse_object_key,
-                   from_multiuse_invite=from_multiuse_invite)
+    context.update(
+        form=form,
+        current_url=request.get_full_path,
+        multiuse_object_key=multiuse_object_key,
+        from_multiuse_invite=from_multiuse_invite,
+    )
     return render(request, 'zerver/accounts_home.html', context=context)
 
+
 def accounts_home_from_multiuse_invite(request: HttpRequest, confirmation_key: str) -> HttpResponse:
     multiuse_object = None
     try:
@@ -585,14 +656,18 @@ def accounts_home_from_multiuse_invite(request: HttpRequest, confirmation_key: s
         realm = get_realm_from_request(request)
         if realm is None or realm.invite_required:
             return render_confirmation_key_error(request, exception)
-    return accounts_home(request, multiuse_object_key=confirmation_key,
-                         multiuse_object=multiuse_object)
+    return accounts_home(
+        request, multiuse_object_key=confirmation_key, multiuse_object=multiuse_object
+    )
+
 
 def generate_204(request: HttpRequest) -> HttpResponse:
     return HttpResponse(content=None, status=204)
 
+
 def find_account(request: HttpRequest) -> HttpResponse:
     from zerver.context_processors import common_context
+
     url = reverse('find_account')
 
     emails: List[str] = []
@@ -608,14 +683,18 @@ def find_account(request: HttpRequest) -> HttpResponse:
                 emails_q |= Q(delivery_email__iexact=email)
 
             for user in UserProfile.objects.filter(
-                    emails_q, is_active=True, is_bot=False,
-                    realm__deactivated=False):
+                emails_q, is_active=True, is_bot=False, realm__deactivated=False
+            ):
                 context = common_context(user)
                 context.update(
                     email=user.delivery_email,
                 )
-                send_email('zerver/emails/find_team', to_user_ids=[user.id], context=context,
-                           from_address=FromAddress.SUPPORT)
+                send_email(
+                    'zerver/emails/find_team',
+                    to_user_ids=[user.id],
+                    context=context,
+                    from_address=FromAddress.SUPPORT,
+                )
 
             # Note: Show all the emails in the result otherwise this
             # feature can be used to ascertain which email addresses
@@ -636,10 +715,12 @@ def find_account(request: HttpRequest) -> HttpResponse:
                 except ValidationError:
                     pass
 
-    return render(request,
-                  'zerver/find_account.html',
-                  context={'form': form, 'current_url': lambda: url,
-                           'emails': emails})
+    return render(
+        request,
+        'zerver/find_account.html',
+        context={'form': form, 'current_url': lambda: url, 'emails': emails},
+    )
+
 
 def realm_redirect(request: HttpRequest) -> HttpResponse:
     if request.method == 'POST':
diff --git a/zerver/views/report.py b/zerver/views/report.py
index 5409e0d949..886740cc59 100644
--- a/zerver/views/report.py
+++ b/zerver/views/report.py
@@ -28,20 +28,25 @@ js_source_map: Optional[SourceMap] = None
 def get_js_source_map() -> Optional[SourceMap]:
     global js_source_map
     if not js_source_map and not (settings.DEVELOPMENT or settings.TEST_SUITE):
-        js_source_map = SourceMap([
-            static_path('webpack-bundles'),
-        ])
+        js_source_map = SourceMap(
+            [
+                static_path('webpack-bundles'),
+            ]
+        )
     return js_source_map
 
+
 @human_users_only
 @has_request_variables
-def report_send_times(request: HttpRequest, user_profile: UserProfile,
-                      time: int=REQ(converter=to_non_negative_int),
-                      received: int=REQ(converter=to_non_negative_int, default=-1),
-                      displayed: int=REQ(converter=to_non_negative_int, default=-1),
-                      locally_echoed: bool=REQ(validator=check_bool, default=False),
-                      rendered_content_disparity: bool=REQ(validator=check_bool,
-                                                           default=False)) -> HttpResponse:
+def report_send_times(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    time: int = REQ(converter=to_non_negative_int),
+    received: int = REQ(converter=to_non_negative_int, default=-1),
+    displayed: int = REQ(converter=to_non_negative_int, default=-1),
+    locally_echoed: bool = REQ(validator=check_bool, default=False),
+    rendered_content_disparity: bool = REQ(validator=check_bool, default=False),
+) -> HttpResponse:
     received_str = "(unknown)"
     if received > 0:
         received_str = str(received)
@@ -49,7 +54,9 @@ def report_send_times(request: HttpRequest, user_profile: UserProfile,
     if displayed > 0:
         displayed_str = str(displayed)
 
-    request._log_data["extra"] = f"[{time}ms/{received_str}ms/{displayed_str}ms/echo:{locally_echoed}/diff:{rendered_content_disparity}]"
+    request._log_data[
+        "extra"
+    ] = f"[{time}ms/{received_str}ms/{displayed_str}ms/echo:{locally_echoed}/diff:{rendered_content_disparity}]"
 
     base_key = statsd_key(user_profile.realm.string_id, clean_periods=True)
     statsd.timing(f"endtoend.send_time.{base_key}", time)
@@ -63,11 +70,15 @@ def report_send_times(request: HttpRequest, user_profile: UserProfile,
         statsd.incr('render_disparity')
     return json_success()
 
+
 @has_request_variables
-def report_narrow_times(request: HttpRequest, user_profile: Union[UserProfile, AnonymousUser],
-                        initial_core: int=REQ(converter=to_non_negative_int),
-                        initial_free: int=REQ(converter=to_non_negative_int),
-                        network: int=REQ(converter=to_non_negative_int)) -> HttpResponse:
+def report_narrow_times(
+    request: HttpRequest,
+    user_profile: Union[UserProfile, AnonymousUser],
+    initial_core: int = REQ(converter=to_non_negative_int),
+    initial_free: int = REQ(converter=to_non_negative_int),
+    network: int = REQ(converter=to_non_negative_int),
+) -> HttpResponse:
     request._log_data["extra"] = f"[{initial_core}ms/{initial_free}ms/{network}ms]"
     realm = get_valid_realm_from_request(request)
     base_key = statsd_key(realm.string_id, clean_periods=True)
@@ -76,10 +87,14 @@ def report_narrow_times(request: HttpRequest, user_profile: Union[UserProfile, A
     statsd.timing(f"narrow.network.{base_key}", network)
     return json_success()
 
+
 @has_request_variables
-def report_unnarrow_times(request: HttpRequest, user_profile: Union[UserProfile, AnonymousUser],
-                          initial_core: int=REQ(converter=to_non_negative_int),
-                          initial_free: int=REQ(converter=to_non_negative_int)) -> HttpResponse:
+def report_unnarrow_times(
+    request: HttpRequest,
+    user_profile: Union[UserProfile, AnonymousUser],
+    initial_core: int = REQ(converter=to_non_negative_int),
+    initial_free: int = REQ(converter=to_non_negative_int),
+) -> HttpResponse:
     request._log_data["extra"] = f"[{initial_core}ms/{initial_free}ms]"
     realm = get_valid_realm_from_request(request)
     base_key = statsd_key(realm.string_id, clean_periods=True)
@@ -87,12 +102,19 @@ def report_unnarrow_times(request: HttpRequest, user_profile: Union[UserProfile,
     statsd.timing(f"unnarrow.initial_free.{base_key}", initial_free)
     return json_success()
 
+
 @has_request_variables
-def report_error(request: HttpRequest, user_profile: UserProfile, message: str=REQ(),
-                 stacktrace: str=REQ(), ui_message: bool=REQ(validator=check_bool),
-                 user_agent: str=REQ(), href: str=REQ(), log: str=REQ(),
-                 more_info: Mapping[str, Any]=REQ(validator=check_dict([]), default={}),
-                 ) -> HttpResponse:
+def report_error(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message: str = REQ(),
+    stacktrace: str = REQ(),
+    ui_message: bool = REQ(validator=check_bool),
+    user_agent: str = REQ(),
+    href: str = REQ(),
+    log: str = REQ(),
+    more_info: Mapping[str, Any] = REQ(validator=check_dict([]), default={}),
+) -> HttpResponse:
     """Accepts an error report and stores in a queue for processing.  The
     actual error reports are later handled by do_report_error"""
     if not settings.BROWSER_ERROR_REPORTING:
@@ -127,48 +149,55 @@ def report_error(request: HttpRequest, user_profile: UserProfile, message: str=R
         email = "unauthenticated@example.com"
         full_name = "Anonymous User"
 
-    queue_json_publish('error_reports', dict(
-        type = "browser",
-        report = dict(
-            host = SplitResult("", request.get_host(), "", "", "").hostname,
-            ip_address = remote_ip,
-            user_email = email,
-            user_full_name = full_name,
-            user_visible = ui_message,
-            server_path = settings.DEPLOY_ROOT,
-            version = version,
-            user_agent = user_agent,
-            href = href,
-            message = message,
-            stacktrace = stacktrace,
-            log = log,
-            more_info = more_info,
+    queue_json_publish(
+        'error_reports',
+        dict(
+            type="browser",
+            report=dict(
+                host=SplitResult("", request.get_host(), "", "", "").hostname,
+                ip_address=remote_ip,
+                user_email=email,
+                user_full_name=full_name,
+                user_visible=ui_message,
+                server_path=settings.DEPLOY_ROOT,
+                version=version,
+                user_agent=user_agent,
+                href=href,
+                message=message,
+                stacktrace=stacktrace,
+                log=log,
+                more_info=more_info,
+            ),
         ),
-    ))
+    )
 
     return json_success()
 
+
 @csrf_exempt
 @require_POST
 @has_request_variables
-def report_csp_violations(request: HttpRequest,
-                          csp_report: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def report_csp_violations(
+    request: HttpRequest, csp_report: Dict[str, Any] = REQ(argument_type='body')
+) -> HttpResponse:
     def get_attr(csp_report_attr: str) -> str:
         return csp_report.get(csp_report_attr, '')
 
-    logging.warning("CSP Violation in Document('%s'). "
-                    "Blocked URI('%s'), Original Policy('%s'), "
-                    "Violated Directive('%s'), Effective Directive('%s'), "
-                    "Disposition('%s'), Referrer('%s'), "
-                    "Status Code('%s'), Script Sample('%s')",
-                    get_attr('document-uri'),
-                    get_attr('blocked-uri'),
-                    get_attr('original-policy'),
-                    get_attr('violated-directive'),
-                    get_attr('effective-directive'),
-                    get_attr('disposition'),
-                    get_attr('referrer'),
-                    get_attr('status-code'),
-                    get_attr('script-sample'))
+    logging.warning(
+        "CSP Violation in Document('%s'). "
+        "Blocked URI('%s'), Original Policy('%s'), "
+        "Violated Directive('%s'), Effective Directive('%s'), "
+        "Disposition('%s'), Referrer('%s'), "
+        "Status Code('%s'), Script Sample('%s')",
+        get_attr('document-uri'),
+        get_attr('blocked-uri'),
+        get_attr('original-policy'),
+        get_attr('violated-directive'),
+        get_attr('effective-directive'),
+        get_attr('disposition'),
+        get_attr('referrer'),
+        get_attr('status-code'),
+        get_attr('script-sample'),
+    )
 
     return json_success()
diff --git a/zerver/views/storage.py b/zerver/views/storage.py
index 1a8e959531..d3c79388de 100644
--- a/zerver/views/storage.py
+++ b/zerver/views/storage.py
@@ -17,8 +17,9 @@ from zerver.models import UserProfile
 
 @has_request_variables
 def update_storage(
-    request: HttpRequest, user_profile: UserProfile,
-    storage: Dict[str, str]=REQ(validator=check_dict([], value_validator=check_string)),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    storage: Dict[str, str] = REQ(validator=check_dict([], value_validator=check_string)),
 ) -> HttpResponse:
     try:
         set_bot_storage(user_profile, list(storage.items()))
@@ -26,11 +27,12 @@ def update_storage(
         return json_error(str(e))
     return json_success()
 
+
 @has_request_variables
 def get_storage(
-        request: HttpRequest,
-        user_profile: UserProfile,
-        keys: Optional[List[str]]=REQ(validator=check_list(check_string), default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    keys: Optional[List[str]] = REQ(validator=check_list(check_string), default=None),
 ) -> HttpResponse:
     keys = keys or get_keys_in_bot_storage(user_profile)
     try:
@@ -39,11 +41,12 @@ def get_storage(
         return json_error(str(e))
     return json_success({'storage': storage})
 
+
 @has_request_variables
 def remove_storage(
-        request: HttpRequest,
-        user_profile: UserProfile,
-        keys: Optional[List[str]]=REQ(validator=check_list(check_string), default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    keys: Optional[List[str]] = REQ(validator=check_list(check_string), default=None),
 ) -> HttpResponse:
     keys = keys or get_keys_in_bot_storage(user_profile)
     try:
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index 8e53fa7d01..3bd9bb6019 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -115,6 +115,7 @@ class PrincipalError(JsonableError):
     def msg_format() -> str:
         return _("User not authorized to execute queries on behalf of '{principal}'")
 
+
 def principal_to_user_profile(agent: UserProfile, principal: Union[str, int]) -> UserProfile:
     try:
         if isinstance(principal, str):
@@ -128,8 +129,10 @@ def principal_to_user_profile(agent: UserProfile, principal: Union[str, int]) ->
         # principal to maybe give a better error message
         raise PrincipalError(principal)
 
-def check_if_removing_someone_else(user_profile: UserProfile,
-                                   principals: Optional[Union[List[str], List[int]]]) -> bool:
+
+def check_if_removing_someone_else(
+    user_profile: UserProfile, principals: Optional[Union[List[str], List[int]]]
+) -> bool:
     if principals is None or len(principals) == 0:
         return False
 
@@ -141,29 +144,36 @@ def check_if_removing_someone_else(user_profile: UserProfile,
     else:
         return principals[0] != user_profile.email
 
-def deactivate_stream_backend(request: HttpRequest,
-                              user_profile: UserProfile,
-                              stream_id: int) -> HttpResponse:
+
+def deactivate_stream_backend(
+    request: HttpRequest, user_profile: UserProfile, stream_id: int
+) -> HttpResponse:
     (stream, sub) = access_stream_for_delete_or_update(user_profile, stream_id)
     do_deactivate_stream(stream, acting_user=user_profile)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def add_default_stream(request: HttpRequest,
-                       user_profile: UserProfile,
-                       stream_id: int=REQ(validator=check_int)) -> HttpResponse:
+def add_default_stream(
+    request: HttpRequest, user_profile: UserProfile, stream_id: int = REQ(validator=check_int)
+) -> HttpResponse:
     (stream, sub) = access_stream_by_id(user_profile, stream_id)
     if stream.invite_only:
         return json_error(_("Private streams cannot be made default."))
     do_add_default_stream(stream)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def create_default_stream_group(request: HttpRequest, user_profile: UserProfile,
-                                group_name: str=REQ(), description: str=REQ(),
-                                stream_names: List[str]=REQ(validator=check_list(check_string))) -> None:
+def create_default_stream_group(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    group_name: str = REQ(),
+    description: str = REQ(),
+    stream_names: List[str] = REQ(validator=check_list(check_string)),
+) -> None:
     streams = []
     for stream_name in stream_names:
         (stream, sub) = access_stream_by_name(user_profile, stream_name)
@@ -171,12 +181,16 @@ def create_default_stream_group(request: HttpRequest, user_profile: UserProfile,
     do_create_default_stream_group(user_profile.realm, group_name, description, streams)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def update_default_stream_group_info(request: HttpRequest, user_profile: UserProfile, group_id: int,
-                                     new_group_name: Optional[str]=REQ(validator=check_string, default=None),
-                                     new_description: Optional[str]=REQ(validator=check_string,
-                                                                        default=None)) -> None:
+def update_default_stream_group_info(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    group_id: int,
+    new_group_name: Optional[str] = REQ(validator=check_string, default=None),
+    new_description: Optional[str] = REQ(validator=check_string, default=None),
+) -> None:
     if not new_group_name and not new_description:
         return json_error(_('You must pass "new_description" or "new_group_name".'))
 
@@ -187,12 +201,16 @@ def update_default_stream_group_info(request: HttpRequest, user_profile: UserPro
         do_change_default_stream_group_description(user_profile.realm, group, new_description)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def update_default_stream_group_streams(request: HttpRequest, user_profile: UserProfile,
-                                        group_id: int, op: str=REQ(),
-                                        stream_names: List[str]=REQ(
-                                            validator=check_list(check_string))) -> None:
+def update_default_stream_group_streams(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    group_id: int,
+    op: str = REQ(),
+    stream_names: List[str] = REQ(validator=check_list(check_string)),
+) -> None:
     group = access_default_stream_group_by_id(user_profile.realm, group_id)
     streams = []
     for stream_name in stream_names:
@@ -207,19 +225,22 @@ def update_default_stream_group_streams(request: HttpRequest, user_profile: User
         return json_error(_('Invalid value for "op". Specify one of "add" or "remove".'))
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def remove_default_stream_group(request: HttpRequest, user_profile: UserProfile,
-                                group_id: int) -> None:
+def remove_default_stream_group(
+    request: HttpRequest, user_profile: UserProfile, group_id: int
+) -> None:
     group = access_default_stream_group_by_id(user_profile.realm, group_id)
     do_remove_default_stream_group(user_profile.realm, group)
     return json_success()
 
+
 @require_realm_admin
 @has_request_variables
-def remove_default_stream(request: HttpRequest,
-                          user_profile: UserProfile,
-                          stream_id: int=REQ(validator=check_int)) -> HttpResponse:
+def remove_default_stream(
+    request: HttpRequest, user_profile: UserProfile, stream_id: int = REQ(validator=check_int)
+) -> HttpResponse:
     (stream, sub) = access_stream_by_id(
         user_profile,
         stream_id,
@@ -228,19 +249,25 @@ def remove_default_stream(request: HttpRequest,
     do_remove_default_stream(stream)
     return json_success()
 
+
 @has_request_variables
 def update_stream_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        stream_id: int,
-        description: Optional[str]=REQ(validator=check_capped_string(
-            Stream.MAX_DESCRIPTION_LENGTH), default=None),
-        is_private: Optional[bool]=REQ(validator=check_bool, default=None),
-        is_announcement_only: Optional[bool]=REQ(validator=check_bool, default=None),
-        stream_post_policy: Optional[int]=REQ(validator=check_int_in(
-            Stream.STREAM_POST_POLICY_TYPES), default=None),
-        history_public_to_subscribers: Optional[bool]=REQ(validator=check_bool, default=None),
-        new_name: Optional[str]=REQ(validator=check_string, default=None),
-        message_retention_days: Optional[Union[int, str]]=REQ(validator=check_string_or_int, default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_id: int,
+    description: Optional[str] = REQ(
+        validator=check_capped_string(Stream.MAX_DESCRIPTION_LENGTH), default=None
+    ),
+    is_private: Optional[bool] = REQ(validator=check_bool, default=None),
+    is_announcement_only: Optional[bool] = REQ(validator=check_bool, default=None),
+    stream_post_policy: Optional[int] = REQ(
+        validator=check_int_in(Stream.STREAM_POST_POLICY_TYPES), default=None
+    ),
+    history_public_to_subscribers: Optional[bool] = REQ(validator=check_bool, default=None),
+    new_name: Optional[str] = REQ(validator=check_string, default=None),
+    message_retention_days: Optional[Union[int, str]] = REQ(
+        validator=check_string_or_int, default=None
+    ),
 ) -> HttpResponse:
     # We allow realm administrators to to update the stream name and
     # description even for private streams.
@@ -251,7 +278,8 @@ def update_stream_backend(
             raise OrganizationOwnerRequired()
         user_profile.realm.ensure_not_on_limited_plan()
         message_retention_days_value = parse_message_retention_days(
-            message_retention_days, Stream.MESSAGE_RETENTION_SPECIAL_VALUES_MAP)
+            message_retention_days, Stream.MESSAGE_RETENTION_SPECIAL_VALUES_MAP
+        )
         do_change_stream_message_retention_days(stream, message_retention_days_value)
 
     if description is not None:
@@ -289,24 +317,25 @@ def update_stream_backend(
         do_change_stream_invite_only(stream, is_private, history_public_to_subscribers)
     return json_success()
 
+
 @has_request_variables
 def list_subscriptions_backend(
     request: HttpRequest,
     user_profile: UserProfile,
-    include_subscribers: bool=REQ(validator=check_bool, default=False),
+    include_subscribers: bool = REQ(validator=check_bool, default=False),
 ) -> HttpResponse:
     subscribed, _ = gather_subscriptions(
-        user_profile, include_subscribers=include_subscribers,
+        user_profile,
+        include_subscribers=include_subscribers,
     )
     return json_success({"subscriptions": subscribed})
 
+
 FuncKwargPair = Tuple[Callable[..., HttpResponse], Dict[str, Union[int, Iterable[Any]]]]
 
 add_subscriptions_schema = check_list(
     check_dict_only(
-        required_keys=[
-            ('name', check_string)
-        ],
+        required_keys=[('name', check_string)],
         optional_keys=[
             ('color', check_color),
             ('description', check_capped_string(Stream.MAX_DESCRIPTION_LENGTH)),
@@ -316,11 +345,13 @@ add_subscriptions_schema = check_list(
 
 remove_subscriptions_schema = check_list(check_string)
 
+
 @has_request_variables
 def update_subscriptions_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        delete: Iterable[str]=REQ(validator=remove_subscriptions_schema, default=[]),
-        add: Iterable[Mapping[str, Any]]=REQ(validator=add_subscriptions_schema, default=[]),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    delete: Iterable[str] = REQ(validator=remove_subscriptions_schema, default=[]),
+    add: Iterable[Mapping[str, Any]] = REQ(validator=add_subscriptions_schema, default=[]),
 ) -> HttpResponse:
     if not add and not delete:
         return json_error(_('Nothing to do. Specify at least one of "add" or "delete".'))
@@ -331,12 +362,13 @@ def update_subscriptions_backend(
     ]
     return compose_views(request, user_profile, method_kwarg_pairs)
 
+
 def compose_views(
     request: HttpRequest,
     user_profile: UserProfile,
     method_kwarg_pairs: "List[FuncKwargPair]",
 ) -> HttpResponse:
-    '''
+    """
     This takes a series of view methods from method_kwarg_pairs and calls
     them in sequence, and it smushes all the json results into a single
     response when everything goes right.  (This helps clients avoid extra
@@ -344,7 +376,7 @@ def compose_views(
     any one of the composed methods.
 
     TODO: Move this a utils-like module if we end up using it more widely.
-    '''
+    """
 
     json_dict: Dict[str, Any] = {}
     with transaction.atomic():
@@ -355,15 +387,20 @@ def compose_views(
             json_dict.update(orjson.loads(response.content))
     return json_success(json_dict)
 
+
 check_principals: Validator[Union[List[str], List[int]]] = check_union(
     [check_list(check_string), check_list(check_int)],
 )
 
+
 @has_request_variables
 def remove_subscriptions_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        streams_raw: Iterable[str]=REQ("subscriptions", validator=remove_subscriptions_schema),
-        principals: Optional[Union[List[str], List[int]]]=REQ(validator=check_principals, default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    streams_raw: Iterable[str] = REQ("subscriptions", validator=remove_subscriptions_schema),
+    principals: Optional[Union[List[str], List[int]]] = REQ(
+        validator=check_principals, default=None
+    ),
 ) -> HttpResponse:
 
     removing_someone_else = check_if_removing_someone_else(user_profile, principals)
@@ -372,19 +409,21 @@ def remove_subscriptions_backend(
     for stream_name in streams_raw:
         streams_as_dict.append({"name": stream_name.strip()})
 
-    streams, __ = list_to_streams(streams_as_dict, user_profile,
-                                  admin_access_required=removing_someone_else)
+    streams, __ = list_to_streams(
+        streams_as_dict, user_profile, admin_access_required=removing_someone_else
+    )
 
     if principals:
-        people_to_unsub = {principal_to_user_profile(
-            user_profile, principal) for principal in principals}
+        people_to_unsub = {
+            principal_to_user_profile(user_profile, principal) for principal in principals
+        }
     else:
         people_to_unsub = {user_profile}
 
     result: Dict[str, List[str]] = dict(removed=[], not_removed=[])
-    (removed, not_subscribed) = bulk_remove_subscriptions(people_to_unsub, streams,
-                                                          request.client,
-                                                          acting_user=user_profile)
+    (removed, not_subscribed) = bulk_remove_subscriptions(
+        people_to_unsub, streams, request.client, acting_user=user_profile
+    )
 
     for (subscriber, removed_stream) in removed:
         result["removed"].append(removed_stream.name)
@@ -393,9 +432,10 @@ def remove_subscriptions_backend(
 
     return json_success(result)
 
-def you_were_just_subscribed_message(acting_user: UserProfile,
-                                     recipient_user: UserProfile,
-                                     stream_names: Set[str]) -> str:
+
+def you_were_just_subscribed_message(
+    acting_user: UserProfile, recipient_user: UserProfile, stream_names: Set[str]
+) -> str:
     subscriptions = sorted(stream_names)
     if len(subscriptions) == 1:
         with override_language(recipient_user.default_language):
@@ -413,26 +453,34 @@ def you_were_just_subscribed_message(acting_user: UserProfile,
         message += f"* #**{stream_name}**\n"
     return message
 
+
 RETENTION_DEFAULT: Union[str, int] = "realm_default"
 EMPTY_PRINCIPALS: Union[Sequence[str], Sequence[int]] = []
 
+
 @require_non_guest_user
 @has_request_variables
 def add_subscriptions_backend(
-        request: HttpRequest,
-        user_profile: UserProfile,
-        streams_raw: Iterable[Dict[str, str]]=REQ("subscriptions", validator=add_subscriptions_schema),
-        invite_only: bool=REQ(validator=check_bool, default=False),
-        stream_post_policy: int=REQ(validator=check_int_in(
-            Stream.STREAM_POST_POLICY_TYPES), default=Stream.STREAM_POST_POLICY_EVERYONE),
-        history_public_to_subscribers: Optional[bool]=REQ(validator=check_bool, default=None),
-        message_retention_days: Union[str, int]=REQ(validator=check_string_or_int,
-                                                    default=RETENTION_DEFAULT),
-        announce: bool=REQ(validator=check_bool, default=False),
-        principals: Union[Sequence[str], Sequence[int]]=REQ(
-            validator=check_principals, default=EMPTY_PRINCIPALS,
-        ),
-        authorization_errors_fatal: bool=REQ(validator=check_bool, default=True),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    streams_raw: Iterable[Dict[str, str]] = REQ(
+        "subscriptions", validator=add_subscriptions_schema
+    ),
+    invite_only: bool = REQ(validator=check_bool, default=False),
+    stream_post_policy: int = REQ(
+        validator=check_int_in(Stream.STREAM_POST_POLICY_TYPES),
+        default=Stream.STREAM_POST_POLICY_EVERYONE,
+    ),
+    history_public_to_subscribers: Optional[bool] = REQ(validator=check_bool, default=None),
+    message_retention_days: Union[str, int] = REQ(
+        validator=check_string_or_int, default=RETENTION_DEFAULT
+    ),
+    announce: bool = REQ(validator=check_bool, default=False),
+    principals: Union[Sequence[str], Sequence[int]] = REQ(
+        validator=check_principals,
+        default=EMPTY_PRINCIPALS,
+    ),
+    authorization_errors_fatal: bool = REQ(validator=check_bool, default=True),
 ) -> HttpResponse:
     realm = user_profile.realm
     stream_dicts = []
@@ -454,47 +502,56 @@ def add_subscriptions_backend(
         stream_dict_copy["stream_post_policy"] = stream_post_policy
         stream_dict_copy["history_public_to_subscribers"] = history_public_to_subscribers
         stream_dict_copy["message_retention_days"] = parse_message_retention_days(
-            message_retention_days, Stream.MESSAGE_RETENTION_SPECIAL_VALUES_MAP)
+            message_retention_days, Stream.MESSAGE_RETENTION_SPECIAL_VALUES_MAP
+        )
 
         stream_dicts.append(stream_dict_copy)
 
     # Validation of the streams arguments, including enforcement of
     # can_create_streams policy and check_stream_name policy is inside
     # list_to_streams.
-    existing_streams, created_streams = \
-        list_to_streams(stream_dicts, user_profile, autocreate=True)
-    authorized_streams, unauthorized_streams = \
-        filter_stream_authorization(user_profile, existing_streams)
+    existing_streams, created_streams = list_to_streams(stream_dicts, user_profile, autocreate=True)
+    authorized_streams, unauthorized_streams = filter_stream_authorization(
+        user_profile, existing_streams
+    )
     if len(unauthorized_streams) > 0 and authorization_errors_fatal:
-        return json_error(_("Unable to access stream ({stream_name}).").format(
-            stream_name=unauthorized_streams[0].name,
-        ))
+        return json_error(
+            _("Unable to access stream ({stream_name}).").format(
+                stream_name=unauthorized_streams[0].name,
+            )
+        )
     # Newly created streams are also authorized for the creator
     streams = authorized_streams + created_streams
 
     if len(principals) > 0:
         if realm.is_zephyr_mirror_realm and not all(stream.invite_only for stream in streams):
-            return json_error(_("You can only invite other Zephyr mirroring users to private streams."))
+            return json_error(
+                _("You can only invite other Zephyr mirroring users to private streams.")
+            )
         if not user_profile.can_subscribe_other_users():
             if user_profile.realm.invite_to_stream_policy == Realm.POLICY_ADMINS_ONLY:
                 return json_error(_("Only administrators can modify other users' subscriptions."))
             # Realm.POLICY_MEMBERS_ONLY only fails if the
             # user is a guest, which happens in the decorator above.
-            assert user_profile.realm.invite_to_stream_policy == \
-                Realm.POLICY_FULL_MEMBERS_ONLY
+            assert user_profile.realm.invite_to_stream_policy == Realm.POLICY_FULL_MEMBERS_ONLY
             return json_error(_("Your account is too new to modify other users' subscriptions."))
-        subscribers = {principal_to_user_profile(user_profile, principal) for principal in principals}
+        subscribers = {
+            principal_to_user_profile(user_profile, principal) for principal in principals
+        }
     else:
         subscribers = {user_profile}
 
-    (subscribed, already_subscribed) = bulk_add_subscriptions(realm, streams, subscribers,
-                                                              acting_user=user_profile, color_map=color_map)
+    (subscribed, already_subscribed) = bulk_add_subscriptions(
+        realm, streams, subscribers, acting_user=user_profile, color_map=color_map
+    )
 
     # We can assume unique emails here for now, but we should eventually
     # convert this function to be more id-centric.
     email_to_user_profile: Dict[str, UserProfile] = {}
 
-    result: Dict[str, Any] = dict(subscribed=defaultdict(list), already_subscribed=defaultdict(list))
+    result: Dict[str, Any] = dict(
+        subscribed=defaultdict(list), already_subscribed=defaultdict(list)
+    )
     for sub_info in subscribed:
         subscriber = sub_info.user
         stream = sub_info.stream
@@ -523,6 +580,7 @@ def add_subscriptions_backend(
         result["unauthorized"] = [s.name for s in unauthorized_streams]
     return json_success(result)
 
+
 def send_messages_for_new_subscribers(
     user_profile: UserProfile,
     subscribers: Set[UserProfile],
@@ -576,7 +634,9 @@ def send_messages_for_new_subscribers(
                     realm=user_profile.realm,
                     sender=sender,
                     recipient_user=recipient_user,
-                    content=msg))
+                    content=msg,
+                )
+            )
 
     if announce and len(created_streams) > 0:
         notifications_stream = user_profile.realm.get_notifications_stream()
@@ -590,7 +650,7 @@ def send_messages_for_new_subscribers(
 
             content = content.format(
                 user_name=f"@_**{user_profile.full_name}|{user_profile.id}**",
-                stream_str=", ".join(f'#**{s.name}**' for s in created_streams)
+                stream_str=", ".join(f'#**{s.name}**' for s in created_streams),
             )
 
             sender = get_system_bot(settings.NOTIFICATION_BOT)
@@ -624,9 +684,13 @@ def send_messages_for_new_subscribers(
     if len(notifications) > 0:
         do_send_messages(notifications, mark_as_read=[user_profile.id])
 
+
 @has_request_variables
-def get_subscribers_backend(request: HttpRequest, user_profile: UserProfile,
-                            stream_id: int=REQ('stream', converter=to_non_negative_int)) -> HttpResponse:
+def get_subscribers_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_id: int = REQ('stream', converter=to_non_negative_int),
+) -> HttpResponse:
     (stream, sub) = access_stream_by_id(
         user_profile,
         stream_id,
@@ -636,32 +700,39 @@ def get_subscribers_backend(request: HttpRequest, user_profile: UserProfile,
 
     return json_success({'subscribers': subscribers})
 
+
 # By default, lists all streams that the user has access to --
 # i.e. public streams plus invite-only streams that the user is on
 @has_request_variables
 def get_streams_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        include_public: bool=REQ(validator=check_bool, default=True),
-        include_web_public: bool=REQ(validator=check_bool, default=False),
-        include_subscribed: bool=REQ(validator=check_bool, default=True),
-        include_all_active: bool=REQ(validator=check_bool, default=False),
-        include_default: bool=REQ(validator=check_bool, default=False),
-        include_owner_subscribed: bool=REQ(validator=check_bool, default=False),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    include_public: bool = REQ(validator=check_bool, default=True),
+    include_web_public: bool = REQ(validator=check_bool, default=False),
+    include_subscribed: bool = REQ(validator=check_bool, default=True),
+    include_all_active: bool = REQ(validator=check_bool, default=False),
+    include_default: bool = REQ(validator=check_bool, default=False),
+    include_owner_subscribed: bool = REQ(validator=check_bool, default=False),
 ) -> HttpResponse:
 
-    streams = do_get_streams(user_profile, include_public=include_public,
-                             include_web_public=include_web_public,
-                             include_subscribed=include_subscribed,
-                             include_all_active=include_all_active,
-                             include_default=include_default,
-                             include_owner_subscribed=include_owner_subscribed)
+    streams = do_get_streams(
+        user_profile,
+        include_public=include_public,
+        include_web_public=include_web_public,
+        include_subscribed=include_subscribed,
+        include_all_active=include_all_active,
+        include_default=include_default,
+        include_owner_subscribed=include_owner_subscribed,
+    )
     return json_success({"streams": streams})
 
+
 @has_request_variables
 def get_topics_backend(
-        request: HttpRequest, maybe_user_profile: Union[UserProfile, AnonymousUser],
-        stream_id: int=REQ(converter=to_non_negative_int,
-                           path_only=True)) -> HttpResponse:
+    request: HttpRequest,
+    maybe_user_profile: Union[UserProfile, AnonymousUser],
+    stream_id: int = REQ(converter=to_non_negative_int, path_only=True),
+) -> HttpResponse:
 
     if not maybe_user_profile.is_authenticated:
         is_web_public_query = True
@@ -690,30 +761,39 @@ def get_topics_backend(
 
     return json_success(dict(topics=result))
 
+
 @require_realm_admin
 @has_request_variables
-def delete_in_topic(request: HttpRequest, user_profile: UserProfile,
-                    stream_id: int=REQ(converter=to_non_negative_int),
-                    topic_name: str=REQ("topic_name")) -> HttpResponse:
+def delete_in_topic(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_id: int = REQ(converter=to_non_negative_int),
+    topic_name: str = REQ("topic_name"),
+) -> HttpResponse:
     (stream, sub) = access_stream_by_id(user_profile, stream_id)
 
     messages = messages_for_topic(stream.recipient_id, topic_name)
     if not stream.is_history_public_to_subscribers():
         # Don't allow the user to delete messages that they don't have access to.
         deletable_message_ids = UserMessage.objects.filter(
-            user_profile=user_profile, message_id__in=messages).values_list("message_id", flat=True)
-        messages = [message for message in messages if message.id in
-                    deletable_message_ids]
+            user_profile=user_profile, message_id__in=messages
+        ).values_list("message_id", flat=True)
+        messages = [message for message in messages if message.id in deletable_message_ids]
 
     do_delete_messages(user_profile.realm, messages)
 
     return json_success()
 
+
 @require_post
 @authenticated_json_view
 @has_request_variables
-def json_stream_exists(request: HttpRequest, user_profile: UserProfile, stream_name: str=REQ("stream"),
-                       autosubscribe: bool=REQ(validator=check_bool, default=False)) -> HttpResponse:
+def json_stream_exists(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_name: str = REQ("stream"),
+    autosubscribe: bool = REQ(validator=check_bool, default=False),
+) -> HttpResponse:
     check_stream_name(stream_name)
 
     try:
@@ -729,40 +809,51 @@ def json_stream_exists(request: HttpRequest, user_profile: UserProfile, stream_n
     # So if we're not yet subscribed and autosubscribe is enabled, we
     # should join.
     if sub is None and autosubscribe:
-        bulk_add_subscriptions(user_profile.realm, [stream], [user_profile], acting_user=user_profile)
+        bulk_add_subscriptions(
+            user_profile.realm, [stream], [user_profile], acting_user=user_profile
+        )
         result["subscribed"] = True
 
     return json_success(result)  # results are ignored for HEAD requests
 
+
 @has_request_variables
-def json_get_stream_id(request: HttpRequest,
-                       user_profile: UserProfile,
-                       stream_name: str=REQ('stream')) -> HttpResponse:
+def json_get_stream_id(
+    request: HttpRequest, user_profile: UserProfile, stream_name: str = REQ('stream')
+) -> HttpResponse:
     (stream, sub) = access_stream_by_name(user_profile, stream_name)
     return json_success({'stream_id': stream.id})
 
+
 @has_request_variables
-def update_subscriptions_property(request: HttpRequest,
-                                  user_profile: UserProfile,
-                                  stream_id: int=REQ(validator=check_int),
-                                  property: str=REQ(),
-                                  value: str=REQ()) -> HttpResponse:
-    subscription_data = [{"property": property,
-                          "stream_id": stream_id,
-                          "value": value}]
-    return update_subscription_properties_backend(request, user_profile,
-                                                  subscription_data=subscription_data)
+def update_subscriptions_property(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    stream_id: int = REQ(validator=check_int),
+    property: str = REQ(),
+    value: str = REQ(),
+) -> HttpResponse:
+    subscription_data = [{"property": property, "stream_id": stream_id, "value": value}]
+    return update_subscription_properties_backend(
+        request, user_profile, subscription_data=subscription_data
+    )
+
 
 @has_request_variables
 def update_subscription_properties_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        subscription_data: List[Dict[str, Any]]=REQ(
-            validator=check_list(
-                check_dict([("stream_id", check_int),
-                            ("property", check_string),
-                            ("value", check_union([check_string, check_bool]))]),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    subscription_data: List[Dict[str, Any]] = REQ(
+        validator=check_list(
+            check_dict(
+                [
+                    ("stream_id", check_int),
+                    ("property", check_string),
+                    ("value", check_union([check_string, check_bool])),
+                ]
             ),
         ),
+    ),
 ) -> HttpResponse:
     """
     This is the entry point to changing subscription properties. This
@@ -774,14 +865,17 @@ def update_subscription_properties_backend(
     [{"stream_id": "1", "property": "is_muted", "value": False},
      {"stream_id": "1", "property": "color", "value": "#c2c2c2"}]
     """
-    property_converters = {"color": check_color, "in_home_view": check_bool,
-                           "is_muted": check_bool,
-                           "desktop_notifications": check_bool,
-                           "audible_notifications": check_bool,
-                           "push_notifications": check_bool,
-                           "email_notifications": check_bool,
-                           "pin_to_top": check_bool,
-                           "wildcard_mentions_notify": check_bool}
+    property_converters = {
+        "color": check_color,
+        "in_home_view": check_bool,
+        "is_muted": check_bool,
+        "desktop_notifications": check_bool,
+        "audible_notifications": check_bool,
+        "push_notifications": check_bool,
+        "email_notifications": check_bool,
+        "pin_to_top": check_bool,
+        "wildcard_mentions_notify": check_bool,
+    }
     response_data = []
 
     for change in subscription_data:
@@ -801,11 +895,10 @@ def update_subscription_properties_backend(
         except ValidationError as error:
             return json_error(error.message)
 
-        do_change_subscription_property(user_profile, sub, stream,
-                                        property, value, acting_user=user_profile)
+        do_change_subscription_property(
+            user_profile, sub, stream, property, value, acting_user=user_profile
+        )
 
-        response_data.append({'stream_id': stream_id,
-                              'property': property,
-                              'value': value})
+        response_data.append({'stream_id': stream_id, 'property': property, 'value': value})
 
     return json_success({"subscription_data": response_data})
diff --git a/zerver/views/submessage.py b/zerver/views/submessage.py
index b032c8c888..e5c66d4dd5 100644
--- a/zerver/views/submessage.py
+++ b/zerver/views/submessage.py
@@ -11,12 +11,13 @@ from zerver.models import UserProfile
 
 
 @has_request_variables
-def process_submessage(request: HttpRequest,
-                       user_profile: UserProfile,
-                       message_id: int=REQ(validator=check_int),
-                       msg_type: str=REQ(),
-                       content: str=REQ(),
-                       ) -> HttpResponse:
+def process_submessage(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message_id: int = REQ(validator=check_int),
+    msg_type: str = REQ(),
+    content: str = REQ(),
+) -> HttpResponse:
     message, user_message = access_message(user_profile, message_id)
 
     try:
diff --git a/zerver/views/thumbnail.py b/zerver/views/thumbnail.py
index 7d5bdf2ff5..652c0b7a30 100644
--- a/zerver/views/thumbnail.py
+++ b/zerver/views/thumbnail.py
@@ -14,15 +14,20 @@ def validate_thumbnail_request(user_profile: UserProfile, path: str) -> Optional
     # path here does not have a leading / as it is parsed from request hitting the
     # thumbnail endpoint (defined in urls.py) that way.
     if path.startswith('user_uploads/'):
-        path_id = path[len('user_uploads/'):]
+        path_id = path[len('user_uploads/') :]
         return validate_attachment_request(user_profile, path_id)
 
     # This is an external link and we don't enforce restricted view policy here.
     return True
 
+
 @has_request_variables
-def backend_serve_thumbnail(request: HttpRequest, user_profile: UserProfile,
-                            url: str=REQ(), size_requested: str=REQ("size")) -> HttpResponse:
+def backend_serve_thumbnail(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    url: str = REQ(),
+    size_requested: str = REQ("size"),
+) -> HttpResponse:
     if not validate_thumbnail_request(user_profile, url):
         return HttpResponseForbidden(_("<p>You are not authorized to view this file.</p>"))
 
diff --git a/zerver/views/tutorial.py b/zerver/views/tutorial.py
index 93ff426061..cd57a3bd25 100644
--- a/zerver/views/tutorial.py
+++ b/zerver/views/tutorial.py
@@ -9,8 +9,9 @@ from zerver.models import UserProfile
 
 @human_users_only
 @has_request_variables
-def set_tutorial_status(request: HttpRequest, user_profile: UserProfile,
-                        status: str=REQ(validator=check_string)) -> HttpResponse:
+def set_tutorial_status(
+    request: HttpRequest, user_profile: UserProfile, status: str = REQ(validator=check_string)
+) -> HttpResponse:
     if status == 'started':
         user_profile.tutorial_status = UserProfile.TUTORIAL_STARTED
     elif status == 'finished':
diff --git a/zerver/views/typing.py b/zerver/views/typing.py
index 1b2d143a71..f4728417ea 100644
--- a/zerver/views/typing.py
+++ b/zerver/views/typing.py
@@ -11,9 +11,10 @@ from zerver.models import UserProfile
 
 @has_request_variables
 def send_notification_backend(
-        request: HttpRequest,
-        user_profile: UserProfile,
-        operator: str=REQ('op'),
-        notification_to: List[int]=REQ('to', validator=check_list(check_int))) -> HttpResponse:
+    request: HttpRequest,
+    user_profile: UserProfile,
+    operator: str = REQ('op'),
+    notification_to: List[int] = REQ('to', validator=check_list(check_int)),
+) -> HttpResponse:
     check_send_typing_notification(user_profile, notification_to, operator)
     return json_success()
diff --git a/zerver/views/unsubscribe.py b/zerver/views/unsubscribe.py
index 73678b9ef7..480bc83140 100644
--- a/zerver/views/unsubscribe.py
+++ b/zerver/views/unsubscribe.py
@@ -10,8 +10,12 @@ from zerver.lib.send_email import clear_scheduled_emails
 from zerver.models import ScheduledEmail, UserProfile
 
 
-def process_unsubscribe(request: HttpRequest, confirmation_key: str, subscription_type: str,
-                        unsubscribe_function: Callable[[UserProfile], None]) -> HttpResponse:
+def process_unsubscribe(
+    request: HttpRequest,
+    confirmation_key: str,
+    subscription_type: str,
+    unsubscribe_function: Callable[[UserProfile], None],
+) -> HttpResponse:
     try:
         user_profile = get_object_from_key(confirmation_key, Confirmation.UNSUBSCRIBE)
     except ConfirmationKeyException:
@@ -22,20 +26,32 @@ def process_unsubscribe(request: HttpRequest, confirmation_key: str, subscriptio
     context.update(subscription_type=subscription_type)
     return render(request, 'zerver/unsubscribe_success.html', context=context)
 
+
 # Email unsubscribe functions. All have the function signature
 # processor(user_profile).
 
+
 def do_missedmessage_unsubscribe(user_profile: UserProfile) -> None:
-    do_change_notification_settings(user_profile, 'enable_offline_email_notifications', False, acting_user=user_profile)
+    do_change_notification_settings(
+        user_profile, 'enable_offline_email_notifications', False, acting_user=user_profile
+    )
+
 
 def do_welcome_unsubscribe(user_profile: UserProfile) -> None:
     clear_scheduled_emails([user_profile.id], ScheduledEmail.WELCOME)
 
+
 def do_digest_unsubscribe(user_profile: UserProfile) -> None:
-    do_change_notification_settings(user_profile, 'enable_digest_emails', False, acting_user=user_profile)
+    do_change_notification_settings(
+        user_profile, 'enable_digest_emails', False, acting_user=user_profile
+    )
+
 
 def do_login_unsubscribe(user_profile: UserProfile) -> None:
-    do_change_notification_settings(user_profile, 'enable_login_emails', False, acting_user=user_profile)
+    do_change_notification_settings(
+        user_profile, 'enable_login_emails', False, acting_user=user_profile
+    )
+
 
 # The keys are part of the URL for the unsubscribe link and must be valid
 # without encoding.
@@ -49,8 +65,7 @@ email_unsubscribers = {
 }
 
 # Login NOT required. These are for one-click unsubscribes.
-def email_unsubscribe(request: HttpRequest, email_type: str,
-                      confirmation_key: str) -> HttpResponse:
+def email_unsubscribe(request: HttpRequest, email_type: str, confirmation_key: str) -> HttpResponse:
     if email_type in email_unsubscribers:
         display_name, unsubscribe_function = email_unsubscribers[email_type]
         return process_unsubscribe(request, confirmation_key, display_name, unsubscribe_function)
diff --git a/zerver/views/upload.py b/zerver/views/upload.py
index fb8df3cabe..5277bc5ef6 100644
--- a/zerver/views/upload.py
+++ b/zerver/views/upload.py
@@ -27,6 +27,7 @@ def serve_s3(request: HttpRequest, url_path: str, url_only: bool) -> HttpRespons
 
     return redirect(url)
 
+
 def serve_local(request: HttpRequest, path_id: str, url_only: bool) -> HttpResponse:
     local_path = get_local_file_path(path_id)
     if local_path is None:
@@ -56,17 +57,22 @@ def serve_local(request: HttpRequest, path_id: str, url_only: bool) -> HttpRespo
     mimetype, encoding = guess_type(local_path)
     attachment = mimetype not in INLINE_MIME_TYPES
 
-    response = sendfile(request, local_path, attachment=attachment,
-                        mimetype=mimetype, encoding=encoding)
+    response = sendfile(
+        request, local_path, attachment=attachment, mimetype=mimetype, encoding=encoding
+    )
     patch_cache_control(response, private=True, immutable=True)
     return response
 
-def serve_file_backend(request: HttpRequest, user_profile: UserProfile,
-                       realm_id_str: str, filename: str) -> HttpResponse:
+
+def serve_file_backend(
+    request: HttpRequest, user_profile: UserProfile, realm_id_str: str, filename: str
+) -> HttpResponse:
     return serve_file(request, user_profile, realm_id_str, filename, url_only=False)
 
-def serve_file_url_backend(request: HttpRequest, user_profile: UserProfile,
-                           realm_id_str: str, filename: str) -> HttpResponse:
+
+def serve_file_url_backend(
+    request: HttpRequest, user_profile: UserProfile, realm_id_str: str, filename: str
+) -> HttpResponse:
     """
     We should return a signed, short-lived URL
     that the client can use for native mobile download, rather than serving a redirect.
@@ -74,9 +80,14 @@ def serve_file_url_backend(request: HttpRequest, user_profile: UserProfile,
 
     return serve_file(request, user_profile, realm_id_str, filename, url_only=True)
 
-def serve_file(request: HttpRequest, user_profile: UserProfile,
-               realm_id_str: str, filename: str,
-               url_only: bool=False) -> HttpResponse:
+
+def serve_file(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    realm_id_str: str,
+    filename: str,
+    url_only: bool = False,
+) -> HttpResponse:
     path_id = f"{realm_id_str}/{filename}"
     is_authorized = validate_attachment_request(user_profile, path_id)
 
@@ -89,6 +100,7 @@ def serve_file(request: HttpRequest, user_profile: UserProfile,
 
     return serve_s3(request, path_id, url_only)
 
+
 def serve_local_file_unauthed(request: HttpRequest, token: str, filename: str) -> HttpResponse:
     path_id = get_local_file_path_id_from_token(token)
     if path_id is None:
@@ -98,6 +110,7 @@ def serve_local_file_unauthed(request: HttpRequest, token: str, filename: str) -
 
     return serve_local(request, path_id, url_only=False)
 
+
 def upload_file_backend(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     if len(request.FILES) == 0:
         return json_error(_("You must specify a file to upload"))
@@ -107,9 +120,11 @@ def upload_file_backend(request: HttpRequest, user_profile: UserProfile) -> Http
     user_file = list(request.FILES.values())[0]
     file_size = user_file.size
     if settings.MAX_FILE_UPLOAD_SIZE * 1024 * 1024 < file_size:
-        return json_error(_("Uploaded file is larger than the allowed limit of {} MiB").format(
-            settings.MAX_FILE_UPLOAD_SIZE,
-        ))
+        return json_error(
+            _("Uploaded file is larger than the allowed limit of {} MiB").format(
+                settings.MAX_FILE_UPLOAD_SIZE,
+            )
+        )
     check_upload_within_quota(user_profile.realm, file_size)
 
     uri = upload_message_image_from_request(request, user_file, user_profile)
diff --git a/zerver/views/user_groups.py b/zerver/views/user_groups.py
index 94624d2463..9a2c569cbc 100644
--- a/zerver/views/user_groups.py
+++ b/zerver/views/user_groups.py
@@ -29,26 +29,34 @@ from zerver.views.streams import FuncKwargPair, compose_views
 
 @require_user_group_edit_permission
 @has_request_variables
-def add_user_group(request: HttpRequest, user_profile: UserProfile,
-                   name: str=REQ(),
-                   members: Sequence[int]=REQ(validator=check_list(check_int), default=[]),
-                   description: str=REQ()) -> HttpResponse:
+def add_user_group(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    name: str = REQ(),
+    members: Sequence[int] = REQ(validator=check_list(check_int), default=[]),
+    description: str = REQ(),
+) -> HttpResponse:
     user_profiles = user_ids_to_users(members, user_profile.realm)
     check_add_user_group(user_profile.realm, name, user_profiles, description)
     return json_success()
 
+
 @require_member_or_admin
 @has_request_variables
 def get_user_group(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     user_groups = user_groups_in_realm_serialized(user_profile.realm)
     return json_success({"user_groups": user_groups})
 
+
 @require_user_group_edit_permission
 @has_request_variables
-def edit_user_group(request: HttpRequest, user_profile: UserProfile,
-                    user_group_id: int=REQ(validator=check_int, path_only=True),
-                    name: str=REQ(default=""), description: str=REQ(default=""),
-                    ) -> HttpResponse:
+def edit_user_group(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_group_id: int = REQ(validator=check_int, path_only=True),
+    name: str = REQ(default=""),
+    description: str = REQ(default=""),
+) -> HttpResponse:
     if not (name or description):
         return json_error(_("No new data supplied"))
 
@@ -62,34 +70,41 @@ def edit_user_group(request: HttpRequest, user_profile: UserProfile,
 
     return json_success()
 
+
 @require_user_group_edit_permission
 @has_request_variables
-def delete_user_group(request: HttpRequest, user_profile: UserProfile,
-                      user_group_id: int=REQ(validator=check_int, path_only=True)) -> HttpResponse:
+def delete_user_group(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_group_id: int = REQ(validator=check_int, path_only=True),
+) -> HttpResponse:
 
     check_delete_user_group(user_group_id, user_profile)
     return json_success()
 
+
 @require_user_group_edit_permission
 @has_request_variables
-def update_user_group_backend(request: HttpRequest, user_profile: UserProfile,
-                              user_group_id: int=REQ(validator=check_int, path_only=True),
-                              delete: Sequence[int]=REQ(validator=check_list(check_int), default=[]),
-                              add: Sequence[int]=REQ(validator=check_list(check_int), default=[]),
-                              ) -> HttpResponse:
+def update_user_group_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_group_id: int = REQ(validator=check_int, path_only=True),
+    delete: Sequence[int] = REQ(validator=check_list(check_int), default=[]),
+    add: Sequence[int] = REQ(validator=check_list(check_int), default=[]),
+) -> HttpResponse:
     if not add and not delete:
         return json_error(_('Nothing to do. Specify at least one of "add" or "delete".'))
 
     method_kwarg_pairs: List[FuncKwargPair] = [
-        (add_members_to_group_backend,
-         dict(user_group_id=user_group_id, members=add)),
-        (remove_members_from_group_backend,
-         dict(user_group_id=user_group_id, members=delete)),
+        (add_members_to_group_backend, dict(user_group_id=user_group_id, members=add)),
+        (remove_members_from_group_backend, dict(user_group_id=user_group_id, members=delete)),
     ]
     return compose_views(request, user_profile, method_kwarg_pairs)
 
-def add_members_to_group_backend(request: HttpRequest, user_profile: UserProfile,
-                                 user_group_id: int, members: List[int]) -> HttpResponse:
+
+def add_members_to_group_backend(
+    request: HttpRequest, user_profile: UserProfile, user_group_id: int, members: List[int]
+) -> HttpResponse:
     if not members:
         return json_success()
 
@@ -99,15 +114,19 @@ def add_members_to_group_backend(request: HttpRequest, user_profile: UserProfile
 
     for user_profile in user_profiles:
         if user_profile.id in existing_member_ids:
-            raise JsonableError(_("User {user_id} is already a member of this group").format(
-                user_id=user_profile.id,
-            ))
+            raise JsonableError(
+                _("User {user_id} is already a member of this group").format(
+                    user_id=user_profile.id,
+                )
+            )
 
     bulk_add_members_to_user_group(user_group, user_profiles)
     return json_success()
 
-def remove_members_from_group_backend(request: HttpRequest, user_profile: UserProfile,
-                                      user_group_id: int, members: List[int]) -> HttpResponse:
+
+def remove_members_from_group_backend(
+    request: HttpRequest, user_profile: UserProfile, user_group_id: int, members: List[int]
+) -> HttpResponse:
     if not members:
         return json_success()
 
@@ -115,7 +134,7 @@ def remove_members_from_group_backend(request: HttpRequest, user_profile: UserPr
     user_group = access_user_group_by_id(user_group_id, user_profile)
     group_member_ids = get_user_group_members(user_group)
     for member in members:
-        if (member not in group_member_ids):
+        if member not in group_member_ids:
             raise JsonableError(_("There is no member '{}' in this user group").format(member))
 
     remove_members_from_user_group(user_group, user_profiles)
diff --git a/zerver/views/user_settings.py b/zerver/views/user_settings.py
index ff3d7a4daf..9786c95e22 100644
--- a/zerver/views/user_settings.py
+++ b/zerver/views/user_settings.py
@@ -48,6 +48,7 @@ from zproject.backends import check_password_strength, email_belongs_to_ldap
 
 AVATAR_CHANGES_DISABLED_ERROR = ugettext_lazy("Avatar changes are disabled in this organization.")
 
+
 def confirm_email_change(request: HttpRequest, confirmation_key: str) -> HttpResponse:
     try:
         email_change_object = get_object_from_key(confirmation_key, Confirmation.EMAIL_CHANGE)
@@ -65,26 +66,37 @@ def confirm_email_change(request: HttpRequest, confirmation_key: str) -> HttpRes
 
     context = {'realm_name': user_profile.realm.name, 'new_email': new_email}
     language = user_profile.default_language
-    send_email('zerver/emails/notify_change_in_email', to_emails=[old_email],
-               from_name=FromAddress.security_email_from_name(user_profile=user_profile),
-               from_address=FromAddress.SUPPORT, language=language,
-               context=context,
-               realm=user_profile.realm)
+    send_email(
+        'zerver/emails/notify_change_in_email',
+        to_emails=[old_email],
+        from_name=FromAddress.security_email_from_name(user_profile=user_profile),
+        from_address=FromAddress.SUPPORT,
+        language=language,
+        context=context,
+        realm=user_profile.realm,
+    )
 
     ctx = {
-        'new_email_html_tag': SafeString(f'<a href="mailto:{escape(new_email)}">{escape(new_email)}</a>'),
-        'old_email_html_tag': SafeString(f'<a href="mailto:{escape(old_email)}">{escape(old_email)}</a>'),
-
+        'new_email_html_tag': SafeString(
+            f'<a href="mailto:{escape(new_email)}">{escape(new_email)}</a>'
+        ),
+        'old_email_html_tag': SafeString(
+            f'<a href="mailto:{escape(old_email)}">{escape(old_email)}</a>'
+        ),
     }
     return render(request, 'confirmation/confirm_email_change.html', context=ctx)
 
+
 @human_users_only
 @has_request_variables
-def json_change_settings(request: HttpRequest, user_profile: UserProfile,
-                         full_name: str=REQ(default=""),
-                         email: str=REQ(default=""),
-                         old_password: str=REQ(default=""),
-                         new_password: str=REQ(default="")) -> HttpResponse:
+def json_change_settings(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    full_name: str = REQ(default=""),
+    email: str = REQ(default=""),
+    old_password: str = REQ(default=""),
+    new_password: str = REQ(default=""),
+) -> HttpResponse:
     if not (full_name or new_password or email):
         return json_error(_("Please fill out all fields."))
 
@@ -94,14 +106,21 @@ def json_change_settings(request: HttpRequest, user_profile: UserProfile,
             return json_error(_("Your Zulip password is managed in LDAP"))
 
         try:
-            if not authenticate(request, username=user_profile.delivery_email, password=old_password,
-                                realm=user_profile.realm, return_data=return_data):
+            if not authenticate(
+                request,
+                username=user_profile.delivery_email,
+                password=old_password,
+                realm=user_profile.realm,
+                return_data=return_data,
+            ):
                 return json_error(_("Wrong password!"))
         except RateLimited as e:
             assert e.secs_to_freedom is not None
             secs_to_freedom = int(e.secs_to_freedom)
             return json_error(
-                _("You're making too many attempts! Try again in {} seconds.").format(secs_to_freedom),
+                _("You're making too many attempts! Try again in {} seconds.").format(
+                    secs_to_freedom
+                ),
             )
 
         if not check_password_strength(new_password):
@@ -159,34 +178,37 @@ def json_change_settings(request: HttpRequest, user_profile: UserProfile,
 
     return json_success(result)
 
+
 emojiset_choices = {emojiset['key'] for emojiset in UserProfile.emojiset_choices()}
 
+
 @human_users_only
 @has_request_variables
 def update_display_settings_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        twenty_four_hour_time: Optional[bool]=REQ(validator=check_bool, default=None),
-        dense_mode: Optional[bool]=REQ(validator=check_bool, default=None),
-        starred_message_counts: Optional[bool]=REQ(validator=check_bool, default=None),
-        fluid_layout_width: Optional[bool]=REQ(validator=check_bool, default=None),
-        high_contrast_mode: Optional[bool]=REQ(validator=check_bool, default=None),
-        color_scheme: Optional[int]=REQ(validator=check_int_in(
-            UserProfile.COLOR_SCHEME_CHOICES), default=None),
-        translate_emoticons: Optional[bool]=REQ(validator=check_bool, default=None),
-        default_language: Optional[str]=REQ(validator=check_string, default=None),
-        left_side_userlist: Optional[bool]=REQ(validator=check_bool, default=None),
-        emojiset: Optional[str]=REQ(validator=check_string_in(
-            emojiset_choices), default=None),
-        demote_inactive_streams: Optional[int]=REQ(validator=check_int_in(
-            UserProfile.DEMOTE_STREAMS_CHOICES), default=None),
-        timezone: Optional[str]=REQ(validator=check_string_in(pytz.all_timezones_set),
-                                    default=None)) -> HttpResponse:
+    request: HttpRequest,
+    user_profile: UserProfile,
+    twenty_four_hour_time: Optional[bool] = REQ(validator=check_bool, default=None),
+    dense_mode: Optional[bool] = REQ(validator=check_bool, default=None),
+    starred_message_counts: Optional[bool] = REQ(validator=check_bool, default=None),
+    fluid_layout_width: Optional[bool] = REQ(validator=check_bool, default=None),
+    high_contrast_mode: Optional[bool] = REQ(validator=check_bool, default=None),
+    color_scheme: Optional[int] = REQ(
+        validator=check_int_in(UserProfile.COLOR_SCHEME_CHOICES), default=None
+    ),
+    translate_emoticons: Optional[bool] = REQ(validator=check_bool, default=None),
+    default_language: Optional[str] = REQ(validator=check_string, default=None),
+    left_side_userlist: Optional[bool] = REQ(validator=check_bool, default=None),
+    emojiset: Optional[str] = REQ(validator=check_string_in(emojiset_choices), default=None),
+    demote_inactive_streams: Optional[int] = REQ(
+        validator=check_int_in(UserProfile.DEMOTE_STREAMS_CHOICES), default=None
+    ),
+    timezone: Optional[str] = REQ(validator=check_string_in(pytz.all_timezones_set), default=None),
+) -> HttpResponse:
 
     # We can't use REQ for this widget because
     # get_available_language_codes requires provisioning to be
     # complete.
-    if (default_language is not None and
-            default_language not in get_available_language_codes()):
+    if default_language is not None and default_language not in get_available_language_codes():
         raise JsonableError(_("Invalid default_language"))
 
     request_settings = {k: v for k, v in list(locals().items()) if k in user_profile.property_types}
@@ -198,38 +220,46 @@ def update_display_settings_backend(
 
     return json_success(result)
 
+
 @human_users_only
 @has_request_variables
 def json_change_notify_settings(
-        request: HttpRequest, user_profile: UserProfile,
-        enable_stream_desktop_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_stream_email_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_stream_push_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_stream_audible_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        wildcard_mentions_notify: Optional[bool]=REQ(validator=check_bool, default=None),
-        notification_sound: Optional[str]=REQ(validator=check_string, default=None),
-        enable_desktop_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_sounds: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_offline_email_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_offline_push_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_online_push_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_digest_emails: Optional[bool]=REQ(validator=check_bool, default=None),
-        enable_login_emails: Optional[bool]=REQ(validator=check_bool, default=None),
-        message_content_in_email_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        pm_content_in_desktop_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        desktop_icon_count_display: Optional[int]=REQ(validator=check_int, default=None),
-        realm_name_in_notifications: Optional[bool]=REQ(validator=check_bool, default=None),
-        presence_enabled: Optional[bool]=REQ(validator=check_bool, default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    enable_stream_desktop_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_stream_email_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_stream_push_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_stream_audible_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    wildcard_mentions_notify: Optional[bool] = REQ(validator=check_bool, default=None),
+    notification_sound: Optional[str] = REQ(validator=check_string, default=None),
+    enable_desktop_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_sounds: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_offline_email_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_offline_push_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_online_push_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_digest_emails: Optional[bool] = REQ(validator=check_bool, default=None),
+    enable_login_emails: Optional[bool] = REQ(validator=check_bool, default=None),
+    message_content_in_email_notifications: Optional[bool] = REQ(
+        validator=check_bool, default=None
+    ),
+    pm_content_in_desktop_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    desktop_icon_count_display: Optional[int] = REQ(validator=check_int, default=None),
+    realm_name_in_notifications: Optional[bool] = REQ(validator=check_bool, default=None),
+    presence_enabled: Optional[bool] = REQ(validator=check_bool, default=None),
 ) -> HttpResponse:
     result = {}
 
     # Stream notification settings.
 
-    if (notification_sound is not None and
-            notification_sound not in get_available_notification_sounds()):
+    if (
+        notification_sound is not None
+        and notification_sound not in get_available_notification_sounds()
+    ):
         raise JsonableError(_("Invalid notification sound '{}'").format(notification_sound))
 
-    req_vars = {k: v for k, v in list(locals().items()) if k in user_profile.notification_setting_types}
+    req_vars = {
+        k: v for k, v in list(locals().items()) if k in user_profile.notification_setting_types
+    }
 
     for k, v in list(req_vars.items()):
         if v is not None and getattr(user_profile, k) != v:
@@ -238,6 +268,7 @@ def json_change_notify_settings(
 
     return json_success(result)
 
+
 def set_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     if len(request.FILES) != 1:
         return json_error(_("You must upload exactly one avatar."))
@@ -246,44 +277,52 @@ def set_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> HttpR
         return json_error(str(AVATAR_CHANGES_DISABLED_ERROR))
 
     user_file = list(request.FILES.values())[0]
-    if ((settings.MAX_AVATAR_FILE_SIZE * 1024 * 1024) < user_file.size):
-        return json_error(_("Uploaded file is larger than the allowed limit of {} MiB").format(
-            settings.MAX_AVATAR_FILE_SIZE,
-        ))
+    if (settings.MAX_AVATAR_FILE_SIZE * 1024 * 1024) < user_file.size:
+        return json_error(
+            _("Uploaded file is larger than the allowed limit of {} MiB").format(
+                settings.MAX_AVATAR_FILE_SIZE,
+            )
+        )
     upload_avatar_image(user_file, user_profile, user_profile)
     do_change_avatar_fields(user_profile, UserProfile.AVATAR_FROM_USER, acting_user=user_profile)
     user_avatar_url = avatar_url(user_profile)
 
     json_result = dict(
-        avatar_url = user_avatar_url,
+        avatar_url=user_avatar_url,
     )
     return json_success(json_result)
 
+
 def delete_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     if avatar_changes_disabled(user_profile.realm) and not user_profile.is_realm_admin:
         return json_error(str(AVATAR_CHANGES_DISABLED_ERROR))
 
-    do_change_avatar_fields(user_profile, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=user_profile)
+    do_change_avatar_fields(
+        user_profile, UserProfile.AVATAR_FROM_GRAVATAR, acting_user=user_profile
+    )
     gravatar_url = avatar_url(user_profile)
 
     json_result = dict(
-        avatar_url = gravatar_url,
+        avatar_url=gravatar_url,
     )
     return json_success(json_result)
 
+
 # We don't use @human_users_only here, because there are use cases for
 # a bot regenerating its own API key.
 @has_request_variables
 def regenerate_api_key(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     new_api_key = do_regenerate_api_key(user_profile, user_profile)
     json_result = dict(
-        api_key = new_api_key,
+        api_key=new_api_key,
     )
     return json_success(json_result)
 
+
 @human_users_only
 @has_request_variables
-def change_enter_sends(request: HttpRequest, user_profile: UserProfile,
-                       enter_sends: bool=REQ(validator=check_bool)) -> HttpResponse:
+def change_enter_sends(
+    request: HttpRequest, user_profile: UserProfile, enter_sends: bool = REQ(validator=check_bool)
+) -> HttpResponse:
     do_change_enter_sends(user_profile, enter_sends)
     return json_success()
diff --git a/zerver/views/users.py b/zerver/views/users.py
index 12b4cf7709..dcab2e1131 100644
--- a/zerver/views/users.py
+++ b/zerver/views/users.py
@@ -87,8 +87,10 @@ def check_last_owner(user_profile: UserProfile) -> bool:
     owners = set(user_profile.realm.get_human_owner_users())
     return user_profile.is_realm_owner and not user_profile.is_bot and len(owners) == 1
 
-def deactivate_user_backend(request: HttpRequest, user_profile: UserProfile,
-                            user_id: int) -> HttpResponse:
+
+def deactivate_user_backend(
+    request: HttpRequest, user_profile: UserProfile, user_id: int
+) -> HttpResponse:
     target = access_user_by_id(user_profile, user_id, for_admin=True)
     if target.is_realm_owner and not user_profile.is_realm_owner:
         raise OrganizationOwnerRequired()
@@ -96,6 +98,7 @@ def deactivate_user_backend(request: HttpRequest, user_profile: UserProfile,
         return json_error(_('Cannot deactivate the only organization owner'))
     return _deactivate_user_profile_backend(request, user_profile, target)
 
+
 def deactivate_user_own_backend(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
     if UserProfile.objects.filter(realm=user_profile.realm, is_active=True).count() == 1:
         raise CannotDeactivateLastUserError(is_last_owner=False)
@@ -105,48 +108,69 @@ def deactivate_user_own_backend(request: HttpRequest, user_profile: UserProfile)
     do_deactivate_user(user_profile, acting_user=user_profile)
     return json_success()
 
-def deactivate_bot_backend(request: HttpRequest, user_profile: UserProfile,
-                           bot_id: int) -> HttpResponse:
+
+def deactivate_bot_backend(
+    request: HttpRequest, user_profile: UserProfile, bot_id: int
+) -> HttpResponse:
     target = access_bot_by_id(user_profile, bot_id)
     return _deactivate_user_profile_backend(request, user_profile, target)
 
-def _deactivate_user_profile_backend(request: HttpRequest, user_profile: UserProfile,
-                                     target: UserProfile) -> HttpResponse:
+
+def _deactivate_user_profile_backend(
+    request: HttpRequest, user_profile: UserProfile, target: UserProfile
+) -> HttpResponse:
     do_deactivate_user(target, acting_user=user_profile)
     return json_success()
 
-def reactivate_user_backend(request: HttpRequest, user_profile: UserProfile,
-                            user_id: int) -> HttpResponse:
-    target = access_user_by_id(user_profile, user_id,
-                               allow_deactivated=True, allow_bots=True, for_admin=True)
+
+def reactivate_user_backend(
+    request: HttpRequest, user_profile: UserProfile, user_id: int
+) -> HttpResponse:
+    target = access_user_by_id(
+        user_profile, user_id, allow_deactivated=True, allow_bots=True, for_admin=True
+    )
     if target.is_bot:
         assert target.bot_type is not None
         check_bot_creation_policy(user_profile, target.bot_type)
     do_reactivate_user(target, acting_user=user_profile)
     return json_success()
 
+
 check_profile_data: Validator[List[Dict[str, Optional[Union[int, str, List[int]]]]]] = check_list(
-    check_dict_only([
-        ('id', check_int),
-        ('value', check_none_or(
-            check_union([check_int, check_string, check_list(check_int)]),
-        )),
-    ]),
+    check_dict_only(
+        [
+            ('id', check_int),
+            (
+                'value',
+                check_none_or(
+                    check_union([check_int, check_string, check_list(check_int)]),
+                ),
+            ),
+        ]
+    ),
 )
 
+
 @has_request_variables
 def update_user_backend(
-    request: HttpRequest, user_profile: UserProfile, user_id: int,
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_id: int,
     full_name: Optional[str] = REQ(default=None, validator=check_string),
-    role: Optional[int] = REQ(default=None, validator=check_int_in(
-        UserProfile.ROLE_TYPES,
-    )),
+    role: Optional[int] = REQ(
+        default=None,
+        validator=check_int_in(
+            UserProfile.ROLE_TYPES,
+        ),
+    ),
     profile_data: Optional[List[Dict[str, Optional[Union[int, str, List[int]]]]]] = REQ(
-        default=None, validator=check_profile_data,
+        default=None,
+        validator=check_profile_data,
     ),
 ) -> HttpResponse:
-    target = access_user_by_id(user_profile, user_id,
-                               allow_deactivated=True, allow_bots=True, for_admin=True)
+    target = access_user_by_id(
+        user_profile, user_id, allow_deactivated=True, allow_bots=True, for_admin=True
+    )
 
     if role is not None and target.role != role:
         # Require that the current user has permissions to
@@ -157,11 +181,12 @@ def update_user_backend(
             raise OrganizationOwnerRequired()
 
         if target.role == UserProfile.ROLE_REALM_OWNER and check_last_owner(user_profile):
-            return json_error(_('The owner permission cannot be removed from the only organization owner.'))
+            return json_error(
+                _('The owner permission cannot be removed from the only organization owner.')
+            )
         do_change_user_role(target, role, acting_user=user_profile)
 
-    if (full_name is not None and target.full_name != full_name and
-            full_name.strip() != ""):
+    if full_name is not None and target.full_name != full_name and full_name.strip() != "":
         # We don't respect `name_changes_disabled` here because the request
         # is on behalf of the administrator.
         check_change_full_name(target, full_name, user_profile)
@@ -174,17 +199,21 @@ def update_user_backend(
                 field_id = entry["id"]
                 check_remove_custom_profile_field_value(target, field_id)
             else:
-                clean_profile_data.append({
-                    "id": entry["id"],
-                    "value": entry["value"],
-                })
+                clean_profile_data.append(
+                    {
+                        "id": entry["id"],
+                        "value": entry["value"],
+                    }
+                )
         validate_user_custom_profile_data(target.realm.id, clean_profile_data)
         do_update_user_custom_profile_data_if_changed(target, clean_profile_data)
 
     return json_success()
 
-def avatar(request: HttpRequest, user_profile: UserProfile,
-           email_or_id: str, medium: bool=False) -> HttpResponse:
+
+def avatar(
+    request: HttpRequest, user_profile: UserProfile, email_or_id: str, medium: bool = False
+) -> HttpResponse:
     """Accepts an email address or user ID and returns the avatar"""
     is_email = False
     try:
@@ -197,7 +226,9 @@ def avatar(request: HttpRequest, user_profile: UserProfile,
         if is_email:
             avatar_user_profile = get_user_including_cross_realm(email_or_id, realm)
         else:
-            avatar_user_profile = get_user_by_id_in_realm_including_cross_realm(int(email_or_id), realm)
+            avatar_user_profile = get_user_by_id_in_realm_including_cross_realm(
+                int(email_or_id), realm
+            )
         # If there is a valid user account passed in, use its avatar
         url = avatar_url(avatar_user_profile, medium=medium)
     except UserProfile.DoesNotExist:
@@ -214,24 +245,29 @@ def avatar(request: HttpRequest, user_profile: UserProfile,
     url = add_query_arg_to_redirect_url(url, request.META['QUERY_STRING'])
     return redirect(url)
 
+
 def get_stream_name(stream: Optional[Stream]) -> Optional[str]:
     if stream:
         return stream.name
     return None
 
+
 @require_member_or_admin
 @has_request_variables
 def patch_bot_backend(
-        request: HttpRequest, user_profile: UserProfile, bot_id: int,
-        full_name: Optional[str]=REQ(default=None),
-        bot_owner_id: Optional[int]=REQ(validator=check_int, default=None),
-        config_data: Optional[Dict[str, str]]=REQ(default=None,
-                                                  validator=check_dict(value_validator=check_string)),
-        service_payload_url: Optional[str]=REQ(validator=check_url, default=None),
-        service_interface: int=REQ(validator=check_int, default=1),
-        default_sending_stream: Optional[str]=REQ(default=None),
-        default_events_register_stream: Optional[str]=REQ(default=None),
-        default_all_public_streams: Optional[bool]=REQ(default=None, validator=check_bool),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    bot_id: int,
+    full_name: Optional[str] = REQ(default=None),
+    bot_owner_id: Optional[int] = REQ(validator=check_int, default=None),
+    config_data: Optional[Dict[str, str]] = REQ(
+        default=None, validator=check_dict(value_validator=check_string)
+    ),
+    service_payload_url: Optional[str] = REQ(validator=check_url, default=None),
+    service_interface: int = REQ(validator=check_int, default=1),
+    default_sending_stream: Optional[str] = REQ(default=None),
+    default_events_register_stream: Optional[str] = REQ(default=None),
+    default_all_public_streams: Optional[bool] = REQ(default=None, validator=check_bool),
 ) -> HttpResponse:
     bot = access_bot_by_id(user_profile, bot_id)
 
@@ -255,18 +291,18 @@ def patch_bot_backend(
         if default_sending_stream == "":
             stream: Optional[Stream] = None
         else:
-            (stream, sub) = access_stream_by_name(
-                user_profile, default_sending_stream)
+            (stream, sub) = access_stream_by_name(user_profile, default_sending_stream)
         do_change_default_sending_stream(bot, stream, acting_user=user_profile)
     if default_events_register_stream is not None:
         if default_events_register_stream == "":
             stream = None
         else:
-            (stream, sub) = access_stream_by_name(
-                user_profile, default_events_register_stream)
+            (stream, sub) = access_stream_by_name(user_profile, default_events_register_stream)
         do_change_default_events_register_stream(bot, stream, acting_user=user_profile)
     if default_all_public_streams is not None:
-        do_change_default_all_public_streams(bot, default_all_public_streams, acting_user=user_profile)
+        do_change_default_all_public_streams(
+            bot, default_all_public_streams, acting_user=user_profile
+        )
 
     if service_payload_url is not None:
         check_valid_interface_type(service_interface)
@@ -289,9 +325,9 @@ def patch_bot_backend(
     json_result = dict(
         full_name=bot.full_name,
         avatar_url=avatar_url(bot),
-        service_interface = service_interface,
-        service_payload_url = service_payload_url,
-        config_data = config_data,
+        service_interface=service_interface,
+        service_payload_url=service_payload_url,
+        config_data=config_data,
         default_sending_stream=get_stream_name(bot.default_sending_stream),
         default_events_register_stream=get_stream_name(bot.default_events_register_stream),
         default_all_public_streams=bot.default_all_public_streams,
@@ -304,9 +340,12 @@ def patch_bot_backend(
 
     return json_success(json_result)
 
+
 @require_member_or_admin
 @has_request_variables
-def regenerate_bot_api_key(request: HttpRequest, user_profile: UserProfile, bot_id: int) -> HttpResponse:
+def regenerate_bot_api_key(
+    request: HttpRequest, user_profile: UserProfile, bot_id: int
+) -> HttpResponse:
     bot = access_bot_by_id(user_profile, bot_id)
 
     new_api_key = do_regenerate_api_key(bot, user_profile)
@@ -315,21 +354,26 @@ def regenerate_bot_api_key(request: HttpRequest, user_profile: UserProfile, bot_
     )
     return json_success(json_result)
 
+
 @require_member_or_admin
 @has_request_variables
 def add_bot_backend(
-        request: HttpRequest, user_profile: UserProfile,
-        full_name_raw: str=REQ("full_name"), short_name_raw: str=REQ("short_name"),
-        bot_type: int=REQ(validator=check_int, default=UserProfile.DEFAULT_BOT),
-        payload_url: str=REQ(validator=check_url, default=""),
-        service_name: Optional[str]=REQ(default=None),
-        config_data: Dict[str, str]=REQ(default={},
-                                        validator=check_dict(value_validator=check_string)),
-        interface_type: int=REQ(validator=check_int, default=Service.GENERIC),
-        default_sending_stream_name: Optional[str]=REQ('default_sending_stream', default=None),
-        default_events_register_stream_name: Optional[str]=REQ('default_events_register_stream',
-                                                               default=None),
-        default_all_public_streams: Optional[bool]=REQ(validator=check_bool, default=None),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    full_name_raw: str = REQ("full_name"),
+    short_name_raw: str = REQ("short_name"),
+    bot_type: int = REQ(validator=check_int, default=UserProfile.DEFAULT_BOT),
+    payload_url: str = REQ(validator=check_url, default=""),
+    service_name: Optional[str] = REQ(default=None),
+    config_data: Dict[str, str] = REQ(
+        default={}, validator=check_dict(value_validator=check_string)
+    ),
+    interface_type: int = REQ(validator=check_int, default=Service.GENERIC),
+    default_sending_stream_name: Optional[str] = REQ('default_sending_stream', default=None),
+    default_events_register_stream_name: Optional[str] = REQ(
+        'default_events_register_stream', default=None
+    ),
+    default_all_public_streams: Optional[bool] = REQ(validator=check_bool, default=None),
 ) -> HttpResponse:
     short_name = check_short_name(short_name_raw)
     if bot_type != UserProfile.INCOMING_WEBHOOK_BOT:
@@ -339,8 +383,12 @@ def add_bot_backend(
     try:
         email = f'{short_name}@{user_profile.realm.get_bot_domain()}'
     except InvalidFakeEmailDomain:
-        return json_error(_("Can't create bots until FAKE_EMAIL_DOMAIN is correctly configured.\n"
-                            "Please contact your server administrator."))
+        return json_error(
+            _(
+                "Can't create bots until FAKE_EMAIL_DOMAIN is correctly configured.\n"
+                "Please contact your server administrator."
+            )
+        )
     form = CreateUserForm({'full_name': full_name, 'email': email})
 
     if bot_type == UserProfile.EMBEDDED_BOT:
@@ -377,36 +425,44 @@ def add_bot_backend(
     default_sending_stream = None
     if default_sending_stream_name is not None:
         (default_sending_stream, ignored_sub) = access_stream_by_name(
-            user_profile, default_sending_stream_name)
+            user_profile, default_sending_stream_name
+        )
 
     default_events_register_stream = None
     if default_events_register_stream_name is not None:
         (default_events_register_stream, ignored_sub) = access_stream_by_name(
-            user_profile, default_events_register_stream_name)
+            user_profile, default_events_register_stream_name
+        )
 
     if bot_type in (UserProfile.INCOMING_WEBHOOK_BOT, UserProfile.EMBEDDED_BOT) and service_name:
         check_valid_bot_config(bot_type, service_name, config_data)
 
-    bot_profile = do_create_user(email=email, password=None,
-                                 realm=user_profile.realm, full_name=full_name,
-                                 bot_type=bot_type,
-                                 bot_owner=user_profile,
-                                 avatar_source=avatar_source,
-                                 default_sending_stream=default_sending_stream,
-                                 default_events_register_stream=default_events_register_stream,
-                                 default_all_public_streams=default_all_public_streams,
-                                 acting_user=user_profile)
+    bot_profile = do_create_user(
+        email=email,
+        password=None,
+        realm=user_profile.realm,
+        full_name=full_name,
+        bot_type=bot_type,
+        bot_owner=user_profile,
+        avatar_source=avatar_source,
+        default_sending_stream=default_sending_stream,
+        default_events_register_stream=default_events_register_stream,
+        default_all_public_streams=default_all_public_streams,
+        acting_user=user_profile,
+    )
     if len(request.FILES) == 1:
         user_file = list(request.FILES.values())[0]
         upload_avatar_image(user_file, user_profile, bot_profile)
 
     if bot_type in (UserProfile.OUTGOING_WEBHOOK_BOT, UserProfile.EMBEDDED_BOT):
-        assert(isinstance(service_name, str))
-        add_service(name=service_name,
-                    user_profile=bot_profile,
-                    base_url=payload_url,
-                    interface=interface_type,
-                    token=generate_api_key())
+        assert isinstance(service_name, str)
+        add_service(
+            name=service_name,
+            user_profile=bot_profile,
+            base_url=payload_url,
+            interface=interface_type,
+            token=generate_api_key(),
+        )
 
     if bot_type == UserProfile.INCOMING_WEBHOOK_BOT and service_name:
         set_bot_config(bot_profile, "integration_id", service_name)
@@ -429,11 +485,13 @@ def add_bot_backend(
     )
     return json_success(json_result)
 
+
 @require_member_or_admin
 def get_bots_backend(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
-    bot_profiles = UserProfile.objects.filter(is_bot=True, is_active=True,
-                                              bot_owner=user_profile)
-    bot_profiles = bot_profiles.select_related('default_sending_stream', 'default_events_register_stream')
+    bot_profiles = UserProfile.objects.filter(is_bot=True, is_active=True, bot_owner=user_profile)
+    bot_profiles = bot_profiles.select_related(
+        'default_sending_stream', 'default_events_register_stream'
+    )
     bot_profiles = bot_profiles.order_by('date_joined')
 
     def bot_info(bot_profile: UserProfile) -> Dict[str, Any]:
@@ -457,18 +515,21 @@ def get_bots_backend(request: HttpRequest, user_profile: UserProfile) -> HttpRes
 
     return json_success({'bots': list(map(bot_info, bot_profiles))})
 
+
 @has_request_variables
-def get_members_backend(request: HttpRequest, user_profile: UserProfile, user_id: Optional[int]=None,
-                        include_custom_profile_fields: bool=REQ(validator=check_bool,
-                                                                default=False),
-                        client_gravatar: bool=REQ(validator=check_bool, default=False),
-                        ) -> HttpResponse:
-    '''
+def get_members_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_id: Optional[int] = None,
+    include_custom_profile_fields: bool = REQ(validator=check_bool, default=False),
+    client_gravatar: bool = REQ(validator=check_bool, default=False),
+) -> HttpResponse:
+    """
     The client_gravatar field here is set to True if clients can compute
     their own gravatars, which saves us bandwidth.  We want to eventually
     make this the default behavior, but we have old clients that expect
     the server to compute this for us.
-    '''
+    """
     realm = user_profile.realm
     if realm.email_address_visibility != Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE:
         # If email addresses are only available to administrators,
@@ -476,13 +537,18 @@ def get_members_backend(request: HttpRequest, user_profile: UserProfile, user_id
         client_gravatar = False
     target_user = None
     if user_id is not None:
-        target_user = access_user_by_id(user_profile, user_id, allow_deactivated=True,
-                                        allow_bots=True, for_admin=False)
+        target_user = access_user_by_id(
+            user_profile, user_id, allow_deactivated=True, allow_bots=True, for_admin=False
+        )
 
-    members = get_raw_user_data(realm, user_profile, target_user=target_user,
-                                client_gravatar=client_gravatar,
-                                user_avatar_url_field_optional=False,
-                                include_custom_profile_fields=include_custom_profile_fields)
+    members = get_raw_user_data(
+        realm,
+        user_profile,
+        target_user=target_user,
+        client_gravatar=client_gravatar,
+        user_avatar_url_field_optional=False,
+        include_custom_profile_fields=include_custom_profile_fields,
+    )
 
     if target_user is not None:
         data: Dict[str, Any] = {"user": members[target_user.id]}
@@ -491,14 +557,15 @@ def get_members_backend(request: HttpRequest, user_profile: UserProfile, user_id
 
     return json_success(data)
 
+
 @require_realm_admin
 @has_request_variables
 def create_user_backend(
     request: HttpRequest,
     user_profile: UserProfile,
-    email: str=REQ(),
-    password: str=REQ(),
-    full_name_raw: str=REQ("full_name"),
+    email: str = REQ(),
+    password: str = REQ(),
+    full_name_raw: str = REQ("full_name"),
 ) -> HttpResponse:
     if not user_profile.can_create_users:
         return json_error(_("User not authorized for this query"))
@@ -515,9 +582,11 @@ def create_user_backend(
     try:
         email_allowed_for_realm(email, user_profile.realm)
     except DomainNotAllowedForRealmError:
-        return json_error(_("Email '{email}' not allowed in this organization").format(
-            email=email,
-        ))
+        return json_error(
+            _("Email '{email}' not allowed in this organization").format(
+                email=email,
+            )
+        )
     except DisposableEmailError:
         return json_error(_("Disposable email addresses are not allowed in this organization"))
     except EmailContainsPlusError:
@@ -535,11 +604,15 @@ def create_user_backend(
     target_user = do_create_user(email, password, realm, full_name, acting_user=user_profile)
     return json_success({'user_id': target_user.id})
 
+
 def get_profile_backend(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
-    raw_user_data = get_raw_user_data(user_profile.realm, user_profile,
-                                      target_user=user_profile,
-                                      client_gravatar=False,
-                                      user_avatar_url_field_optional=False)
+    raw_user_data = get_raw_user_data(
+        user_profile.realm,
+        user_profile,
+        target_user=user_profile,
+        client_gravatar=False,
+        user_avatar_url_field_optional=False,
+    )
     result: Dict[str, Any] = raw_user_data[user_profile.id]
 
     result['max_message_id'] = -1
@@ -550,11 +623,14 @@ def get_profile_backend(request: HttpRequest, user_profile: UserProfile) -> Http
 
     return json_success(result)
 
+
 @has_request_variables
-def get_subscription_backend(request: HttpRequest, user_profile: UserProfile,
-                             user_id: int=REQ(validator=check_int, path_only=True),
-                             stream_id: int=REQ(validator=check_int, path_only=True),
-                             ) -> HttpResponse:
+def get_subscription_backend(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_id: int = REQ(validator=check_int, path_only=True),
+    stream_id: int = REQ(validator=check_int, path_only=True),
+) -> HttpResponse:
     target_user = access_user_by_id(user_profile, user_id, for_admin=False)
     (stream, sub) = access_stream_by_id(user_profile, stream_id)
 
diff --git a/zerver/views/video_calls.py b/zerver/views/video_calls.py
index 9d3d3e52d5..6bf17b23d0 100644
--- a/zerver/views/video_calls.py
+++ b/zerver/views/video_calls.py
@@ -90,7 +90,9 @@ def register_zoom_user(request: HttpRequest) -> HttpResponse:
 @has_request_variables
 def complete_zoom_user(
     request: HttpRequest,
-    state: Dict[str, str] = REQ(validator=check_dict([("realm", check_string)], value_validator=check_string)),
+    state: Dict[str, str] = REQ(
+        validator=check_dict([("realm", check_string)], value_validator=check_string)
+    ),
 ) -> HttpResponse:
     if get_subdomain(request) != state["realm"]:
         return redirect(urljoin(get_realm(state["realm"]).uri, request.get_full_path()))
@@ -102,7 +104,9 @@ def complete_zoom_user(
 def complete_zoom_user_in_realm(
     request: HttpRequest,
     code: str = REQ(),
-    state: Dict[str, str] = REQ(validator=check_dict([("sid", check_string)], value_validator=check_string)),
+    state: Dict[str, str] = REQ(
+        validator=check_dict([("sid", check_string)], value_validator=check_string)
+    ),
 ) -> HttpResponse:
     if not constant_time_compare(state["sid"], get_zoom_sid(request)):
         raise JsonableError(_("Invalid Zoom session identifier"))
@@ -140,6 +144,7 @@ def make_zoom_video_call(request: HttpRequest, user: UserProfile) -> HttpRespons
 
     return json_success({"url": res.json()["join_url"]})
 
+
 @csrf_exempt
 @require_POST
 @has_request_variables
@@ -166,13 +171,29 @@ def get_bigbluebutton_url(request: HttpRequest, user_profile: UserProfile) -> Ht
     # https://docs.bigbluebutton.org/dev/api.html#usage for reference for checksum
     id = "zulip-" + str(random.randint(100000000000, 999999999999))
     password = b32encode(secrets.token_bytes(7))[:10].decode()
-    checksum = hashlib.sha1(("create" + "meetingID=" + id + "&moderatorPW="
-                             + password + "&attendeePW=" + password + "a" + settings.BIG_BLUE_BUTTON_SECRET).encode()).hexdigest()
-    url = add_query_to_redirect_url("/calls/bigbluebutton/join", urlencode({
-        "meeting_id": "\"" + id + "\"",
-        "password": "\"" + password + "\"",
-        "checksum": "\"" + checksum + "\""
-    }))
+    checksum = hashlib.sha1(
+        (
+            "create"
+            + "meetingID="
+            + id
+            + "&moderatorPW="
+            + password
+            + "&attendeePW="
+            + password
+            + "a"
+            + settings.BIG_BLUE_BUTTON_SECRET
+        ).encode()
+    ).hexdigest()
+    url = add_query_to_redirect_url(
+        "/calls/bigbluebutton/join",
+        urlencode(
+            {
+                "meeting_id": "\"" + id + "\"",
+                "password": "\"" + password + "\"",
+                "checksum": "\"" + checksum + "\"",
+            }
+        ),
+    )
     return json_success({"url": url})
 
 
@@ -184,20 +205,29 @@ def get_bigbluebutton_url(request: HttpRequest, user_profile: UserProfile) -> Ht
 @zulip_login_required
 @never_cache
 @has_request_variables
-def join_bigbluebutton(request: HttpRequest, meeting_id: str = REQ(validator=check_string),
-                       password: str = REQ(validator=check_string),
-                       checksum: str = REQ(validator=check_string)) -> HttpResponse:
+def join_bigbluebutton(
+    request: HttpRequest,
+    meeting_id: str = REQ(validator=check_string),
+    password: str = REQ(validator=check_string),
+    checksum: str = REQ(validator=check_string),
+) -> HttpResponse:
     if settings.BIG_BLUE_BUTTON_URL is None or settings.BIG_BLUE_BUTTON_SECRET is None:
         return json_error(_("Big Blue Button is not configured."))
     else:
         try:
             response = requests.get(
-                add_query_to_redirect_url(settings.BIG_BLUE_BUTTON_URL + "api/create", urlencode({
-                    "meetingID": meeting_id,
-                    "moderatorPW": password,
-                    "attendeePW": password + "a",
-                    "checksum": checksum
-                })))
+                add_query_to_redirect_url(
+                    settings.BIG_BLUE_BUTTON_URL + "api/create",
+                    urlencode(
+                        {
+                            "meetingID": meeting_id,
+                            "moderatorPW": password,
+                            "attendeePW": password + "a",
+                            "checksum": checksum,
+                        }
+                    ),
+                )
+            )
             response.raise_for_status()
         except requests.RequestException:
             return json_error(_("Error connecting to the Big Blue Button server."))
@@ -218,6 +248,10 @@ def join_bigbluebutton(request: HttpRequest, meeting_id: str = REQ(validator=che
             quote_via=quote,
         )
 
-        checksum = hashlib.sha1(("join" + join_params + settings.BIG_BLUE_BUTTON_SECRET).encode()).hexdigest()
-        redirect_url_base = add_query_to_redirect_url(settings.BIG_BLUE_BUTTON_URL + "api/join", join_params)
+        checksum = hashlib.sha1(
+            ("join" + join_params + settings.BIG_BLUE_BUTTON_SECRET).encode()
+        ).hexdigest()
+        redirect_url_base = add_query_to_redirect_url(
+            settings.BIG_BLUE_BUTTON_URL + "api/join", join_params
+        )
         return redirect(add_query_arg_to_redirect_url(redirect_url_base, "checksum=" + checksum))
diff --git a/zerver/views/zephyr.py b/zerver/views/zephyr.py
index fabdeb162a..aabde7dd99 100644
--- a/zerver/views/zephyr.py
+++ b/zerver/views/zephyr.py
@@ -24,10 +24,12 @@ kerberos_alter_egos = {
     'golem': 'ctl',
 }
 
+
 @authenticated_json_view
 @has_request_variables
-def webathena_kerberos_login(request: HttpRequest, user_profile: UserProfile,
-                             cred: Optional[str]=REQ(default=None)) -> HttpResponse:
+def webathena_kerberos_login(
+    request: HttpRequest, user_profile: UserProfile, cred: Optional[str] = REQ(default=None)
+) -> HttpResponse:
     global kerberos_alter_egos
     if cred is None:
         return json_error(_("Could not find Kerberos credential"))
@@ -39,10 +41,10 @@ def webathena_kerberos_login(request: HttpRequest, user_profile: UserProfile,
         user = parsed_cred["cname"]["nameString"][0]
         if user in kerberos_alter_egos:
             user = kerberos_alter_egos[user]
-        assert(user == user_profile.email.split("@")[0])
+        assert user == user_profile.email.split("@")[0]
         # Limit characters in usernames to valid MIT usernames
         # This is important for security since DNS is not secure.
-        assert(re.match(r'^[a-z0-9_.-]+$', user) is not None)
+        assert re.match(r'^[a-z0-9_.-]+$', user) is not None
         ccache = make_ccache(parsed_cred)
 
         # 'user' has been verified to contain only benign characters that won't
@@ -64,8 +66,9 @@ def webathena_kerberos_login(request: HttpRequest, user_profile: UserProfile,
             api_key,
             base64.b64encode(ccache).decode("utf-8"),
         ]
-        subprocess.check_call(["ssh", settings.PERSONAL_ZMIRROR_SERVER, "--",
-                               " ".join(map(shlex.quote, command))])
+        subprocess.check_call(
+            ["ssh", settings.PERSONAL_ZMIRROR_SERVER, "--", " ".join(map(shlex.quote, command))]
+        )
     except subprocess.CalledProcessError:
         logging.exception("Error updating the user's ccache", stack_info=True)
         return json_error(_("We were unable to setup mirroring for you"))
diff --git a/zerver/webhooks/airbrake/view.py b/zerver/webhooks/airbrake/view.py
index 4498086dce..7a56ac13ae 100644
--- a/zerver/webhooks/airbrake/view.py
+++ b/zerver/webhooks/airbrake/view.py
@@ -12,18 +12,24 @@ from zerver.models import UserProfile
 AIRBRAKE_TOPIC_TEMPLATE = '{project_name}'
 AIRBRAKE_MESSAGE_TEMPLATE = '[{error_class}]({error_url}): "{error_message}" occurred.'
 
+
 @webhook_view('Airbrake')
 @has_request_variables
-def api_airbrake_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_airbrake_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     subject = get_subject(payload)
     body = get_body(payload)
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_subject(payload: Dict[str, Any]) -> str:
     return AIRBRAKE_TOPIC_TEMPLATE.format(project_name=payload['error']['project']['name'])
 
+
 def get_body(payload: Dict[str, Any]) -> str:
     data = {
         'error_url': payload['airbrake_error_url'],
diff --git a/zerver/webhooks/alertmanager/tests.py b/zerver/webhooks/alertmanager/tests.py
index 92f3d7aef9..45882bf0bf 100644
--- a/zerver/webhooks/alertmanager/tests.py
+++ b/zerver/webhooks/alertmanager/tests.py
@@ -15,7 +15,10 @@ class AlertmanagerHookTests(WebhookTestCase):
 """.strip()
 
         self.check_webhook(
-            "alert", expected_topic, expected_message, "application/json",
+            "alert",
+            expected_topic,
+            expected_message,
+            "application/json",
         )
 
     def test_single_error_issue_message(self) -> None:
@@ -25,5 +28,8 @@ class AlertmanagerHookTests(WebhookTestCase):
 """.strip()
 
         self.check_webhook(
-            "single_alert", expected_topic, expected_message, "application/json",
+            "single_alert",
+            expected_topic,
+            expected_message,
+            "application/json",
         )
diff --git a/zerver/webhooks/alertmanager/view.py b/zerver/webhooks/alertmanager/view.py
index 8e651fe312..f4a653dd61 100644
--- a/zerver/webhooks/alertmanager/view.py
+++ b/zerver/webhooks/alertmanager/view.py
@@ -12,8 +12,11 @@ from zerver.models import UserProfile
 
 @webhook_view('Alertmanager')
 @has_request_variables
-def api_alertmanager_webhook(request: HttpRequest, user_profile: UserProfile,
-                             payload: Dict[str, Any] = REQ(argument_type='body')) -> HttpResponse:
+def api_alertmanager_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     name_field = request.GET.get("name", "instance")
     desc_field = request.GET.get("desc", "alertname")
     topics: Dict[str, Dict[str, List[str]]] = {}
@@ -22,10 +25,8 @@ def api_alertmanager_webhook(request: HttpRequest, user_profile: UserProfile,
         labels = alert.get("labels", {})
         annotations = alert.get("annotations", {})
 
-        name = labels.get(
-            name_field, annotations.get(name_field, "(unknown)"))
-        desc = labels.get(
-            desc_field, annotations.get(desc_field, f"<missing field: {desc_field}>"))
+        name = labels.get(name_field, annotations.get(name_field, "(unknown)"))
+        desc = labels.get(desc_field, annotations.get(desc_field, f"<missing field: {desc_field}>"))
 
         url = alert.get("generatorURL").replace("tab=1", "tab=0")
 
diff --git a/zerver/webhooks/ansibletower/tests.py b/zerver/webhooks/ansibletower/tests.py
index 4c24cf187f..46c3cc92dd 100644
--- a/zerver/webhooks/ansibletower/tests.py
+++ b/zerver/webhooks/ansibletower/tests.py
@@ -11,8 +11,10 @@ class AnsibletowerHookTests(WebhookTestCase):
         Tests if ansibletower project update successful notification is handled correctly
         """
         expected_topic = "AWX - Project Update"
-        expected_message = ("Project Update: [#2677 AWX - Project Update]"
-                            "(http://awx.example.co.uk/#/jobs/project/2677) was successful.")
+        expected_message = (
+            "Project Update: [#2677 AWX - Project Update]"
+            "(http://awx.example.co.uk/#/jobs/project/2677) was successful."
+        )
 
         self.check_webhook("project_update_successful", expected_topic, expected_message)
 
@@ -21,8 +23,10 @@ class AnsibletowerHookTests(WebhookTestCase):
         Tests if ansibletower project update failed notification is handled correctly
         """
         expected_topic = "AWX - Project Update"
-        expected_message = ("Project Update: [#2678 AWX - Project Update]"
-                            "(http://awx.example.co.uk/#/jobs/project/2678) failed.")
+        expected_message = (
+            "Project Update: [#2678 AWX - Project Update]"
+            "(http://awx.example.co.uk/#/jobs/project/2678) failed."
+        )
 
         self.check_webhook("project_update_failed", expected_topic, expected_message)
 
@@ -100,8 +104,10 @@ Job: [#2722 System - Updates - Ubuntu](http://awx.example.co.uk/#/jobs/playbook/
         Tests if ansibletower inventory update successful notification is handled correctly
         """
         expected_topic = "AWX - Inventory Update"
-        expected_message = ("Inventory Update: [#2724 AWX - Inventory Update]"
-                            "(http://awx.example.co.uk/#/jobs/inventory/2724) was successful.")
+        expected_message = (
+            "Inventory Update: [#2724 AWX - Inventory Update]"
+            "(http://awx.example.co.uk/#/jobs/inventory/2724) was successful."
+        )
 
         self.check_webhook("inventory_update_successful", expected_topic, expected_message)
 
@@ -110,8 +116,10 @@ Job: [#2722 System - Updates - Ubuntu](http://awx.example.co.uk/#/jobs/playbook/
         Tests if ansibletower inventory update failed notification is handled correctly
         """
         expected_topic = "AWX - Inventory Update"
-        expected_message = ("Inventory Update: [#2724 AWX - Inventory Update]"
-                            "(http://awx.example.co.uk/#/jobs/inventory/2724) failed.")
+        expected_message = (
+            "Inventory Update: [#2724 AWX - Inventory Update]"
+            "(http://awx.example.co.uk/#/jobs/inventory/2724) failed."
+        )
 
         self.check_webhook("inventory_update_failed", expected_topic, expected_message)
 
@@ -120,8 +128,10 @@ Job: [#2722 System - Updates - Ubuntu](http://awx.example.co.uk/#/jobs/playbook/
         Tests if ansibletower adhoc command successful notification is handled correctly
         """
         expected_topic = "shell: uname -r"
-        expected_message = ("AdHoc Command: [#2726 shell: uname -r]"
-                            "(http://awx.example.co.uk/#/jobs/command/2726) was successful.")
+        expected_message = (
+            "AdHoc Command: [#2726 shell: uname -r]"
+            "(http://awx.example.co.uk/#/jobs/command/2726) was successful."
+        )
 
         self.check_webhook("adhoc_command_successful", expected_topic, expected_message)
 
@@ -130,8 +140,10 @@ Job: [#2722 System - Updates - Ubuntu](http://awx.example.co.uk/#/jobs/playbook/
         Tests if ansibletower adhoc command failed notification is handled correctly
         """
         expected_topic = "shell: uname -r"
-        expected_message = ("AdHoc Command: [#2726 shell: uname -r]"
-                            "(http://awx.example.co.uk/#/jobs/command/2726) failed.")
+        expected_message = (
+            "AdHoc Command: [#2726 shell: uname -r]"
+            "(http://awx.example.co.uk/#/jobs/command/2726) failed."
+        )
 
         self.check_webhook("adhoc_command_failed", expected_topic, expected_message)
 
@@ -140,8 +152,10 @@ Job: [#2722 System - Updates - Ubuntu](http://awx.example.co.uk/#/jobs/playbook/
         Tests if ansibletower system job successful notification is handled correctly
         """
         expected_topic = "Cleanup Job Details"
-        expected_message = ("System Job: [#2721 Cleanup Job Details]"
-                            "(http://awx.example.co.uk/#/jobs/system/2721) was successful.")
+        expected_message = (
+            "System Job: [#2721 Cleanup Job Details]"
+            "(http://awx.example.co.uk/#/jobs/system/2721) was successful."
+        )
 
         self.check_webhook("system_job_successful", expected_topic, expected_message)
 
@@ -150,7 +164,9 @@ Job: [#2722 System - Updates - Ubuntu](http://awx.example.co.uk/#/jobs/playbook/
         Tests if ansibletower system job failed notification is handled correctly
         """
         expected_topic = "Cleanup Job Details"
-        expected_message = ("System Job: [#2721 Cleanup Job Details]"
-                            "(http://awx.example.co.uk/#/jobs/system/2721) failed.")
+        expected_message = (
+            "System Job: [#2721 Cleanup Job Details]"
+            "(http://awx.example.co.uk/#/jobs/system/2721) failed."
+        )
 
         self.check_webhook("system_job_failed", expected_topic, expected_message)
diff --git a/zerver/webhooks/ansibletower/view.py b/zerver/webhooks/ansibletower/view.py
index 5e5f5f2833..c0a2a6b40e 100644
--- a/zerver/webhooks/ansibletower/view.py
+++ b/zerver/webhooks/ansibletower/view.py
@@ -18,10 +18,14 @@ ANSIBLETOWER_JOB_MESSAGE_TEMPLATE = """
 
 ANSIBLETOWER_JOB_HOST_ROW_TEMPLATE = '* {hostname}: {status}\n'
 
+
 @webhook_view('AnsibleTower')
 @has_request_variables
-def api_ansibletower_webhook(request: HttpRequest, user_profile: UserProfile,
-                             payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_ansibletower_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     body = get_body(payload)
     subject = payload['name']
@@ -29,6 +33,7 @@ def api_ansibletower_webhook(request: HttpRequest, user_profile: UserProfile,
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def extract_friendly_name(payload: Dict[str, Any]) -> str:
     tentative_job_name = payload.get("friendly_name", "")
     if not tentative_job_name:
@@ -39,22 +44,25 @@ def extract_friendly_name(payload: Dict[str, Any]) -> str:
             tentative_job_name = "Job"
     return tentative_job_name
 
+
 def get_body(payload: Dict[str, Any]) -> str:
     friendly_name = extract_friendly_name(payload)
-    if (friendly_name == 'Job'):
+    if friendly_name == 'Job':
         hosts_list_data = payload['hosts']
         hosts_data = []
         for host in payload['hosts']:
-            if (hosts_list_data[host].get('failed') is True):
+            if hosts_list_data[host].get('failed') is True:
                 hoststatus = 'Failed'
-            elif (hosts_list_data[host].get('failed') is False):
+            elif hosts_list_data[host].get('failed') is False:
                 hoststatus = 'Success'
-            hosts_data.append({
-                'hostname': host,
-                'status': hoststatus,
-            })
+            hosts_data.append(
+                {
+                    'hostname': host,
+                    'status': hoststatus,
+                }
+            )
 
-        if (payload['status'] == "successful"):
+        if payload['status'] == "successful":
             status = 'was successful'
         else:
             status = 'failed'
@@ -70,7 +78,7 @@ def get_body(payload: Dict[str, Any]) -> str:
 
     else:
 
-        if (payload['status'] == "successful"):
+        if payload['status'] == "successful":
             status = 'was successful'
         else:
             status = 'failed'
@@ -85,6 +93,7 @@ def get_body(payload: Dict[str, Any]) -> str:
 
         return ANSIBLETOWER_DEFAULT_MESSAGE_TEMPLATE.format(**data)
 
+
 def get_hosts_content(hosts_data: List[Dict[str, Any]]) -> str:
     hosts_data = sorted(hosts_data, key=operator.itemgetter('hostname'))
     hosts_content = ''
diff --git a/zerver/webhooks/appfollow/tests.py b/zerver/webhooks/appfollow/tests.py
index e3526e791b..f8aecb9170 100644
--- a/zerver/webhooks/appfollow/tests.py
+++ b/zerver/webhooks/appfollow/tests.py
@@ -56,6 +56,7 @@ Acme enables me to manage the flow of information quite well. I only wish I coul
         )
         self.URL_TEMPLATE = original_url_template
 
+
 class ConvertMarkdownTest(ZulipTestCase):
     def test_convert_bold(self) -> None:
         self.assertEqual(convert_markdown("*test message*"), "**test message**")
diff --git a/zerver/webhooks/appfollow/view.py b/zerver/webhooks/appfollow/view.py
index 3c283eace4..c350e33f1c 100644
--- a/zerver/webhooks/appfollow/view.py
+++ b/zerver/webhooks/appfollow/view.py
@@ -13,18 +13,21 @@ from zerver.models import UserProfile
 
 @webhook_view("AppFollow")
 @has_request_variables
-def api_appfollow_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Any]=REQ(argument_type="body")) -> HttpResponse:
+def api_appfollow_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type="body"),
+) -> HttpResponse:
     message = payload["text"]
     app_name_search = re.search(r'\A(.+)', message)
     assert app_name_search is not None
     app_name = app_name_search.group(0)
     topic = app_name
 
-    check_send_webhook_message(request, user_profile, topic,
-                               body=convert_markdown(message))
+    check_send_webhook_message(request, user_profile, topic, body=convert_markdown(message))
     return json_success()
 
+
 def convert_markdown(text: str) -> str:
     # Converts Slack-style Markdown to Zulip format
     # Implemented mainly for AppFollow messages
diff --git a/zerver/webhooks/appveyor/view.py b/zerver/webhooks/appveyor/view.py
index 9635a9d09e..d42e5220c7 100644
--- a/zerver/webhooks/appveyor/view.py
+++ b/zerver/webhooks/appveyor/view.py
@@ -15,10 +15,14 @@ APPVEYOR_MESSAGE_TEMPLATE = """
 * **Finished**: {finished}
 """.strip()
 
+
 @webhook_view('Appveyor')
 @has_request_variables
-def api_appveyor_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_appveyor_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     body = get_body_for_http_request(payload)
     subject = get_subject_for_http_request(payload)
@@ -26,10 +30,12 @@ def api_appveyor_webhook(request: HttpRequest, user_profile: UserProfile,
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_subject_for_http_request(payload: Dict[str, Any]) -> str:
     event_data = payload['eventData']
     return APPVEYOR_TOPIC_TEMPLATE.format(project_name=event_data['projectName'])
 
+
 def get_body_for_http_request(payload: Dict[str, Any]) -> str:
     event_data = payload['eventData']
 
diff --git a/zerver/webhooks/basecamp/support_event.py b/zerver/webhooks/basecamp/support_event.py
index 0ce0cf520c..2e151322f9 100644
--- a/zerver/webhooks/basecamp/support_event.py
+++ b/zerver/webhooks/basecamp/support_event.py
@@ -43,4 +43,6 @@ TODOS_SUPPORT_EVENTS = [
     'todo_due_on_changed',
 ]
 
-SUPPORT_EVENTS = DOC_SUPPORT_EVENTS + QUESTION_SUPPORT_EVENTS + MESSAGE_SUPPORT_EVENTS + TODOS_SUPPORT_EVENTS
+SUPPORT_EVENTS = (
+    DOC_SUPPORT_EVENTS + QUESTION_SUPPORT_EVENTS + MESSAGE_SUPPORT_EVENTS + TODOS_SUPPORT_EVENTS
+)
diff --git a/zerver/webhooks/basecamp/tests.py b/zerver/webhooks/basecamp/tests.py
index ab33bd4a28..2155874e3c 100644
--- a/zerver/webhooks/basecamp/tests.py
+++ b/zerver/webhooks/basecamp/tests.py
@@ -2,6 +2,7 @@ from zerver.lib.test_classes import WebhookTestCase
 
 TOPIC = "Zulip HQ"
 
+
 class BasecampHookTests(WebhookTestCase):
     STREAM_NAME = 'basecamp'
     URL_TEMPLATE = "/api/v1/external/basecamp?stream={stream}&api_key={api_key}"
diff --git a/zerver/webhooks/basecamp/view.py b/zerver/webhooks/basecamp/view.py
index b24de5b882..8ffc6f69d4 100644
--- a/zerver/webhooks/basecamp/view.py
+++ b/zerver/webhooks/basecamp/view.py
@@ -15,17 +15,25 @@ from .support_event import SUPPORT_EVENTS
 
 DOCUMENT_TEMPLATE = "{user_name} {verb} the document [{title}]({url})"
 QUESTION_TEMPLATE = "{user_name} {verb} the question [{title}]({url})"
-QUESTIONS_ANSWER_TEMPLATE = ("{user_name} {verb} the [answer]({answer_url}) " +
-                             "of the question [{question_title}]({question_url})")
-COMMENT_TEMPLATE = "{user_name} {verb} the [comment]({answer_url}) of the task [{task_title}]({task_url})"
+QUESTIONS_ANSWER_TEMPLATE = (
+    "{user_name} {verb} the [answer]({answer_url}) "
+    + "of the question [{question_title}]({question_url})"
+)
+COMMENT_TEMPLATE = (
+    "{user_name} {verb} the [comment]({answer_url}) of the task [{task_title}]({task_url})"
+)
 MESSAGE_TEMPLATE = "{user_name} {verb} the message [{title}]({url})"
 TODO_LIST_TEMPLATE = "{user_name} {verb} the todo list [{title}]({url})"
 TODO_TEMPLATE = "{user_name} {verb} the todo task [{title}]({url})"
 
+
 @webhook_view('Basecamp')
 @has_request_variables
-def api_basecamp_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_basecamp_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     event = get_event_type(payload)
 
     if event not in SUPPORT_EVENTS:
@@ -52,21 +60,27 @@ def api_basecamp_webhook(request: HttpRequest, user_profile: UserProfile,
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_project_name(payload: Dict[str, Any]) -> str:
     return payload['recording']['bucket']['name']
 
+
 def get_event_type(payload: Dict[str, Any]) -> str:
     return payload['kind']
 
+
 def get_event_creator(payload: Dict[str, Any]) -> str:
     return payload['creator']['name']
 
+
 def get_subject_url(payload: Dict[str, Any]) -> str:
     return payload['recording']['app_url']
 
+
 def get_subject_title(payload: Dict[str, Any]) -> str:
     return payload['recording']['title']
 
+
 def get_verb(event: str, prefix: str) -> str:
     verb = event.replace(prefix, '')
     if verb == 'active':
@@ -77,14 +91,17 @@ def get_verb(event: str, prefix: str) -> str:
         return "changed {} of".format(matched.group('subject'))
     return verb
 
+
 def add_punctuation_if_necessary(body: str, title: str) -> str:
     if title[-1] not in string.punctuation:
         body = f'{body}.'
     return body
 
+
 def get_document_body(event: str, payload: Dict[str, Any]) -> str:
     return get_generic_body(event, payload, 'document_', DOCUMENT_TEMPLATE)
 
+
 def get_questions_answer_body(event: str, payload: Dict[str, Any]) -> str:
     verb = get_verb(event, 'question_answer_')
     question = payload['recording']['parent']
@@ -99,6 +116,7 @@ def get_questions_answer_body(event: str, payload: Dict[str, Any]) -> str:
         question_url=question['app_url'],
     )
 
+
 def get_comment_body(event: str, payload: Dict[str, Any]) -> str:
     verb = get_verb(event, 'comment_')
     task = payload['recording']['parent']
@@ -112,18 +130,23 @@ def get_comment_body(event: str, payload: Dict[str, Any]) -> str:
         task_url=task['app_url'],
     )
 
+
 def get_questions_body(event: str, payload: Dict[str, Any]) -> str:
     return get_generic_body(event, payload, 'question_', QUESTION_TEMPLATE)
 
+
 def get_message_body(event: str, payload: Dict[str, Any]) -> str:
     return get_generic_body(event, payload, 'message_', MESSAGE_TEMPLATE)
 
+
 def get_todo_list_body(event: str, payload: Dict[str, Any]) -> str:
     return get_generic_body(event, payload, 'todolist_', TODO_LIST_TEMPLATE)
 
+
 def get_todo_body(event: str, payload: Dict[str, Any]) -> str:
     return get_generic_body(event, payload, 'todo_', TODO_TEMPLATE)
 
+
 def get_generic_body(event: str, payload: Dict[str, Any], prefix: str, template: str) -> str:
     verb = get_verb(event, prefix)
     title = get_subject_title(payload)
diff --git a/zerver/webhooks/beanstalk/tests.py b/zerver/webhooks/beanstalk/tests.py
index d080308b38..7f3b5989b9 100644
--- a/zerver/webhooks/beanstalk/tests.py
+++ b/zerver/webhooks/beanstalk/tests.py
@@ -14,8 +14,9 @@ class BeanstalkHookTests(WebhookTestCase):
         expected_message = """Leo Franchi [pushed](http://lfranchi-svn.beanstalkapp.com/work-test) 1 commit to branch master.
 
 * add some stuff ([e50508d](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/e50508df))"""
-        self.api_stream_message(self.test_user, 'git_singlecommit', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user, 'git_singlecommit', expected_topic, expected_message, content_type=None
+        )
 
     def test_git_single_filtered_by_branches(self) -> None:
         self.url = self.build_webhook_url(branches='master,development')
@@ -23,8 +24,9 @@ class BeanstalkHookTests(WebhookTestCase):
         expected_message = """Leo Franchi [pushed](http://lfranchi-svn.beanstalkapp.com/work-test) 1 commit to branch master.
 
 * add some stuff ([e50508d](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/e50508df))"""
-        self.api_stream_message(self.test_user, 'git_singlecommit', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user, 'git_singlecommit', expected_topic, expected_message, content_type=None
+        )
 
     def test_git_multiple_committers(self) -> None:
         expected_topic = "work-test / master"
@@ -33,8 +35,13 @@ class BeanstalkHookTests(WebhookTestCase):
 * Added new file ([edf529c](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/edf529c7))
 * Filled in new file with some stuff ([c2a191b](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/c2a191b9))
 * More work to fix some bugs ([2009815](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/20098158))"""
-        self.api_stream_message(self.test_user, 'git_multiple_committers', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user,
+            'git_multiple_committers',
+            expected_topic,
+            expected_message,
+            content_type=None,
+        )
 
     def test_git_multiple_committers_filtered_by_branches(self) -> None:
         self.url = self.build_webhook_url(branches='master,development')
@@ -44,8 +51,13 @@ class BeanstalkHookTests(WebhookTestCase):
 * Added new file ([edf529c](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/edf529c7))
 * Filled in new file with some stuff ([c2a191b](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/c2a191b9))
 * More work to fix some bugs ([2009815](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/20098158))"""
-        self.api_stream_message(self.test_user, 'git_multiple_committers', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user,
+            'git_multiple_committers',
+            expected_topic,
+            expected_message,
+            content_type=None,
+        )
 
     def test_git_multiple(self) -> None:
         expected_topic = "work-test / master"
@@ -54,8 +66,9 @@ class BeanstalkHookTests(WebhookTestCase):
 * Added new file ([edf529c](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/edf529c7))
 * Filled in new file with some stuff ([c2a191b](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/c2a191b9))
 * More work to fix some bugs ([2009815](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/20098158))"""
-        self.api_stream_message(self.test_user, 'git_multiple', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user, 'git_multiple', expected_topic, expected_message, content_type=None
+        )
 
     def test_git_multiple_filtered_by_branches(self) -> None:
         self.url = self.build_webhook_url(branches='master,development')
@@ -65,8 +78,9 @@ class BeanstalkHookTests(WebhookTestCase):
 * Added new file ([edf529c](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/edf529c7))
 * Filled in new file with some stuff ([c2a191b](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/c2a191b9))
 * More work to fix some bugs ([2009815](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/20098158))"""
-        self.api_stream_message(self.test_user, 'git_multiple', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user, 'git_multiple', expected_topic, expected_message, content_type=None
+        )
 
     def test_git_more_than_limit(self) -> None:
         commits_info = "* add some stuff ([e50508d](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/e50508df))\n"
@@ -74,8 +88,13 @@ class BeanstalkHookTests(WebhookTestCase):
         expected_message = f"""Leo Franchi [pushed](http://lfranchi-svn.beanstalkapp.com/work-test) 50 commits to branch master.
 
 {(commits_info * COMMITS_LIMIT)}[and {50 - COMMITS_LIMIT} more commit(s)]"""
-        self.api_stream_message(self.test_user, 'git_morethanlimitcommits', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user,
+            'git_morethanlimitcommits',
+            expected_topic,
+            expected_message,
+            content_type=None,
+        )
 
     def test_git_more_than_limit_filtered_by_branches(self) -> None:
         self.url = self.build_webhook_url(branches='master,development')
@@ -84,11 +103,18 @@ class BeanstalkHookTests(WebhookTestCase):
         expected_message = f"""Leo Franchi [pushed](http://lfranchi-svn.beanstalkapp.com/work-test) 50 commits to branch master.
 
 {(commits_info * COMMITS_LIMIT)}[and {50 - COMMITS_LIMIT} more commit(s)]"""
-        self.api_stream_message(self.test_user, 'git_morethanlimitcommits', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user,
+            'git_morethanlimitcommits',
+            expected_topic,
+            expected_message,
+            content_type=None,
+        )
 
     @patch('zerver.webhooks.beanstalk.view.check_send_webhook_message')
-    def test_git_single_filtered_by_branches_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_git_single_filtered_by_branches_ignore(
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_payload('git_singlecommit')
         result = self.api_post(self.test_user, self.url, payload)
@@ -97,7 +123,8 @@ class BeanstalkHookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.beanstalk.view.check_send_webhook_message')
     def test_git_multiple_committers_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_payload('git_multiple_committers')
         result = self.api_post(self.test_user, self.url, payload)
@@ -106,7 +133,8 @@ class BeanstalkHookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.beanstalk.view.check_send_webhook_message')
     def test_git_multiple_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_payload('git_multiple')
         result = self.api_post(self.test_user, self.url, payload)
@@ -115,7 +143,8 @@ class BeanstalkHookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.beanstalk.view.check_send_webhook_message')
     def test_git_more_than_limit_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_payload('git_morethanlimitcommits')
         result = self.api_post(self.test_user, self.url, payload)
@@ -127,16 +156,18 @@ class BeanstalkHookTests(WebhookTestCase):
         expected_message = """Leo Franchi pushed [revision 3](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/3):
 
 > Removed a file and added another one!"""
-        self.api_stream_message(self.test_user, 'svn_addremove', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user, 'svn_addremove', expected_topic, expected_message, content_type=None
+        )
 
     def test_svn_changefile(self) -> None:
         expected_topic = "svn r2"
         expected_message = """Leo Franchi pushed [revision 2](http://lfranchi-svn.beanstalkapp.com/work-test/changesets/2):
 
 > Added some code"""
-        self.api_stream_message(self.test_user, 'svn_changefile', expected_topic, expected_message,
-                                content_type=None)
+        self.api_stream_message(
+            self.test_user, 'svn_changefile', expected_topic, expected_message, content_type=None
+        )
 
     def get_payload(self, fixture_name: str) -> Dict[str, str]:
         return {'payload': self.webhook_fixture_data('beanstalk', fixture_name)}
diff --git a/zerver/webhooks/beanstalk/view.py b/zerver/webhooks/beanstalk/view.py
index 7125021ecc..22c810271c 100644
--- a/zerver/webhooks/beanstalk/view.py
+++ b/zerver/webhooks/beanstalk/view.py
@@ -16,11 +16,19 @@ from zerver.lib.webhooks.git import TOPIC_WITH_BRANCH_TEMPLATE, get_push_commits
 from zerver.models import UserProfile
 
 
-def build_message_from_gitlog(user_profile: UserProfile, name: str, ref: str,
-                              commits: List[Dict[str, str]], before: str, after: str,
-                              url: str, pusher: str, forced: Optional[str]=None,
-                              created: Optional[str]=None, deleted: bool=False,
-                              ) -> Tuple[str, str]:
+def build_message_from_gitlog(
+    user_profile: UserProfile,
+    name: str,
+    ref: str,
+    commits: List[Dict[str, str]],
+    before: str,
+    after: str,
+    url: str,
+    pusher: str,
+    forced: Optional[str] = None,
+    created: Optional[str] = None,
+    deleted: bool = False,
+) -> Tuple[str, str]:
     short_ref = re.sub(r'^refs/heads/', '', ref)
     subject = TOPIC_WITH_BRANCH_TEMPLATE.format(repo=name, branch=short_ref)
 
@@ -29,17 +37,21 @@ def build_message_from_gitlog(user_profile: UserProfile, name: str, ref: str,
 
     return subject, content
 
+
 def _transform_commits_list_to_common_format(commits: List[Dict[str, Any]]) -> List[Dict[str, str]]:
     new_commits_list = []
     for commit in commits:
-        new_commits_list.append({
-            'name': commit['author'].get('username'),
-            'sha': commit.get('id'),
-            'url': commit.get('url'),
-            'message': commit.get('message'),
-        })
+        new_commits_list.append(
+            {
+                'name': commit['author'].get('username'),
+                'sha': commit.get('id'),
+                'url': commit.get('url'),
+                'message': commit.get('message'),
+            }
+        )
     return new_commits_list
 
+
 # Beanstalk's web hook UI rejects URL with a @ in the username section
 # So we ask the user to replace them with %40
 # We manually fix the username here before passing it along to @authenticated_rest_api_view
@@ -60,12 +72,16 @@ def beanstalk_decoder(view_func: ViewFuncT) -> ViewFuncT:
 
     return cast(ViewFuncT, _wrapped_view_func)  # https://github.com/python/mypy/issues/1927
 
+
 @beanstalk_decoder
 @authenticated_rest_api_view(webhook_client_name="Beanstalk")
 @has_request_variables
-def api_beanstalk_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Any]=REQ(validator=check_dict([])),
-                          branches: Optional[str]=REQ(default=None)) -> HttpResponse:
+def api_beanstalk_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(validator=check_dict([])),
+    branches: Optional[str] = REQ(default=None),
+) -> HttpResponse:
     # Beanstalk supports both SVN and Git repositories
     # We distinguish between the two by checking for a
     # 'uri' key that is only present for Git repos
@@ -77,11 +93,16 @@ def api_beanstalk_webhook(request: HttpRequest, user_profile: UserProfile,
         for commit in payload['commits']:
             commit['author'] = {'username': commit['author']['name']}
 
-        subject, content = build_message_from_gitlog(user_profile, payload['repository']['name'],
-                                                     payload['ref'], payload['commits'],
-                                                     payload['before'], payload['after'],
-                                                     payload['repository']['url'],
-                                                     payload['pusher_name'])
+        subject, content = build_message_from_gitlog(
+            user_profile,
+            payload['repository']['name'],
+            payload['ref'],
+            payload['commits'],
+            payload['before'],
+            payload['after'],
+            payload['repository']['url'],
+            payload['pusher_name'],
+        )
     else:
         author = payload.get('author_full_name')
         url = payload.get('changeset_url')
diff --git a/zerver/webhooks/beeminder/view.py b/zerver/webhooks/beeminder/view.py
index 8873cdcd03..57deef3ba3 100644
--- a/zerver/webhooks/beeminder/view.py
+++ b/zerver/webhooks/beeminder/view.py
@@ -10,19 +10,26 @@ from zerver.lib.response import json_success
 from zerver.lib.webhooks.common import check_send_webhook_message
 from zerver.models import UserProfile
 
-MESSAGE_TEMPLATE = ("You are going to derail from goal **{goal_name}** in **{time:0.1f} hours**. "
-                    "You need **{limsum}** to avoid derailing.\n"
-                    "* Pledge: **{pledge}$** {expression}\n")
+MESSAGE_TEMPLATE = (
+    "You are going to derail from goal **{goal_name}** in **{time:0.1f} hours**. "
+    "You need **{limsum}** to avoid derailing.\n"
+    "* Pledge: **{pledge}$** {expression}\n"
+)
+
 
 def get_time(payload: Dict[str, Any]) -> Any:
     losedate = payload["goal"]["losedate"]
-    time_remaining = (losedate - time.time())/3600
+    time_remaining = (losedate - time.time()) / 3600
     return time_remaining
 
+
 @webhook_view("Beeminder")
 @has_request_variables
-def api_beeminder_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_beeminder_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     goal_name = payload["goal"]["slug"]
     limsum = payload["goal"]["limsum"]
diff --git a/zerver/webhooks/bitbucket/tests.py b/zerver/webhooks/bitbucket/tests.py
index 5a9dfe198d..07c7e5bcdd 100644
--- a/zerver/webhooks/bitbucket/tests.py
+++ b/zerver/webhooks/bitbucket/tests.py
@@ -5,6 +5,7 @@ from zerver.lib.test_classes import WebhookTestCase
 TOPIC = "Repository name"
 TOPIC_BRANCH_EVENTS = "Repository name / master"
 
+
 class BitbucketHookTests(WebhookTestCase):
     STREAM_NAME = 'bitbucket'
     URL_TEMPLATE = "/api/v1/external/bitbucket?stream={stream}"
@@ -15,74 +16,76 @@ class BitbucketHookTests(WebhookTestCase):
         self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
         commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))'
         expected_message = f"kolaszek pushed 1 commit to branch master.\n\n{commit_info}"
-        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS,
-                                expected_message)
+        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
 
     def test_bitbucket_on_push_event_without_user_info(self) -> None:
         fixture_name = 'push_without_user_info'
         self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
         commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))'
-        expected_message = f"Someone pushed 1 commit to branch master. Commits by eeshangarg (1).\n\n{commit_info}"
-        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS,
-                                expected_message)
+        expected_message = (
+            f"Someone pushed 1 commit to branch master. Commits by eeshangarg (1).\n\n{commit_info}"
+        )
+        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
 
     def test_bitbucket_on_push_event_filtered_by_branches(self) -> None:
         fixture_name = 'push'
-        self.url = self.build_webhook_url(payload=self.get_body(fixture_name),
-                                          branches='master,development')
+        self.url = self.build_webhook_url(
+            payload=self.get_body(fixture_name), branches='master,development'
+        )
         commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))'
         expected_message = f"kolaszek pushed 1 commit to branch master.\n\n{commit_info}"
-        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS,
-                                expected_message)
+        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
 
     def test_bitbucket_on_push_commits_above_limit_event(self) -> None:
         fixture_name = 'push_commits_above_limit'
         self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
         commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))\n'
         expected_message = f"kolaszek pushed 50 commits to branch master.\n\n{commit_info * 20}[and 30 more commit(s)]"
-        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS,
-                                expected_message)
+        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
 
     def test_bitbucket_on_push_commits_above_limit_event_filtered_by_branches(self) -> None:
         fixture_name = 'push_commits_above_limit'
-        self.url = self.build_webhook_url(payload=self.get_body(fixture_name),
-                                          branches='master,development')
+        self.url = self.build_webhook_url(
+            payload=self.get_body(fixture_name), branches='master,development'
+        )
         commit_info = '* c ([25f93d2](https://bitbucket.org/kolaszek/repository-name/commits/25f93d22b719e2d678a7ad5ee0ef0d1fcdf39c12))\n'
         expected_message = f"kolaszek pushed 50 commits to branch master.\n\n{commit_info * 20}[and 30 more commit(s)]"
-        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS,
-                                expected_message)
+        self.api_stream_message(self.test_user, fixture_name, TOPIC_BRANCH_EVENTS, expected_message)
 
     def test_bitbucket_on_force_push_event(self) -> None:
         fixture_name = 'force_push'
         self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
-        expected_message = "kolaszek [force pushed](https://bitbucket.org/kolaszek/repository-name)."
-        self.api_stream_message(self.test_user, fixture_name, TOPIC,
-                                expected_message)
+        expected_message = (
+            "kolaszek [force pushed](https://bitbucket.org/kolaszek/repository-name)."
+        )
+        self.api_stream_message(self.test_user, fixture_name, TOPIC, expected_message)
 
     def test_bitbucket_on_force_push_event_without_user_info(self) -> None:
         fixture_name = 'force_push_without_user_info'
         self.url = self.build_webhook_url(payload=self.get_body(fixture_name))
-        expected_message = "Someone [force pushed](https://bitbucket.org/kolaszek/repository-name/)."
-        self.api_stream_message(self.test_user, fixture_name, TOPIC,
-                                expected_message)
+        expected_message = (
+            "Someone [force pushed](https://bitbucket.org/kolaszek/repository-name/)."
+        )
+        self.api_stream_message(self.test_user, fixture_name, TOPIC, expected_message)
 
     @patch('zerver.webhooks.bitbucket.view.check_send_webhook_message')
-    def test_bitbucket_on_push_event_filtered_by_branches_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_bitbucket_on_push_event_filtered_by_branches_ignore(
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         fixture_name = 'push'
         payload = self.get_body(fixture_name)
-        self.url = self.build_webhook_url(payload=payload,
-                                          branches='changes,development')
+        self.url = self.build_webhook_url(payload=payload, branches='changes,development')
         result = self.api_post(self.test_user, self.url, payload, content_type="application/json,")
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
 
     @patch('zerver.webhooks.bitbucket.view.check_send_webhook_message')
     def test_bitbucket_push_commits_above_limit_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         fixture_name = 'push_commits_above_limit'
         payload = self.get_body(fixture_name)
-        self.url = self.build_webhook_url(payload=payload,
-                                          branches='changes,development')
+        self.url = self.build_webhook_url(payload=payload, branches='changes,development')
         result = self.api_post(self.test_user, self.url, payload, content_type="application/json,")
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
diff --git a/zerver/webhooks/bitbucket/view.py b/zerver/webhooks/bitbucket/view.py
index 47bc6f799c..6753187ca3 100644
--- a/zerver/webhooks/bitbucket/view.py
+++ b/zerver/webhooks/bitbucket/view.py
@@ -13,9 +13,12 @@ from zerver.models import UserProfile
 
 @authenticated_rest_api_view(webhook_client_name="Bitbucket")
 @has_request_variables
-def api_bitbucket_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Mapping[str, Any]=REQ(validator=check_dict([])),
-                          branches: Optional[str]=REQ(default=None)) -> HttpResponse:
+def api_bitbucket_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Mapping[str, Any] = REQ(validator=check_dict([])),
+    branches: Optional[str] = REQ(default=None),
+) -> HttpResponse:
     repository = payload['repository']
 
     commits = [
@@ -24,9 +27,8 @@ def api_bitbucket_webhook(request: HttpRequest, user_profile: UserProfile,
             'sha': commit.get('raw_node'),
             'message': commit.get('message'),
             'url': '{}{}commits/{}'.format(
-                payload.get('canon_url'),
-                repository.get('absolute_url'),
-                commit.get('raw_node')),
+                payload.get('canon_url'), repository.get('absolute_url'), commit.get('raw_node')
+            ),
         }
         for commit in payload['commits']
     ]
@@ -46,10 +48,9 @@ def api_bitbucket_webhook(request: HttpRequest, user_profile: UserProfile,
 
         committer = payload.get('user')
         content = get_push_commits_event_message(
-            committer if committer is not None else 'Someone',
-            None, branch, commits)
+            committer if committer is not None else 'Someone', None, branch, commits
+        )
         subject = TOPIC_WITH_BRANCH_TEMPLATE.format(repo=repository['name'], branch=branch)
 
-    check_send_webhook_message(request, user_profile, subject, content,
-                               unquote_url_parameters=True)
+    check_send_webhook_message(request, user_profile, subject, content, unquote_url_parameters=True)
     return json_success()
diff --git a/zerver/webhooks/bitbucket2/tests.py b/zerver/webhooks/bitbucket2/tests.py
index e3a29e1816..93521f9c36 100644
--- a/zerver/webhooks/bitbucket2/tests.py
+++ b/zerver/webhooks/bitbucket2/tests.py
@@ -8,6 +8,7 @@ TOPIC_PR_EVENTS = "Repository name / PR #1 new commit"
 TOPIC_ISSUE_EVENTS = "Repository name / Issue #1 Bug"
 TOPIC_BRANCH_EVENTS = "Repository name / master"
 
+
 class Bitbucket2HookTests(WebhookTestCase):
     STREAM_NAME = 'bitbucket2'
     URL_TEMPLATE = "/api/v1/external/bitbucket2?stream={stream}&api_key={api_key}"
@@ -36,7 +37,9 @@ class Bitbucket2HookTests(WebhookTestCase):
         expected_message = f"""Tomasz [pushed](https://bitbucket.org/kolaszek/repository-name/branch/master) 3 commits to branch master. Commits by Ben (2) and Tomasz (1).\n\n{commit_info*2}* first commit ([84b96ad](https://bitbucket.org/kolaszek/repository-name/commits/84b96adc644a30fd6465b3d196369d880762afed))"""
         self.check_webhook("push_multiple_committers", TOPIC_BRANCH_EVENTS, expected_message)
 
-    def test_bitbucket2_on_push_commits_multiple_committers_with_others_filtered_by_branches(self) -> None:
+    def test_bitbucket2_on_push_commits_multiple_committers_with_others_filtered_by_branches(
+        self,
+    ) -> None:
         self.url = self.build_webhook_url(branches='master,development')
         commit_info = '* first commit ([84b96ad](https://bitbucket.org/kolaszek/repository-name/commits/84b96adc644a30fd6465b3d196369d880762afed))\n'
         expected_message = f"""Tomasz [pushed](https://bitbucket.org/kolaszek/repository-name/branch/master) 10 commits to branch master. Commits by Tomasz (4), James (3), Brendon (2) and others (1).\n\n{commit_info*9}* first commit ([84b96ad](https://bitbucket.org/kolaszek/repository-name/commits/84b96adc644a30fd6465b3d196369d880762afed))"""
@@ -129,7 +132,7 @@ class Bitbucket2HookTests(WebhookTestCase):
             "pull_request_created_or_updated_without_username",
             TOPIC_PR_EVENTS,
             expected_message,
-            **kwargs
+            **kwargs,
         )
 
     def test_bitbucket2_on_pull_request_created_with_custom_topic_in_url(self) -> None:
@@ -191,7 +194,9 @@ class Bitbucket2HookTests(WebhookTestCase):
         )
 
     def test_bitbucket2_on_pull_request_fulfilled_event(self) -> None:
-        expected_message = "Tomasz merged [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
+        expected_message = (
+            "Tomasz merged [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
+        )
         kwargs = {
             "HTTP_X_EVENT_KEY": 'pullrequest:fulfilled',
         }
@@ -255,14 +260,18 @@ class Bitbucket2HookTests(WebhookTestCase):
         self.check_webhook("repo_updated", expected_topic, expected_message, **kwargs)
 
     def test_bitbucket2_on_push_one_tag_event(self) -> None:
-        expected_message = "Tomasz pushed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
+        expected_message = (
+            "Tomasz pushed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
+        )
         kwargs = {
             "HTTP_X_EVENT_KEY": 'pullrequest:push',
         }
         self.check_webhook("push_one_tag", TOPIC, expected_message, **kwargs)
 
     def test_bitbucket2_on_push_remove_tag_event(self) -> None:
-        expected_message = "Tomasz removed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
+        expected_message = (
+            "Tomasz removed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
+        )
         kwargs = {
             "HTTP_X_EVENT_KEY": 'pullrequest:push',
         }
@@ -322,7 +331,7 @@ class Bitbucket2HookTests(WebhookTestCase):
             message=msg,
             stream_name=self.STREAM_NAME,
             topic_name=TOPIC_BRANCH_EVENTS,
-            content="Tomasz [pushed](https://bitbucket.org/kolaszek/repository-name/branch/master) 1 commit to branch master.\n\n* first commit ([84b96ad](https://bitbucket.org/kolaszek/repository-name/commits/84b96adc644a30fd6465b3d196369d880762afed))"
+            content="Tomasz [pushed](https://bitbucket.org/kolaszek/repository-name/branch/master) 1 commit to branch master.\n\n* first commit ([84b96ad](https://bitbucket.org/kolaszek/repository-name/commits/84b96adc644a30fd6465b3d196369d880762afed))",
         )
 
         msg = self.get_last_message()
@@ -371,12 +380,15 @@ class Bitbucket2HookTests(WebhookTestCase):
         kwargs = {
             "HTTP_X_EVENT_KEY": 'pullrequest:push',
         }
-        expected_message = "Tomasz pushed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
+        expected_message = (
+            "Tomasz pushed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
+        )
         self.check_webhook("more_than_one_push_event", TOPIC, expected_message, **kwargs)
 
     @patch('zerver.webhooks.bitbucket2.view.check_send_webhook_message')
     def test_bitbucket2_on_push_event_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,devlopment')
         payload = self.get_body('push')
         result = self.client_post(self.url, payload, content_type="application/json")
@@ -385,7 +397,8 @@ class Bitbucket2HookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.bitbucket2.view.check_send_webhook_message')
     def test_bitbucket2_on_push_commits_above_limit_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,devlopment')
         payload = self.get_body('push_commits_above_limit')
         result = self.client_post(self.url, payload, content_type="application/json")
@@ -394,7 +407,8 @@ class Bitbucket2HookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.bitbucket2.view.check_send_webhook_message')
     def test_bitbucket2_on_force_push_event_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,devlopment')
         payload = self.get_body('force_push')
         result = self.client_post(self.url, payload, content_type="application/json")
@@ -403,7 +417,8 @@ class Bitbucket2HookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.bitbucket2.view.check_send_webhook_message')
     def test_bitbucket2_on_push_multiple_committers_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,devlopment')
         payload = self.get_body('push_multiple_committers')
         result = self.client_post(self.url, payload, content_type="application/json")
@@ -412,7 +427,8 @@ class Bitbucket2HookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.bitbucket2.view.check_send_webhook_message')
     def test_bitbucket2_on_push_multiple_committers_with_others_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,devlopment')
         payload = self.get_body('push_multiple_committers_with_others')
         result = self.client_post(self.url, payload, content_type="application/json")
@@ -421,7 +437,8 @@ class Bitbucket2HookTests(WebhookTestCase):
 
     @patch('zerver.webhooks.bitbucket2.view.check_send_webhook_message')
     def test_bitbucket2_on_push_without_changes_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         payload = self.get_body('push_without_changes')
         result = self.client_post(self.url, payload, content_type="application/json")
         self.assertFalse(check_send_webhook_message_mock.called)
@@ -431,7 +448,7 @@ class Bitbucket2HookTests(WebhookTestCase):
         self.assertEqual(get_user_info({}), "Unknown user")
 
         dct = dict(
-            nickname= "alice",
+            nickname="alice",
             noisy_field="whatever",
             display_name="Alice Smith",
         )
diff --git a/zerver/webhooks/bitbucket2/view.py b/zerver/webhooks/bitbucket2/view.py
index 85b68bd658..486c1c7e3b 100644
--- a/zerver/webhooks/bitbucket2/view.py
+++ b/zerver/webhooks/bitbucket2/view.py
@@ -31,9 +31,15 @@ from zerver.models import UserProfile
 BITBUCKET_TOPIC_TEMPLATE = '{repository_name}'
 
 BITBUCKET_FORK_BODY = "{actor} forked the repository into [{fork_name}]({fork_url})."
-BITBUCKET_COMMIT_STATUS_CHANGED_BODY = '[System {key}]({system_url}) changed status of {commit_info} to {status}.'
-BITBUCKET_REPO_UPDATED_CHANGED = '{actor} changed the {change} of the **{repo_name}** repo from **{old}** to **{new}**'
-BITBUCKET_REPO_UPDATED_ADDED = '{actor} changed the {change} of the **{repo_name}** repo to **{new}**'
+BITBUCKET_COMMIT_STATUS_CHANGED_BODY = (
+    '[System {key}]({system_url}) changed status of {commit_info} to {status}.'
+)
+BITBUCKET_REPO_UPDATED_CHANGED = (
+    '{actor} changed the {change} of the **{repo_name}** repo from **{old}** to **{new}**'
+)
+BITBUCKET_REPO_UPDATED_ADDED = (
+    '{actor} changed the {change} of the **{repo_name}** repo to **{new}**'
+)
 
 PULL_REQUEST_SUPPORTED_ACTIONS = [
     'approved',
@@ -47,12 +53,16 @@ PULL_REQUEST_SUPPORTED_ACTIONS = [
     'comment_deleted',
 ]
 
+
 @webhook_view('Bitbucket2')
 @has_request_variables
-def api_bitbucket2_webhook(request: HttpRequest, user_profile: UserProfile,
-                           payload: Dict[str, Any]=REQ(argument_type='body'),
-                           branches: Optional[str]=REQ(default=None),
-                           user_specified_topic: Optional[str]=REQ("topic", default=None)) -> HttpResponse:
+def api_bitbucket2_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    branches: Optional[str] = REQ(default=None),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+) -> HttpResponse:
     type = get_type(request, payload)
     if type == 'push':
         # ignore push events with no changes
@@ -74,22 +84,25 @@ def api_bitbucket2_webhook(request: HttpRequest, user_profile: UserProfile,
         body = body_function(payload)
 
     if type != 'push':
-        check_send_webhook_message(request, user_profile, subject,
-                                   body, unquote_url_parameters=True)
+        check_send_webhook_message(
+            request, user_profile, subject, body, unquote_url_parameters=True
+        )
     else:
         for b, s in zip(body, subject):
-            check_send_webhook_message(request, user_profile, s, b,
-                                       unquote_url_parameters=True)
+            check_send_webhook_message(request, user_profile, s, b, unquote_url_parameters=True)
 
     return json_success()
 
-def get_subject_for_branch_specified_events(payload: Dict[str, Any],
-                                            branch_name: Optional[str]=None) -> str:
+
+def get_subject_for_branch_specified_events(
+    payload: Dict[str, Any], branch_name: Optional[str] = None
+) -> str:
     return TOPIC_WITH_BRANCH_TEMPLATE.format(
         repo=get_repository_name(payload['repository']),
         branch=get_branch_name_for_push_event(payload) if branch_name is None else branch_name,
     )
 
+
 def get_push_subjects(payload: Dict[str, Any]) -> List[str]:
     subjects_list = []
     for change in payload['push']['changes']:
@@ -104,9 +117,13 @@ def get_push_subjects(payload: Dict[str, Any]) -> List[str]:
             subjects_list.append(str(get_subject_for_branch_specified_events(payload, branch_name)))
     return subjects_list
 
+
 def get_subject(payload: Dict[str, Any]) -> str:
-    assert(payload['repository'] is not None)
-    return BITBUCKET_TOPIC_TEMPLATE.format(repository_name=get_repository_name(payload['repository']))
+    assert payload['repository'] is not None
+    return BITBUCKET_TOPIC_TEMPLATE.format(
+        repository_name=get_repository_name(payload['repository'])
+    )
+
 
 def get_subject_based_on_type(payload: Dict[str, Any], type: str) -> Any:
     if type.startswith('pull_request'):
@@ -127,6 +144,7 @@ def get_subject_based_on_type(payload: Dict[str, Any], type: str) -> Any:
         return get_push_subjects(payload)
     return get_subject(payload)
 
+
 def get_type(request: HttpRequest, payload: Dict[str, Any]) -> str:
     if payload.get('push'):
         return 'push'
@@ -160,10 +178,12 @@ def get_type(request: HttpRequest, payload: Dict[str, Any]) -> str:
 
     raise UnsupportedWebhookEventType(event_key)
 
+
 def get_body_based_on_type(type: str) -> Any:
     fn = GET_SINGLE_MESSAGE_BODY_DEPENDING_ON_TYPE_MAPPER.get(type)
     return fn
 
+
 def get_push_bodies(payload: Dict[str, Any]) -> List[str]:
     messages_list = []
     for change in payload['push']['changes']:
@@ -179,12 +199,14 @@ def get_push_bodies(payload: Dict[str, Any]) -> List[str]:
             messages_list.append(get_normal_push_body(payload, change))
     return messages_list
 
+
 def get_remove_branch_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
     return get_remove_branch_event_message(
         get_actor_info(payload),
         change['old']['name'],
     )
 
+
 def get_force_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
     return get_force_push_commits_event_message(
         get_actor_info(payload),
@@ -193,18 +215,23 @@ def get_force_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
         change['new']['target']['hash'],
     )
 
+
 def get_commit_author_name(commit: Dict[str, Any]) -> str:
     if commit['author'].get('user'):
         return get_user_info(commit['author']['user'])
     return commit['author']['raw'].split()[0]
 
+
 def get_normal_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
-    commits_data = [{
-        'name': get_commit_author_name(commit),
-        'sha': commit.get('hash'),
-        'url': commit.get('links').get('html').get('href'),
-        'message': commit.get('message'),
-    } for commit in change['commits']]
+    commits_data = [
+        {
+            'name': get_commit_author_name(commit),
+            'sha': commit.get('hash'),
+            'url': commit.get('links').get('html').get('href'),
+            'message': commit.get('message'),
+        }
+        for commit in change['commits']
+    ]
 
     return get_push_commits_event_message(
         get_actor_info(payload),
@@ -214,6 +241,7 @@ def get_normal_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str
         is_truncated=change['truncated'],
     )
 
+
 def get_fork_body(payload: Dict[str, Any]) -> str:
     return BITBUCKET_FORK_BODY.format(
         actor=get_user_info(payload["actor"]),
@@ -221,6 +249,7 @@ def get_fork_body(payload: Dict[str, Any]) -> str:
         fork_url=get_repository_url(payload['fork']),
     )
 
+
 def get_commit_comment_body(payload: Dict[str, Any]) -> str:
     comment = payload['comment']
     action = '[commented]({})'.format(comment['links']['html']['href'])
@@ -232,6 +261,7 @@ def get_commit_comment_body(payload: Dict[str, Any]) -> str:
         comment['content']['raw'],
     )
 
+
 def get_commit_status_changed_body(payload: Dict[str, Any]) -> str:
     commit_api_url = payload['commit_status']['links']['commit']['href']
     commit_id = commit_api_url.split('/')[-1]
@@ -249,13 +279,13 @@ def get_commit_status_changed_body(payload: Dict[str, Any]) -> str:
         status=payload['commit_status']['state'],
     )
 
-def get_issue_commented_body(payload: Dict[str, Any],
-                             include_title: bool=False) -> str:
+
+def get_issue_commented_body(payload: Dict[str, Any], include_title: bool = False) -> str:
     action = '[commented]({}) on'.format(payload['comment']['links']['html']['href'])
     return get_issue_action_body(payload, action, include_title)
 
-def get_issue_action_body(payload: Dict[str, Any], action: str,
-                          include_title: bool=False) -> str:
+
+def get_issue_action_body(payload: Dict[str, Any], action: str, include_title: bool = False) -> str:
     issue = payload['issue']
     assignee = None
     message = None
@@ -274,8 +304,10 @@ def get_issue_action_body(payload: Dict[str, Any], action: str,
         title=issue['title'] if include_title else None,
     )
 
-def get_pull_request_action_body(payload: Dict[str, Any], action: str,
-                                 include_title: bool=False) -> str:
+
+def get_pull_request_action_body(
+    payload: Dict[str, Any], action: str, include_title: bool = False
+) -> str:
     pull_request = payload['pullrequest']
     return get_pull_request_event_message(
         get_actor_info(payload),
@@ -285,8 +317,10 @@ def get_pull_request_action_body(payload: Dict[str, Any], action: str,
         title=pull_request['title'] if include_title else None,
     )
 
-def get_pull_request_created_or_updated_body(payload: Dict[str, Any], action: str,
-                                             include_title: bool=False) -> str:
+
+def get_pull_request_created_or_updated_body(
+    payload: Dict[str, Any], action: str, include_title: bool = False
+) -> str:
     pull_request = payload['pullrequest']
     assignee = None
     if pull_request.get('reviewers'):
@@ -304,23 +338,28 @@ def get_pull_request_created_or_updated_body(payload: Dict[str, Any], action: st
         title=pull_request['title'] if include_title else None,
     )
 
+
 def get_pull_request_comment_created_action_body(
-        payload: Dict[str, Any],
-        include_title: bool=False,
+    payload: Dict[str, Any],
+    include_title: bool = False,
 ) -> str:
     action = '[commented]({})'.format(payload['comment']['links']['html']['href'])
     return get_pull_request_comment_action_body(payload, action, include_title)
 
+
 def get_pull_request_deleted_or_updated_comment_action_body(
-        payload: Dict[str, Any], action: str,
-        include_title: bool=False,
+    payload: Dict[str, Any],
+    action: str,
+    include_title: bool = False,
 ) -> str:
     action = "{} a [comment]({})".format(action, payload['comment']['links']['html']['href'])
     return get_pull_request_comment_action_body(payload, action, include_title)
 
+
 def get_pull_request_comment_action_body(
-        payload: Dict[str, Any], action: str,
-        include_title: bool=False,
+    payload: Dict[str, Any],
+    action: str,
+    include_title: bool = False,
 ) -> str:
     action += ' on'
     return get_pull_request_event_message(
@@ -332,6 +371,7 @@ def get_pull_request_comment_action_body(
         title=payload['pullrequest']['title'] if include_title else None,
     )
 
+
 def get_push_tag_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
     if change.get('new'):
         tag = change['new']
@@ -347,12 +387,14 @@ def get_push_tag_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
         action=action,
     )
 
+
 def append_punctuation(title: str, message: str) -> str:
     if title[-1] not in string.punctuation:
         message = f"{message}."
 
     return message
 
+
 def get_repo_updated_body(payload: Dict[str, Any]) -> str:
     changes = ['website', 'name', 'links', 'language', 'full_name', 'description']
     body = ""
@@ -366,32 +408,43 @@ def get_repo_updated_body(payload: Dict[str, Any]) -> str:
             change = 'full name'
         if new and old:
             message = BITBUCKET_REPO_UPDATED_CHANGED.format(
-                actor=actor, change=change, repo_name=repo_name,
-                old=old, new=new,
+                actor=actor,
+                change=change,
+                repo_name=repo_name,
+                old=old,
+                new=new,
             )
             message = append_punctuation(new, message) + '\n'
             body += message
         elif new and not old:
             message = BITBUCKET_REPO_UPDATED_ADDED.format(
-                actor=actor, change=change, repo_name=repo_name, new=new,
+                actor=actor,
+                change=change,
+                repo_name=repo_name,
+                new=new,
             )
             message = append_punctuation(new, message) + '\n'
             body += message
 
     return body
 
+
 def get_pull_request_url(pullrequest_payload: Dict[str, Any]) -> str:
     return pullrequest_payload['links']['html']['href']
 
+
 def get_repository_url(repository_payload: Dict[str, Any]) -> str:
     return repository_payload['links']['html']['href']
 
+
 def get_repository_name(repository_payload: Dict[str, Any]) -> str:
     return repository_payload['name']
 
+
 def get_repository_full_name(repository_payload: Dict[str, Any]) -> str:
     return repository_payload['full_name']
 
+
 def get_user_info(dct: Dict[str, Any]) -> str:
     # See https://developer.atlassian.com/cloud/bitbucket/bitbucket-api-changes-gdpr/
     # Since GDPR, we don't get username; instead, we either get display_name
@@ -411,10 +464,12 @@ def get_user_info(dct: Dict[str, Any]) -> str:
 
     return "Unknown user"
 
+
 def get_actor_info(payload: Dict[str, Any]) -> str:
     actor = payload['actor']
     return get_user_info(actor)
 
+
 def get_branch_name_for_push_event(payload: Dict[str, Any]) -> Optional[str]:
     change = payload['push']['changes'][-1]
     potential_tag = (change['new'] or change['old'] or {}).get('type')
@@ -423,6 +478,7 @@ def get_branch_name_for_push_event(payload: Dict[str, Any]) -> Optional[str]:
     else:
         return (change['new'] or change['old']).get('name')
 
+
 GET_SINGLE_MESSAGE_BODY_DEPENDING_ON_TYPE_MAPPER = {
     'fork': get_fork_body,
     'commit_comment': get_commit_comment_body,
@@ -437,10 +493,12 @@ GET_SINGLE_MESSAGE_BODY_DEPENDING_ON_TYPE_MAPPER = {
     'pull_request_fulfilled': partial(get_pull_request_action_body, action='merged'),
     'pull_request_rejected': partial(get_pull_request_action_body, action='rejected'),
     'pull_request_comment_created': get_pull_request_comment_created_action_body,
-    'pull_request_comment_updated': partial(get_pull_request_deleted_or_updated_comment_action_body,
-                                            action='updated'),
-    'pull_request_comment_deleted': partial(get_pull_request_deleted_or_updated_comment_action_body,
-                                            action='deleted'),
+    'pull_request_comment_updated': partial(
+        get_pull_request_deleted_or_updated_comment_action_body, action='updated'
+    ),
+    'pull_request_comment_deleted': partial(
+        get_pull_request_deleted_or_updated_comment_action_body, action='deleted'
+    ),
     'push': get_push_bodies,
     'repo:updated': get_repo_updated_body,
 }
diff --git a/zerver/webhooks/bitbucket3/tests.py b/zerver/webhooks/bitbucket3/tests.py
index 4941784e73..bf08f0fbe2 100644
--- a/zerver/webhooks/bitbucket3/tests.py
+++ b/zerver/webhooks/bitbucket3/tests.py
@@ -3,6 +3,7 @@ from zerver.lib.test_classes import WebhookTestCase
 TOPIC = "sandbox"
 TOPIC_BRANCH_EVENTS = "sandbox / {branch}"
 
+
 class Bitbucket3HookTests(WebhookTestCase):
     STREAM_NAME = "bitbucket3"
     URL_TEMPLATE = "/api/v1/external/bitbucket3?stream={stream}&api_key={api_key}"
@@ -10,12 +11,16 @@ class Bitbucket3HookTests(WebhookTestCase):
 
     # Diagnostics events:
     def test_ping(self) -> None:
-        expected_message = "Congratulations! The Bitbucket Server webhook was configured successfully!"
+        expected_message = (
+            "Congratulations! The Bitbucket Server webhook was configured successfully!"
+        )
         self.check_webhook("diagnostics_ping", "Bitbucket Server Ping", expected_message)
 
     def test_ping_with_user_defined_topic(self) -> None:
         self.url = self.build_webhook_url(topic="my topic")
-        expected_message = "Congratulations! The Bitbucket Server webhook was configured successfully!"
+        expected_message = (
+            "Congratulations! The Bitbucket Server webhook was configured successfully!"
+        )
         self.check_webhook("diagnostics_ping", "my topic", expected_message)
 
     # Core repo events:
@@ -42,21 +47,29 @@ class Bitbucket3HookTests(WebhookTestCase):
 
     # Repo push events:
     def test_push_add_branch(self) -> None:
-        expected_message = """[hypro999](http://139.59.64.214:7990/users/hypro999) created branch2 branch."""
+        expected_message = (
+            """[hypro999](http://139.59.64.214:7990/users/hypro999) created branch2 branch."""
+        )
         expected_topic = TOPIC_BRANCH_EVENTS.format(branch="branch2")
         self.check_webhook("repo_push_add_branch", expected_topic, expected_message)
 
     def test_push_add_tag(self) -> None:
-        expected_message = """[hypro999](http://139.59.64.214:7990/users/hypro999) pushed tag newtag."""
+        expected_message = (
+            """[hypro999](http://139.59.64.214:7990/users/hypro999) pushed tag newtag."""
+        )
         self.check_webhook("repo_push_add_tag", TOPIC, expected_message)
 
     def test_push_delete_branch(self) -> None:
-        expected_message = """[hypro999](http://139.59.64.214:7990/users/hypro999) deleted branch branch2."""
+        expected_message = (
+            """[hypro999](http://139.59.64.214:7990/users/hypro999) deleted branch branch2."""
+        )
         expected_topic = TOPIC_BRANCH_EVENTS.format(branch="branch2")
         self.check_webhook("repo_push_delete_branch", expected_topic, expected_message)
 
     def test_push_delete_tag(self) -> None:
-        expected_message = """[hypro999](http://139.59.64.214:7990/users/hypro999) removed tag test-tag."""
+        expected_message = (
+            """[hypro999](http://139.59.64.214:7990/users/hypro999) removed tag test-tag."""
+        )
         self.check_webhook("repo_push_delete_tag", TOPIC, expected_message)
 
     def test_push_update_single_branch(self) -> None:
diff --git a/zerver/webhooks/bitbucket3/view.py b/zerver/webhooks/bitbucket3/view.py
index 97c6bbd016..19adebb626 100644
--- a/zerver/webhooks/bitbucket3/view.py
+++ b/zerver/webhooks/bitbucket3/view.py
@@ -23,9 +23,13 @@ from zerver.lib.webhooks.git import (
 from zerver.models import UserProfile
 from zerver.webhooks.bitbucket2.view import BITBUCKET_REPO_UPDATED_CHANGED, BITBUCKET_TOPIC_TEMPLATE
 
-BITBUCKET_FORK_BODY = "User {display_name}(login: {username}) forked the repository into [{fork_name}]({fork_url})."
+BITBUCKET_FORK_BODY = (
+    "User {display_name}(login: {username}) forked the repository into [{fork_name}]({fork_url})."
+)
 BRANCH_UPDATED_MESSAGE_TEMPLATE = "{user_name} pushed to branch {branch_name}. Head is now {head}."
-PULL_REQUEST_MARKED_AS_NEEDS_WORK_TEMPLATE = "{user_name} marked [PR #{number}]({url}) as \"needs work\"."
+PULL_REQUEST_MARKED_AS_NEEDS_WORK_TEMPLATE = (
+    "{user_name} marked [PR #{number}]({url}) as \"needs work\"."
+)
 PULL_REQUEST_MARKED_AS_NEEDS_WORK_TEMPLATE_WITH_TITLE = """
 {user_name} marked [PR #{number} {title}]({url}) as \"needs work\".
 """.strip()
@@ -33,7 +37,9 @@ PULL_REQUEST_REASSIGNED_TEMPLATE = "{user_name} reassigned [PR #{number}]({url})
 PULL_REQUEST_REASSIGNED_TEMPLATE_WITH_TITLE = """
 {user_name} reassigned [PR #{number} {title}]({url}) to {assignees}.
 """.strip()
-PULL_REQUEST_REASSIGNED_TO_NONE_TEMPLATE = "{user_name} removed all reviewers from [PR #{number}]({url})."
+PULL_REQUEST_REASSIGNED_TO_NONE_TEMPLATE = (
+    "{user_name} removed all reviewers from [PR #{number}]({url})."
+)
 PULL_REQUEST_REASSIGNED_TO_NONE_TEMPLATE_WITH_TITLE = """
 {user_name} removed all reviewers from [PR #{number} {title}]({url})
 """.strip()
@@ -46,18 +52,24 @@ PULL_REQUEST_OPENED_OR_MODIFIED_TEMPLATE_WITH_REVIEWERS_WITH_TITLE = """
 `{destination}` (assigned to {assignees} for review)
 """.strip()
 
+
 def fixture_to_headers(fixture_name: str) -> Dict[str, str]:
     if fixture_name == "diagnostics_ping":
         return {"HTTP_X_EVENT_KEY": "diagnostics:ping"}
     return {}
 
+
 def get_user_name(payload: Dict[str, Any]) -> str:
-    user_name = "[{name}]({url})".format(name=payload["actor"]["name"],
-                                         url=payload["actor"]["links"]["self"][0]["href"])
+    user_name = "[{name}]({url})".format(
+        name=payload["actor"]["name"], url=payload["actor"]["links"]["self"][0]["href"]
+    )
     return user_name
 
-def ping_handler(payload: Dict[str, Any], include_title: Optional[str]=None,
-                 ) -> List[Dict[str, str]]:
+
+def ping_handler(
+    payload: Dict[str, Any],
+    include_title: Optional[str] = None,
+) -> List[Dict[str, str]]:
     if include_title:
         subject = include_title
     else:
@@ -65,6 +77,7 @@ def ping_handler(payload: Dict[str, Any], include_title: Optional[str]=None,
     body = "Congratulations! The Bitbucket Server webhook was configured successfully!"
     return [{"subject": subject, "body": body}]
 
+
 def repo_comment_handler(payload: Dict[str, Any], action: str) -> List[Dict[str, str]]:
     repo_name = payload["repository"]["name"]
     subject = BITBUCKET_TOPIC_TEMPLATE.format(repository_name=repo_name)
@@ -83,6 +96,7 @@ def repo_comment_handler(payload: Dict[str, Any], action: str) -> List[Dict[str,
     )
     return [{"subject": subject, "body": body}]
 
+
 def repo_forked_handler(payload: Dict[str, Any]) -> List[Dict[str, str]]:
     repo_name = payload["repository"]["origin"]["name"]
     subject = BITBUCKET_TOPIC_TEMPLATE.format(repository_name=repo_name)
@@ -94,6 +108,7 @@ def repo_forked_handler(payload: Dict[str, Any]) -> List[Dict[str, str]]:
     )
     return [{"subject": subject, "body": body}]
 
+
 def repo_modified_handler(payload: Dict[str, Any]) -> List[Dict[str, str]]:
     subject_new = BITBUCKET_TOPIC_TEMPLATE.format(repository_name=payload["new"]["name"])
     new_name = payload['new']['name']
@@ -108,6 +123,7 @@ def repo_modified_handler(payload: Dict[str, Any]) -> List[Dict[str, str]]:
     body = f"{body}{punctuation}"
     return [{"subject": subject_new, "body": body}]
 
+
 def repo_push_branch_data(payload: Dict[str, Any], change: Dict[str, Any]) -> Dict[str, str]:
     event_type = change["type"]
     repo_name = payload["repository"]["name"]
@@ -136,6 +152,7 @@ def repo_push_branch_data(payload: Dict[str, Any], change: Dict[str, Any]) -> Di
     subject = TOPIC_WITH_BRANCH_TEMPLATE.format(repo=repo_name, branch=branch_name)
     return {"subject": subject, "body": body}
 
+
 def repo_push_tag_data(payload: Dict[str, Any], change: Dict[str, Any]) -> Dict[str, str]:
     event_type = change["type"]
     repo_name = payload["repository"]["name"]
@@ -153,8 +170,11 @@ def repo_push_tag_data(payload: Dict[str, Any], change: Dict[str, Any]) -> Dict[
     body = get_push_tag_event_message(get_user_name(payload), tag_name, action=action)
     return {"subject": subject, "body": body}
 
-def repo_push_handler(payload: Dict[str, Any], branches: Optional[str]=None,
-                      ) -> List[Dict[str, str]]:
+
+def repo_push_handler(
+    payload: Dict[str, Any],
+    branches: Optional[str] = None,
+) -> List[Dict[str, str]]:
     data = []
     for change in payload["changes"]:
         event_target_type = change["ref"]["type"]
@@ -171,6 +191,7 @@ def repo_push_handler(payload: Dict[str, Any], branches: Optional[str]=None,
             raise UnsupportedWebhookEventType(message)
     return data
 
+
 def get_assignees_string(pr: Dict[str, Any]) -> Optional[str]:
     reviewers = []
     for reviewer in pr["reviewers"]:
@@ -185,9 +206,11 @@ def get_assignees_string(pr: Dict[str, Any]) -> Optional[str]:
         assignees = ", ".join(reviewers[:-1]) + " and " + reviewers[-1]
     return assignees
 
+
 def get_pr_subject(repo: str, type: str, id: str, title: str) -> str:
     return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(repo=repo, type=type, id=id, title=title)
 
+
 def get_simple_pr_body(payload: Dict[str, Any], action: str, include_title: Optional[bool]) -> str:
     pr = payload["pullRequest"]
     return get_pull_request_event_message(
@@ -198,23 +221,27 @@ def get_simple_pr_body(payload: Dict[str, Any], action: str, include_title: Opti
         title=pr["title"] if include_title else None,
     )
 
-def get_pr_opened_or_modified_body(payload: Dict[str, Any], action: str,
-                                   include_title: Optional[bool]) -> str:
+
+def get_pr_opened_or_modified_body(
+    payload: Dict[str, Any], action: str, include_title: Optional[bool]
+) -> str:
     pr = payload["pullRequest"]
     description = pr.get("description")
     assignees_string = get_assignees_string(pr)
     if assignees_string:
         # Then use the custom message template for this particular integration so that we can
         # specify the reviewers at the end of the message (but before the description/message).
-        parameters = {"user_name": get_user_name(payload),
-                      "action": action,
-                      "url": pr["links"]["self"][0]["href"],
-                      "number": pr["id"],
-                      "source": pr["fromRef"]["displayId"],
-                      "destination": pr["toRef"]["displayId"],
-                      "message": description,
-                      "assignees": assignees_string,
-                      "title": pr["title"] if include_title else None}
+        parameters = {
+            "user_name": get_user_name(payload),
+            "action": action,
+            "url": pr["links"]["self"][0]["href"],
+            "number": pr["id"],
+            "source": pr["fromRef"]["displayId"],
+            "destination": pr["toRef"]["displayId"],
+            "message": description,
+            "assignees": assignees_string,
+            "title": pr["title"] if include_title else None,
+        }
         if include_title:
             body = PULL_REQUEST_OPENED_OR_MODIFIED_TEMPLATE_WITH_REVIEWERS_WITH_TITLE.format(
                 **parameters,
@@ -238,6 +265,7 @@ def get_pr_opened_or_modified_body(payload: Dict[str, Any], action: str,
         title=pr["title"] if include_title else None,
     )
 
+
 def get_pr_needs_work_body(payload: Dict[str, Any], include_title: Optional[bool]) -> str:
     pr = payload["pullRequest"]
     if not include_title:
@@ -253,6 +281,7 @@ def get_pr_needs_work_body(payload: Dict[str, Any], include_title: Optional[bool
         title=pr["title"],
     )
 
+
 def get_pr_reassigned_body(payload: Dict[str, Any], include_title: Optional[bool]) -> str:
     pr = payload["pullRequest"]
     assignees_string = get_assignees_string(pr)
@@ -287,11 +316,14 @@ def get_pr_reassigned_body(payload: Dict[str, Any], include_title: Optional[bool
         title=pr["title"],
     )
 
-def pr_handler(payload: Dict[str, Any], action: str,
-               include_title: bool=False) -> List[Dict[str, str]]:
+
+def pr_handler(
+    payload: Dict[str, Any], action: str, include_title: bool = False
+) -> List[Dict[str, str]]:
     pr = payload["pullRequest"]
-    subject = get_pr_subject(pr["toRef"]["repository"]["name"], type="PR", id=pr["id"],
-                             title=pr["title"])
+    subject = get_pr_subject(
+        pr["toRef"]["repository"]["name"], type="PR", id=pr["id"], title=pr["title"]
+    )
     if action in ["opened", "modified"]:
         body = get_pr_opened_or_modified_body(payload, action, include_title)
     elif action == "needs_work":
@@ -303,11 +335,14 @@ def pr_handler(payload: Dict[str, Any], action: str,
 
     return [{"subject": subject, "body": body}]
 
-def pr_comment_handler(payload: Dict[str, Any], action: str,
-                       include_title: bool=False) -> List[Dict[str, str]]:
+
+def pr_comment_handler(
+    payload: Dict[str, Any], action: str, include_title: bool = False
+) -> List[Dict[str, str]]:
     pr = payload["pullRequest"]
-    subject = get_pr_subject(pr["toRef"]["repository"]["name"], type="PR", id=pr["id"],
-                             title=pr["title"])
+    subject = get_pr_subject(
+        pr["toRef"]["repository"]["name"], type="PR", id=pr["id"], title=pr["title"]
+    )
     message = payload["comment"]["text"]
     if action == "deleted their comment on":
         message = f"~~{message}~~"
@@ -322,6 +357,7 @@ def pr_comment_handler(payload: Dict[str, Any], action: str,
 
     return [{"subject": subject, "body": body}]
 
+
 EVENT_HANDLER_MAP = {
     "diagnostics:ping": ping_handler,
     "repo:comment:added": partial(repo_comment_handler, action="commented"),
@@ -344,6 +380,7 @@ EVENT_HANDLER_MAP = {
     "pr:reviewer:unapproved": partial(pr_handler, action="unapproved"),
 }  # type Dict[str, Optional[Callable[..., List[Dict[str, str]]]]]
 
+
 def get_event_handler(eventkey: str) -> Callable[..., List[Dict[str, str]]]:
     # The main reason for this function existence is because of mypy
     handler: Any = EVENT_HANDLER_MAP.get(eventkey)
@@ -351,13 +388,16 @@ def get_event_handler(eventkey: str) -> Callable[..., List[Dict[str, str]]]:
         raise UnsupportedWebhookEventType(eventkey)
     return handler
 
+
 @webhook_view("Bitbucket3")
 @has_request_variables
-def api_bitbucket3_webhook(request: HttpRequest, user_profile: UserProfile,
-                           payload: Dict[str, Any]=REQ(argument_type="body"),
-                           branches: Optional[str]=REQ(default=None),
-                           user_specified_topic: Optional[str]=REQ("topic", default=None),
-                           ) -> HttpResponse:
+def api_bitbucket3_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type="body"),
+    branches: Optional[str] = REQ(default=None),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+) -> HttpResponse:
     try:
         eventkey = payload["eventKey"]
     except KeyError:
@@ -371,7 +411,8 @@ def api_bitbucket3_webhook(request: HttpRequest, user_profile: UserProfile,
     else:
         data = handler(payload)
     for element in data:
-        check_send_webhook_message(request, user_profile, element["subject"],
-                                   element["body"], unquote_url_parameters=True)
+        check_send_webhook_message(
+            request, user_profile, element["subject"], element["body"], unquote_url_parameters=True
+        )
 
     return json_success()
diff --git a/zerver/webhooks/buildbot/tests.py b/zerver/webhooks/buildbot/tests.py
index 00af0355eb..f7592656a5 100644
--- a/zerver/webhooks/buildbot/tests.py
+++ b/zerver/webhooks/buildbot/tests.py
@@ -8,7 +8,9 @@ class BuildbotHookTests(WebhookTestCase):
 
     def test_build_started(self) -> None:
         expected_topic = "buildbot-hello"
-        expected_message = "Build [#33](http://exampleurl.com/#builders/1/builds/33) for **runtests** started."
+        expected_message = (
+            "Build [#33](http://exampleurl.com/#builders/1/builds/33) for **runtests** started."
+        )
         self.check_webhook("started", expected_topic, expected_message)
 
     def test_build_success(self) -> None:
diff --git a/zerver/webhooks/buildbot/view.py b/zerver/webhooks/buildbot/view.py
index 773fb0e7b9..61a531a58c 100644
--- a/zerver/webhooks/buildbot/view.py
+++ b/zerver/webhooks/buildbot/view.py
@@ -11,8 +11,11 @@ from zerver.models import UserProfile
 
 @webhook_view('Buildbot')
 @has_request_variables
-def api_buildbot_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_buildbot_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     topic = payload["project"]
     if not topic:
         topic = "general"
@@ -20,11 +23,11 @@ def api_buildbot_webhook(request: HttpRequest, user_profile: UserProfile,
     check_send_webhook_message(request, user_profile, topic, body)
     return json_success()
 
+
 def get_message(payload: Dict[str, Any]) -> str:
     if "results" in payload:
         # See http://docs.buildbot.net/latest/developer/results.html
-        results = ("success", "warnings", "failure", "skipped",
-                   "exception", "retry", "cancelled")
+        results = ("success", "warnings", "failure", "skipped", "exception", "retry", "cancelled")
         status = results[payload["results"]]
 
     if payload["event"] == "new":
diff --git a/zerver/webhooks/canarytoken/view.py b/zerver/webhooks/canarytoken/view.py
index f5420ffb9f..4ff79e798c 100644
--- a/zerver/webhooks/canarytoken/view.py
+++ b/zerver/webhooks/canarytoken/view.py
@@ -13,9 +13,10 @@ from zerver.models import UserProfile
 @webhook_view('Canarytoken')
 @has_request_variables
 def api_canarytoken_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        message: Dict[str, Any] = REQ(argument_type='body'),
-        user_specified_topic: Optional[str] = REQ('topic', default=None)
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message: Dict[str, Any] = REQ(argument_type='body'),
+    user_specified_topic: Optional[str] = REQ('topic', default=None),
 ) -> HttpResponse:
     """
     Construct a response to a webhook event from a Thinkst canarytoken from
@@ -26,9 +27,11 @@ def api_canarytoken_webhook(
     https://help.canary.tools/hc/en-gb/articles/360002426577-How-do-I-configure-notifications-for-a-Generic-Webhook-
     """
     topic = 'canarytoken alert'
-    body = (f"**:alert: Canarytoken has been triggered on {message['time']}!**\n\n"
-            f"{message['memo']} \n\n"
-            f"[Manage this canarytoken]({message['manage_url']})")
+    body = (
+        f"**:alert: Canarytoken has been triggered on {message['time']}!**\n\n"
+        f"{message['memo']} \n\n"
+        f"[Manage this canarytoken]({message['manage_url']})"
+    )
 
     if user_specified_topic:
         topic = user_specified_topic
diff --git a/zerver/webhooks/circleci/view.py b/zerver/webhooks/circleci/view.py
index 74e49a915c..fc1eb7f810 100644
--- a/zerver/webhooks/circleci/view.py
+++ b/zerver/webhooks/circleci/view.py
@@ -14,10 +14,14 @@ outcome_to_formatted_status_map = {
     "canceled": "was canceled",
 }
 
+
 @webhook_view('CircleCI')
 @has_request_variables
-def api_circleci_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type="body")) -> HttpResponse:
+def api_circleci_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type="body"),
+) -> HttpResponse:
     payload = payload['payload']
     subject = get_subject(payload)
     body = get_body(payload)
@@ -25,10 +29,12 @@ def api_circleci_webhook(request: HttpRequest, user_profile: UserProfile,
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_subject(payload: Dict[str, Any]) -> str:
     repository_name = payload["reponame"]
     return f"{repository_name}"
 
+
 def get_commit_range_info(payload: Dict[str, Any]) -> str:
     commits = payload["all_commit_details"]
     num_commits = len(commits)
@@ -56,6 +62,7 @@ def get_commit_range_info(payload: Dict[str, Any]) -> str:
         last_commit_url = commits[-1]["commit_url"]
         return f"- **Commits ({num_commits}):** [{shortened_first_commit_id}]({first_commit_url}) ... [{shortened_last_commit_id}]({last_commit_url})"
 
+
 def get_authors_and_committer_info(payload: Dict[str, Any]) -> str:
     body = ""
 
@@ -99,6 +106,7 @@ def get_authors_and_committer_info(payload: Dict[str, Any]) -> str:
 
     return body
 
+
 def super_minimal_body(payload: Dict[str, Any]) -> str:
     branch_name = payload["branch"]
     status = payload["status"]
@@ -107,6 +115,7 @@ def super_minimal_body(payload: Dict[str, Any]) -> str:
     username = payload["username"]
     return f"[Build]({build_url}) triggered by {username} on branch `{branch_name}` {formatted_status}."
 
+
 def get_body(payload: Dict[str, Any]) -> str:
     build_num = payload.get("build_num", None)
     if not build_num:
diff --git a/zerver/webhooks/clubhouse/tests.py b/zerver/webhooks/clubhouse/tests.py
index 983277fb33..a2a449bbf6 100644
--- a/zerver/webhooks/clubhouse/tests.py
+++ b/zerver/webhooks/clubhouse/tests.py
@@ -12,7 +12,9 @@ class ClubhouseWebhookTest(WebhookTestCase):
     def test_story_create(self) -> None:
         expected_message = "New story [Add cool feature!](https://app.clubhouse.io/zulip/story/11) of type **feature** was created."
         self.check_webhook(
-            "story_create", "Add cool feature!", expected_message,
+            "story_create",
+            "Add cool feature!",
+            expected_message,
         )
 
     def test_story_delete(self) -> None:
@@ -22,7 +24,9 @@ class ClubhouseWebhookTest(WebhookTestCase):
     def test_epic_story_create(self) -> None:
         expected_message = "New story [An epic story!](https://app.clubhouse.io/zulip/story/23) was created and added to the epic **New Cool Epic!**."
         self.check_webhook(
-            "epic_create_story", "An epic story!", expected_message,
+            "epic_create_story",
+            "An epic story!",
+            expected_message,
         )
 
     def test_epic_delete(self) -> None:
@@ -30,7 +34,9 @@ class ClubhouseWebhookTest(WebhookTestCase):
         self.check_webhook("epic_delete", "Clubhouse Fork", expected_message)
 
     def test_story_archive(self) -> None:
-        expected_message = "The story [Story 2](https://app.clubhouse.io/zulip/story/9) was archived."
+        expected_message = (
+            "The story [Story 2](https://app.clubhouse.io/zulip/story/9) was archived."
+        )
         self.check_webhook("story_archive", "Story 2", expected_message)
 
     def test_epic_archive(self) -> None:
@@ -38,7 +44,9 @@ class ClubhouseWebhookTest(WebhookTestCase):
         self.check_webhook("epic_archive", "Zulip is epic!", expected_message)
 
     def test_story_unarchive(self) -> None:
-        expected_message = "The story [Story 2](https://app.clubhouse.io/zulip/story/9) was unarchived."
+        expected_message = (
+            "The story [Story 2](https://app.clubhouse.io/zulip/story/9) was unarchived."
+        )
         self.check_webhook("story_unarchive", "Story 2", expected_message)
 
     def test_epic_create(self) -> None:
@@ -78,7 +86,9 @@ class ClubhouseWebhookTest(WebhookTestCase):
         self.check_webhook("story_update_description", "Add cool feature!", expected_message)
 
     def test_epic_update_change_state(self) -> None:
-        expected_message = "State of the epic **New Cool Epic!** was changed from **to do** to **in progress**."
+        expected_message = (
+            "State of the epic **New Cool Epic!** was changed from **to do** to **in progress**."
+        )
         self.check_webhook("epic_update_change_state", "New Cool Epic!", expected_message)
 
     def test_story_update_change_state(self) -> None:
@@ -112,16 +122,17 @@ class ClubhouseWebhookTest(WebhookTestCase):
         self.check_webhook("story_task_complete", "Add cool feature!", expected_message)
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
-    def test_story_task_incomplete_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_story_task_incomplete_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
         payload = self.get_body('story_task_not_complete')
         result = self.client_post(self.url, payload, content_type="application/json")
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
 
     def test_story_epic_changed(self) -> None:
-        expected_message = ("The story [Add cool feature!](https://app.clubhouse.io/zulip/story/11) was moved from **Release 1.9**"
-                            " to **Clubhouse Fork**.")
+        expected_message = (
+            "The story [Add cool feature!](https://app.clubhouse.io/zulip/story/11) was moved from **Release 1.9**"
+            " to **Clubhouse Fork**."
+        )
         self.check_webhook("story_update_change_epic", "Add cool feature!", expected_message)
 
     def test_story_epic_added(self) -> None:
@@ -150,7 +161,8 @@ class ClubhouseWebhookTest(WebhookTestCase):
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
     def test_story_file_attachment_removed_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         payload = self.get_body('story_update_remove_attachment')
         result = self.client_post(self.url, payload, content_type="application/json")
         self.assertFalse(check_send_webhook_message_mock.called)
@@ -167,8 +179,7 @@ class ClubhouseWebhookTest(WebhookTestCase):
         )
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
-    def test_story_label_removed_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_story_label_removed_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
         payload = self.get_body('story_update_remove_label')
         result = self.client_post(self.url, payload, content_type="application/json")
         self.assertFalse(check_send_webhook_message_mock.called)
@@ -197,7 +208,9 @@ class ClubhouseWebhookTest(WebhookTestCase):
         )
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
-    def test_empty_post_request_body_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_empty_post_request_body_ignore(
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         payload = json.dumps(None)
         result = self.client_post(self.url, payload, content_type="application/json")
         self.assertFalse(check_send_webhook_message_mock.called)
diff --git a/zerver/webhooks/clubhouse/view.py b/zerver/webhooks/clubhouse/view.py
index 04a57624e2..c70653b152 100644
--- a/zerver/webhooks/clubhouse/view.py
+++ b/zerver/webhooks/clubhouse/view.py
@@ -12,28 +12,52 @@ from zerver.models import UserProfile
 
 EPIC_NAME_TEMPLATE = "**{name}**"
 STORY_NAME_TEMPLATE = "[{name}]({app_url})"
-COMMENT_ADDED_TEMPLATE = "New comment added to the {entity} {name_template}:\n``` quote\n{text}\n```"
-NEW_DESC_ADDED_TEMPLATE = "New description added to the {entity} {name_template}:\n``` quote\n{new}\n```"
-DESC_CHANGED_TEMPLATE = ("Description for the {entity} {name_template} was changed from:\n"
-                         "``` quote\n{old}\n```\nto\n``` quote\n{new}\n```")
+COMMENT_ADDED_TEMPLATE = (
+    "New comment added to the {entity} {name_template}:\n``` quote\n{text}\n```"
+)
+NEW_DESC_ADDED_TEMPLATE = (
+    "New description added to the {entity} {name_template}:\n``` quote\n{new}\n```"
+)
+DESC_CHANGED_TEMPLATE = (
+    "Description for the {entity} {name_template} was changed from:\n"
+    "``` quote\n{old}\n```\nto\n``` quote\n{new}\n```"
+)
 DESC_REMOVED_TEMPLATE = "Description for the {entity} {name_template} was removed."
-STATE_CHANGED_TEMPLATE = "State of the {entity} {name_template} was changed from **{old}** to **{new}**."
-NAME_CHANGED_TEMPLATE = ("The name of the {entity} {name_template} was changed from:\n"
-                         "``` quote\n{old}\n```\nto\n``` quote\n{new}\n```")
+STATE_CHANGED_TEMPLATE = (
+    "State of the {entity} {name_template} was changed from **{old}** to **{new}**."
+)
+NAME_CHANGED_TEMPLATE = (
+    "The name of the {entity} {name_template} was changed from:\n"
+    "``` quote\n{old}\n```\nto\n``` quote\n{new}\n```"
+)
 ARCHIVED_TEMPLATE = "The {entity} {name_template} was {action}."
 STORY_TASK_TEMPLATE = "Task **{task_description}** was {action} the story {name_template}."
-STORY_TASK_COMPLETED_TEMPLATE = "Task **{task_description}** ({name_template}) was completed. :tada:"
-STORY_ADDED_REMOVED_EPIC_TEMPLATE = "The story {story_name_template} was {action} the epic {epic_name_template}."
+STORY_TASK_COMPLETED_TEMPLATE = (
+    "Task **{task_description}** ({name_template}) was completed. :tada:"
+)
+STORY_ADDED_REMOVED_EPIC_TEMPLATE = (
+    "The story {story_name_template} was {action} the epic {epic_name_template}."
+)
 STORY_EPIC_CHANGED_TEMPLATE = "The story {story_name_template} was moved from {old_epic_name_template} to {new_epic_name_template}."
 STORY_ESTIMATE_TEMPLATE = "The estimate for the story {story_name_template} was set to {estimate}."
-FILE_ATTACHMENT_TEMPLATE = "A {type} attachment `{file_name}` was added to the story {name_template}."
+FILE_ATTACHMENT_TEMPLATE = (
+    "A {type} attachment `{file_name}` was added to the story {name_template}."
+)
 STORY_LABEL_TEMPLATE = "The label **{label_name}** was added to the story {name_template}."
-STORY_UPDATE_PROJECT_TEMPLATE = "The story {name_template} was moved from the **{old}** project to **{new}**."
-STORY_UPDATE_TYPE_TEMPLATE = "The type of the story {name_template} was changed from **{old_type}** to **{new_type}**."
+STORY_UPDATE_PROJECT_TEMPLATE = (
+    "The story {name_template} was moved from the **{old}** project to **{new}**."
+)
+STORY_UPDATE_TYPE_TEMPLATE = (
+    "The type of the story {name_template} was changed from **{old_type}** to **{new_type}**."
+)
 DELETE_TEMPLATE = "The {entity_type} **{name}** was deleted."
 STORY_UPDATE_OWNER_TEMPLATE = "New owner added to the story {name_template}."
-STORY_GITHUB_PR_TEMPLATE = "New GitHub PR [#{name}]({url}) opened for story {name_template} ({old} -> {new})."
-STORY_GITHUB_BRANCH_TEMPLATE = "New GitHub branch [{name}]({url}) associated with story {name_template} ({old} -> {new})."
+STORY_GITHUB_PR_TEMPLATE = (
+    "New GitHub PR [#{name}]({url}) opened for story {name_template} ({old} -> {new})."
+)
+STORY_GITHUB_BRANCH_TEMPLATE = (
+    "New GitHub branch [{name}]({url}) associated with story {name_template} ({old} -> {new})."
+)
 
 
 def get_action_with_primary_id(payload: Dict[str, Any]) -> Dict[str, Any]:
@@ -43,6 +67,7 @@ def get_action_with_primary_id(payload: Dict[str, Any]) -> Dict[str, Any]:
 
     return action_with_primary_id
 
+
 def get_event(payload: Dict[str, Any]) -> Optional[str]:
     action = get_action_with_primary_id(payload)
     event = "{}_{}".format(action["entity_type"], action["action"])
@@ -81,14 +106,17 @@ def get_event(payload: Dict[str, Any]) -> Optional[str]:
 
     return event
 
+
 def get_topic_function_based_on_type(payload: Dict[str, Any]) -> Any:
     entity_type = get_action_with_primary_id(payload)["entity_type"]
     return EVENT_TOPIC_FUNCTION_MAPPER.get(entity_type)
 
+
 def get_delete_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     return DELETE_TEMPLATE.format(**action)
 
+
 def get_story_create_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
 
@@ -109,11 +137,13 @@ def get_story_create_body(payload: Dict[str, Any]) -> str:
 
     return message.format(**kwargs)
 
+
 def get_epic_create_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     message = "New epic **{name}**({state}) was created."
     return message.format(**action)
 
+
 def get_comment_added_body(payload: Dict[str, Any], entity: str) -> str:
     actions = payload["actions"]
     kwargs = {"entity": entity}
@@ -129,6 +159,7 @@ def get_comment_added_body(payload: Dict[str, Any], entity: str) -> str:
 
     return COMMENT_ADDED_TEMPLATE.format(**kwargs)
 
+
 def get_update_description_body(payload: Dict[str, Any], entity: str) -> str:
     action = get_action_with_primary_id(payload)
     desc = action["changes"]["description"]
@@ -152,6 +183,7 @@ def get_update_description_body(payload: Dict[str, Any], entity: str) -> str:
 
     return body
 
+
 def get_epic_update_state_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     state = action["changes"]["state"]
@@ -164,6 +196,7 @@ def get_epic_update_state_body(payload: Dict[str, Any]) -> str:
 
     return STATE_CHANGED_TEMPLATE.format(**kwargs)
 
+
 def get_story_update_state_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     workflow_state_id = action["changes"]["workflow_state_id"]
@@ -188,6 +221,7 @@ def get_story_update_state_body(payload: Dict[str, Any]) -> str:
 
     return STATE_CHANGED_TEMPLATE.format(**kwargs)
 
+
 def get_update_name_body(payload: Dict[str, Any], entity: str) -> str:
     action = get_action_with_primary_id(payload)
     name = action["changes"]["name"]
@@ -203,6 +237,7 @@ def get_update_name_body(payload: Dict[str, Any], entity: str) -> str:
 
     return NAME_CHANGED_TEMPLATE.format(**kwargs)
 
+
 def get_update_archived_body(payload: Dict[str, Any], entity: str) -> str:
     primary_action = get_action_with_primary_id(payload)
     archived = primary_action["changes"]["archived"]
@@ -222,6 +257,7 @@ def get_update_archived_body(payload: Dict[str, Any], entity: str) -> str:
 
     return ARCHIVED_TEMPLATE.format(**kwargs)
 
+
 def get_story_task_body(payload: Dict[str, Any], action: str) -> str:
     primary_action = get_action_with_primary_id(payload)
 
@@ -239,6 +275,7 @@ def get_story_task_body(payload: Dict[str, Any], action: str) -> str:
 
     return STORY_TASK_TEMPLATE.format(**kwargs)
 
+
 def get_story_task_completed_body(payload: Dict[str, Any]) -> Optional[str]:
     action = get_action_with_primary_id(payload)
 
@@ -259,6 +296,7 @@ def get_story_task_completed_body(payload: Dict[str, Any]) -> Optional[str]:
     else:
         return None
 
+
 def get_story_update_epic_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
 
@@ -274,12 +312,10 @@ def get_story_update_epic_body(payload: Dict[str, Any]) -> str:
 
     for ref in payload["references"]:
         if ref["id"] == new_id:
-            kwargs["new_epic_name_template"] = EPIC_NAME_TEMPLATE.format(
-                name=ref["name"])
+            kwargs["new_epic_name_template"] = EPIC_NAME_TEMPLATE.format(name=ref["name"])
 
         if ref["id"] == old_id:
-            kwargs["old_epic_name_template"] = EPIC_NAME_TEMPLATE.format(
-                name=ref["name"])
+            kwargs["old_epic_name_template"] = EPIC_NAME_TEMPLATE.format(name=ref["name"])
 
     if new_id and old_id:
         return STORY_EPIC_CHANGED_TEMPLATE.format(**kwargs)
@@ -292,6 +328,7 @@ def get_story_update_epic_body(payload: Dict[str, Any]) -> str:
 
     return STORY_ADDED_REMOVED_EPIC_TEMPLATE.format(**kwargs)
 
+
 def get_story_update_estimate_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
 
@@ -310,6 +347,7 @@ def get_story_update_estimate_body(payload: Dict[str, Any]) -> str:
 
     return STORY_ESTIMATE_TEMPLATE.format(**kwargs)
 
+
 def get_reference_by_id(payload: Dict[str, Any], ref_id: int) -> Dict[str, Any]:
     ref: Dict[str, Any] = {}
     for reference in payload['references']:
@@ -318,14 +356,13 @@ def get_reference_by_id(payload: Dict[str, Any], ref_id: int) -> Dict[str, Any]:
 
     return ref
 
-def get_story_create_github_entity_body(payload: Dict[str, Any],
-                                        entity: str) -> str:
+
+def get_story_create_github_entity_body(payload: Dict[str, Any], entity: str) -> str:
     action = get_action_with_primary_id(payload)
 
     story: Dict[str, Any] = {}
     for a in payload['actions']:
-        if (a['entity_type'] == 'story' and
-                a['changes'].get('workflow_state_id') is not None):
+        if a['entity_type'] == 'story' and a['changes'].get('workflow_state_id') is not None:
             story = a
 
     new_state_id = story['changes']['workflow_state_id']['new']
@@ -341,9 +378,12 @@ def get_story_create_github_entity_body(payload: Dict[str, Any],
         'old': old_state,
     }
 
-    template = STORY_GITHUB_PR_TEMPLATE if entity == 'pull-request' else STORY_GITHUB_BRANCH_TEMPLATE
+    template = (
+        STORY_GITHUB_PR_TEMPLATE if entity == 'pull-request' else STORY_GITHUB_BRANCH_TEMPLATE
+    )
     return template.format(**kwargs)
 
+
 def get_story_update_attachment_body(payload: Dict[str, Any]) -> Optional[str]:
     action = get_action_with_primary_id(payload)
 
@@ -369,6 +409,7 @@ def get_story_update_attachment_body(payload: Dict[str, Any]) -> Optional[str]:
 
     return FILE_ATTACHMENT_TEMPLATE.format(**kwargs)
 
+
 def get_story_label_body(payload: Dict[str, Any]) -> Optional[str]:
     action = get_action_with_primary_id(payload)
 
@@ -400,6 +441,7 @@ def get_story_label_body(payload: Dict[str, Any]) -> Optional[str]:
 
     return STORY_LABEL_TEMPLATE.format(**kwargs)
 
+
 def get_story_update_project_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     kwargs = {
@@ -419,6 +461,7 @@ def get_story_update_project_body(payload: Dict[str, Any]) -> str:
 
     return STORY_UPDATE_PROJECT_TEMPLATE.format(**kwargs)
 
+
 def get_story_update_type_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     kwargs = {
@@ -432,6 +475,7 @@ def get_story_update_type_body(payload: Dict[str, Any]) -> str:
 
     return STORY_UPDATE_TYPE_TEMPLATE.format(**kwargs)
 
+
 def get_story_update_owner_body(payload: Dict[str, Any]) -> str:
     action = get_action_with_primary_id(payload)
     kwargs = {
@@ -443,7 +487,8 @@ def get_story_update_owner_body(payload: Dict[str, Any]) -> str:
 
     return STORY_UPDATE_OWNER_TEMPLATE.format(**kwargs)
 
-def get_entity_name(payload: Dict[str, Any], entity: Optional[str]=None) -> Optional[str]:
+
+def get_entity_name(payload: Dict[str, Any], entity: Optional[str] = None) -> Optional[str]:
     action = get_action_with_primary_id(payload)
     name = action.get("name")
 
@@ -459,11 +504,13 @@ def get_entity_name(payload: Dict[str, Any], entity: Optional[str]=None) -> Opti
 
     return name
 
+
 def get_name_template(entity: str) -> str:
     if entity == "story":
         return STORY_NAME_TEMPLATE
     return EPIC_NAME_TEMPLATE
 
+
 EVENT_BODY_FUNCTION_MAPPER = {
     "story_update_archived": partial(get_update_archived_body, entity='story'),
     "epic_update_archived": partial(get_update_archived_body, entity='epic'),
@@ -507,11 +554,13 @@ IGNORED_EVENTS = {
     'story-comment_update',
 }
 
+
 @webhook_view('ClubHouse')
 @has_request_variables
 def api_clubhouse_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Optional[Dict[str, Any]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Optional[Dict[str, Any]] = REQ(argument_type='body'),
 ) -> HttpResponse:
 
     # Clubhouse has a tendency to send empty POST requests to
diff --git a/zerver/webhooks/codeship/view.py b/zerver/webhooks/codeship/view.py
index 4dee67961f..8db986c1f9 100644
--- a/zerver/webhooks/codeship/view.py
+++ b/zerver/webhooks/codeship/view.py
@@ -10,7 +10,9 @@ from zerver.lib.webhooks.common import check_send_webhook_message
 from zerver.models import UserProfile
 
 CODESHIP_TOPIC_TEMPLATE = '{project_name}'
-CODESHIP_MESSAGE_TEMPLATE = '[Build]({build_url}) triggered by {committer} on {branch} branch {status}.'
+CODESHIP_MESSAGE_TEMPLATE = (
+    '[Build]({build_url}) triggered by {committer} on {branch} branch {status}.'
+)
 
 CODESHIP_DEFAULT_STATUS = 'has {status} status'
 CODESHIP_STATUS_MAPPER = {
@@ -22,8 +24,11 @@ CODESHIP_STATUS_MAPPER = {
 
 @webhook_view('Codeship')
 @has_request_variables
-def api_codeship_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_codeship_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     payload = payload['build']
     subject = get_subject_for_http_request(payload)
     body = get_body_for_http_request(payload)
@@ -47,4 +52,6 @@ def get_body_for_http_request(payload: Dict[str, Any]) -> str:
 
 def get_status_message(payload: Dict[str, Any]) -> str:
     build_status = payload['status']
-    return CODESHIP_STATUS_MAPPER.get(build_status, CODESHIP_DEFAULT_STATUS.format(status=build_status))
+    return CODESHIP_STATUS_MAPPER.get(
+        build_status, CODESHIP_DEFAULT_STATUS.format(status=build_status)
+    )
diff --git a/zerver/webhooks/crashlytics/tests.py b/zerver/webhooks/crashlytics/tests.py
index 9af4c9fa3d..9ea5d09671 100644
--- a/zerver/webhooks/crashlytics/tests.py
+++ b/zerver/webhooks/crashlytics/tests.py
@@ -13,5 +13,7 @@ class CrashlyticsHookTests(WebhookTestCase):
 
     def test_crashlytics_build_in_success_status(self) -> None:
         expected_topic = "123: Issue Title"
-        expected_message = "[Issue](http://crashlytics.com/full/url/to/issue) impacts at least 16 device(s)."
+        expected_message = (
+            "[Issue](http://crashlytics.com/full/url/to/issue) impacts at least 16 device(s)."
+        )
         self.check_webhook("issue_message", expected_topic, expected_message)
diff --git a/zerver/webhooks/crashlytics/view.py b/zerver/webhooks/crashlytics/view.py
index 8bb6ab1ea5..207df454a7 100644
--- a/zerver/webhooks/crashlytics/view.py
+++ b/zerver/webhooks/crashlytics/view.py
@@ -20,8 +20,11 @@ VERIFICATION_EVENT = 'verification'
 
 @webhook_view('Crashlytics')
 @has_request_variables
-def api_crashlytics_webhook(request: HttpRequest, user_profile: UserProfile,
-                            payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_crashlytics_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     event = payload['event']
     if event == VERIFICATION_EVENT:
         subject = CRASHLYTICS_SETUP_TOPIC_TEMPLATE
diff --git a/zerver/webhooks/delighted/tests.py b/zerver/webhooks/delighted/tests.py
index 266eabf161..93c89e08d8 100644
--- a/zerver/webhooks/delighted/tests.py
+++ b/zerver/webhooks/delighted/tests.py
@@ -25,10 +25,12 @@ Your service is fast and flawless!
 
     def test_feedback_message_non_promoter(self) -> None:
         expected_topic = "Survey Response"
-        expected_message = ("Great! You have new feedback.\n"
-                            ">Score of 5/10 from paul_gravis@example.com"
-                            "\n>Your service is slow, but nearly flawless! "
-                            "Keep up the good work!")
+        expected_message = (
+            "Great! You have new feedback.\n"
+            ">Score of 5/10 from paul_gravis@example.com"
+            "\n>Your service is slow, but nearly flawless! "
+            "Keep up the good work!"
+        )
         expected_message = """
 Great! You have new feedback. Score of 5/10 from paul_gravis@example.com:
 
diff --git a/zerver/webhooks/delighted/view.py b/zerver/webhooks/delighted/view.py
index ff204a995c..8b081be27f 100644
--- a/zerver/webhooks/delighted/view.py
+++ b/zerver/webhooks/delighted/view.py
@@ -24,16 +24,21 @@ Great! You have new feedback. Score of {score}/10 from {email}:
 ```
 """.strip()
 
+
 def body_template(score: int) -> str:
     if score >= 7:
         return PROMOTER
     else:
         return FEEDBACK
 
+
 @webhook_view("Delighted")
 @has_request_variables
-def api_delighted_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Dict[str, Any]]=REQ(argument_type='body')) -> HttpResponse:
+def api_delighted_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Dict[str, Any]] = REQ(argument_type='body'),
+) -> HttpResponse:
     person = payload['event_data']['person']
     selected_payload = {'email': person['email']}
     selected_payload['score'] = payload['event_data']['score']
diff --git a/zerver/webhooks/deskdotcom/tests.py b/zerver/webhooks/deskdotcom/tests.py
index b66cddad62..bbadac05ed 100644
--- a/zerver/webhooks/deskdotcom/tests.py
+++ b/zerver/webhooks/deskdotcom/tests.py
@@ -10,6 +10,7 @@ from zerver.lib.test_classes import WebhookTestCase
 # stream=deskdotcom&topic=static%20text%20notification&data=This%20is%20a%20custom%20action.
 #
 
+
 class DeskDotComHookTests(WebhookTestCase):
     STREAM_NAME = 'deskdotcom'
     URL_TEMPLATE = "/api/v1/external/deskdotcom?stream={stream}"
@@ -20,37 +21,63 @@ class DeskDotComHookTests(WebhookTestCase):
         expected_topic = "static text notification"
         expected_message = "This is a custom action."
 
-        self.api_stream_message(self.test_user, 'static_text', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'static_text',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_case_updated_message(self) -> None:
         expected_topic = "case updated notification"
-        expected_message = ("Case 2 updated. "
-                            "Link: <a href='https://deskdotcomtest.desk.com/web/agent/case/2'>"
-                            "I have a question</a>")
+        expected_message = (
+            "Case 2 updated. "
+            "Link: <a href='https://deskdotcomtest.desk.com/web/agent/case/2'>"
+            "I have a question</a>"
+        )
 
-        self.api_stream_message(self.test_user, 'case_updated', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'case_updated',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_unicode_text_italian(self) -> None:
 
         expected_topic = "case updated notification"
-        expected_message = ("Case 2 updated. "
-                            "Link: <a href='https://deskdotcomtest.desk.com/web/agent/case/2'>"
-                            "Il mio hovercraft è pieno di anguille.</a>")
+        expected_message = (
+            "Case 2 updated. "
+            "Link: <a href='https://deskdotcomtest.desk.com/web/agent/case/2'>"
+            "Il mio hovercraft è pieno di anguille.</a>"
+        )
 
-        self.api_stream_message(self.test_user, 'unicode_text_italian', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'unicode_text_italian',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_unicode_text_japanese(self) -> None:
 
         expected_topic = "case updated notification"
-        expected_message = ("Case 2 updated. "
-                            "Link: <a href='https://deskdotcomtest.desk.com/web/agent/case/2'>"
-                            "私のホバークラフトは鰻でいっぱいです</a>")
+        expected_message = (
+            "Case 2 updated. "
+            "Link: <a href='https://deskdotcomtest.desk.com/web/agent/case/2'>"
+            "私のホバークラフトは鰻でいっぱいです</a>"
+        )
 
-        self.api_stream_message(self.test_user, 'unicode_text_japanese', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'unicode_text_japanese',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def get_body(self, fixture_name: str) -> str:
         return self.webhook_fixture_data("deskdotcom", fixture_name, file_type="txt")
diff --git a/zerver/webhooks/deskdotcom/view.py b/zerver/webhooks/deskdotcom/view.py
index f4f0debbfe..315fa1af61 100644
--- a/zerver/webhooks/deskdotcom/view.py
+++ b/zerver/webhooks/deskdotcom/view.py
@@ -15,8 +15,9 @@ from zerver.models import UserProfile
 # from the "data" param and post it, which this does.
 @authenticated_rest_api_view(webhook_client_name="Desk")
 @has_request_variables
-def api_deskdotcom_webhook(request: HttpRequest, user_profile: UserProfile,
-                           data: str=REQ()) -> HttpResponse:
+def api_deskdotcom_webhook(
+    request: HttpRequest, user_profile: UserProfile, data: str = REQ()
+) -> HttpResponse:
     topic = "Desk.com notification"
     check_send_webhook_message(request, user_profile, topic, data)
     return json_success()
diff --git a/zerver/webhooks/dialogflow/view.py b/zerver/webhooks/dialogflow/view.py
index f0380262d7..3c476d562a 100644
--- a/zerver/webhooks/dialogflow/view.py
+++ b/zerver/webhooks/dialogflow/view.py
@@ -12,9 +12,12 @@ from zerver.models import UserProfile, get_user_profile_by_email
 
 @webhook_view("Dialogflow")
 @has_request_variables
-def api_dialogflow_webhook(request: HttpRequest, user_profile: UserProfile,
-                           payload: Dict[str, Any]=REQ(argument_type='body'),
-                           email: str=REQ()) -> HttpResponse:
+def api_dialogflow_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    email: str = REQ(),
+) -> HttpResponse:
     status = payload["status"]["code"]
 
     if status == 200:
diff --git a/zerver/webhooks/dropbox/tests.py b/zerver/webhooks/dropbox/tests.py
index f35a4a9f72..7c946fcc8b 100644
--- a/zerver/webhooks/dropbox/tests.py
+++ b/zerver/webhooks/dropbox/tests.py
@@ -20,8 +20,7 @@ class DropboxHookTests(WebhookTestCase):
 
     def test_verification_request(self) -> None:
         self.subscribe(self.test_user, self.STREAM_NAME)
-        get_params = {'stream_name': self.STREAM_NAME,
-                      'api_key': get_api_key(self.test_user)}
+        get_params = {'stream_name': self.STREAM_NAME, 'api_key': get_api_key(self.test_user)}
         result = self.client_get(self.url, get_params)
         self.assert_json_error(result, "Missing 'challenge' argument", 400)
 
diff --git a/zerver/webhooks/dropbox/view.py b/zerver/webhooks/dropbox/view.py
index 6f1f2ec42e..4da5355fc4 100644
--- a/zerver/webhooks/dropbox/view.py
+++ b/zerver/webhooks/dropbox/view.py
@@ -14,12 +14,13 @@ from zerver.models import UserProfile
 def api_dropbox_webhook(
     request: HttpRequest,
     user_profile: UserProfile,
-    challenge: Optional[str]=REQ(default=None),
+    challenge: Optional[str] = REQ(default=None),
 ) -> HttpResponse:
     if request.method == 'POST':
         topic = 'Dropbox'
-        check_send_webhook_message(request, user_profile, topic,
-                                   "File has been updated on Dropbox!")
+        check_send_webhook_message(
+            request, user_profile, topic, "File has been updated on Dropbox!"
+        )
         return json_success()
     else:
         if challenge is None:
diff --git a/zerver/webhooks/errbit/view.py b/zerver/webhooks/errbit/view.py
index 28c9feef8b..2224b89e52 100644
--- a/zerver/webhooks/errbit/view.py
+++ b/zerver/webhooks/errbit/view.py
@@ -11,19 +11,25 @@ from zerver.models import UserProfile
 ERRBIT_TOPIC_TEMPLATE = '{project_name}'
 ERRBIT_MESSAGE_TEMPLATE = '[{error_class}]({error_url}): "{error_message}" occurred.'
 
+
 @webhook_view('Errbit')
 @has_request_variables
-def api_errbit_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_errbit_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     subject = get_subject(payload)
     body = get_body(payload)
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_subject(payload: Dict[str, Any]) -> str:
     project = payload['problem']['app_name'] + ' / ' + payload['problem']['environment']
     return ERRBIT_TOPIC_TEMPLATE.format(project_name=project)
 
+
 def get_body(payload: Dict[str, Any]) -> str:
     data = {
         'error_url': payload['problem']['url'],
diff --git a/zerver/webhooks/flock/view.py b/zerver/webhooks/flock/view.py
index 2b7d3ba76d..d584715760 100644
--- a/zerver/webhooks/flock/view.py
+++ b/zerver/webhooks/flock/view.py
@@ -10,10 +10,14 @@ from zerver.models import UserProfile
 
 CHECK_IS_REPLY = "in reply to"
 
+
 @webhook_view('Flock')
 @has_request_variables
-def api_flock_webhook(request: HttpRequest, user_profile: UserProfile,
-                      payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_flock_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     if len(payload["text"]) != 0:
         message_body = payload["text"]
diff --git a/zerver/webhooks/freshdesk/tests.py b/zerver/webhooks/freshdesk/tests.py
index 7745d2c0ec..b74ad06e6b 100644
--- a/zerver/webhooks/freshdesk/tests.py
+++ b/zerver/webhooks/freshdesk/tests.py
@@ -26,8 +26,13 @@ Test ticket description ☃.
 * **Status**: Pending
 """.strip()
 
-        self.api_stream_message(self.test_user, 'ticket_created', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'ticket_created',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_status_change(self) -> None:
         """
@@ -41,8 +46,13 @@ Requester Bob <requester-bob@example.com> updated [ticket #11](http://test1234zz
 * **Status**: Resolved -> Waiting on Customer
 """.strip()
 
-        self.api_stream_message(self.test_user, 'status_changed', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'status_changed',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_priority_change(self) -> None:
         """
@@ -55,12 +65,16 @@ Requester Bob <requester-bob@example.com> updated [ticket #11](http://test1234zz
 
 * **Priority**: High -> Low
 """.strip()
-        self.api_stream_message(self.test_user, 'priority_changed', expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            'priority_changed',
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
-    def test_unknown_event_payload_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_unknown_event_payload_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
         """
         Ignore unknown event payloads.
         """
@@ -83,9 +97,16 @@ Requester Bob <requester-bob@example.com> updated [ticket #11](http://test1234zz
         expected_message = """
 Requester Bob <requester-bob@example.com> added a {} note to \
 [ticket #11](http://test1234zzz.freshdesk.com/helpdesk/tickets/11).
-""".strip().format(note_type)
-        self.api_stream_message(self.test_user, fixture, expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+""".strip().format(
+            note_type
+        )
+        self.api_stream_message(
+            self.test_user,
+            fixture,
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_private_note_change(self) -> None:
         self.note_change("private_note", "private")
@@ -103,5 +124,10 @@ Requester Bob <requester-bob@example.com> added a {} note to \
         expected_message = """
 Requester \u2603 Bob <requester-bob@example.com> created [ticket #12](http://test1234zzz.freshdesk.com/helpdesk/tickets/12):\n\n``` quote\nThere are too many cat pictures on the internet \u2603. We need more guinea pigs.\nExhibit 1:\n\n  \n\n[guinea_pig.png](http://cdn.freshdesk.com/data/helpdesk/attachments/production/12744808/original/guinea_pig.png)\n```\n\n* **Type**: Problem\n* **Priority**: Urgent\n* **Status**: Open
 """.strip()
-        self.api_stream_message(self.test_user, "inline_images", expected_topic, expected_message,
-                                content_type="application/x-www-form-urlencoded")
+        self.api_stream_message(
+            self.test_user,
+            "inline_images",
+            expected_topic,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
diff --git a/zerver/webhooks/freshdesk/view.py b/zerver/webhooks/freshdesk/view.py
index a5f11b0195..b405fe4fe4 100644
--- a/zerver/webhooks/freshdesk/view.py
+++ b/zerver/webhooks/freshdesk/view.py
@@ -28,6 +28,7 @@ TICKET_CREATION_TEMPLATE = """
 * **Status**: {status}
 """.strip()
 
+
 class TicketDict(Dict[str, Any]):
     """
     A helper class to turn a dictionary with ticket information into
@@ -48,8 +49,17 @@ def property_name(property: str, index: int) -> str:
     information through the API, since only FlightCar uses this integration,
     hardcode their statuses.
     """
-    statuses = ["", "", "Open", "Pending", "Resolved", "Closed",
-                "Waiting on Customer", "Job Application", "Monthly"]
+    statuses = [
+        "",
+        "",
+        "Open",
+        "Pending",
+        "Resolved",
+        "Closed",
+        "Waiting on Customer",
+        "Job Application",
+        "Monthly",
+    ]
     priorities = ["", "Low", "Medium", "High", "Urgent"]
 
     name = ""
@@ -76,8 +86,11 @@ def parse_freshdesk_event(event_string: str) -> List[str]:
         # This is a property change event, like {status:{from:4,to:6}}. Pull out
         # the property, from, and to states.
         property, _, from_state, _, to_state = data
-        return [property, property_name(property, int(from_state)),
-                property_name(property, int(to_state))]
+        return [
+            property,
+            property_name(property, int(from_state)),
+            property_name(property, int(to_state)),
+        ]
 
 
 def format_freshdesk_note_message(ticket: TicketDict, event_info: List[str]) -> str:
@@ -128,10 +141,14 @@ def format_freshdesk_ticket_creation_message(ticket: TicketDict) -> str:
 
     return content
 
+
 @authenticated_rest_api_view(webhook_client_name="Freshdesk")
 @has_request_variables
-def api_freshdesk_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_freshdesk_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     ticket_data = payload["freshdesk_webhook"]
 
     ticket = TicketDict(ticket_data)
diff --git a/zerver/webhooks/front/tests.py b/zerver/webhooks/front/tests.py
index a68a6e7331..5131141973 100644
--- a/zerver/webhooks/front/tests.py
+++ b/zerver/webhooks/front/tests.py
@@ -24,10 +24,12 @@ class FrontHookTests(WebhookTestCase):
 
     def test_outbound_message(self) -> None:
         expected_topic = 'cnv_keo696'
-        expected_message = "[Outbound message](https://app.frontapp.com/open/msg_1176ie2) " \
-                           "from **support@planet-express.com** " \
-                           "to **calculon@momsbot.com**:\n" \
-                           "```quote\n*Subject*: Your next delivery is on Epsilon 96Z\n```"
+        expected_message = (
+            "[Outbound message](https://app.frontapp.com/open/msg_1176ie2) "
+            "from **support@planet-express.com** "
+            "to **calculon@momsbot.com**:\n"
+            "```quote\n*Subject*: Your next delivery is on Epsilon 96Z\n```"
+        )
 
         self.check_webhook(
             "outbound_message",
@@ -93,8 +95,10 @@ class FrontHookTests(WebhookTestCase):
 
     def test_mention_all(self) -> None:
         expected_topic = 'cnv_keo696'
-        expected_message = "**Leela Turanga** left a comment:\n" \
-                           "```quote\n@all Could someone else take this?\n```"
+        expected_message = (
+            "**Leela Turanga** left a comment:\n"
+            "```quote\n@all Could someone else take this?\n```"
+        )
 
         self.check_webhook(
             "mention_all",
@@ -107,10 +111,12 @@ class FrontHookTests(WebhookTestCase):
 
     def test_inbound_message(self) -> None:
         expected_topic = 'cnv_keocka'
-        expected_message = "[Inbound message](https://app.frontapp.com/open/msg_1176r8y) " \
-                           "from **calculon@momsbot.com** " \
-                           "to **support@planet-express.com**:\n" \
-                           "```quote\n*Subject*: Being a robot is great, but...\n```"
+        expected_message = (
+            "[Inbound message](https://app.frontapp.com/open/msg_1176r8y) "
+            "from **calculon@momsbot.com** "
+            "to **support@planet-express.com**:\n"
+            "```quote\n*Subject*: Being a robot is great, but...\n```"
+        )
 
         self.check_webhook(
             "inbound_message",
@@ -144,9 +150,11 @@ class FrontHookTests(WebhookTestCase):
 
     def test_outbound_reply(self) -> None:
         expected_topic = 'cnv_keocka'
-        expected_message = "[Outbound reply](https://app.frontapp.com/open/msg_1176ryy) " \
-                           "from **support@planet-express.com** " \
-                           "to **calculon@momsbot.com**."
+        expected_message = (
+            "[Outbound reply](https://app.frontapp.com/open/msg_1176ryy) "
+            "from **support@planet-express.com** "
+            "to **calculon@momsbot.com**."
+        )
 
         self.check_webhook(
             "outbound_reply",
@@ -168,8 +176,10 @@ class FrontHookTests(WebhookTestCase):
 
     def test_mention(self) -> None:
         expected_topic = 'cnv_keocka'
-        expected_message = "**Leela Turanga** left a comment:\n" \
-                           "```quote\n@bender Could you take it from here?\n```"
+        expected_message = (
+            "**Leela Turanga** left a comment:\n"
+            "```quote\n@bender Could you take it from here?\n```"
+        )
 
         self.check_webhook(
             "mention",
@@ -205,7 +215,8 @@ class FrontHookTests(WebhookTestCase):
         payload = self.get_body('conversation_assigned')
         payload_json = orjson.loads(payload)
         payload_json['type'] = 'qwerty'
-        result = self.client_post(self.url, orjson.dumps(payload_json),
-                                  content_type="application/x-www-form-urlencoded")
+        result = self.client_post(
+            self.url, orjson.dumps(payload_json), content_type="application/x-www-form-urlencoded"
+        )
 
         self.assert_json_error(result, "Unknown webhook request")
diff --git a/zerver/webhooks/front/view.py b/zerver/webhooks/front/view.py
index f3b938fbc5..567e7b9d51 100644
--- a/zerver/webhooks/front/view.py
+++ b/zerver/webhooks/front/view.py
@@ -17,80 +17,101 @@ def get_message_data(payload: Dict[str, Any]) -> Tuple[str, str, str, str]:
     subject = payload['conversation']['subject']
     return link, outbox, inbox, subject
 
+
 def get_source_name(payload: Dict[str, Any]) -> str:
     first_name = payload['source']['data']['first_name']
     last_name = payload['source']['data']['last_name']
     return f"{first_name} {last_name}"
 
+
 def get_target_name(payload: Dict[str, Any]) -> str:
     first_name = payload['target']['data']['first_name']
     last_name = payload['target']['data']['last_name']
     return f"{first_name} {last_name}"
 
+
 def get_inbound_message_body(payload: Dict[str, Any]) -> str:
     link, outbox, inbox, subject = get_message_data(payload)
-    return "[Inbound message]({link}) from **{outbox}** to **{inbox}**:\n" \
-           "```quote\n*Subject*: {subject}\n```" \
-        .format(link=link, outbox=outbox, inbox=inbox, subject=subject)
+    return (
+        "[Inbound message]({link}) from **{outbox}** to **{inbox}**:\n"
+        "```quote\n*Subject*: {subject}\n```".format(
+            link=link, outbox=outbox, inbox=inbox, subject=subject
+        )
+    )
+
 
 def get_outbound_message_body(payload: Dict[str, Any]) -> str:
     link, outbox, inbox, subject = get_message_data(payload)
-    return "[Outbound message]({link}) from **{inbox}** to **{outbox}**:\n" \
-           "```quote\n*Subject*: {subject}\n```" \
-        .format(link=link, inbox=inbox, outbox=outbox, subject=subject)
+    return (
+        "[Outbound message]({link}) from **{inbox}** to **{outbox}**:\n"
+        "```quote\n*Subject*: {subject}\n```".format(
+            link=link, inbox=inbox, outbox=outbox, subject=subject
+        )
+    )
+
 
 def get_outbound_reply_body(payload: Dict[str, Any]) -> str:
     link, outbox, inbox, subject = get_message_data(payload)
-    return "[Outbound reply]({link}) from **{inbox}** to **{outbox}**." \
-        .format(link=link, inbox=inbox, outbox=outbox)
+    return "[Outbound reply]({link}) from **{inbox}** to **{outbox}**.".format(
+        link=link, inbox=inbox, outbox=outbox
+    )
+
 
 def get_comment_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     comment = payload['target']['data']['body']
-    return "**{name}** left a comment:\n```quote\n{comment}\n```" \
-        .format(name=name, comment=comment)
+    return "**{name}** left a comment:\n```quote\n{comment}\n```".format(name=name, comment=comment)
+
 
 def get_conversation_assigned_body(payload: Dict[str, Any]) -> str:
     source_name = get_source_name(payload)
     target_name = get_target_name(payload)
 
     if source_name == target_name:
-        return "**{source_name}** assigned themselves." \
-            .format(source_name=source_name)
+        return "**{source_name}** assigned themselves.".format(source_name=source_name)
+
+    return "**{source_name}** assigned **{target_name}**.".format(
+        source_name=source_name, target_name=target_name
+    )
 
-    return "**{source_name}** assigned **{target_name}**." \
-        .format(source_name=source_name, target_name=target_name)
 
 def get_conversation_unassigned_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     return f"Unassigned by **{name}**."
 
+
 def get_conversation_archived_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     return f"Archived by **{name}**."
 
+
 def get_conversation_reopened_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     return f"Reopened by **{name}**."
 
+
 def get_conversation_deleted_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     return f"Deleted by **{name}**."
 
+
 def get_conversation_restored_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     return f"Restored by **{name}**."
 
+
 def get_conversation_tagged_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     tag = payload['target']['data']['name']
     return f"**{name}** added tag **{tag}**."
 
+
 def get_conversation_untagged_body(payload: Dict[str, Any]) -> str:
     name = get_source_name(payload)
     tag = payload['target']['data']['name']
     return f"**{name}** removed tag **{tag}**."
 
+
 EVENT_FUNCTION_MAPPER = {
     'inbound': get_inbound_message_body,
     'outbound': get_outbound_message_body,
@@ -107,13 +128,18 @@ EVENT_FUNCTION_MAPPER = {
     'untag': get_conversation_untagged_body,
 }
 
+
 def get_body_based_on_event(event: str) -> Any:
     return EVENT_FUNCTION_MAPPER[event]
 
+
 @webhook_view('Front')
 @has_request_variables
-def api_front_webhook(request: HttpRequest, user_profile: UserProfile,
-                      payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_front_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     event = payload['type']
     if event not in EVENT_FUNCTION_MAPPER:
diff --git a/zerver/webhooks/gci/view.py b/zerver/webhooks/gci/view.py
index ab420f95ed..9f301bf8fc 100644
--- a/zerver/webhooks/gci/view.py
+++ b/zerver/webhooks/gci/view.py
@@ -15,9 +15,11 @@ GCI_TOPIC_TEMPLATE = '{student_name}'
 def build_instance_url(instance_id: str) -> str:
     return f"https://codein.withgoogle.com/dashboard/task-instances/{instance_id}/"
 
+
 class UnknownEventType(Exception):
     pass
 
+
 def get_abandon_event_body(payload: Dict[str, Any]) -> str:
     return GCI_MESSAGE_TEMPLATE.format(
         actor=payload['task_claimed_by'],
@@ -26,6 +28,7 @@ def get_abandon_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_submit_event_body(payload: Dict[str, Any]) -> str:
     return GCI_MESSAGE_TEMPLATE.format(
         actor=payload['task_claimed_by'],
@@ -34,6 +37,7 @@ def get_submit_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_comment_event_body(payload: Dict[str, Any]) -> str:
     return GCI_MESSAGE_TEMPLATE.format(
         actor=payload['author'],
@@ -42,6 +46,7 @@ def get_comment_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_claim_event_body(payload: Dict[str, Any]) -> str:
     return GCI_MESSAGE_TEMPLATE.format(
         actor=payload['task_claimed_by'],
@@ -50,6 +55,7 @@ def get_claim_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_approve_event_body(payload: Dict[str, Any]) -> str:
     return GCI_MESSAGE_TEMPLATE.format(
         actor=payload['author'],
@@ -58,6 +64,7 @@ def get_approve_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_approve_pending_pc_event_body(payload: Dict[str, Any]) -> str:
     template = "{} (pending parental consent).".format(GCI_MESSAGE_TEMPLATE.rstrip('.'))
     return template.format(
@@ -67,6 +74,7 @@ def get_approve_pending_pc_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_needswork_event_body(payload: Dict[str, Any]) -> str:
     template = "{} for more work.".format(GCI_MESSAGE_TEMPLATE.rstrip('.'))
     return template.format(
@@ -76,9 +84,11 @@ def get_needswork_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_extend_event_body(payload: Dict[str, Any]) -> str:
-    template = "{} by {days} day(s).".format(GCI_MESSAGE_TEMPLATE.rstrip('.'),
-                                             days=payload['extension_days'])
+    template = "{} by {days} day(s).".format(
+        GCI_MESSAGE_TEMPLATE.rstrip('.'), days=payload['extension_days']
+    )
     return template.format(
         actor=payload['author'],
         action='extended the deadline for',
@@ -86,6 +96,7 @@ def get_extend_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_unassign_event_body(payload: Dict[str, Any]) -> str:
     return GCI_MESSAGE_TEMPLATE.format(
         actor=payload['author'],
@@ -94,16 +105,21 @@ def get_unassign_event_body(payload: Dict[str, Any]) -> str:
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 def get_outoftime_event_body(payload: Dict[str, Any]) -> str:
     return 'The deadline for the task [{task_name}]({task_url}) has passed.'.format(
         task_name=payload['task_definition_name'],
         task_url=build_instance_url(payload['task_instance']),
     )
 
+
 @webhook_view("GoogleCodeIn")
 @has_request_variables
-def api_gci_webhook(request: HttpRequest, user_profile: UserProfile,
-                    payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_gci_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     event = get_event(payload)
     if event is not None:
         body = get_body_based_on_event(event)(payload)
@@ -114,6 +130,7 @@ def api_gci_webhook(request: HttpRequest, user_profile: UserProfile,
 
     return json_success()
 
+
 EVENTS_FUNCTION_MAPPER = {
     'abandon': get_abandon_event_body,
     'approve': get_approve_event_body,
@@ -127,6 +144,7 @@ EVENTS_FUNCTION_MAPPER = {
     'unassign': get_unassign_event_body,
 }
 
+
 def get_event(payload: Dict[str, Any]) -> Optional[str]:
     event = payload['event_type']
     if event in EVENTS_FUNCTION_MAPPER:
@@ -134,5 +152,6 @@ def get_event(payload: Dict[str, Any]) -> Optional[str]:
 
     raise UnknownEventType(f"Event '{event}' is unknown and cannot be handled")  # nocoverage
 
+
 def get_body_based_on_event(event: str) -> Any:
     return EVENTS_FUNCTION_MAPPER[event]
diff --git a/zerver/webhooks/gitea/tests.py b/zerver/webhooks/gitea/tests.py
index 57af065f5c..64cb02ff07 100644
--- a/zerver/webhooks/gitea/tests.py
+++ b/zerver/webhooks/gitea/tests.py
@@ -96,10 +96,13 @@ class GiteaHookTests(WebhookTestCase):
         self.check_webhook("issue_comment__edited", expected_topic, expected_message)
 
     @patch('zerver.webhooks.gogs.view.check_send_webhook_message')
-    def test_push_filtered_by_branches_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_push_filtered_by_branches_ignore(
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_body('push__5_commits')
-        result = self.client_post(self.url, payload, HTTP_X_GITEA_EVENT='push',
-                                  content_type="application/json")
+        result = self.client_post(
+            self.url, payload, HTTP_X_GITEA_EVENT='push', content_type="application/json"
+        )
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
diff --git a/zerver/webhooks/gitea/view.py b/zerver/webhooks/gitea/view.py
index bac426f9f8..5d79871cb4 100644
--- a/zerver/webhooks/gitea/view.py
+++ b/zerver/webhooks/gitea/view.py
@@ -14,8 +14,8 @@ from zerver.webhooks.gogs.view import gogs_webhook_main
 
 fixture_to_headers = get_http_headers_from_filename("HTTP_X_GITEA_EVENT")
 
-def format_pull_request_event(payload: Dict[str, Any],
-                              include_title: bool=False) -> str:
+
+def format_pull_request_event(payload: Dict[str, Any], include_title: bool = False) -> str:
     assignee = payload['pull_request']['assignee']
     data = {
         'user_name': payload['pull_request']['user']['username'],
@@ -34,11 +34,23 @@ def format_pull_request_event(payload: Dict[str, Any],
 
     return get_pull_request_event_message(**data)
 
+
 @webhook_view('Gitea')
 @has_request_variables
-def api_gitea_webhook(request: HttpRequest, user_profile: UserProfile,
-                      payload: Dict[str, Any]=REQ(argument_type='body'),
-                      branches: Optional[str]=REQ(default=None),
-                      user_specified_topic: Optional[str]=REQ("topic", default=None)) -> HttpResponse:
-    return gogs_webhook_main('Gitea', 'X_GITEA_EVENT', format_pull_request_event,
-                             request, user_profile, payload, branches, user_specified_topic)
+def api_gitea_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    branches: Optional[str] = REQ(default=None),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+) -> HttpResponse:
+    return gogs_webhook_main(
+        'Gitea',
+        'X_GITEA_EVENT',
+        format_pull_request_event,
+        request,
+        user_profile,
+        payload,
+        branches,
+        user_specified_topic,
+    )
diff --git a/zerver/webhooks/github/tests.py b/zerver/webhooks/github/tests.py
index a222ff3b5b..3f72f59251 100644
--- a/zerver/webhooks/github/tests.py
+++ b/zerver/webhooks/github/tests.py
@@ -13,6 +13,7 @@ TOPIC_ORGANIZATION = "baxterandthehackers organization"
 TOPIC_BRANCH = "public-repo / changes"
 TOPIC_WIKI = "public-repo / Wiki Pages"
 
+
 class GitHubWebhookTest(WebhookTestCase):
     STREAM_NAME = 'github'
     URL_TEMPLATE = "/api/v1/external/github?stream={stream}&api_key={api_key}"
@@ -141,7 +142,9 @@ class GitHubWebhookTest(WebhookTestCase):
         self.check_webhook("issues", expected_topic, expected_message)
 
     def test_membership_msg(self) -> None:
-        expected_message = "baxterthehacker added [kdaigle](https://github.com/kdaigle) to the Contractors team."
+        expected_message = (
+            "baxterthehacker added [kdaigle](https://github.com/kdaigle) to the Contractors team."
+        )
         self.check_webhook("membership", TOPIC_ORGANIZATION, expected_message)
 
     def test_membership_removal_msg(self) -> None:
@@ -184,7 +187,9 @@ class GitHubWebhookTest(WebhookTestCase):
         self.check_webhook("pull_request__closed", expected_topic, expected_message)
 
     def test_pull_request_merged_msg(self) -> None:
-        expected_message = "baxterthehacker merged [PR #1](https://github.com/baxterthehacker/public-repo/pull/1)."
+        expected_message = (
+            "baxterthehacker merged [PR #1](https://github.com/baxterthehacker/public-repo/pull/1)."
+        )
         self.check_webhook("pull_request__merged", TOPIC_PR, expected_message)
 
     def test_public_msg(self) -> None:
@@ -212,7 +217,9 @@ class GitHubWebhookTest(WebhookTestCase):
         self.check_webhook("release", TOPIC_REPO, expected_message)
 
     def test_page_build_msg(self) -> None:
-        expected_message = "GitHub Pages build, triggered by baxterthehacker, has finished building."
+        expected_message = (
+            "GitHub Pages build, triggered by baxterthehacker, has finished building."
+        )
         self.check_webhook("page_build", TOPIC_REPO, expected_message)
 
     def test_status_msg(self) -> None:
@@ -270,7 +277,9 @@ class GitHubWebhookTest(WebhookTestCase):
         self.check_webhook("pull_request__assigned", expected_topic, expected_message)
 
     def test_pull_request_unassigned_msg(self) -> None:
-        expected_message = "eeshangarg unassigned [PR #1](https://github.com/zulip-test-org/helloworld/pull/1)."
+        expected_message = (
+            "eeshangarg unassigned [PR #1](https://github.com/zulip-test-org/helloworld/pull/1)."
+        )
         self.check_webhook(
             "pull_request__unassigned",
             "helloworld / PR #1 Mention that Zulip rocks!",
@@ -442,9 +451,7 @@ A temporary team so that I can get some webhook fixtures!
                 bogus_key1={},
                 bogus_key2={},
             ),
-            team=dict(
-                name="My Team"
-            ),
+            team=dict(name="My Team"),
         )
 
         log_mock = patch("zerver.decorator.webhook_unsupported_events_logger.exception")
@@ -462,7 +469,7 @@ A temporary team so that I can get some webhook fixtures!
             message=stream_message,
             stream_name=self.STREAM_NAME,
             topic_name="team My Team",
-            content="Team has changes to `bogus_key1/bogus_key2` data."
+            content="Team has changes to `bogus_key1/bogus_key2` data.",
         )
 
         m.assert_called_once()
diff --git a/zerver/webhooks/github/view.py b/zerver/webhooks/github/view.py
index d95bdc63e5..84430df434 100644
--- a/zerver/webhooks/github/view.py
+++ b/zerver/webhooks/github/view.py
@@ -29,6 +29,7 @@ from zerver.models import UserProfile
 
 fixture_to_headers = get_http_headers_from_filename("HTTP_X_GITHUB_EVENT")
 
+
 class Helper:
     def __init__(
         self,
@@ -45,6 +46,7 @@ class Helper:
             unsupported_event=True,
         )
 
+
 def get_opened_or_update_pull_request_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -72,6 +74,7 @@ def get_opened_or_update_pull_request_body(helper: Helper) -> str:
         title=pull_request['title'] if include_title else None,
     )
 
+
 def get_assigned_or_unassigned_pull_request_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -91,6 +94,7 @@ def get_assigned_or_unassigned_pull_request_body(helper: Helper) -> str:
         return f"{base_message[:-1]} to {assignee}."
     return base_message
 
+
 def get_closed_pull_request_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -104,6 +108,7 @@ def get_closed_pull_request_body(helper: Helper) -> str:
         title=pull_request['title'] if include_title else None,
     )
 
+
 def get_membership_body(helper: Helper) -> str:
     payload = helper.payload
     action = payload['action']
@@ -119,6 +124,7 @@ def get_membership_body(helper: Helper) -> str:
         team_name=team_name,
     )
 
+
 def get_member_body(helper: Helper) -> str:
     payload = helper.payload
     return "{} {} [{}]({}) to [{}]({}).".format(
@@ -130,6 +136,7 @@ def get_member_body(helper: Helper) -> str:
         payload['repository']['html_url'],
     )
 
+
 def get_issue_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -146,6 +153,7 @@ def get_issue_body(helper: Helper) -> str:
         title=issue['title'] if include_title else None,
     )
 
+
 def get_issue_comment_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -168,6 +176,7 @@ def get_issue_comment_body(helper: Helper) -> str:
         title=issue['title'] if include_title else None,
     )
 
+
 def get_fork_body(helper: Helper) -> str:
     payload = helper.payload
     forkee = payload['forkee']
@@ -177,16 +186,19 @@ def get_fork_body(helper: Helper) -> str:
         forkee['html_url'],
     )
 
+
 def get_deployment_body(helper: Helper) -> str:
     payload = helper.payload
     return f'{get_sender_name(payload)} created new deployment.'
 
+
 def get_change_deployment_status_body(helper: Helper) -> str:
     payload = helper.payload
     return 'Deployment changed status to {}.'.format(
         payload['deployment_status']['state'],
     )
 
+
 def get_create_or_delete_body(helper: Helper, action: str) -> str:
     payload = helper.payload
     ref_type = payload['ref_type']
@@ -197,6 +209,7 @@ def get_create_or_delete_body(helper: Helper, action: str) -> str:
         payload['ref'],
     ).rstrip()
 
+
 def get_commit_comment_body(helper: Helper) -> str:
     payload = helper.payload
     comment = payload['comment']
@@ -211,6 +224,7 @@ def get_commit_comment_body(helper: Helper) -> str:
         comment['body'],
     )
 
+
 def get_push_tags_body(helper: Helper) -> str:
     payload = helper.payload
     return get_push_tag_event_message(
@@ -219,15 +233,18 @@ def get_push_tags_body(helper: Helper) -> str:
         action='pushed' if payload.get('created') else 'removed',
     )
 
+
 def get_push_commits_body(helper: Helper) -> str:
     payload = helper.payload
-    commits_data = [{
-        'name': (commit.get('author').get('username') or
-                 commit.get('author').get('name')),
-        'sha': commit['id'],
-        'url': commit['url'],
-        'message': commit['message'],
-    } for commit in payload['commits']]
+    commits_data = [
+        {
+            'name': (commit.get('author').get('username') or commit.get('author').get('name')),
+            'sha': commit['id'],
+            'url': commit['url'],
+            'message': commit['message'],
+        }
+        for commit in payload['commits']
+    ]
     return get_push_commits_event_message(
         get_sender_name(payload),
         payload['compare'],
@@ -236,6 +253,7 @@ def get_push_commits_body(helper: Helper) -> str:
         deleted=payload['deleted'],
     )
 
+
 def get_public_body(helper: Helper) -> str:
     payload = helper.payload
     return "{} made the repository [{}]({}) public.".format(
@@ -244,6 +262,7 @@ def get_public_body(helper: Helper) -> str:
         payload['repository']['html_url'],
     )
 
+
 def get_wiki_pages_body(helper: Helper) -> str:
     payload = helper.payload
     wiki_page_info_template = "* {action} [{title}]({url})\n"
@@ -256,6 +275,7 @@ def get_wiki_pages_body(helper: Helper) -> str:
         )
     return f"{get_sender_name(payload)}:\n{wiki_info.rstrip()}"
 
+
 def get_watch_body(helper: Helper) -> str:
     payload = helper.payload
     return "{} starred the repository [{}]({}).".format(
@@ -264,6 +284,7 @@ def get_watch_body(helper: Helper) -> str:
         payload['repository']['html_url'],
     )
 
+
 def get_repository_body(helper: Helper) -> str:
     payload = helper.payload
     return "{} {} the repository [{}]({}).".format(
@@ -273,6 +294,7 @@ def get_repository_body(helper: Helper) -> str:
         payload['repository']['html_url'],
     )
 
+
 def get_add_team_body(helper: Helper) -> str:
     payload = helper.payload
     return "The repository [{}]({}) was added to team {}.".format(
@@ -281,6 +303,7 @@ def get_add_team_body(helper: Helper) -> str:
         payload['team']['name'],
     )
 
+
 def get_team_body(helper: Helper) -> str:
     payload = helper.payload
     changes = payload["changes"]
@@ -305,6 +328,7 @@ def get_team_body(helper: Helper) -> str:
     # from GitHub.
     return f"Team has changes to `{missing_keys}` data."
 
+
 def get_release_body(helper: Helper) -> str:
     payload = helper.payload
     data = {
@@ -318,6 +342,7 @@ def get_release_body(helper: Helper) -> str:
 
     return get_release_event_message(**data)
 
+
 def get_page_build_body(helper: Helper) -> str:
     payload = helper.payload
     build = payload['build']
@@ -339,6 +364,7 @@ def get_page_build_body(helper: Helper) -> str:
         action,
     )
 
+
 def get_status_body(helper: Helper) -> str:
     payload = helper.payload
     if payload['target_url']:
@@ -354,16 +380,18 @@ def get_status_body(helper: Helper) -> str:
         status,
     )
 
+
 def get_pull_request_ready_for_review_body(helper: Helper) -> str:
     payload = helper.payload
 
     message = "**{sender}** has marked [PR #{pr_number}]({pr_url}) as ready for review."
     return message.format(
-        sender = get_sender_name(payload),
-        pr_number = payload['pull_request']['number'],
-        pr_url = payload['pull_request']['html_url'],
+        sender=get_sender_name(payload),
+        pr_number=payload['pull_request']['number'],
+        pr_url=payload['pull_request']['html_url'],
     )
 
+
 def get_pull_request_review_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -379,6 +407,7 @@ def get_pull_request_review_body(helper: Helper) -> str:
         title=title if include_title else None,
     )
 
+
 def get_pull_request_review_comment_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
@@ -401,20 +430,23 @@ def get_pull_request_review_comment_body(helper: Helper) -> str:
         title=title if include_title else None,
     )
 
+
 def get_pull_request_review_requested_body(helper: Helper) -> str:
     payload = helper.payload
     include_title = helper.include_title
     requested_reviewer = [payload['requested_reviewer']] if 'requested_reviewer' in payload else []
-    requested_reviewers = (payload['pull_request']['requested_reviewers'] or requested_reviewer)
+    requested_reviewers = payload['pull_request']['requested_reviewers'] or requested_reviewer
 
     requested_team = [payload['requested_team']] if 'requested_team' in payload else []
-    requested_team_reviewers = (payload['pull_request']['requested_teams'] or requested_team)
+    requested_team_reviewers = payload['pull_request']['requested_teams'] or requested_team
 
     sender = get_sender_name(payload)
     pr_number = payload['pull_request']['number']
     pr_url = payload['pull_request']['html_url']
     message = "**{sender}** requested {reviewers} for a review on [PR #{pr_number}]({pr_url})."
-    message_with_title = "**{sender}** requested {reviewers} for a review on [PR #{pr_number} {title}]({pr_url})."
+    message_with_title = (
+        "**{sender}** requested {reviewers} for a review on [PR #{pr_number} {title}]({pr_url})."
+    )
     body = message_with_title if include_title else message
 
     all_reviewers = []
@@ -439,6 +471,7 @@ def get_pull_request_review_requested_body(helper: Helper) -> str:
         title=payload['pull_request']['title'] if include_title else None,
     )
 
+
 def get_check_run_body(helper: Helper) -> str:
     payload = helper.payload
     template = """
@@ -459,6 +492,7 @@ Check [{name}]({html_url}) {status} ({conclusion}). ([{short_hash}]({commit_url}
 
     return template.format(**kwargs)
 
+
 def get_star_body(helper: Helper) -> str:
     payload = helper.payload
     template = "{user} {action} the repository [{repo}]({url})."
@@ -469,31 +503,40 @@ def get_star_body(helper: Helper) -> str:
         url=payload['repository']['html_url'],
     )
 
+
 def get_ping_body(helper: Helper) -> str:
     payload = helper.payload
     return get_setup_webhook_message('GitHub', get_sender_name(payload))
 
+
 def get_repository_name(payload: Dict[str, Any]) -> str:
     return payload['repository']['name']
 
+
 def get_repository_full_name(payload: Dict[str, Any]) -> str:
     return payload['repository']['full_name']
 
+
 def get_organization_name(payload: Dict[str, Any]) -> str:
     return payload['organization']['login']
 
+
 def get_sender_name(payload: Dict[str, Any]) -> str:
     return payload['sender']['login']
 
+
 def get_branch_name_from_ref(ref_string: str) -> str:
     return re.sub(r'^refs/heads/', '', ref_string)
 
+
 def get_tag_name_from_ref(ref_string: str) -> str:
     return re.sub(r'^refs/tags/', '', ref_string)
 
+
 def is_commit_push_event(payload: Dict[str, Any]) -> bool:
     return bool(re.match(r'^refs/heads/', payload['ref']))
 
+
 def get_subject_based_on_type(payload: Dict[str, Any], event: str) -> str:
     if 'pull_request' in event:
         return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
@@ -536,6 +579,7 @@ def get_subject_based_on_type(payload: Dict[str, Any], event: str) -> str:
 
     return get_repository_name(payload)
 
+
 EVENT_FUNCTION_MAPPER: Dict[str, Callable[[Helper], str]] = {
     'commit_comment': get_commit_comment_body,
     'closed_pull_request': get_closed_pull_request_body,
@@ -600,13 +644,16 @@ IGNORED_TEAM_ACTIONS = [
     "removed_from_repository",
 ]
 
+
 @webhook_view('GitHub', notify_bot_owner_on_invalid_json=True)
 @has_request_variables
 def api_github_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Any]=REQ(argument_type='body'),
-        branches: Optional[str]=REQ(default=None),
-        user_specified_topic: Optional[str]=REQ("topic", default=None)) -> HttpResponse:
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    branches: Optional[str] = REQ(default=None),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+) -> HttpResponse:
     """
     GitHub sends the event as an HTTP header.  We have our
     own Zulip-specific concept of an event that often maps
@@ -637,6 +684,7 @@ def api_github_webhook(
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_zulip_event_name(
     header_event: str,
     payload: Dict[str, Any],
diff --git a/zerver/webhooks/gitlab/tests.py b/zerver/webhooks/gitlab/tests.py
index c1e689f3a6..99603dfb27 100644
--- a/zerver/webhooks/gitlab/tests.py
+++ b/zerver/webhooks/gitlab/tests.py
@@ -323,7 +323,8 @@ A trivial change that should probably be ignored.
         self.check_webhook(
             'merge_request_hook__merge_request_created_with_multiple_assignees',
             expected_topic,
-            expected_message)
+            expected_message,
+        )
 
     def test_merge_request_closed_event_message(self) -> None:
         expected_topic = "my-awesome-project / MR #2 NEW MR"
@@ -370,9 +371,8 @@ A trivial change that should probably be ignored.
         expected_topic = "my-awesome-project / MR #3 New Merge Request"
         expected_message = "Tomasz Kolek updated [MR #3](https://gitlab.com/tomaszkolek0/my-awesome-project/merge_requests/3) (assigned to Tomasz Kolek) from `tomek` to `master`:\n\n~~~ quote\nupdated desc\n~~~"
         self.check_webhook(
-            'merge_request_hook__merge_request_updated',
-            expected_topic,
-            expected_message)
+            'merge_request_hook__merge_request_updated', expected_topic, expected_message
+        )
 
     def test_merge_request_added_commit_event_message(self) -> None:
         expected_topic = "my-awesome-project / MR #3 New Merge Request"
@@ -406,7 +406,10 @@ A trivial change that should probably be ignored.
         expected_message = "Build job_name from test stage was created."
 
         self.check_webhook(
-            "build_created", expected_topic, expected_message, HTTP_X_GITLAB_EVENT="Job Hook",
+            "build_created",
+            expected_topic,
+            expected_message,
+            HTTP_X_GITLAB_EVENT="Job Hook",
         )
 
     def test_build_started_event_message(self) -> None:
@@ -414,7 +417,10 @@ A trivial change that should probably be ignored.
         expected_message = "Build job_name from test stage started."
 
         self.check_webhook(
-            "build_started", expected_topic, expected_message, HTTP_X_GITLAB_EVENT="Job Hook",
+            "build_started",
+            expected_topic,
+            expected_message,
+            HTTP_X_GITLAB_EVENT="Job Hook",
         )
 
     def test_build_succeeded_event_message(self) -> None:
@@ -422,7 +428,10 @@ A trivial change that should probably be ignored.
         expected_message = "Build job_name from test stage changed status to success."
 
         self.check_webhook(
-            "build_succeeded", expected_topic, expected_message, HTTP_X_GITLAB_EVENT="Job Hook",
+            "build_succeeded",
+            expected_topic,
+            expected_message,
+            HTTP_X_GITLAB_EVENT="Job Hook",
         )
 
     def test_build_created_event_message_legacy_event_name(self) -> None:
@@ -430,7 +439,10 @@ A trivial change that should probably be ignored.
         expected_message = "Build job_name from test stage was created."
 
         self.check_webhook(
-            "build_created", expected_topic, expected_message, HTTP_X_GITLAB_EVENT="Build Hook",
+            "build_created",
+            expected_topic,
+            expected_message,
+            HTTP_X_GITLAB_EVENT="Build Hook",
         )
 
     def test_build_started_event_message_legacy_event_name(self) -> None:
@@ -438,7 +450,10 @@ A trivial change that should probably be ignored.
         expected_message = "Build job_name from test stage started."
 
         self.check_webhook(
-            "build_started", expected_topic, expected_message, HTTP_X_GITLAB_EVENT="Build Hook",
+            "build_started",
+            expected_topic,
+            expected_message,
+            HTTP_X_GITLAB_EVENT="Build Hook",
         )
 
     def test_build_succeeded_event_message_legacy_event_name(self) -> None:
@@ -446,7 +461,10 @@ A trivial change that should probably be ignored.
         expected_message = "Build job_name from test stage changed status to success."
 
         self.check_webhook(
-            "build_succeeded", expected_topic, expected_message, HTTP_X_GITLAB_EVENT="Build Hook",
+            "build_succeeded",
+            expected_topic,
+            expected_message,
+            HTTP_X_GITLAB_EVENT="Build Hook",
         )
 
     def test_pipeline_succeeded_with_artifacts_event_message(self) -> None:
@@ -454,7 +472,9 @@ A trivial change that should probably be ignored.
         expected_message = "[Pipeline (22668)](https://gitlab.example.com/group1/onlysomeproject/pipelines/22668) changed status to success with build(s):\n* [cleanup:cleanup docker image](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58592) - success\n* [pages](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58591) - success\n  * built artifact: *artifacts.zip* [[Browse](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58591/artifacts/browse)|[Download](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58591/artifacts/download)]\n* [black+pytest:future environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58590) - success\n* [docs:anaconda environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58589) - success\n  * built artifact: *sphinx-docs.zip* [[Browse](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58589/artifacts/browse)|[Download](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58589/artifacts/download)]\n* [pytest:current environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58588) - success\n* [black:current environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58587) - success\n* [setup:docker image](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58586) - success."
 
         self.check_webhook(
-            "pipeline_hook__pipline_succeeded_with_artifacts", expected_topic, expected_message,
+            "pipeline_hook__pipline_succeeded_with_artifacts",
+            expected_topic,
+            expected_message,
         )
 
     def test_pipeline_succeeded_event_message(self) -> None:
@@ -462,7 +482,9 @@ A trivial change that should probably be ignored.
         expected_message = "[Pipeline (4414206)](https://gitlab.com/TomaszKolek/my-awesome-project/pipelines/4414206) changed status to success with build(s):\n* [job_name2](https://gitlab.com/TomaszKolek/my-awesome-project/-/jobs/4541113) - success\n* [job_name](https://gitlab.com/TomaszKolek/my-awesome-project/-/jobs/4541112) - success."
 
         self.check_webhook(
-            "pipeline_hook__pipeline_succeeded", expected_topic, expected_message,
+            "pipeline_hook__pipeline_succeeded",
+            expected_topic,
+            expected_message,
         )
 
     def test_pipeline_started_event_message(self) -> None:
@@ -470,7 +492,9 @@ A trivial change that should probably be ignored.
         expected_message = "[Pipeline (4414206)](https://gitlab.com/TomaszKolek/my-awesome-project/pipelines/4414206) started with build(s):\n* [job_name](https://gitlab.com/TomaszKolek/my-awesome-project/-/jobs/4541112) - running\n* [job_name2](https://gitlab.com/TomaszKolek/my-awesome-project/-/jobs/4541113) - pending."
 
         self.check_webhook(
-            "pipeline_hook__pipeline_started", expected_topic, expected_message,
+            "pipeline_hook__pipeline_started",
+            expected_topic,
+            expected_message,
         )
 
     def test_pipeline_pending_event_message(self) -> None:
@@ -478,7 +502,9 @@ A trivial change that should probably be ignored.
         expected_message = "[Pipeline (4414206)](https://gitlab.com/TomaszKolek/my-awesome-project/pipelines/4414206) was created with build(s):\n* [job_name2](https://gitlab.com/TomaszKolek/my-awesome-project/-/jobs/4541113) - pending\n* [job_name](https://gitlab.com/TomaszKolek/my-awesome-project/-/jobs/4541112) - created."
 
         self.check_webhook(
-            "pipeline_hook__pipeline_pending", expected_topic, expected_message,
+            "pipeline_hook__pipeline_pending",
+            expected_topic,
+            expected_message,
         )
 
     def test_issue_type_test_payload(self) -> None:
@@ -486,24 +512,32 @@ A trivial change that should probably be ignored.
         expected_message = "Webhook for **public-repo** has been configured successfully! :tada:"
 
         self.check_webhook(
-            "test_hook__issue_test_payload", expected_topic, expected_message,
+            "test_hook__issue_test_payload",
+            expected_topic,
+            expected_message,
         )
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
     def test_push_event_message_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='master,development')
         payload = self.get_body('push_hook')
-        result = self.client_post(self.url, payload, HTTP_X_GITLAB_EVENT='Push Hook', content_type="application/json")
+        result = self.client_post(
+            self.url, payload, HTTP_X_GITLAB_EVENT='Push Hook', content_type="application/json"
+        )
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
     def test_push_commits_more_than_limit_message_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='master,development')
         payload = self.get_body('push_hook__push_commits_more_than_limit')
-        result = self.client_post(self.url, payload, HTTP_X_GITLAB_EVENT='Push Hook', content_type="application/json")
+        result = self.client_post(
+            self.url, payload, HTTP_X_GITLAB_EVENT='Push Hook', content_type="application/json"
+        )
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
 
@@ -544,9 +578,8 @@ A trivial change that should probably be ignored.
         expected_topic = "my-awesome-project / MR #3 New Merge Request"
         expected_message = "Tomasz Kolek created [MR #3](https://gitlab.com/tomaszkolek0/my-awesome-project/merge_requests/3) (assigned to Tomasz Kolek) from `tomek` to `master`:\n\n~~~ quote\ndescription of merge request\n~~~"
         self.check_webhook(
-            'system_hook__merge_request_created_with_assignee',
-            expected_topic,
-            expected_message)
+            'system_hook__merge_request_created_with_assignee', expected_topic, expected_message
+        )
 
     def test_system_merge_request_closed_event_message(self) -> None:
         expected_topic = "my-awesome-project / MR #2 NEW MR"
diff --git a/zerver/webhooks/gitlab/view.py b/zerver/webhooks/gitlab/view.py
index 0025d56588..96bb662644 100644
--- a/zerver/webhooks/gitlab/view.py
+++ b/zerver/webhooks/gitlab/view.py
@@ -35,11 +35,13 @@ def fixture_to_headers(fixture_name: str) -> Dict[str, Any]:
     # HTTP event title "Push Hook".
     return {"HTTP_X_GITLAB_EVENT": fixture_name.split("__")[0].replace("_", " ").title()}
 
+
 def get_push_event_body(payload: Dict[str, Any]) -> str:
     if payload.get('after') == EMPTY_SHA:
         return get_remove_branch_event_body(payload)
     return get_normal_push_event_body(payload)
 
+
 def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
     compare_url = '{}/compare/{}...{}'.format(
         get_project_homepage(payload),
@@ -64,12 +66,14 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
         commits,
     )
 
+
 def get_remove_branch_event_body(payload: Dict[str, Any]) -> str:
     return get_remove_branch_event_message(
         get_user_name(payload),
         get_branch_name(payload),
     )
 
+
 def get_tag_push_event_body(payload: Dict[str, Any]) -> str:
     return get_push_tag_event_message(
         get_user_name(payload),
@@ -77,8 +81,8 @@ def get_tag_push_event_body(payload: Dict[str, Any]) -> str:
         action="pushed" if payload.get('checkout_sha') else "removed",
     )
 
-def get_issue_created_event_body(payload: Dict[str, Any],
-                                 include_title: bool=False) -> str:
+
+def get_issue_created_event_body(payload: Dict[str, Any], include_title: bool = False) -> str:
     description = payload['object_attributes'].get('description')
     # Filter out multiline hidden comments
     if description is not None:
@@ -95,8 +99,8 @@ def get_issue_created_event_body(payload: Dict[str, Any],
         title=payload['object_attributes'].get('title') if include_title else None,
     )
 
-def get_issue_event_body(payload: Dict[str, Any], action: str,
-                         include_title: bool=False) -> str:
+
+def get_issue_event_body(payload: Dict[str, Any], action: str, include_title: bool = False) -> str:
     return get_issue_event_message(
         get_issue_user_name(payload),
         action,
@@ -105,21 +109,27 @@ def get_issue_event_body(payload: Dict[str, Any], action: str,
         title=payload['object_attributes'].get('title') if include_title else None,
     )
 
-def get_merge_request_updated_event_body(payload: Dict[str, Any],
-                                         include_title: bool=False) -> str:
+
+def get_merge_request_updated_event_body(
+    payload: Dict[str, Any], include_title: bool = False
+) -> str:
     if payload['object_attributes'].get('oldrev'):
         return get_merge_request_event_body(
-            payload, "added commit(s) to",
+            payload,
+            "added commit(s) to",
             include_title=include_title,
         )
 
     return get_merge_request_open_or_updated_body(
-        payload, "updated",
+        payload,
+        "updated",
         include_title=include_title,
     )
 
-def get_merge_request_event_body(payload: Dict[str, Any], action: str,
-                                 include_title: bool=False) -> str:
+
+def get_merge_request_event_body(
+    payload: Dict[str, Any], action: str, include_title: bool = False
+) -> str:
     pull_request = payload['object_attributes']
     return get_pull_request_event_message(
         get_issue_user_name(payload),
@@ -130,8 +140,10 @@ def get_merge_request_event_body(payload: Dict[str, Any], action: str,
         title=payload['object_attributes'].get('title') if include_title else None,
     )
 
-def get_merge_request_open_or_updated_body(payload: Dict[str, Any], action: str,
-                                           include_title: bool=False) -> str:
+
+def get_merge_request_open_or_updated_body(
+    payload: Dict[str, Any], action: str, include_title: bool = False
+) -> str:
     pull_request = payload['object_attributes']
     return get_pull_request_event_message(
         get_issue_user_name(payload),
@@ -146,6 +158,7 @@ def get_merge_request_open_or_updated_body(payload: Dict[str, Any], action: str,
         title=payload['object_attributes'].get('title') if include_title else None,
     )
 
+
 def get_assignees(payload: Dict[str, Any]) -> List[Dict[str, str]]:
     assignee_details = payload.get('assignees')
     if assignee_details is None:
@@ -156,6 +169,7 @@ def get_assignees(payload: Dict[str, Any]) -> List[Dict[str, str]]:
             assignee_details = [single_assignee_details]
     return assignee_details
 
+
 def replace_assignees_username_with_name(assignees: List[Dict[str, str]]) -> List[Dict[str, str]]:
     """Replace the username of each assignee with their (full) name.
 
@@ -167,6 +181,7 @@ def replace_assignees_username_with_name(assignees: List[Dict[str, str]]) -> Lis
         assignee["username"] = assignee["name"]
     return assignees
 
+
 def get_commented_commit_event_body(payload: Dict[str, Any]) -> str:
     comment = payload['object_attributes']
     action = '[commented]({})'.format(comment['url'])
@@ -178,8 +193,10 @@ def get_commented_commit_event_body(payload: Dict[str, Any]) -> str:
         comment['note'],
     )
 
-def get_commented_merge_request_event_body(payload: Dict[str, Any],
-                                           include_title: bool=False) -> str:
+
+def get_commented_merge_request_event_body(
+    payload: Dict[str, Any], include_title: bool = False
+) -> str:
     comment = payload['object_attributes']
     action = '[commented]({}) on'.format(comment['url'])
     url = '{}/merge_requests/{}'.format(
@@ -197,8 +214,8 @@ def get_commented_merge_request_event_body(payload: Dict[str, Any],
         title=payload['merge_request'].get('title') if include_title else None,
     )
 
-def get_commented_issue_event_body(payload: Dict[str, Any],
-                                   include_title: bool=False) -> str:
+
+def get_commented_issue_event_body(payload: Dict[str, Any], include_title: bool = False) -> str:
     comment = payload['object_attributes']
     action = '[commented]({}) on'.format(comment['url'])
     url = '{}/issues/{}'.format(
@@ -216,8 +233,8 @@ def get_commented_issue_event_body(payload: Dict[str, Any],
         title=payload['issue'].get('title') if include_title else None,
     )
 
-def get_commented_snippet_event_body(payload: Dict[str, Any],
-                                     include_title: bool=False) -> str:
+
+def get_commented_snippet_event_body(payload: Dict[str, Any], include_title: bool = False) -> str:
     comment = payload['object_attributes']
     action = '[commented]({}) on'.format(comment['url'])
     url = '{}/snippets/{}'.format(
@@ -235,6 +252,7 @@ def get_commented_snippet_event_body(payload: Dict[str, Any],
         title=payload['snippet'].get('title') if include_title else None,
     )
 
+
 def get_wiki_page_event_body(payload: Dict[str, Any], action: str) -> str:
     return "{} {} [Wiki Page \"{}\"]({}).".format(
         get_issue_user_name(payload),
@@ -243,6 +261,7 @@ def get_wiki_page_event_body(payload: Dict[str, Any], action: str) -> str:
         payload['object_attributes'].get('url'),
     )
 
+
 def get_build_hook_event_body(payload: Dict[str, Any]) -> str:
     build_status = payload.get('build_status')
     if build_status == 'created':
@@ -257,9 +276,11 @@ def get_build_hook_event_body(payload: Dict[str, Any]) -> str:
         action,
     )
 
+
 def get_test_event_body(payload: Dict[str, Any]) -> str:
     return f"Webhook for **{get_repo_name(payload)}** has been configured successfully! :tada:"
 
+
 def get_pipeline_event_body(payload: Dict[str, Any]) -> str:
     pipeline_status = payload['object_attributes'].get('status')
     if pipeline_status == 'pending':
@@ -301,6 +322,7 @@ def get_pipeline_event_body(payload: Dict[str, Any]) -> str:
         builds_status[:-1],
     )
 
+
 def get_repo_name(payload: Dict[str, Any]) -> str:
     if 'project' in payload:
         return payload['project']['name']
@@ -310,26 +332,33 @@ def get_repo_name(payload: Dict[str, Any]) -> str:
     # section.
     return payload['repository']['name']
 
+
 def get_user_name(payload: Dict[str, Any]) -> str:
     return payload['user_name']
 
+
 def get_issue_user_name(payload: Dict[str, Any]) -> str:
     return payload['user']['name']
 
+
 def get_project_homepage(payload: Dict[str, Any]) -> str:
     if 'project' in payload:
         return payload['project']['web_url']
     return payload['repository']['homepage']
 
+
 def get_branch_name(payload: Dict[str, Any]) -> str:
     return payload['ref'].replace('refs/heads/', '')
 
+
 def get_tag_name(payload: Dict[str, Any]) -> str:
     return payload['ref'].replace('refs/tags/', '')
 
+
 def get_object_url(payload: Dict[str, Any]) -> str:
     return payload['object_attributes']['url']
 
+
 EVENT_FUNCTION_MAPPER = {
     'Push Hook': get_push_event_body,
     'Tag Push Hook': get_tag_push_event_body,
@@ -361,13 +390,17 @@ EVENT_FUNCTION_MAPPER = {
     'Pipeline Hook': get_pipeline_event_body,
 }
 
+
 @webhook_view("GitLab")
 @has_request_variables
-def api_gitlab_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body'),
-                       branches: Optional[str]=REQ(default=None),
-                       use_merge_request_title: bool=REQ(default=True, validator=check_bool),
-                       user_specified_topic: Optional[str]=REQ("topic", default=None)) -> HttpResponse:
+def api_gitlab_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    branches: Optional[str] = REQ(default=None),
+    use_merge_request_title: bool = REQ(default=True, validator=check_bool),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+) -> HttpResponse:
     event = get_event(request, payload, branches)
     if event is not None:
         event_body_function = get_body_based_on_event(event)
@@ -388,10 +421,14 @@ def api_gitlab_webhook(request: HttpRequest, user_profile: UserProfile,
         check_send_webhook_message(request, user_profile, topic, body)
     return json_success()
 
+
 def get_body_based_on_event(event: str) -> Any:
     return EVENT_FUNCTION_MAPPER[event]
 
-def get_subject_based_on_event(event: str, payload: Dict[str, Any], use_merge_request_title: bool) -> str:
+
+def get_subject_based_on_event(
+    event: str, payload: Dict[str, Any], use_merge_request_title: bool
+) -> str:
     if event == 'Push Hook':
         return f"{get_repo_name(payload)} / {get_branch_name(payload)}"
     elif event == 'Job Hook' or event == 'Build Hook':
@@ -399,7 +436,8 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any], use_merge_re
     elif event == 'Pipeline Hook':
         return "{} / {}".format(
             get_repo_name(payload),
-            payload['object_attributes'].get('ref').replace('refs/heads/', ''))
+            payload['object_attributes'].get('ref').replace('refs/heads/', ''),
+        )
     elif event.startswith('Merge Request Hook'):
         return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
             repo=get_repo_name(payload),
@@ -438,7 +476,10 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any], use_merge_re
         )
     return get_repo_name(payload)
 
-def get_event(request: HttpRequest, payload: Dict[str, Any], branches: Optional[str]) -> Optional[str]:
+
+def get_event(
+    request: HttpRequest, payload: Dict[str, Any], branches: Optional[str]
+) -> Optional[str]:
     event = validate_extract_webhook_http_header(request, 'X_GITLAB_EVENT', 'GitLab')
     if event == "System Hook":
         # Convert the event name to a GitLab event title
diff --git a/zerver/webhooks/gocd/tests.py b/zerver/webhooks/gocd/tests.py
index 996ebe34b8..49bd419754 100644
--- a/zerver/webhooks/gocd/tests.py
+++ b/zerver/webhooks/gocd/tests.py
@@ -8,11 +8,13 @@ class GocdHookTests(WebhookTestCase):
     TOPIC = 'https://github.com/gocd/gocd'
 
     def test_gocd_message(self) -> None:
-        expected_message = ("Author: Balaji B <balaji@example.com>\n"
-                            "Build status: Passed :thumbs_up:\n"
-                            "Details: [build log](https://ci.example.com"
-                            "/go/tab/pipeline/history/pipelineName)\n"
-                            "Comment: my hola mundo changes")
+        expected_message = (
+            "Author: Balaji B <balaji@example.com>\n"
+            "Build status: Passed :thumbs_up:\n"
+            "Details: [build log](https://ci.example.com"
+            "/go/tab/pipeline/history/pipelineName)\n"
+            "Comment: my hola mundo changes"
+        )
 
         self.check_webhook(
             "pipeline",
@@ -22,11 +24,13 @@ class GocdHookTests(WebhookTestCase):
         )
 
     def test_failed_message(self) -> None:
-        expected_message = ("Author: User Name <username123@example.com>\n"
-                            "Build status: Failed :thumbs_down:\n"
-                            "Details: [build log](https://ci.example.com"
-                            "/go/tab/pipeline/history/pipelineName)\n"
-                            "Comment: my hola mundo changes")
+        expected_message = (
+            "Author: User Name <username123@example.com>\n"
+            "Build status: Failed :thumbs_down:\n"
+            "Details: [build log](https://ci.example.com"
+            "/go/tab/pipeline/history/pipelineName)\n"
+            "Comment: my hola mundo changes"
+        )
 
         self.check_webhook(
             "pipeline_failed",
diff --git a/zerver/webhooks/gocd/view.py b/zerver/webhooks/gocd/view.py
index 274c0e3dbf..87162e0316 100644
--- a/zerver/webhooks/gocd/view.py
+++ b/zerver/webhooks/gocd/view.py
@@ -17,11 +17,14 @@ Build status: {} {}
 Details: [build log]({})
 Comment: {}"""
 
+
 @webhook_view('Gocd')
 @has_request_variables
-def api_gocd_webhook(request: HttpRequest, user_profile: UserProfile,
-                     payload: Dict[str, Any]=REQ(argument_type='body'),
-                     ) -> HttpResponse:
+def api_gocd_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     modifications = payload['build_cause']['material_revisions'][0]['modifications'][0]
     result = payload['stages'][0]['result']
diff --git a/zerver/webhooks/gogs/tests.py b/zerver/webhooks/gogs/tests.py
index c8f867e60f..ac56f8790d 100644
--- a/zerver/webhooks/gogs/tests.py
+++ b/zerver/webhooks/gogs/tests.py
@@ -52,7 +52,9 @@ class GogsHookTests(WebhookTestCase):
 
     def test_new_branch(self) -> None:
         expected_topic = "try-git / my_feature"
-        expected_message = "john created [my_feature](http://localhost:3000/john/try-git/src/my_feature) branch."
+        expected_message = (
+            "john created [my_feature](http://localhost:3000/john/try-git/src/my_feature) branch."
+        )
         self.check_webhook("create__branch", expected_topic, expected_message)
 
     def test_pull_request_opened(self) -> None:
@@ -137,30 +139,37 @@ class GogsHookTests(WebhookTestCase):
         self.check_webhook("release__published", expected_topic, expected_message)
 
     @patch('zerver.webhooks.gogs.view.check_send_webhook_message')
-    def test_push_filtered_by_branches_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_push_filtered_by_branches_ignore(
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_body('push')
-        result = self.client_post(self.url, payload, HTTP_X_GOGS_EVENT='push',
-                                  content_type="application/json")
+        result = self.client_post(
+            self.url, payload, HTTP_X_GOGS_EVENT='push', content_type="application/json"
+        )
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
 
     @patch('zerver.webhooks.gogs.view.check_send_webhook_message')
     def test_push_commits_more_than_limits_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_body('push__commits_more_than_limits')
-        result = self.client_post(self.url, payload, HTTP_X_GOGS_EVENT='push',
-                                  content_type="application/json")
+        result = self.client_post(
+            self.url, payload, HTTP_X_GOGS_EVENT='push', content_type="application/json"
+        )
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
 
     @patch('zerver.webhooks.gogs.view.check_send_webhook_message')
     def test_push_multiple_committers_filtered_by_branches_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url(branches='changes,development')
         payload = self.get_body('push__commits_multiple_committers')
-        result = self.client_post(self.url, payload, HTTP_X_GOGS_EVENT='push',
-                                  content_type="application/json")
+        result = self.client_post(
+            self.url, payload, HTTP_X_GOGS_EVENT='push', content_type="application/json"
+        )
         self.assertFalse(check_send_webhook_message_mock.called)
         self.assert_json_success(result)
diff --git a/zerver/webhooks/gogs/view.py b/zerver/webhooks/gogs/view.py
index e8854cfd5a..defd33f2ce 100644
--- a/zerver/webhooks/gogs/view.py
+++ b/zerver/webhooks/gogs/view.py
@@ -26,15 +26,16 @@ from zerver.models import UserProfile
 
 fixture_to_headers = get_http_headers_from_filename("HTTP_X_GOGS_EVENT")
 
+
 def get_issue_url(repo_url: str, issue_nr: int) -> str:
     return f"{repo_url}/issues/{issue_nr}"
 
+
 def format_push_event(payload: Dict[str, Any]) -> str:
 
     for commit in payload['commits']:
         commit['sha'] = commit['id']
-        commit['name'] = (commit['author']['username'] or
-                          commit['author']['name'].split()[0])
+        commit['name'] = commit['author']['username'] or commit['author']['name'].split()[0]
 
     data = {
         'user_name': payload['sender']['username'],
@@ -45,6 +46,7 @@ def format_push_event(payload: Dict[str, Any]) -> str:
 
     return get_push_commits_event_message(**data)
 
+
 def format_new_branch_event(payload: Dict[str, Any]) -> str:
 
     branch_name = payload['ref']
@@ -57,8 +59,8 @@ def format_new_branch_event(payload: Dict[str, Any]) -> str:
     }
     return get_create_branch_event_message(**data)
 
-def format_pull_request_event(payload: Dict[str, Any],
-                              include_title: bool=False) -> str:
+
+def format_pull_request_event(payload: Dict[str, Any], include_title: bool = False) -> str:
 
     data = {
         'user_name': payload['pull_request']['user']['username'],
@@ -76,7 +78,8 @@ def format_pull_request_event(payload: Dict[str, Any],
 
     return get_pull_request_event_message(**data)
 
-def format_issues_event(payload: Dict[str, Any], include_title: bool=False) -> str:
+
+def format_issues_event(payload: Dict[str, Any], include_title: bool = False) -> str:
     issue_nr = payload['issue']['number']
     assignee = payload['issue']['assignee']
     return get_issue_event_message(
@@ -89,7 +92,8 @@ def format_issues_event(payload: Dict[str, Any], include_title: bool=False) -> s
         title=payload['issue']['title'] if include_title else None,
     )
 
-def format_issue_comment_event(payload: Dict[str, Any], include_title: bool=False) -> str:
+
+def format_issue_comment_event(payload: Dict[str, Any], include_title: bool = False) -> str:
     action = payload['action']
     comment = payload['comment']
     issue = payload['issue']
@@ -109,7 +113,8 @@ def format_issue_comment_event(payload: Dict[str, Any], include_title: bool=Fals
         title=issue['title'] if include_title else None,
     )
 
-def format_release_event(payload: Dict[str, Any], include_title: bool=False) -> str:
+
+def format_release_event(payload: Dict[str, Any], include_title: bool = False) -> str:
     data = {
         'user_name': payload['release']['author']['username'],
         'action': payload['action'],
@@ -120,21 +125,38 @@ def format_release_event(payload: Dict[str, Any], include_title: bool=False) ->
 
     return get_release_event_message(**data)
 
+
 @webhook_view('Gogs')
 @has_request_variables
-def api_gogs_webhook(request: HttpRequest, user_profile: UserProfile,
-                     payload: Dict[str, Any]=REQ(argument_type='body'),
-                     branches: Optional[str]=REQ(default=None),
-                     user_specified_topic: Optional[str]=REQ("topic", default=None)) -> HttpResponse:
-    return gogs_webhook_main("Gogs", "X_GOGS_EVENT", format_pull_request_event,
-                             request, user_profile, payload, branches, user_specified_topic)
+def api_gogs_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    branches: Optional[str] = REQ(default=None),
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+) -> HttpResponse:
+    return gogs_webhook_main(
+        "Gogs",
+        "X_GOGS_EVENT",
+        format_pull_request_event,
+        request,
+        user_profile,
+        payload,
+        branches,
+        user_specified_topic,
+    )
 
-def gogs_webhook_main(integration_name: str, http_header_name: str,
-                      format_pull_request_event: Callable[..., Any],
-                      request: HttpRequest, user_profile: UserProfile,
-                      payload: Dict[str, Any],
-                      branches: Optional[str],
-                      user_specified_topic: Optional[str]) -> HttpResponse:
+
+def gogs_webhook_main(
+    integration_name: str,
+    http_header_name: str,
+    format_pull_request_event: Callable[..., Any],
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any],
+    branches: Optional[str],
+    user_specified_topic: Optional[str],
+) -> HttpResponse:
     repo = payload['repository']['name']
     event = validate_extract_webhook_http_header(request, http_header_name, integration_name)
     if event == 'push':
diff --git a/zerver/webhooks/gosquared/tests.py b/zerver/webhooks/gosquared/tests.py
index 0f3619f465..7b4231df5d 100644
--- a/zerver/webhooks/gosquared/tests.py
+++ b/zerver/webhooks/gosquared/tests.py
@@ -10,7 +10,9 @@ class GoSquaredHookTests(WebhookTestCase):
     # Note: Include a test function per each distinct message condition your integration supports
     def test_traffic_message(self) -> None:
         expected_topic = "GoSquared - requestb.in"
-        expected_message = "[requestb.in](https://www.gosquared.com/now/GSN-595854-T) has 33 visitors online."
+        expected_message = (
+            "[requestb.in](https://www.gosquared.com/now/GSN-595854-T) has 33 visitors online."
+        )
 
         self.check_webhook(
             "traffic_spike",
diff --git a/zerver/webhooks/gosquared/view.py b/zerver/webhooks/gosquared/view.py
index eddf6cc006..7c9aaecc08 100644
--- a/zerver/webhooks/gosquared/view.py
+++ b/zerver/webhooks/gosquared/view.py
@@ -21,29 +21,30 @@ The {status} **{name}** messaged:
 
 @webhook_view('GoSquared')
 @has_request_variables
-def api_gosquared_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Dict[str, Any]]=REQ(argument_type='body')) -> HttpResponse:
+def api_gosquared_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Dict[str, Any]] = REQ(argument_type='body'),
+) -> HttpResponse:
     body = ""
     topic = ""
 
     # Unfortunately, there is no other way to infer the event type
     # than just inferring it from the payload's attributes
     # Traffic spike/dip event
-    if (payload.get('concurrents') is not None and
-            payload.get('siteDetails') is not None):
+    if payload.get('concurrents') is not None and payload.get('siteDetails') is not None:
         domain_name = payload['siteDetails']['domain']
         user_num = payload['concurrents']
         user_acc = payload['siteDetails']['acct']
         acc_url = 'https://www.gosquared.com/now/' + user_acc
-        body = TRAFFIC_SPIKE_TEMPLATE.format(website_name=domain_name,
-                                             website_url=acc_url,
-                                             user_num=user_num)
+        body = TRAFFIC_SPIKE_TEMPLATE.format(
+            website_name=domain_name, website_url=acc_url, user_num=user_num
+        )
         topic = f'GoSquared - {domain_name}'
         check_send_webhook_message(request, user_profile, topic, body)
 
     # Live chat message event
-    elif (payload.get('message') is not None and
-          payload.get('person') is not None):
+    elif payload.get('message') is not None and payload.get('person') is not None:
         # Only support non-private messages
         if not payload['message']['private']:
             session_title = payload['message']['session']['title']
diff --git a/zerver/webhooks/grafana/view.py b/zerver/webhooks/grafana/view.py
index 08e1d88d0d..b6ddb21be7 100644
--- a/zerver/webhooks/grafana/view.py
+++ b/zerver/webhooks/grafana/view.py
@@ -12,11 +12,13 @@ GRAFANA_TOPIC_TEMPLATE = '{alert_title}'
 
 GRAFANA_MESSAGE_TEMPLATE = '[{rule_name}]({rule_url})\n\n{alert_message}{eval_matches}'
 
+
 @webhook_view('Grafana')
 @has_request_variables
 def api_grafana_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Any]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
 ) -> HttpResponse:
 
     topic = GRAFANA_TOPIC_TEMPLATE.format(alert_title=payload['title'])
@@ -31,13 +33,17 @@ def api_grafana_webhook(
     if payload.get('message') is not None:
         message_text = payload['message'] + "\n\n"
 
-    body = GRAFANA_MESSAGE_TEMPLATE.format(alert_message=message_text,
-                                           rule_name=payload['ruleName'],
-                                           rule_url=payload['ruleUrl'],
-                                           eval_matches=eval_matches_text)
+    body = GRAFANA_MESSAGE_TEMPLATE.format(
+        alert_message=message_text,
+        rule_name=payload['ruleName'],
+        rule_url=payload['ruleUrl'],
+        eval_matches=eval_matches_text,
+    )
 
     if payload.get('imageUrl') is not None:
-        body += "\n[Click to view visualization]({visualization})".format(visualization=payload['imageUrl'])
+        body += "\n[Click to view visualization]({visualization})".format(
+            visualization=payload['imageUrl']
+        )
 
     body = body.strip()
 
diff --git a/zerver/webhooks/greenhouse/tests.py b/zerver/webhooks/greenhouse/tests.py
index 485945b6e4..919ba112ef 100644
--- a/zerver/webhooks/greenhouse/tests.py
+++ b/zerver/webhooks/greenhouse/tests.py
@@ -65,8 +65,7 @@ New Prospect Application Trisha Troy (ID: 968190), applying for:
         )
 
     @patch('zerver.webhooks.greenhouse.view.check_send_webhook_message')
-    def test_ping_message_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_ping_message_ignore(self, check_send_webhook_message_mock: MagicMock) -> None:
         self.url = self.build_webhook_url()
         payload = self.get_body('ping_event')
         result = self.client_post(self.url, payload, content_type=self.CONTENT_TYPE)
diff --git a/zerver/webhooks/greenhouse/view.py b/zerver/webhooks/greenhouse/view.py
index f65f9cbc52..ca74483d16 100644
--- a/zerver/webhooks/greenhouse/view.py
+++ b/zerver/webhooks/greenhouse/view.py
@@ -15,6 +15,7 @@ MESSAGE_TEMPLATE = """
 * **Attachments**: {attachments}
 """.strip()
 
+
 def dict_list_to_string(some_list: List[Any]) -> str:
     internal_template = ''
     for item in some_list:
@@ -29,10 +30,14 @@ def dict_list_to_string(some_list: List[Any]) -> str:
     internal_template = internal_template[:-2]
     return internal_template
 
+
 @webhook_view('Greenhouse')
 @has_request_variables
-def api_greenhouse_webhook(request: HttpRequest, user_profile: UserProfile,
-                           payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_greenhouse_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     if payload['action'] == 'ping':
         return json_success()
 
diff --git a/zerver/webhooks/groove/tests.py b/zerver/webhooks/groove/tests.py
index 957bb87169..bae9cf4228 100644
--- a/zerver/webhooks/groove/tests.py
+++ b/zerver/webhooks/groove/tests.py
@@ -65,9 +65,12 @@ The content of the body goes here.
     # is assigned to no one.
     def test_groove_ticket_assigned_no_one(self) -> None:
         self.subscribe(self.test_user, self.STREAM_NAME)
-        result = self.client_post(self.url, self.get_body('ticket_assigned__no_one'),
-                                  content_type="application/x-www-form-urlencoded",
-                                  HTTP_X_GROOVE_EVENT='ticket_assigned')
+        result = self.client_post(
+            self.url,
+            self.get_body('ticket_assigned__no_one'),
+            content_type="application/x-www-form-urlencoded",
+            HTTP_X_GROOVE_EVENT='ticket_assigned',
+        )
         self.assert_json_success(result)
 
     # This simulates the notification when an agent replied to a ticket.
diff --git a/zerver/webhooks/groove/view.py b/zerver/webhooks/groove/view.py
index 47ffe1534a..e9e7f8aa55 100644
--- a/zerver/webhooks/groove/view.py
+++ b/zerver/webhooks/groove/view.py
@@ -33,9 +33,11 @@ AGENT_REPLIED_TEMPLATE = """
 ```
 """.strip()
 
+
 def ticket_started_body(payload: Dict[str, Any]) -> str:
     return TICKET_STARTED_TEMPLATE.format(**payload)
 
+
 def ticket_assigned_body(payload: Dict[str, Any]) -> Optional[str]:
     state = payload['state']
     kwargs = {
@@ -60,6 +62,7 @@ def ticket_assigned_body(payload: Dict[str, Any]) -> Optional[str]:
     else:
         return None
 
+
 def replied_body(payload: Dict[str, Any], actor: str, action: str) -> str:
     actor_url = "http://api.groovehq.com/v1/{}/".format(actor + 's')
     actor = payload['links']['author']['href'].split(actor_url)[1]
@@ -75,6 +78,7 @@ def replied_body(payload: Dict[str, Any], actor: str, action: str) -> str:
 
     return body
 
+
 def get_event_handler(event: str) -> Callable[..., str]:
     # The main reason for this function existence is because of mypy
     handler: Any = EVENTS_FUNCTION_MAPPER.get(event)
@@ -82,10 +86,14 @@ def get_event_handler(event: str) -> Callable[..., str]:
         raise UnsupportedWebhookEventType(event)
     return handler
 
+
 @webhook_view('Groove')
 @has_request_variables
-def api_groove_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_groove_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     event = validate_extract_webhook_http_header(request, 'X_GROOVE_EVENT', 'Groove')
     assert event is not None
     handler = get_event_handler(event)
@@ -98,6 +106,7 @@ def api_groove_webhook(request: HttpRequest, user_profile: UserProfile,
 
     return json_success()
 
+
 EVENTS_FUNCTION_MAPPER = {
     'ticket_started': ticket_started_body,
     'ticket_assigned': ticket_assigned_body,
diff --git a/zerver/webhooks/harbor/tests.py b/zerver/webhooks/harbor/tests.py
index 4667f717a6..201c26248d 100644
--- a/zerver/webhooks/harbor/tests.py
+++ b/zerver/webhooks/harbor/tests.py
@@ -14,8 +14,7 @@ class HarborHookTests(WebhookTestCase):
         self.check_webhook("push_image", expected_topic, expected_message)
 
     @patch('zerver.lib.webhooks.common.check_send_webhook_message')
-    def test_delete_image_ignored(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+    def test_delete_image_ignored(self, check_send_webhook_message_mock: MagicMock) -> None:
         self.url = self.build_webhook_url()
         payload = self.get_body('delete_image')
         result = self.client_post(self.url, payload, content_type="application/json")
diff --git a/zerver/webhooks/harbor/view.py b/zerver/webhooks/harbor/view.py
index 5d1389594f..da9f85eada 100644
--- a/zerver/webhooks/harbor/view.py
+++ b/zerver/webhooks/harbor/view.py
@@ -27,18 +27,18 @@ def guess_zulip_user_from_harbor(harbor_username: str, realm: Realm) -> Optional
         # We search a user's full name, short name,
         # and beginning of email address
         user = UserProfile.objects.filter(
-            Q(full_name__iexact=harbor_username) |
-            Q(email__istartswith=harbor_username),
+            Q(full_name__iexact=harbor_username) | Q(email__istartswith=harbor_username),
             is_active=True,
-            realm=realm).order_by("id")[0]
+            realm=realm,
+        ).order_by("id")[0]
         return user  # nocoverage
     except IndexError:
         return None
 
 
-def handle_push_image_event(payload: Dict[str, Any],
-                            user_profile: UserProfile,
-                            operator_username: str) -> str:
+def handle_push_image_event(
+    payload: Dict[str, Any], user_profile: UserProfile, operator_username: str
+) -> str:
     image_name = payload["event_data"]["repository"]["repo_full_name"]
     image_tag = payload["event_data"]["resources"][0]["tag"]
 
@@ -60,16 +60,16 @@ Image scan completed for `{image_name}:{image_tag}`. Vulnerabilities by severity
 """.strip()
 
 
-def handle_scanning_completed_event(payload: Dict[str, Any],
-                                    user_profile: UserProfile,
-                                    operator_username: str) -> str:
+def handle_scanning_completed_event(
+    payload: Dict[str, Any], user_profile: UserProfile, operator_username: str
+) -> str:
     scan_results = ""
     scan_summaries = payload["event_data"]["resources"][0]["scan_overview"]["components"]["summary"]
-    summaries_sorted = sorted(
-        scan_summaries, key=lambda x: x["severity"], reverse=True)
+    summaries_sorted = sorted(scan_summaries, key=lambda x: x["severity"], reverse=True)
     for scan_summary in summaries_sorted:
         scan_results += "* {}: **{}**\n".format(
-            VULNERABILITY_SEVERITY_NAME_MAP[scan_summary["severity"]], scan_summary["count"])
+            VULNERABILITY_SEVERITY_NAME_MAP[scan_summary["severity"]], scan_summary["count"]
+        )
 
     return SCANNING_COMPLETED_TEMPLATE.format(
         image_name=payload["event_data"]["repository"]["repo_full_name"],
@@ -86,14 +86,16 @@ EVENT_FUNCTION_MAPPER = {
 
 @webhook_view("Harbor")
 @has_request_variables
-def api_harbor_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any] = REQ(argument_type='body')) -> HttpResponse:
+def api_harbor_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     operator_username = "**{}**".format(payload["operator"])
 
     if operator_username != "auto":
-        operator_profile = guess_zulip_user_from_harbor(
-            operator_username, user_profile.realm)
+        operator_profile = guess_zulip_user_from_harbor(operator_username, user_profile.realm)
 
     if operator_profile:
         operator_username = f"@**{operator_profile.full_name}**"  # nocoverage
@@ -111,7 +113,5 @@ def api_harbor_webhook(request: HttpRequest, user_profile: UserProfile,
 
     content: str = content_func(payload, user_profile, operator_username)
 
-    check_send_webhook_message(request, user_profile,
-                               topic, content,
-                               unquote_url_parameters=True)
+    check_send_webhook_message(request, user_profile, topic, content, unquote_url_parameters=True)
     return json_success()
diff --git a/zerver/webhooks/hellosign/tests.py b/zerver/webhooks/hellosign/tests.py
index 5cbc3eb30b..083e866e60 100644
--- a/zerver/webhooks/hellosign/tests.py
+++ b/zerver/webhooks/hellosign/tests.py
@@ -10,13 +10,15 @@ class HelloSignHookTests(WebhookTestCase):
 
     def test_signatures_message(self) -> None:
         expected_topic = "NDA with Acme Co."
-        expected_message = ("The `NDA with Acme Co.` document is awaiting the signature of "
-                            "Jack, and was just signed by Jill.")
+        expected_message = (
+            "The `NDA with Acme Co.` document is awaiting the signature of "
+            "Jack, and was just signed by Jill."
+        )
         self.check_webhook("signatures", expected_topic, expected_message, content_type=None)
 
     def test_signatures_message_signed_by_one(self) -> None:
         expected_topic = "NDA with Acme Co."
-        expected_message = ("The `NDA with Acme Co.` document was just signed by Jill.")
+        expected_message = "The `NDA with Acme Co.` document was just signed by Jill."
         self.check_webhook(
             "signatures_signed_by_one_signatory",
             expected_topic,
@@ -26,8 +28,10 @@ class HelloSignHookTests(WebhookTestCase):
 
     def test_signatures_message_with_four_signatories(self) -> None:
         expected_topic = "Signature doc"
-        expected_message = ("The `Signature doc` document is awaiting the signature of "
-                            "Eeshan Garg, John Smith, Jane Doe, and Stephen Strange.")
+        expected_message = (
+            "The `Signature doc` document is awaiting the signature of "
+            "Eeshan Garg, John Smith, Jane Doe, and Stephen Strange."
+        )
         self.check_webhook(
             "signatures_with_four_signatories", expected_topic, expected_message, content_type=None
         )
@@ -35,8 +39,10 @@ class HelloSignHookTests(WebhookTestCase):
     def test_signatures_message_with_own_subject(self) -> None:
         expected_topic = "Our own subject."
         self.url = self.build_webhook_url(topic=expected_topic)
-        expected_message = ("The `NDA with Acme Co.` document is awaiting the signature of "
-                            "Jack, and was just signed by Jill.")
+        expected_message = (
+            "The `NDA with Acme Co.` document is awaiting the signature of "
+            "Jack, and was just signed by Jill."
+        )
         self.check_webhook(
             "signatures_with_own_subject",
             expected_topic,
diff --git a/zerver/webhooks/hellosign/view.py b/zerver/webhooks/hellosign/view.py
index 94b510d26e..967d350bc7 100644
--- a/zerver/webhooks/hellosign/view.py
+++ b/zerver/webhooks/hellosign/view.py
@@ -13,6 +13,7 @@ IS_AWAITING_SIGNATURE = "is awaiting the signature of {awaiting_recipients}"
 WAS_JUST_SIGNED_BY = "was just signed by {signed_recipients}"
 BODY = "The `{contract_title}` document {actions}."
 
+
 def get_message_body(payload: Dict[str, Dict[str, Any]]) -> str:
     contract_title = payload['signature_request']['title']
     recipients: Dict[str, List[str]] = {}
@@ -38,8 +39,8 @@ def get_message_body(payload: Dict[str, Dict[str, Any]]) -> str:
         else:
             recipients_text = text
 
-    return BODY.format(contract_title=contract_title,
-                       actions=recipients_text).strip()
+    return BODY.format(contract_title=contract_title, actions=recipients_text).strip()
+
 
 def get_recipients_text(recipients: List[str]) -> str:
     recipients_text = ""
@@ -52,11 +53,14 @@ def get_recipients_text(recipients: List[str]) -> str:
 
     return recipients_text
 
+
 @webhook_view('HelloSign')
 @has_request_variables
-def api_hellosign_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Dict[str, Any]]=REQ(
-                              whence='json', converter=orjson.loads)) -> HttpResponse:
+def api_hellosign_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Dict[str, Any]] = REQ(whence='json', converter=orjson.loads),
+) -> HttpResponse:
     if "signature_request" in payload:
         body = get_message_body(payload)
         topic = payload['signature_request']['title']
diff --git a/zerver/webhooks/helloworld/tests.py b/zerver/webhooks/helloworld/tests.py
index 283f619df4..9a7997f0e8 100644
--- a/zerver/webhooks/helloworld/tests.py
+++ b/zerver/webhooks/helloworld/tests.py
@@ -41,8 +41,11 @@ class HelloWorldHookTests(WebhookTestCase):
         self.url = self.build_webhook_url()
         expected_message = "Hello! I am happy to be here! :smile:\nThe Wikipedia featured article for today is **[Goodbye](https://en.wikipedia.org/wiki/Goodbye)**"
 
-        self.send_and_test_private_message('goodbye', expected_message=expected_message,
-                                           content_type="application/x-www-form-urlencoded")
+        self.send_and_test_private_message(
+            'goodbye',
+            expected_message=expected_message,
+            content_type="application/x-www-form-urlencoded",
+        )
 
     def test_stream_error_pm_to_bot_owner(self) -> None:
         # Note that this is really just a test for check_send_webhook_message
@@ -50,9 +53,12 @@ class HelloWorldHookTests(WebhookTestCase):
         self.url = self.build_webhook_url()
         notification_bot = get_system_bot(settings.NOTIFICATION_BOT)
         expected_message = "Your bot `webhook-bot@zulip.com` tried to send a message to stream #**nonexistent**, but that stream does not exist. Click [here](#streams/new) to create it."
-        self.send_and_test_private_message('goodbye', expected_message=expected_message,
-                                           content_type='application/x-www-form-urlencoded',
-                                           sender=notification_bot)
+        self.send_and_test_private_message(
+            'goodbye',
+            expected_message=expected_message,
+            content_type='application/x-www-form-urlencoded',
+            sender=notification_bot,
+        )
 
     def test_custom_topic(self) -> None:
         # Note that this is really just a test for check_send_webhook_message
diff --git a/zerver/webhooks/helloworld/view.py b/zerver/webhooks/helloworld/view.py
index cb13c27aaf..7aa4fde06e 100644
--- a/zerver/webhooks/helloworld/view.py
+++ b/zerver/webhooks/helloworld/view.py
@@ -13,15 +13,18 @@ from zerver.models import UserProfile
 @webhook_view('HelloWorld')
 @has_request_variables
 def api_helloworld_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Iterable[Dict[str, Any]]] = REQ(argument_type='body'),
 ) -> HttpResponse:
 
     # construct the body of the message
     body = 'Hello! I am happy to be here! :smile:'
 
     # try to add the Wikipedia article of the day
-    body_template = '\nThe Wikipedia featured article for today is **[{featured_title}]({featured_url})**'
+    body_template = (
+        '\nThe Wikipedia featured article for today is **[{featured_title}]({featured_url})**'
+    )
     body += body_template.format(**payload)
 
     topic = "Hello World"
diff --git a/zerver/webhooks/heroku/view.py b/zerver/webhooks/heroku/view.py
index 8ed422faf8..a1e45a9ffd 100644
--- a/zerver/webhooks/heroku/view.py
+++ b/zerver/webhooks/heroku/view.py
@@ -15,13 +15,19 @@ TEMPLATE = """
 ```
 """.strip()
 
+
 @webhook_view("Heroku", notify_bot_owner_on_invalid_json=False)
 @has_request_variables
-def api_heroku_webhook(request: HttpRequest, user_profile: UserProfile,
-                       head: str=REQ(), app: str=REQ(), user: str=REQ(),
-                       url: str=REQ(), git_log: str=REQ()) -> HttpResponse:
-    content = TEMPLATE.format(user=user, head=head, app=app,
-                              url=url, git_log=git_log)
+def api_heroku_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    head: str = REQ(),
+    app: str = REQ(),
+    user: str = REQ(),
+    url: str = REQ(),
+    git_log: str = REQ(),
+) -> HttpResponse:
+    content = TEMPLATE.format(user=user, head=head, app=app, url=url, git_log=git_log)
 
     check_send_webhook_message(request, user_profile, app, content)
     return json_success()
diff --git a/zerver/webhooks/homeassistant/view.py b/zerver/webhooks/homeassistant/view.py
index c4b6d66d25..08bec3d80b 100644
--- a/zerver/webhooks/homeassistant/view.py
+++ b/zerver/webhooks/homeassistant/view.py
@@ -11,8 +11,11 @@ from zerver.models import UserProfile
 
 @webhook_view('HomeAssistant')
 @has_request_variables
-def api_homeassistant_webhook(request: HttpRequest, user_profile: UserProfile,
-                              payload: Dict[str, str]=REQ(argument_type='body')) -> HttpResponse:
+def api_homeassistant_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, str] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     # construct the body of the message
     body = payload["message"]
diff --git a/zerver/webhooks/ifttt/view.py b/zerver/webhooks/ifttt/view.py
index 2d0c6e09de..34b65bc290 100644
--- a/zerver/webhooks/ifttt/view.py
+++ b/zerver/webhooks/ifttt/view.py
@@ -12,8 +12,11 @@ from zerver.models import UserProfile
 
 @webhook_view('IFTTT')
 @has_request_variables
-def api_iftt_app_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_iftt_app_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     topic = payload.get('topic')
     content = payload.get('content')
 
diff --git a/zerver/webhooks/insping/view.py b/zerver/webhooks/insping/view.py
index bc1a544142..4322ac0316 100644
--- a/zerver/webhooks/insping/view.py
+++ b/zerver/webhooks/insping/view.py
@@ -15,11 +15,13 @@ State changed to **{state}**:
 * **Timestamp**: {timestamp}
 """.strip()
 
+
 @webhook_view('Insping')
 @has_request_variables
 def api_insping_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Dict[str, Any]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Dict[str, Any]] = REQ(argument_type='body'),
 ) -> HttpResponse:
 
     data = payload['webhook_event_data']
@@ -29,12 +31,13 @@ def api_insping_webhook(
     response_time = data['response_time']
     timestamp = data['request_start_time']
 
-    time_formatted = time.strftime("%c", time.strptime(timestamp,
-                                                       "%Y-%m-%dT%H:%M:%S.%f+00:00"))
+    time_formatted = time.strftime("%c", time.strptime(timestamp, "%Y-%m-%dT%H:%M:%S.%f+00:00"))
 
     body = MESSAGE_TEMPLATE.format(
-        state=state_name, url=url_tested,
-        response_time=response_time, timestamp=time_formatted,
+        state=state_name,
+        url=url_tested,
+        response_time=response_time,
+        timestamp=time_formatted,
     )
 
     topic = 'insping'
diff --git a/zerver/webhooks/intercom/tests.py b/zerver/webhooks/intercom/tests.py
index 84d5b37f06..7a95943b94 100644
--- a/zerver/webhooks/intercom/tests.py
+++ b/zerver/webhooks/intercom/tests.py
@@ -24,14 +24,18 @@ New company **Kandra Labs** created:
 * **Monthly spending**: 0
 """.strip()
         self.check_webhook(
-            "company_created", expected_topic, expected_message,
+            "company_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_contact_added_email(self) -> None:
         expected_topic = "Contact: Azure Bus from St. John's"
         expected_message = "New email jerryguitarist@gmail.com added to contact."
         self.check_webhook(
-            "contact_added_email", expected_topic, expected_message,
+            "contact_added_email",
+            expected_topic,
+            expected_message,
         )
 
     def test_contact_created(self) -> None:
@@ -43,7 +47,9 @@ New contact created:
 * **Location**: St. John's, Newfoundland and Labrador, Canada
 """.strip()
         self.check_webhook(
-            "contact_created", expected_topic, expected_message,
+            "contact_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_contact_signed_up(self) -> None:
@@ -54,56 +60,72 @@ Contact signed up:
 * **Location**: St. John's, Newfoundland and Labrador, Canada
 """.strip()
         self.check_webhook(
-            "contact_signed_up", expected_topic, expected_message,
+            "contact_signed_up",
+            expected_topic,
+            expected_message,
         )
 
     def test_contact_tag_created(self) -> None:
         expected_topic = "Contact: Eeshan Garg"
         expected_message = "Contact tagged with the `developer` tag."
         self.check_webhook(
-            "contact_tag_created", expected_topic, expected_message,
+            "contact_tag_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_contact_tag_deleted(self) -> None:
         expected_topic = "Contact: Eeshan Garg"
         expected_message = "The tag `developer` was removed from the contact."
         self.check_webhook(
-            "contact_tag_deleted", expected_topic, expected_message,
+            "contact_tag_deleted",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_assigned(self) -> None:
         expected_topic = "Lead: Eeshan Garg"
         expected_message = "Tim Abbott assigned to conversation."
         self.check_webhook(
-            "conversation_admin_assigned", expected_topic, expected_message,
+            "conversation_admin_assigned",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_opened(self) -> None:
         expected_topic = "Lead: Cordelia Lear"
         expected_message = "Eeshan Garg opened the conversation."
         self.check_webhook(
-            "conversation_admin_opened", expected_topic, expected_message,
+            "conversation_admin_opened",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_closed(self) -> None:
         expected_topic = "Lead: Eeshan Garg"
         expected_message = "Cordelia Lear closed the conversation."
         self.check_webhook(
-            "conversation_admin_closed", expected_topic, expected_message,
+            "conversation_admin_closed",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_snoozed(self) -> None:
         expected_topic = "Lead: Eeshan Garg"
         expected_message = "Cordelia Lear snoozed the conversation."
         self.check_webhook(
-            "conversation_admin_snoozed", expected_topic, expected_message,
+            "conversation_admin_snoozed",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_unsnoozed(self) -> None:
         expected_topic = "Lead: Eeshan Garg"
         expected_message = "Cordelia Lear unsnoozed the conversation."
         self.check_webhook(
-            "conversation_admin_unsnoozed", expected_topic, expected_message,
+            "conversation_admin_unsnoozed",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_replied(self) -> None:
@@ -116,7 +138,9 @@ Hey Eeshan! How can I help?
 ```
 """.strip()
         self.check_webhook(
-            "conversation_admin_replied", expected_topic, expected_message,
+            "conversation_admin_replied",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_noted(self) -> None:
@@ -129,7 +153,9 @@ Talk to Tim about this user's query.
 ```
 """.strip()
         self.check_webhook(
-            "conversation_admin_noted", expected_topic, expected_message,
+            "conversation_admin_noted",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_admin_single_created(self) -> None:
@@ -142,7 +168,9 @@ Hi Eeshan, What's up
 ```
 """.strip()
         self.check_webhook(
-            "conversation_admin_single_created", expected_topic, expected_message,
+            "conversation_admin_single_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_user_created(self) -> None:
@@ -155,7 +183,9 @@ Hello everyone!
 ```
 """.strip()
         self.check_webhook(
-            "conversation_user_created", expected_topic, expected_message,
+            "conversation_user_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_conversation_user_replied(self) -> None:
@@ -168,14 +198,18 @@ Well, I need some help getting access to a developer account.
 ```
 """.strip()
         self.check_webhook(
-            "conversation_user_replied", expected_topic, expected_message,
+            "conversation_user_replied",
+            expected_topic,
+            expected_message,
         )
 
     def test_event_created(self) -> None:
         expected_topic = "Events"
         expected_message = "New event **invited-friend** created."
         self.check_webhook(
-            "event_created", expected_topic, expected_message,
+            "event_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_user_created(self) -> None:
@@ -187,12 +221,16 @@ New user created:
 """.strip()
 
         self.check_webhook(
-            "user_created", expected_topic, expected_message,
+            "user_created",
+            expected_topic,
+            expected_message,
         )
 
     def test_user_deleted(self) -> None:
         self.check_webhook(
-            "user_deleted", "User: jerryguitarist@gmail.com", "User deleted.",
+            "user_deleted",
+            "User: jerryguitarist@gmail.com",
+            "User deleted.",
         )
 
     def test_user_email_updated(self) -> None:
@@ -204,18 +242,26 @@ New user created:
 
     def test_user_tag_created(self) -> None:
         self.check_webhook(
-            "user_tag_created", "User: eeshangarg", "The tag `developer` was added to the user.",
+            "user_tag_created",
+            "User: eeshangarg",
+            "The tag `developer` was added to the user.",
         )
 
     def test_user_tag_deleted(self) -> None:
         expected_topic = 'User: eeshangarg'
-        expected_message = 'The tag `CSV Import - 2019-03-26 22:46:04 UTC` was removed from the user.'
+        expected_message = (
+            'The tag `CSV Import - 2019-03-26 22:46:04 UTC` was removed from the user.'
+        )
 
         self.check_webhook(
-            "user_tag_deleted", expected_topic, expected_message,
+            "user_tag_deleted",
+            expected_topic,
+            expected_message,
         )
 
     def test_user_unsubscribed(self) -> None:
         self.check_webhook(
-            "user_unsubscribed", "Contact: Eeshan Garg", "User unsubscribed from emails.",
+            "user_unsubscribed",
+            "Contact: Eeshan Garg",
+            "User unsubscribed from emails.",
         )
diff --git a/zerver/webhooks/intercom/view.py b/zerver/webhooks/intercom/view.py
index 045232449f..8af2e87878 100644
--- a/zerver/webhooks/intercom/view.py
+++ b/zerver/webhooks/intercom/view.py
@@ -64,6 +64,7 @@ New user created:
 * **Email**: {email}
 """.strip()
 
+
 class MLStripper(HTMLParser):
     def __init__(self) -> None:
         self.reset()
@@ -77,11 +78,13 @@ class MLStripper(HTMLParser):
     def get_data(self) -> str:
         return ''.join(self.fed)
 
+
 def strip_tags(html: str) -> str:
     s = MLStripper()
     s.feed(html)
     return s.get_data()
 
+
 def get_topic_for_contacts(user: Dict[str, Any]) -> str:
     topic = "{type}: {name}".format(
         type=user['type'].capitalize(),
@@ -90,16 +93,19 @@ def get_topic_for_contacts(user: Dict[str, Any]) -> str:
 
     return topic
 
+
 def get_company_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     body = COMPANY_CREATED.format(**payload['data']['item'])
     return ('Companies', body)
 
+
 def get_contact_added_email_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']
     body = CONTACT_EMAIL_ADDED.format(email=user['email'])
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_contact_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     contact = payload['data']['item']
     body = CONTACT_CREATED.format(
@@ -112,6 +118,7 @@ def get_contact_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     topic = get_topic_for_contacts(contact)
     return (topic, body)
 
+
 def get_contact_signed_up_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     contact = payload['data']['item']
     body = CONTACT_SIGNED_UP.format(
@@ -123,27 +130,31 @@ def get_contact_signed_up_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     topic = get_topic_for_contacts(contact)
     return (topic, body)
 
+
 def get_contact_tag_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     body = CONTACT_TAG_CREATED.format(**payload['data']['item']['tag'])
     contact = payload['data']['item']['contact']
     topic = get_topic_for_contacts(contact)
     return (topic, body)
 
+
 def get_contact_tag_deleted_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     body = CONTACT_TAG_DELETED.format(**payload['data']['item']['tag'])
     contact = payload['data']['item']['contact']
     topic = get_topic_for_contacts(contact)
     return (topic, body)
 
+
 def get_conversation_admin_assigned_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     body = CONVERSATION_ADMIN_ASSIGNED.format(**payload['data']['item']['assignee'])
     user = payload['data']['item']['user']
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_conversation_admin_message(
-        payload: Dict[str, Any],
-        action: str,
+    payload: Dict[str, Any],
+    action: str,
 ) -> Tuple[str, str]:
     assignee = payload['data']['item']['assignee']
     user = payload['data']['item']['user']
@@ -154,9 +165,10 @@ def get_conversation_admin_message(
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_conversation_admin_reply_message(
-        payload: Dict[str, Any],
-        action: str,
+    payload: Dict[str, Any],
+    action: str,
 ) -> Tuple[str, str]:
     assignee = payload['data']['item']['assignee']
     user = payload['data']['item']['user']
@@ -170,8 +182,8 @@ def get_conversation_admin_reply_message(
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
-def get_conversation_admin_single_created_message(
-        payload: Dict[str, Any]) -> Tuple[str, str]:
+
+def get_conversation_admin_single_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     assignee = payload['data']['item']['assignee']
     user = payload['data']['item']['user']
     conversation_body = payload['data']['item']['conversation_message']['body']
@@ -183,6 +195,7 @@ def get_conversation_admin_single_created_message(
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_conversation_user_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']['user']
     conversation_body = payload['data']['item']['conversation_message']['body']
@@ -194,6 +207,7 @@ def get_conversation_user_created_message(payload: Dict[str, Any]) -> Tuple[str,
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_conversation_user_replied_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']['user']
     note = payload['data']['item']['conversation_parts']['conversation_parts'][0]
@@ -206,31 +220,36 @@ def get_conversation_user_replied_message(payload: Dict[str, Any]) -> Tuple[str,
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_event_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     event = payload['data']['item']
     body = EVENT_CREATED.format(**event)
     return ('Events', body)
 
+
 def get_user_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']
     body = USER_CREATED.format(**user)
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_user_deleted_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']
     topic = get_topic_for_contacts(user)
     return (topic, 'User deleted.')
 
+
 def get_user_email_updated_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']
     body = 'User\'s email was updated to {}.'.format(user['email'])
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 def get_user_tagged_message(
-        payload: Dict[str, Any],
-        action: str,
+    payload: Dict[str, Any],
+    action: str,
 ) -> Tuple[str, str]:
     user = payload['data']['item']['user']
     tag = payload['data']['item']['tag']
@@ -241,12 +260,14 @@ def get_user_tagged_message(
     )
     return (topic, body)
 
+
 def get_user_unsubscribed_message(payload: Dict[str, Any]) -> Tuple[str, str]:
     user = payload['data']['item']
     body = 'User unsubscribed from emails.'
     topic = get_topic_for_contacts(user)
     return (topic, body)
 
+
 EVENT_TO_FUNCTION_MAPPER = {
     'company.created': get_company_created_message,
     'contact.added_email': get_contact_added_email_message,
@@ -259,8 +280,12 @@ EVENT_TO_FUNCTION_MAPPER = {
     'conversation.admin.opened': partial(get_conversation_admin_message, action='opened'),
     'conversation.admin.snoozed': partial(get_conversation_admin_message, action='snoozed'),
     'conversation.admin.unsnoozed': partial(get_conversation_admin_message, action='unsnoozed'),
-    'conversation.admin.replied': partial(get_conversation_admin_reply_message, action='replied to'),
-    'conversation.admin.noted': partial(get_conversation_admin_reply_message, action='added a note to'),
+    'conversation.admin.replied': partial(
+        get_conversation_admin_reply_message, action='replied to'
+    ),
+    'conversation.admin.noted': partial(
+        get_conversation_admin_reply_message, action='added a note to'
+    ),
     'conversation.admin.single.created': get_conversation_admin_single_created_message,
     'conversation.user.created': get_conversation_user_created_message,
     'conversation.user.replied': get_conversation_user_replied_message,
@@ -276,16 +301,21 @@ EVENT_TO_FUNCTION_MAPPER = {
     'visitor.signed_up': get_contact_signed_up_message,
 }
 
+
 def get_event_handler(event_type: str) -> Callable[..., Tuple[str, str]]:
     handler: Any = EVENT_TO_FUNCTION_MAPPER.get(event_type)
     if handler is None:
         raise UnsupportedWebhookEventType(event_type)
     return handler
 
+
 @webhook_view('Intercom')
 @has_request_variables
-def api_intercom_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_intercom_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     event_type = payload['topic']
     if event_type == 'ping':
         return json_success()
diff --git a/zerver/webhooks/jira/tests.py b/zerver/webhooks/jira/tests.py
index e4b984bcb3..fc97340a33 100644
--- a/zerver/webhooks/jira/tests.py
+++ b/zerver/webhooks/jira/tests.py
@@ -60,11 +60,7 @@ Leo Franchi created [BUG-15: New bug with hook](http://lfranchi.com:8080/browse/
             url = self.build_webhook_url()
             payload = dict(webhookEvent=action)
             with patch("zerver.webhooks.jira.view.check_send_webhook_message") as m:
-                result = self.client_post(
-                    url,
-                    payload,
-                    content_type="application/json"
-                )
+                result = self.client_post(url, payload, content_type="application/json")
             self.assertFalse(m.called)
             self.assert_json_success(result)
 
diff --git a/zerver/webhooks/jira/view.py b/zerver/webhooks/jira/view.py
index 81f6de892d..f529384a40 100644
--- a/zerver/webhooks/jira/view.py
+++ b/zerver/webhooks/jira/view.py
@@ -25,20 +25,22 @@ IGNORED_EVENTS = [
     "worklog_updated",
 ]
 
+
 def guess_zulip_user_from_jira(jira_username: str, realm: Realm) -> Optional[UserProfile]:
     try:
         # Try to find a matching user in Zulip
         # We search a user's full name, short name,
         # and beginning of email address
         user = UserProfile.objects.filter(
-            Q(full_name__iexact=jira_username) |
-            Q(email__istartswith=jira_username),
+            Q(full_name__iexact=jira_username) | Q(email__istartswith=jira_username),
             is_active=True,
-            realm=realm).order_by("id")[0]
+            realm=realm,
+        ).order_by("id")[0]
         return user
     except IndexError:
         return None
 
+
 def convert_jira_markup(content: str, realm: Realm) -> str:
     # Attempt to do some simplistic conversion of JIRA
     # formatting to Markdown, for consumption in Zulip
@@ -90,7 +92,8 @@ def convert_jira_markup(content: str, realm: Realm) -> str:
 
     return content
 
-def get_in(payload: Dict[str, Any], keys: List[str], default: str='') -> Any:
+
+def get_in(payload: Dict[str, Any], keys: List[str], default: str = '') -> Any:
     try:
         for key in keys:
             payload = payload[key]
@@ -98,7 +101,10 @@ def get_in(payload: Dict[str, Any], keys: List[str], default: str='') -> Any:
         return default
     return payload
 
-def get_issue_string(payload: Dict[str, Any], issue_id: Optional[str]=None, with_title: bool=False) -> str:
+
+def get_issue_string(
+    payload: Dict[str, Any], issue_id: Optional[str] = None, with_title: bool = False
+) -> str:
     # Guess the URL as it is not specified in the payload
     # We assume that there is a /browse/BUG-### page
     # from the REST URL of the issue itself
@@ -116,6 +122,7 @@ def get_issue_string(payload: Dict[str, Any], issue_id: Optional[str]=None, with
     else:
         return text
 
+
 def get_assignee_mention(assignee_email: str, realm: Realm) -> str:
     if assignee_email != '':
         try:
@@ -125,9 +132,11 @@ def get_assignee_mention(assignee_email: str, realm: Realm) -> str:
         return f"**{assignee_name}**"
     return ''
 
+
 def get_issue_author(payload: Dict[str, Any]) -> str:
     return get_in(payload, ['user', 'displayName'])
 
+
 def get_issue_id(payload: Dict[str, Any]) -> str:
     if 'issue' not in payload:
         # Some ancient version of Jira or one of its extensions posts
@@ -140,6 +149,7 @@ def get_issue_id(payload: Dict[str, Any]) -> str:
 
     return get_in(payload, ['issue', 'key'])
 
+
 def get_issue_title(payload: Dict[str, Any]) -> str:
     if 'issue' not in payload:
         # Some ancient version of Jira or one of its extensions posts
@@ -152,9 +162,11 @@ def get_issue_title(payload: Dict[str, Any]) -> str:
 
     return get_in(payload, ['issue', 'fields', 'summary'])
 
+
 def get_issue_subject(payload: Dict[str, Any]) -> str:
     return f"{get_issue_id(payload)}: {get_issue_title(payload)}"
 
+
 def get_sub_event_for_update_issue(payload: Dict[str, Any]) -> str:
     sub_event = payload.get('issue_event_type_name', '')
     if sub_event == '':
@@ -164,12 +176,14 @@ def get_sub_event_for_update_issue(payload: Dict[str, Any]) -> str:
             return 'issue_transited'
     return sub_event
 
+
 def get_event_type(payload: Dict[str, Any]) -> Optional[str]:
     event = payload.get('webhookEvent')
     if event is None and payload.get('transition'):
         event = 'jira:issue_updated'
     return event
 
+
 def add_change_info(content: str, field: str, from_field: str, to_field: str) -> str:
     content += f"* Changed {field}"
     if from_field:
@@ -178,6 +192,7 @@ def add_change_info(content: str, field: str, from_field: str, to_field: str) ->
         content += f" to {to_field}\n"
     return content
 
+
 def handle_updated_issue_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
     # Reassigned, commented, reopened, and resolved events are all bundled
     # into this one 'updated' event type, so we try to extract the meaningful
@@ -232,7 +247,9 @@ def handle_updated_issue_event(payload: Dict[str, Any], user_profile: UserProfil
 
                 from_field_string = item.get('fromString')
                 if target_field_string or from_field_string:
-                    content = add_change_info(content, field, from_field_string, target_field_string)
+                    content = add_change_info(
+                        content, field, from_field_string, target_field_string
+                    )
 
         elif sub_event == 'issue_transited':
             from_field_string = get_in(payload, ['transition', 'from_status'])
@@ -242,6 +259,7 @@ def handle_updated_issue_event(payload: Dict[str, Any], user_profile: UserProfil
 
     return content
 
+
 def handle_created_issue_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
     template = """
 {author} created {issue_string}:
@@ -257,6 +275,7 @@ def handle_created_issue_event(payload: Dict[str, Any], user_profile: UserProfil
         assignee=get_in(payload, ['issue', 'fields', 'assignee', 'displayName'], 'no one'),
     )
 
+
 def handle_deleted_issue_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
     template = "{author} deleted {issue_string}{punctuation}"
     title = get_issue_title(payload)
@@ -267,6 +286,7 @@ def handle_deleted_issue_event(payload: Dict[str, Any], user_profile: UserProfil
         punctuation=punctuation,
     )
 
+
 def normalize_comment(comment: str) -> str:
     # Here's how Jira escapes special characters in their payload:
     # ,.?\\!\n\"'\n\\[]\\{}()\n@#$%^&*\n~`|/\\\\
@@ -274,33 +294,37 @@ def normalize_comment(comment: str) -> str:
     normalized_comment = comment.replace("\\!", "!")
     return normalized_comment
 
+
 def handle_comment_created_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
     title = get_issue_title(payload)
     return "{author} commented on issue: *\"{title}\"\
 *\n``` quote\n{comment}\n```\n".format(
-        author = payload["comment"]["author"]["displayName"],
-        title = title,
-        comment = normalize_comment(payload["comment"]["body"]),
+        author=payload["comment"]["author"]["displayName"],
+        title=title,
+        comment=normalize_comment(payload["comment"]["body"]),
     )
 
+
 def handle_comment_updated_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
     title = get_issue_title(payload)
     return "{author} updated their comment on issue: *\"{title}\"\
 *\n``` quote\n{comment}\n```\n".format(
-        author = payload["comment"]["author"]["displayName"],
-        title = title,
-        comment = normalize_comment(payload["comment"]["body"]),
+        author=payload["comment"]["author"]["displayName"],
+        title=title,
+        comment=normalize_comment(payload["comment"]["body"]),
     )
 
+
 def handle_comment_deleted_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
     title = get_issue_title(payload)
     return "{author} deleted their comment on issue: *\"{title}\"\
 *\n``` quote\n~~{comment}~~\n```\n".format(
-        author = payload["comment"]["author"]["displayName"],
-        title = title,
-        comment = normalize_comment(payload["comment"]["body"]),
+        author=payload["comment"]["author"]["displayName"],
+        title=title,
+        comment=normalize_comment(payload["comment"]["body"]),
     )
 
+
 JIRA_CONTENT_FUNCTION_MAPPER = {
     "jira:issue_created": handle_created_issue_event,
     "jira:issue_deleted": handle_deleted_issue_event,
@@ -310,16 +334,21 @@ JIRA_CONTENT_FUNCTION_MAPPER = {
     "comment_deleted": handle_comment_deleted_event,
 }
 
+
 def get_event_handler(event: Optional[str]) -> Optional[Callable[..., str]]:
     if event is None:
         return None
 
     return JIRA_CONTENT_FUNCTION_MAPPER.get(event)
 
+
 @webhook_view("JIRA")
 @has_request_variables
-def api_jira_webhook(request: HttpRequest, user_profile: UserProfile,
-                     payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_jira_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     event = get_event_type(payload)
     if event in IGNORED_EVENTS:
@@ -333,7 +362,5 @@ def api_jira_webhook(request: HttpRequest, user_profile: UserProfile,
     subject = get_issue_subject(payload)
     content: str = content_func(payload, user_profile)
 
-    check_send_webhook_message(request, user_profile,
-                               subject, content,
-                               unquote_url_parameters=True)
+    check_send_webhook_message(request, user_profile, subject, content, unquote_url_parameters=True)
     return json_success()
diff --git a/zerver/webhooks/librato/tests.py b/zerver/webhooks/librato/tests.py
index 3adce8b4c7..70469f4168 100644
--- a/zerver/webhooks/librato/tests.py
+++ b/zerver/webhooks/librato/tests.py
@@ -12,7 +12,9 @@ class LibratoHookTests(WebhookTestCase):
     def get_body(self, fixture_name: str) -> str:
         if self.IS_ATTACHMENT:
             return self.webhook_fixture_data("librato", fixture_name, file_type='json')
-        return urllib.parse.urlencode({'payload': self.webhook_fixture_data("librato", fixture_name, file_type='json')})
+        return urllib.parse.urlencode(
+            {'payload': self.webhook_fixture_data("librato", fixture_name, file_type='json')}
+        )
 
     def test_alert_message_with_default_topic(self) -> None:
         expected_topic = 'Alert alert.name'
diff --git a/zerver/webhooks/librato/view.py b/zerver/webhooks/librato/view.py
index 1969156940..4cc0caebf8 100644
--- a/zerver/webhooks/librato/view.py
+++ b/zerver/webhooks/librato/view.py
@@ -15,6 +15,7 @@ ALERT_CLEAR = 'clear'
 ALERT_VIOLATION = 'violations'
 SNAPSHOT = 'image_url'
 
+
 class LibratoWebhookParser:
     ALERT_URL_TEMPLATE = "https://metrics.librato.com/alerts#/{alert_id}"
 
@@ -39,8 +40,9 @@ class LibratoWebhookParser:
 
     def parse_violation(self, violation: Dict[str, Any]) -> Tuple[str, str]:
         metric_name = violation['metric']
-        recorded_at = datetime.fromtimestamp((violation['recorded_at']),
-                                             tz=timezone.utc).strftime('%Y-%m-%d %H:%M:%S')
+        recorded_at = datetime.fromtimestamp((violation['recorded_at']), tz=timezone.utc).strftime(
+            '%Y-%m-%d %H:%M:%S'
+        )
         return metric_name, recorded_at
 
     def parse_conditions(self) -> List[Dict[str, Any]]:
@@ -52,9 +54,14 @@ class LibratoWebhookParser:
         return violations
 
     def parse_snapshot(self, snapshot: Dict[str, Any]) -> Tuple[str, str, str]:
-        author_name, image_url, title = snapshot['author_name'], snapshot['image_url'], snapshot['title']
+        author_name, image_url, title = (
+            snapshot['author_name'],
+            snapshot['image_url'],
+            snapshot['title'],
+        )
         return author_name, image_url, title
 
+
 class LibratoWebhookHandler(LibratoWebhookParser):
     def __init__(self, payload: Dict[str, Any], attachments: List[Dict[str, Any]]) -> None:
         super().__init__(payload, attachments)
@@ -88,12 +95,13 @@ class LibratoWebhookHandler(LibratoWebhookParser):
 
     def handle_alert_clear_message(self) -> str:
         alert_clear_template = "Alert [alert_name]({alert_url}) has cleared at {trigger_time} UTC!"
-        trigger_time = datetime.fromtimestamp((self.payload['trigger_time']),
-                                              tz=timezone.utc).strftime('%Y-%m-%d %H:%M:%S')
+        trigger_time = datetime.fromtimestamp(
+            (self.payload['trigger_time']), tz=timezone.utc
+        ).strftime('%Y-%m-%d %H:%M:%S')
         alert_id, alert_name, alert_url, alert_runbook_url = self.parse_alert()
-        content = alert_clear_template.format(alert_name=alert_name,
-                                              alert_url=alert_url,
-                                              trigger_time=trigger_time)
+        content = alert_clear_template.format(
+            alert_name=alert_name, alert_url=alert_url, trigger_time=trigger_time
+        )
         return content
 
     def handle_snapshots(self) -> str:
@@ -105,7 +113,9 @@ class LibratoWebhookHandler(LibratoWebhookParser):
     def handle_snapshot(self, snapshot: Dict[str, Any]) -> str:
         snapshot_template = "**{author_name}** sent a [snapshot]({image_url}) of [metric]({title})."
         author_name, image_url, title = self.parse_snapshot(snapshot)
-        content = snapshot_template.format(author_name=author_name, image_url=image_url, title=title)
+        content = snapshot_template.format(
+            author_name=author_name, image_url=image_url, title=title
+        )
         return content
 
     def handle_alert_violation_message(self) -> str:
@@ -126,23 +136,33 @@ class LibratoWebhookHandler(LibratoWebhookParser):
             content += self.generate_violated_metric_condition(violation, condition)
         return content
 
-    def generate_violated_metric_condition(self, violation: Dict[str, Any],
-                                           condition: Dict[str, Any]) -> str:
+    def generate_violated_metric_condition(
+        self, violation: Dict[str, Any], condition: Dict[str, Any]
+    ) -> str:
         summary_function, threshold, condition_type, duration = self.parse_condition(condition)
         metric_name, recorded_at = self.parse_violation(violation)
-        metric_condition_template = "\n * Metric `{metric_name}`, {summary_function} was {condition_type} {threshold}"
+        metric_condition_template = (
+            "\n * Metric `{metric_name}`, {summary_function} was {condition_type} {threshold}"
+        )
         content = metric_condition_template.format(
-            metric_name=metric_name, summary_function=summary_function, condition_type=condition_type,
-            threshold=threshold)
+            metric_name=metric_name,
+            summary_function=summary_function,
+            condition_type=condition_type,
+            threshold=threshold,
+        )
         if duration:
             content += f" by {duration}s"
         content += f", recorded at {recorded_at} UTC."
         return content
 
+
 @webhook_view('Librato')
 @has_request_variables
-def api_librato_webhook(request: HttpRequest, user_profile: UserProfile,
-                        payload: Dict[str, Any]=REQ(converter=orjson.loads, default={})) -> HttpResponse:
+def api_librato_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(converter=orjson.loads, default={}),
+) -> HttpResponse:
     try:
         attachments = orjson.loads(request.body).get('attachments', [])
     except orjson.JSONDecodeError:
diff --git a/zerver/webhooks/mention/view.py b/zerver/webhooks/mention/view.py
index 2f2bbfcfef..b47174a25c 100644
--- a/zerver/webhooks/mention/view.py
+++ b/zerver/webhooks/mention/view.py
@@ -13,8 +13,9 @@ from zerver.models import UserProfile
 @webhook_view('Mention')
 @has_request_variables
 def api_mention_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Iterable[Dict[str, Any]]] = REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Iterable[Dict[str, Any]]] = REQ(argument_type='body'),
 ) -> HttpResponse:
     title = payload["title"]
     source_url = payload["url"]
@@ -27,8 +28,7 @@ def api_mention_webhook(
 {description}
 ```
 """.strip()
-    body = template.format(title=title, url=source_url,
-                           description=description)
+    body = template.format(title=title, url=source_url, description=description)
     topic = 'news'
 
     # send the message
diff --git a/zerver/webhooks/netlify/tests.py b/zerver/webhooks/netlify/tests.py
index aac0c807bd..0cc588ab0d 100644
--- a/zerver/webhooks/netlify/tests.py
+++ b/zerver/webhooks/netlify/tests.py
@@ -24,9 +24,10 @@ class NetlifyHookTests(WebhookTestCase):
 
     def test_failed_message(self) -> None:
         expected_topic = "master"
-        expected_message = ("The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) "
-                            "on branch master failed during stage 'building site': Build script returned non-zero exit code: 127"
-                            )
+        expected_message = (
+            "The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) "
+            "on branch master failed during stage 'building site': Build script returned non-zero exit code: 127"
+        )
 
         self.check_webhook(
             "deploy_failed", expected_topic, expected_message, content_type="application/json"
@@ -34,9 +35,10 @@ class NetlifyHookTests(WebhookTestCase):
 
     def test_locked_message(self) -> None:
         expected_topic = "master"
-        expected_message = ("The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) "
-                            "on branch master is now locked."
-                            )
+        expected_message = (
+            "The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) "
+            "on branch master is now locked."
+        )
 
         self.check_webhook(
             "deploy_locked", expected_topic, expected_message, content_type="application/json"
@@ -44,9 +46,10 @@ class NetlifyHookTests(WebhookTestCase):
 
     def test_unlocked_message(self) -> None:
         expected_topic = "master"
-        expected_message = ("The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) "
-                            "on branch master is now unlocked."
-                            )
+        expected_message = (
+            "The build [objective-jepsen-35fbb2](http://objective-jepsen-35fbb2.netlify.com) "
+            "on branch master is now unlocked."
+        )
 
         self.check_webhook(
             "deploy_unlocked", expected_topic, expected_message, content_type="application/json"
diff --git a/zerver/webhooks/netlify/view.py b/zerver/webhooks/netlify/view.py
index 9185b3f67b..96b50e7c6a 100644
--- a/zerver/webhooks/netlify/view.py
+++ b/zerver/webhooks/netlify/view.py
@@ -17,19 +17,23 @@ EVENTS = ['deploy_failed', 'deploy_locked', 'deploy_unlocked', 'deploy_building'
 
 fixture_to_headers = get_http_headers_from_filename("HTTP_X_NETLIFY_EVENT")
 
+
 @webhook_view('Netlify')
 @has_request_variables
 def api_netlify_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Iterable[Dict[str, Any]]] = REQ(argument_type='body'),
 ) -> HttpResponse:
 
     message_template = get_template(request, payload)
 
-    body = message_template.format(build_name=payload['name'],
-                                   build_url=payload['url'],
-                                   branch_name=payload['branch'],
-                                   state=payload['state'])
+    body = message_template.format(
+        build_name=payload['name'],
+        build_url=payload['url'],
+        branch_name=payload['branch'],
+        state=payload['state'],
+    )
 
     topic = "{topic}".format(topic=payload['branch'])
 
@@ -37,6 +41,7 @@ def api_netlify_webhook(
 
     return json_success()
 
+
 def get_template(request: HttpRequest, payload: Dict[str, Any]) -> str:
 
     message_template = 'The build [{build_name}]({build_url}) on branch {branch_name} '
diff --git a/zerver/webhooks/newrelic/tests.py b/zerver/webhooks/newrelic/tests.py
index 9936c91d13..8e443937b6 100644
--- a/zerver/webhooks/newrelic/tests.py
+++ b/zerver/webhooks/newrelic/tests.py
@@ -56,7 +56,10 @@ Violation description test.
                 "",
                 content_type="application/json",
             )
-        self.assertIn("The newrelic webhook requires current_state be in [open|acknowledged|closed]", e.exception.args[0])
+        self.assertIn(
+            "The newrelic webhook requires current_state be in [open|acknowledged|closed]",
+            e.exception.args[0],
+        )
 
     def test_missing_fields(self) -> None:
         expected_topic = "Unknown Policy (Unknown ID)"
@@ -82,7 +85,10 @@ No details.
                 "",
                 content_type="application/json",
             )
-        self.assertIn("The newrelic webhook requires current_state be in [open|acknowledged|closed]", e.exception.args[0])
+        self.assertIn(
+            "The newrelic webhook requires current_state be in [open|acknowledged|closed]",
+            e.exception.args[0],
+        )
 
     def test_missing_timestamp(self) -> None:
         with self.assertRaises(AssertionError) as e:
@@ -92,7 +98,9 @@ No details.
                 "",
                 content_type="application/json",
             )
-        self.assertIn("The newrelic webhook requires timestamp in milliseconds", e.exception.args[0])
+        self.assertIn(
+            "The newrelic webhook requires timestamp in milliseconds", e.exception.args[0]
+        )
 
     def test_malformatted_time(self) -> None:
         with self.assertRaises(AssertionError) as e:
diff --git a/zerver/webhooks/newrelic/view.py b/zerver/webhooks/newrelic/view.py
index fa1e8cb565..192cc6c492 100644
--- a/zerver/webhooks/newrelic/view.py
+++ b/zerver/webhooks/newrelic/view.py
@@ -17,23 +17,28 @@ OPEN_TEMPLATE = """
 ```
 """.strip()
 
-DEFAULT_TEMPLATE = """[Incident]({incident_url}) **{status}** {owner}for condition: **{condition_name}**""".strip()
+DEFAULT_TEMPLATE = (
+    """[Incident]({incident_url}) **{status}** {owner}for condition: **{condition_name}**""".strip()
+)
 
 TOPIC_TEMPLATE = """{policy_name} ({incident_id})""".strip()
 
+
 @webhook_view("NewRelic")
 @has_request_variables
 def api_newrelic_webhook(
     request: HttpRequest,
     user_profile: UserProfile,
-    payload: Dict[str, Any]=REQ(argument_type='body')
+    payload: Dict[str, Any] = REQ(argument_type='body'),
 ) -> HttpResponse:
 
     info = {
         "condition_name": payload.get('condition_name', 'Unknown condition'),
         "details": payload.get('details', 'No details.'),
         "incident_url": payload.get('incident_url', 'https://alerts.newrelic.com'),
-        "incident_acknowledge_url": payload.get('incident_acknowledge_url', 'https://alerts.newrelic.com'),
+        "incident_acknowledge_url": payload.get(
+            'incident_acknowledge_url', 'https://alerts.newrelic.com'
+        ),
         "status": payload.get('current_state', 'None'),
         "iso_timestamp": '',
         "owner": payload.get('owner', ''),
@@ -57,7 +62,9 @@ def api_newrelic_webhook(
     elif 'closed' in info['status']:
         content = DEFAULT_TEMPLATE.format(**info)
     else:
-        return json_error(_("The newrelic webhook requires current_state be in [open|acknowledged|closed]"))
+        return json_error(
+            _("The newrelic webhook requires current_state be in [open|acknowledged|closed]")
+        )
 
     topic_info = {
         "policy_name": payload.get('policy_name', 'Unknown Policy'),
diff --git a/zerver/webhooks/opbeat/tests.py b/zerver/webhooks/opbeat/tests.py
index 11a3c27102..cea65d13a9 100644
--- a/zerver/webhooks/opbeat/tests.py
+++ b/zerver/webhooks/opbeat/tests.py
@@ -45,7 +45,10 @@ App foo created
 **test title**
 test summary'''
         self.check_webhook(
-            "unsupported_object", expected_topic, expected_message, content_type="application/json",
+            "unsupported_object",
+            expected_topic,
+            expected_message,
+            content_type="application/json",
         )
 
     def test_error_fixed(self) -> None:
diff --git a/zerver/webhooks/opbeat/view.py b/zerver/webhooks/opbeat/view.py
index e01af2ca33..780def07e9 100644
--- a/zerver/webhooks/opbeat/view.py
+++ b/zerver/webhooks/opbeat/view.py
@@ -89,8 +89,7 @@ def format_object(
                 else:
                     message += f'\n>{key}: {value}'
             if key == 'subject':
-                message = format_object(
-                    obj['subject'], obj['subject_type'], message + '\n')
+                message = format_object(obj['subject'], obj['subject_type'], message + '\n')
             if ':' in key:
                 value, value_type = key.split(':')
                 message = format_object(obj[value], value_type, message + '\n')
@@ -99,8 +98,11 @@ def format_object(
 
 @webhook_view("Opbeat")
 @has_request_variables
-def api_opbeat_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_opbeat_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     """
     This uses the subject name from opbeat to make the subject,
     and the summary from Opbeat as the message body, with
diff --git a/zerver/webhooks/opsgenie/view.py b/zerver/webhooks/opsgenie/view.py
index acfbde7190..14776c55e2 100644
--- a/zerver/webhooks/opsgenie/view.py
+++ b/zerver/webhooks/opsgenie/view.py
@@ -11,8 +11,11 @@ from zerver.models import UserProfile
 
 @webhook_view('OpsGenie')
 @has_request_variables
-def api_opsgenie_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_opsgenie_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     # construct the body of the message
     info = {
diff --git a/zerver/webhooks/pagerduty/view.py b/zerver/webhooks/pagerduty/view.py
index bc1b32d884..0eb3e0962e 100644
--- a/zerver/webhooks/pagerduty/view.py
+++ b/zerver/webhooks/pagerduty/view.py
@@ -66,6 +66,7 @@ Incident [{incident_num}]({incident_url}) resolved:
 ```
 """.strip()
 
+
 def build_pagerduty_formatdict(message: Dict[str, Any]) -> Dict[str, Any]:
     format_dict: Dict[str, Any] = {}
     format_dict['action'] = PAGER_DUTY_EVENT_NAMES[message['type']]
@@ -107,6 +108,7 @@ def build_pagerduty_formatdict(message: Dict[str, Any]) -> Dict[str, Any]:
     format_dict['trigger_message'] = '\n'.join(trigger_message)
     return format_dict
 
+
 def build_pagerduty_formatdict_v2(message: Dict[str, Any]) -> Dict[str, Any]:
     format_dict = {}
     format_dict['action'] = PAGER_DUTY_EVENT_NAMES_V2[message['event']]
@@ -122,7 +124,8 @@ def build_pagerduty_formatdict_v2(message: Dict[str, Any]) -> Dict[str, Any]:
     if assignments:
         assignee = assignments[0]['assignee']
         format_dict['assignee_info'] = ASSIGNEE_TEMPLATE.format(
-            username=assignee['summary'], url=assignee['html_url'])
+            username=assignee['summary'], url=assignee['html_url']
+        )
     else:
         format_dict['assignee_info'] = 'nobody'
 
@@ -138,10 +141,10 @@ def build_pagerduty_formatdict_v2(message: Dict[str, Any]) -> Dict[str, Any]:
         format_dict['trigger_message'] = trigger_description
     return format_dict
 
-def send_formated_pagerduty(request: HttpRequest,
-                            user_profile: UserProfile,
-                            message_type: str,
-                            format_dict: Dict[str, Any]) -> None:
+
+def send_formated_pagerduty(
+    request: HttpRequest, user_profile: UserProfile, message_type: str, format_dict: Dict[str, Any]
+) -> None:
     if message_type in ('incident.trigger', 'incident.unacknowledge'):
         template = INCIDENT_WITH_SERVICE_AND_ASSIGNEE
     elif message_type == 'incident.resolve' and format_dict.get('resolving_agent_info') is not None:
@@ -157,11 +160,13 @@ def send_formated_pagerduty(request: HttpRequest,
     body = template.format(**format_dict)
     check_send_webhook_message(request, user_profile, subject, body)
 
+
 @webhook_view('PagerDuty')
 @has_request_variables
 def api_pagerduty_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Iterable[Dict[str, Any]]] = REQ(argument_type='body'),
 ) -> HttpResponse:
     for message in payload['messages']:
         message_type = message.get('type')
diff --git a/zerver/webhooks/papertrail/view.py b/zerver/webhooks/papertrail/view.py
index c9cac472d7..1738370731 100644
--- a/zerver/webhooks/papertrail/view.py
+++ b/zerver/webhooks/papertrail/view.py
@@ -17,18 +17,28 @@ SEARCH_TEMPLATE = """
 ```
 """.strip()
 
+
 @webhook_view('Papertrail')
 @has_request_variables
 def api_papertrail_webhook(
     request: HttpRequest,
     user_profile: UserProfile,
-    payload: Dict[str, Any] = REQ(validator=check_dict([
-        ("events", check_list(check_dict([]))),
-        ("saved_search", check_dict([
-            ("name", check_string),
-            ("html_search_url", check_string),
-        ])),
-    ])),
+    payload: Dict[str, Any] = REQ(
+        validator=check_dict(
+            [
+                ("events", check_list(check_dict([]))),
+                (
+                    "saved_search",
+                    check_dict(
+                        [
+                            ("name", check_string),
+                            ("html_search_url", check_string),
+                        ]
+                    ),
+                ),
+            ]
+        )
+    ),
 ) -> HttpResponse:
 
     matches = MATCHES_TEMPLATE.format(
diff --git a/zerver/webhooks/pingdom/view.py b/zerver/webhooks/pingdom/view.py
index 7482ff1b57..2d901e1498 100644
--- a/zerver/webhooks/pingdom/view.py
+++ b/zerver/webhooks/pingdom/view.py
@@ -39,8 +39,11 @@ SUPPORTED_CHECK_TYPES = (
 
 @webhook_view('Pingdom')
 @has_request_variables
-def api_pingdom_webhook(request: HttpRequest, user_profile: UserProfile,
-                        payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_pingdom_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     check_type = get_check_type(payload)
 
     if check_type in SUPPORTED_CHECK_TYPES:
diff --git a/zerver/webhooks/pivotal/tests.py b/zerver/webhooks/pivotal/tests.py
index 40c087d500..b886c18352 100644
--- a/zerver/webhooks/pivotal/tests.py
+++ b/zerver/webhooks/pivotal/tests.py
@@ -90,6 +90,7 @@ class PivotalV3HookTests(WebhookTestCase):
     def get_body(self, fixture_name: str) -> str:
         return self.webhook_fixture_data('pivotal', fixture_name, file_type='xml')
 
+
 class PivotalV5HookTests(WebhookTestCase):
     STREAM_NAME = 'pivotal'
     URL_TEMPLATE = "/api/v1/external/pivotal?stream={stream}&api_key={api_key}"
diff --git a/zerver/webhooks/pivotal/view.py b/zerver/webhooks/pivotal/view.py
index 4a336d2360..c8dab5783c 100644
--- a/zerver/webhooks/pivotal/view.py
+++ b/zerver/webhooks/pivotal/view.py
@@ -62,6 +62,7 @@ def api_pivotal_webhook_v3(request: HttpRequest, user_profile: UserProfile) -> T
         content = f"{description} ({issue_status} {issue_type}{estimate}):\n\n~~~ quote\n{issue_desc}\n~~~\n\n{more_info}"
     return subject, content
 
+
 UNSUPPORTED_EVENT_TYPES = [
     "task_create_activity",
     "comment_delete_activity",
@@ -73,6 +74,7 @@ UNSUPPORTED_EVENT_TYPES = [
     "epic_update_activity",
 ]
 
+
 def api_pivotal_webhook_v5(request: HttpRequest, user_profile: UserProfile) -> Tuple[str, str]:
     payload = orjson.loads(request.body)
 
@@ -110,7 +112,8 @@ def api_pivotal_webhook_v5(request: HttpRequest, user_profile: UserProfile) -> T
 
             if "current_state" in old_values and "current_state" in new_values:
                 content += "* state changed from **{}** to **{}**\n".format(
-                    old_values["current_state"], new_values["current_state"])
+                    old_values["current_state"], new_values["current_state"]
+                )
             if "estimate" in old_values and "estimate" in new_values:
                 old_estimate = old_values.get("estimate", None)
                 if old_estimate is None:
@@ -121,7 +124,8 @@ def api_pivotal_webhook_v5(request: HttpRequest, user_profile: UserProfile) -> T
                 content += f"* estimate {estimate} **{new_estimate} points**\n"
             if "story_type" in old_values and "story_type" in new_values:
                 content += "* type changed from **{}** to **{}**\n".format(
-                    old_values["story_type"], new_values["story_type"])
+                    old_values["story_type"], new_values["story_type"]
+                )
 
             comment = extract_comment(change)
             if comment is not None:
@@ -131,7 +135,9 @@ def api_pivotal_webhook_v5(request: HttpRequest, user_profile: UserProfile) -> T
         for change in changes:
             comment = extract_comment(change)
             if comment is not None:
-                content += f"{performed_by} added a comment to {story_info}:\n~~~quote\n{comment}\n~~~"
+                content += (
+                    f"{performed_by} added a comment to {story_info}:\n~~~quote\n{comment}\n~~~"
+                )
     elif event_type == "story_create_activity":
         content += f"{performed_by} created {story_type}: {story_info}\n"
         for change in changes:
@@ -146,8 +152,9 @@ def api_pivotal_webhook_v5(request: HttpRequest, user_profile: UserProfile) -> T
             old_values = change.get("original_values", {})
             new_values = change["new_values"]
             if "current_state" in old_values and "current_state" in new_values:
-                content += " from **{}** to **{}**.".format(old_values["current_state"],
-                                                            new_values["current_state"])
+                content += " from **{}** to **{}**.".format(
+                    old_values["current_state"], new_values["current_state"]
+                )
     elif event_type in UNSUPPORTED_EVENT_TYPES:
         # Known but unsupported Pivotal event types
         pass
@@ -156,6 +163,7 @@ def api_pivotal_webhook_v5(request: HttpRequest, user_profile: UserProfile) -> T
 
     return subject, content
 
+
 @webhook_view("Pivotal")
 @has_request_variables
 def api_pivotal_webhook(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
diff --git a/zerver/webhooks/raygun/view.py b/zerver/webhooks/raygun/view.py
index 18ab3ef625..abb08052bc 100644
--- a/zerver/webhooks/raygun/view.py
+++ b/zerver/webhooks/raygun/view.py
@@ -13,8 +13,11 @@ from zerver.models import UserProfile
 
 @webhook_view('Raygun')
 @has_request_variables
-def api_raygun_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any] = REQ(argument_type='body')) -> HttpResponse:
+def api_raygun_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     # The payload contains 'event' key. This 'event' key has a value of either
     # 'error_notification' or 'error_activity'. 'error_notification' happens
     # when an error is caught in an application, where as 'error_activity'
@@ -123,7 +126,7 @@ def notification_message_follow_up(payload: Dict[str, Any]) -> str:
         # Cut the "MinuteFollowUp" from the possible event types, then add "
         # minute" after that. So prefix for "OneMinuteFollowUp" is "One
         # minute", where "FiveMinuteFollowUp" is "Five minute".
-        prefix = followup_type[:len(followup_type) - 14] + " minute"
+        prefix = followup_type[: len(followup_type) - 14] + " minute"
 
     message += f"{prefix} {followup_link_md}:\n"
 
@@ -246,8 +249,7 @@ def activity_message(payload: Dict[str, Any]) -> str:
         assigned_to = payload['error']['assignedTo']
         message += f"{user} assigned {error_link_md} to {assigned_to}:\n"
 
-    message += "* **Timestamp**: {}\n".format(
-        parse_time(payload['error']['activityDate']))
+    message += "* **Timestamp**: {}\n".format(parse_time(payload['error']['activityDate']))
 
     message += make_app_info_chunk(payload['application'])
 
@@ -272,8 +274,11 @@ def compose_activity_message(payload: Dict[str, Any]) -> str:
     # But, they all are almost identical and the only differences between them
     # are the keys at line 9 (check fixtures). So there's no need to split
     # the function like the notification one.
-    if event_type == "StatusChanged" or event_type == "AssignedToUser" \
-            or event_type == "CommentAdded":
+    if (
+        event_type == "StatusChanged"
+        or event_type == "AssignedToUser"
+        or event_type == "CommentAdded"
+    ):
         return activity_message(payload)
     else:
         raise UnsupportedWebhookEventType(event_type)
@@ -291,6 +296,5 @@ def parse_time(timestamp: str) -> str:
 
     format = "%Y-%m-%dT%H:%M:%S"
     format += "Z" if timestamp[-1:] == "Z" else ""
-    parsed_time = time.strftime("%c", time.strptime(timestamp,
-                                                    format))
+    parsed_time = time.strftime("%c", time.strptime(timestamp, format))
     return parsed_time
diff --git a/zerver/webhooks/reviewboard/view.py b/zerver/webhooks/reviewboard/view.py
index f2d6a35276..f019de165e 100644
--- a/zerver/webhooks/reviewboard/view.py
+++ b/zerver/webhooks/reviewboard/view.py
@@ -56,6 +56,7 @@ BRANCH_TEMPLATE = "**Branch**: {branch_name}"
 
 fixture_to_headers = get_http_headers_from_filename("HTTP_X_REVIEWBOARD_EVENT")
 
+
 def get_target_people_string(payload: Dict[str, Any]) -> str:
     result = ""
     target_people = payload['review_request']['target_people']
@@ -68,6 +69,7 @@ def get_target_people_string(payload: Dict[str, Any]) -> str:
 
     return result
 
+
 def get_review_published_body(payload: Dict[str, Any]) -> str:
     kwargs = {
         'review_url': payload['review']['absolute_url'],
@@ -80,6 +82,7 @@ def get_review_published_body(payload: Dict[str, Any]) -> str:
 
     return REVIEW_PUBLISHED.format(**kwargs).strip()
 
+
 def get_reply_published_body(payload: Dict[str, Any]) -> str:
     kwargs = {
         'reply_url': payload['reply']['links']['self']['href'],
@@ -93,6 +96,7 @@ def get_reply_published_body(payload: Dict[str, Any]) -> str:
 
     return REPLY_PUBLISHED.format(**kwargs).strip()
 
+
 def get_review_request_published_body(payload: Dict[str, Any]) -> str:
     kwargs = {
         'id': payload['review_request']['id'],
@@ -113,6 +117,7 @@ def get_review_request_published_body(payload: Dict[str, Any]) -> str:
 
     return message.format(**kwargs).strip()
 
+
 def get_review_request_reopened_body(payload: Dict[str, Any]) -> str:
     kwargs = {
         'id': payload['review_request']['id'],
@@ -133,6 +138,7 @@ def get_review_request_reopened_body(payload: Dict[str, Any]) -> str:
 
     return message.format(**kwargs).strip()
 
+
 def get_review_request_closed_body(payload: Dict[str, Any]) -> str:
     kwargs = {
         'id': payload['review_request']['id'],
@@ -153,9 +159,11 @@ def get_review_request_closed_body(payload: Dict[str, Any]) -> str:
 
     return message.format(**kwargs).strip()
 
+
 def get_review_request_repo_title(payload: Dict[str, Any]) -> str:
     return payload['review_request']['links']['repository']['title']
 
+
 RB_MESSAGE_FUNCTIONS = {
     'review_request_published': get_review_request_published_body,
     'review_request_reopened': get_review_request_reopened_body,
@@ -164,14 +172,15 @@ RB_MESSAGE_FUNCTIONS = {
     'reply_published': get_reply_published_body,
 }
 
+
 @webhook_view('ReviewBoard')
 @has_request_variables
 def api_reviewboard_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Iterable[Dict[str, Any]]] = REQ(argument_type='body'),
 ) -> HttpResponse:
-    event_type = validate_extract_webhook_http_header(
-        request, 'X_REVIEWBOARD_EVENT', 'ReviewBoard')
+    event_type = validate_extract_webhook_http_header(request, 'X_REVIEWBOARD_EVENT', 'ReviewBoard')
     assert event_type is not None
 
     body_function = RB_MESSAGE_FUNCTIONS.get(event_type)
diff --git a/zerver/webhooks/semaphore/tests.py b/zerver/webhooks/semaphore/tests.py
index 80b491073a..0165d16ad7 100644
--- a/zerver/webhooks/semaphore/tests.py
+++ b/zerver/webhooks/semaphore/tests.py
@@ -122,13 +122,17 @@ class SemaphoreHookTests(WebhookTestCase):
         expected_message = """
 [Notifications](https://semaphore.semaphoreci.com/workflows/a8704319-2422-4828-9b11-6b2afa3554e6) pipeline **stopped** for unknown event
 """.strip()
-        with patch('zerver.webhooks.semaphore.tests.SemaphoreHookTests.get_body', self.get_unknown_event):
+        with patch(
+            'zerver.webhooks.semaphore.tests.SemaphoreHookTests.get_body', self.get_unknown_event
+        ):
             self.check_webhook(
                 "tag", expected_topic, expected_message, content_type="application/json"
             )
 
     def get_unknown_event(self, fixture_name: str) -> str:
         """Return modified payload with revision.reference_type changed"""
-        fixture_data = orjson.loads(self.webhook_fixture_data("semaphore", fixture_name, file_type="json"))
+        fixture_data = orjson.loads(
+            self.webhook_fixture_data("semaphore", fixture_name, file_type="json")
+        )
         fixture_data['revision']['reference_type'] = 'unknown'
         return fixture_data
diff --git a/zerver/webhooks/semaphore/view.py b/zerver/webhooks/semaphore/view.py
index 13110dff1f..8ca89769dd 100644
--- a/zerver/webhooks/semaphore/view.py
+++ b/zerver/webhooks/semaphore/view.py
@@ -89,18 +89,24 @@ GITHUB_URL_TEMPLATES = {
 
 @webhook_view('Semaphore')
 @has_request_variables
-def api_semaphore_webhook(request: HttpRequest, user_profile: UserProfile,
-                          payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_semaphore_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     content, project_name, branch_name = (
         semaphore_classic(payload) if 'event' in payload else semaphore_2(payload)
     )
     subject = (
-        TOPIC_TEMPLATE.format(project=project_name, branch=branch_name) if branch_name else project_name
+        TOPIC_TEMPLATE.format(project=project_name, branch=branch_name)
+        if branch_name
+        else project_name
     )
     check_send_webhook_message(request, user_profile, subject, content)
     return json_success()
 
+
 def semaphore_classic(payload: Dict[str, Any]) -> Tuple[str, str, str]:
     # semaphore only gives the last commit, even if there were multiple commits
     # since the last build
@@ -150,6 +156,7 @@ def semaphore_classic(payload: Dict[str, Any]) -> Tuple[str, str, str]:
 
     return content, project_name, branch_name
 
+
 def semaphore_2(payload: Dict[str, Any]) -> Tuple[str, str, Optional[str]]:
     repo_url = payload["repository"]["url"]
     project_name = payload["project"]["name"]
@@ -172,7 +179,9 @@ def semaphore_2(payload: Dict[str, Any]) -> Tuple[str, str, Optional[str]]:
             commit_id=commit_id,
             commit_hash=commit_id[:7],
             commit_message=summary_line(payload["revision"]["commit_message"]),
-            commit_url=GITHUB_URL_TEMPLATES['commit'].format(repo_url=repo_url, commit_id=commit_id),
+            commit_url=GITHUB_URL_TEMPLATES['commit'].format(
+                repo_url=repo_url, commit_id=commit_id
+            ),
         )
         template = GH_PUSH_TEMPLATE if is_github_repo(repo_url) else PUSH_TEMPLATE
         content = template.format(**context)
@@ -182,7 +191,8 @@ def semaphore_2(payload: Dict[str, Any]) -> Tuple[str, str, Optional[str]]:
         pull_request_title = pull_request["name"]
         pull_request_number = pull_request["number"]
         pull_request_url = GITHUB_URL_TEMPLATES['pull_request'].format(
-            repo_url=repo_url, pr_number=pull_request_number)
+            repo_url=repo_url, pr_number=pull_request_number
+        )
         context.update(
             branch_name=branch_name,
             pull_request_title=pull_request_title,
@@ -207,8 +217,10 @@ def semaphore_2(payload: Dict[str, Any]) -> Tuple[str, str, Optional[str]]:
         content = DEFAULT_TEMPLATE.format(**context)
     return content, project_name, branch_name
 
+
 def is_github_repo(repo_url: str) -> bool:
     return urlparse(repo_url).hostname == 'github.com'
 
+
 def summary_line(message: str) -> str:
     return message.splitlines()[0]
diff --git a/zerver/webhooks/sentry/tests.py b/zerver/webhooks/sentry/tests.py
index 7c06f8ea0f..8411ab8ce1 100644
--- a/zerver/webhooks/sentry/tests.py
+++ b/zerver/webhooks/sentry/tests.py
@@ -114,7 +114,9 @@ Traceback:
 **timestamp:** 2020-10-26 16:39:54
 **filename:** None
 ```"""
-        self.check_webhook("webhook_event_for_exception_javascript", expected_topic, expected_message)
+        self.check_webhook(
+            "webhook_event_for_exception_javascript", expected_topic, expected_message
+        )
 
     def test_event_for_message_golang(self) -> None:
         expected_topic = "A test message event from golang."
diff --git a/zerver/webhooks/sentry/view.py b/zerver/webhooks/sentry/view.py
index 1c244678f0..e907af75d4 100644
--- a/zerver/webhooks/sentry/view.py
+++ b/zerver/webhooks/sentry/view.py
@@ -37,12 +37,15 @@ EXCEPTION_EVENT_TEMPLATE = """
 ```
 """
 
-EXCEPTION_EVENT_TEMPLATE_WITH_TRACEBACK = EXCEPTION_EVENT_TEMPLATE + """
+EXCEPTION_EVENT_TEMPLATE_WITH_TRACEBACK = (
+    EXCEPTION_EVENT_TEMPLATE
+    + """
 Traceback:
 ```{syntax_highlight_as}
 {pre_context}---> {context_line}{post_context}\
 ```
 """
+)
 # Because of the \n added at the end of each context element,
 # this will actually look better in the traceback.
 
@@ -81,7 +84,7 @@ def convert_lines_to_traceback_string(lines: Optional[List[str]]) -> str:
     traceback = ""
     if lines is not None:
         for line in lines:
-            if (line == ""):
+            if line == "":
                 traceback += "\n"
             else:
                 traceback += f"     {line}\n"
@@ -161,7 +164,9 @@ def handle_event_payload(event: Dict[str, Any]) -> Tuple[str, str]:
     return (subject, body)
 
 
-def handle_issue_payload(action: str, issue: Dict[str, Any], actor: Dict[str, Any]) -> Tuple[str, str]:
+def handle_issue_payload(
+    action: str, issue: Dict[str, Any], actor: Dict[str, Any]
+) -> Tuple[str, str]:
     """ Handle either an issue type event. """
     subject = issue["title"]
     datetime = issue["lastSeen"].split(".")[0].replace("T", " ")
@@ -244,8 +249,11 @@ def transform_webhook_payload(payload: Dict[str, Any]) -> Optional[Dict[str, Any
 
 @webhook_view('Sentry')
 @has_request_variables
-def api_sentry_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any] = REQ(argument_type="body")) -> HttpResponse:
+def api_sentry_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type="body"),
+) -> HttpResponse:
     data = payload.get("data", None)
 
     if data is None:
diff --git a/zerver/webhooks/slack/view.py b/zerver/webhooks/slack/view.py
index 8e0a58ba0c..ee36e41cce 100644
--- a/zerver/webhooks/slack/view.py
+++ b/zerver/webhooks/slack/view.py
@@ -10,14 +10,18 @@ from zerver.models import UserProfile
 ZULIP_MESSAGE_TEMPLATE = "**{message_sender}**: `{text}`"
 VALID_OPTIONS = {'SHOULD_NOT_BE_MAPPED': '0', 'SHOULD_BE_MAPPED': '1'}
 
+
 @webhook_view('Slack', notify_bot_owner_on_invalid_json=False)
 @has_request_variables
-def api_slack_webhook(request: HttpRequest, user_profile: UserProfile,
-                      user_name: str=REQ(),
-                      text: str=REQ(),
-                      channel_name: str=REQ(),
-                      stream: str=REQ(default='slack'),
-                      channels_map_to_topics: str=REQ(default='1')) -> HttpRequest:
+def api_slack_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_name: str = REQ(),
+    text: str = REQ(),
+    channel_name: str = REQ(),
+    stream: str = REQ(default='slack'),
+    channels_map_to_topics: str = REQ(default='1'),
+) -> HttpRequest:
 
     if channels_map_to_topics not in list(VALID_OPTIONS.values()):
         return json_error(_('Error: channels_map_to_topics parameter other than 0 or 1'))
diff --git a/zerver/webhooks/slack_incoming/tests.py b/zerver/webhooks/slack_incoming/tests.py
index 6a97414271..4ffedfe779 100644
--- a/zerver/webhooks/slack_incoming/tests.py
+++ b/zerver/webhooks/slack_incoming/tests.py
@@ -13,7 +13,9 @@ Hello, world.
 """.strip()
 
         self.check_webhook(
-            "text", expected_topic, expected_message,
+            "text",
+            expected_topic,
+            expected_message,
         )
 
     def test_message_as_www_urlencoded(self) -> None:
@@ -39,7 +41,9 @@ Danny Torrence left the following review for your property:
 """.strip()
 
         self.check_webhook(
-            "actions", expected_topic, expected_message,
+            "actions",
+            expected_topic,
+            expected_message,
         )
 
     def test_message_with_blocks(self) -> None:
@@ -52,7 +56,9 @@ Danny Torrence left the following review for your property:
 """.strip()
 
         self.check_webhook(
-            "blocks", expected_topic, expected_message,
+            "blocks",
+            expected_topic,
+            expected_message,
         )
 
     def test_message_with_attachment(self) -> None:
@@ -80,7 +86,9 @@ Danny Torrence left the following review for your property:
 """.strip()
 
         self.check_webhook(
-            "attachment", expected_topic, expected_message,
+            "attachment",
+            expected_topic,
+            expected_message,
         )
 
     def get_body(self, fixture_name: str) -> str:
diff --git a/zerver/webhooks/slack_incoming/view.py b/zerver/webhooks/slack_incoming/view.py
index 3072ae5ed8..26e90ae873 100644
--- a/zerver/webhooks/slack_incoming/view.py
+++ b/zerver/webhooks/slack_incoming/view.py
@@ -16,12 +16,12 @@ from zerver.models import UserProfile
 
 @webhook_view('SlackIncoming')
 @has_request_variables
-def api_slack_incoming_webhook(request: HttpRequest, user_profile: UserProfile,
-                               user_specified_topic: Optional[str]=REQ("topic", default=None),
-                               payload: Optional[Dict[str, Any]] = REQ(
-                                   'payload',
-                                   converter=orjson.loads,
-                                   default=None)) -> HttpResponse:
+def api_slack_incoming_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    user_specified_topic: Optional[str] = REQ("topic", default=None),
+    payload: Optional[Dict[str, Any]] = REQ('payload', converter=orjson.loads, default=None),
+) -> HttpResponse:
 
     # Slack accepts webhook payloads as payload="encoded json" as
     # application/x-www-form-urlencoded, as well as in the body as
@@ -79,6 +79,7 @@ def add_block(block: Dict[str, Any], body: str) -> str:
 
     return body
 
+
 def add_attachment(attachment: Dict[str, Any], body: str) -> str:
     attachment_body = ""
     if "title" in attachment and "title_link" in attachment:
@@ -88,9 +89,11 @@ def add_attachment(attachment: Dict[str, Any], body: str) -> str:
 
     return body + attachment_body
 
+
 def replace_links(text: str) -> str:
     return re.sub(r"<(\w+?:\/\/.*?)\|(.*?)>", r"[\2](\1)", text)
 
+
 def replace_formatting(text: str) -> str:
     # Slack uses *text* for bold, whereas Zulip interprets that as italics
     text = re.sub(r'([^\w])\*(?!\s+)([^\*^\n]+)(?<!\s)\*([^\w])', r"\1**\2**\3", text)
diff --git a/zerver/webhooks/solano/view.py b/zerver/webhooks/solano/view.py
index 6ddb4d2c8a..ecb20688db 100644
--- a/zerver/webhooks/solano/view.py
+++ b/zerver/webhooks/solano/view.py
@@ -16,10 +16,14 @@ Build update (see [build log]({build_log_url})):
 * **Status**: {status} {emoji}
 """.strip()
 
+
 @webhook_view('SolanoLabs')
 @has_request_variables
-def api_solano_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_solano_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     event = payload.get('event')
     topic = 'build update'
     if event == 'test':
@@ -34,7 +38,7 @@ def api_solano_webhook(request: HttpRequest, user_profile: UserProfile,
     commit_id = payload['commit_id']
 
     good_status = ['passed']
-    bad_status  = ['failed', 'error']
+    bad_status = ['failed', 'error']
     neutral_status = ['running']
     emoji = ''
     if status in good_status:
@@ -55,16 +59,19 @@ def api_solano_webhook(request: HttpRequest, user_profile: UserProfile,
         commit_url += f'/pipelines/{commit_id}'
 
     body = MESSAGE_TEMPLATE.format(
-        author=author, build_log_url=build_log,
-        commit_id=commit_id[:7], commit_url=commit_url,
-        status=status, emoji=emoji,
+        author=author,
+        build_log_url=build_log,
+        commit_id=commit_id[:7],
+        commit_url=commit_url,
+        status=status,
+        emoji=emoji,
     )
 
     check_send_webhook_message(request, user_profile, topic, body)
     return json_success()
 
-def handle_test_event(request: HttpRequest, user_profile: UserProfile,
-                      topic: str) -> HttpResponse:
+
+def handle_test_event(request: HttpRequest, user_profile: UserProfile, topic: str) -> HttpResponse:
     body = 'Solano webhook set up correctly.'
     check_send_webhook_message(request, user_profile, topic, body)
     return json_success()
diff --git a/zerver/webhooks/splunk/view.py b/zerver/webhooks/splunk/view.py
index c90049a28c..e83fe1272f 100644
--- a/zerver/webhooks/splunk/view.py
+++ b/zerver/webhooks/splunk/view.py
@@ -17,10 +17,14 @@ Splunk alert from saved search:
 * **Raw**: `{raw}`
 """.strip()
 
+
 @webhook_view('Splunk')
 @has_request_variables
-def api_splunk_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_splunk_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     # use default values if expected data is not provided
     search_name = payload.get('search_name', 'Missing search_name')
@@ -37,8 +41,11 @@ def api_splunk_webhook(request: HttpRequest, user_profile: UserProfile,
 
     # construct the message body
     body = MESSAGE_TEMPLATE.format(
-        search=search_name, link=results_link,
-        host=host, source=source, raw=raw,
+        search=search_name,
+        link=results_link,
+        host=host,
+        source=source,
+        raw=raw,
     )
 
     # send the message
diff --git a/zerver/webhooks/statuspage/view.py b/zerver/webhooks/statuspage/view.py
index 4778addf72..095389bf6f 100644
--- a/zerver/webhooks/statuspage/view.py
+++ b/zerver/webhooks/statuspage/view.py
@@ -18,36 +18,44 @@ COMPONENT_TEMPLATE = "**{name}** has changed status from **{old_status}** to **{
 
 TOPIC_TEMPLATE = '{name}: {description}'
 
+
 def get_incident_events_body(payload: Dict[str, Any]) -> str:
     return INCIDENT_TEMPLATE.format(
-        name = payload["incident"]["name"],
-        state = payload["incident"]["status"],
-        content = payload["incident"]["incident_updates"][0]["body"],
+        name=payload["incident"]["name"],
+        state=payload["incident"]["status"],
+        content=payload["incident"]["incident_updates"][0]["body"],
     )
 
+
 def get_components_update_body(payload: Dict[str, Any]) -> str:
     return COMPONENT_TEMPLATE.format(
-        name = payload["component"]["name"],
-        old_status = payload["component_update"]["old_status"],
-        new_status = payload["component_update"]["new_status"],
+        name=payload["component"]["name"],
+        old_status=payload["component_update"]["old_status"],
+        new_status=payload["component_update"]["new_status"],
     )
 
+
 def get_incident_topic(payload: Dict[str, Any]) -> str:
     return TOPIC_TEMPLATE.format(
-        name = payload["incident"]["name"],
-        description = payload["page"]["status_description"],
+        name=payload["incident"]["name"],
+        description=payload["page"]["status_description"],
     )
 
+
 def get_component_topic(payload: Dict[str, Any]) -> str:
     return TOPIC_TEMPLATE.format(
-        name = payload["component"]["name"],
-        description = payload["page"]["status_description"],
+        name=payload["component"]["name"],
+        description=payload["page"]["status_description"],
     )
 
+
 @webhook_view('Statuspage')
 @has_request_variables
-def api_statuspage_webhook(request: HttpRequest, user_profile: UserProfile,
-                           payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_statuspage_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     status = payload["page"]["status_indicator"]
 
diff --git a/zerver/webhooks/stripe/tests.py b/zerver/webhooks/stripe/tests.py
index ccbcddf241..b8f7fd18af 100644
--- a/zerver/webhooks/stripe/tests.py
+++ b/zerver/webhooks/stripe/tests.py
@@ -31,7 +31,9 @@ class StripeHookTests(WebhookTestCase):
 
     def test_charge_failed(self) -> None:
         expected_topic = "charges"
-        expected_message = "[Charge](https://dashboard.stripe.com/charges/ch_00000000000000) for 1.00 AUD failed"
+        expected_message = (
+            "[Charge](https://dashboard.stripe.com/charges/ch_00000000000000) for 1.00 AUD failed"
+        )
         self.check_webhook(
             "charge_failed",
             expected_topic,
@@ -63,7 +65,9 @@ class StripeHookTests(WebhookTestCase):
 
     def test_customer_created(self) -> None:
         expected_topic = "cus_00000000000000"
-        expected_message = "[Customer](https://dashboard.stripe.com/customers/cus_00000000000000) created"
+        expected_message = (
+            "[Customer](https://dashboard.stripe.com/customers/cus_00000000000000) created"
+        )
         self.check_webhook(
             "customer_created",
             expected_topic,
@@ -83,7 +87,9 @@ class StripeHookTests(WebhookTestCase):
 
     def test_customer_deleted(self) -> None:
         expected_topic = "cus_00000000000000"
-        expected_message = "[Customer](https://dashboard.stripe.com/customers/cus_00000000000000) deleted"
+        expected_message = (
+            "[Customer](https://dashboard.stripe.com/customers/cus_00000000000000) deleted"
+        )
         self.check_webhook(
             "customer_deleted",
             expected_topic,
@@ -107,7 +113,9 @@ Billing method: send invoice"""
 
     def test_customer_subscription_deleted(self) -> None:
         expected_topic = "cus_00000000000000"
-        expected_message = "[Subscription](https://dashboard.stripe.com/subscriptions/sub_00000000000000) deleted"
+        expected_message = (
+            "[Subscription](https://dashboard.stripe.com/subscriptions/sub_00000000000000) deleted"
+        )
         self.check_webhook(
             "customer_subscription_deleted",
             expected_topic,
@@ -137,7 +145,7 @@ Billing method: send invoice"""
         expected_topic = "cus_00000000000000"
         expected_message = "[Subscription](https://dashboard.stripe.com/subscriptions/sub_00000000000000) trial will end in 3 days"
         # 3 days before the end of the trial, plus a little bit to make sure the rounding is working
-        with mock.patch('time.time', return_value=1480892861 - 3*3600*24 + 100):
+        with mock.patch('time.time', return_value=1480892861 - 3 * 3600 * 24 + 100):
             # use fixture named stripe_customer_subscription_trial_will_end
             self.check_webhook(
                 "customer_subscription_trial_will_end",
@@ -148,8 +156,10 @@ Billing method: send invoice"""
 
     def test_customer_updated__account_balance(self) -> None:
         expected_topic = "cus_00000000000000"
-        expected_message = "[Customer](https://dashboard.stripe.com/customers/cus_00000000000000) updated" + \
-                           "\n* Account balance is now 100"
+        expected_message = (
+            "[Customer](https://dashboard.stripe.com/customers/cus_00000000000000) updated"
+            + "\n* Account balance is now 100"
+        )
         self.check_webhook(
             "customer_updated__account_balance",
             expected_topic,
@@ -169,7 +179,9 @@ Billing method: send invoice"""
 
     def test_invoice_payment_failed(self) -> None:
         expected_topic = "cus_00000000000000"
-        expected_message = "[Invoice](https://dashboard.stripe.com/invoices/in_00000000000000) payment failed"
+        expected_message = (
+            "[Invoice](https://dashboard.stripe.com/invoices/in_00000000000000) payment failed"
+        )
         self.check_webhook(
             "invoice_payment_failed",
             expected_topic,
@@ -218,7 +230,8 @@ Amount due: 0.00 INR
 
     @patch('zerver.webhooks.stripe.view.check_send_webhook_message')
     def test_account_updated_without_previous_attributes_ignore(
-            self, check_send_webhook_message_mock: MagicMock) -> None:
+        self, check_send_webhook_message_mock: MagicMock
+    ) -> None:
         self.url = self.build_webhook_url()
         payload = self.get_body('account_updated_without_previous_attributes')
         result = self.client_post(self.url, payload, content_type="application/json")
diff --git a/zerver/webhooks/stripe/view.py b/zerver/webhooks/stripe/view.py
index 6da5bfe750..a3bd886aff 100644
--- a/zerver/webhooks/stripe/view.py
+++ b/zerver/webhooks/stripe/view.py
@@ -16,14 +16,19 @@ from zerver.models import UserProfile
 class SuppressedEvent(Exception):
     pass
 
+
 class NotImplementedEventType(SuppressedEvent):
     pass
 
+
 @webhook_view('Stripe')
 @has_request_variables
-def api_stripe_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body'),
-                       stream: str=REQ(default='test')) -> HttpResponse:
+def api_stripe_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+    stream: str = REQ(default='test'),
+) -> HttpResponse:
     try:
         topic, body = topic_and_body(payload)
     except SuppressedEvent:  # nocoverage
@@ -31,6 +36,7 @@ def api_stripe_webhook(request: HttpRequest, user_profile: UserProfile,
     check_send_webhook_message(request, user_profile, topic, body)
     return json_success()
 
+
 def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
     event_type = payload["type"]  # invoice.created, customer.subscription.created, etc
     if len(event_type.split('.')) == 3:
@@ -51,19 +57,24 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
     body = None
 
     def update_string(blacklist: Sequence[str] = []) -> str:
-        assert('previous_attributes' in payload['data'])
+        assert 'previous_attributes' in payload['data']
         previous_attributes = payload['data']['previous_attributes']
         for attribute in blacklist:
             previous_attributes.pop(attribute, None)
         if not previous_attributes:  # nocoverage
             raise SuppressedEvent()
-        return ''.join('\n* ' + attribute.replace('_', ' ').capitalize() +
-                       ' is now ' + stringify(object_[attribute])
-                       for attribute in sorted(previous_attributes.keys()))
+        return ''.join(
+            '\n* '
+            + attribute.replace('_', ' ').capitalize()
+            + ' is now '
+            + stringify(object_[attribute])
+            for attribute in sorted(previous_attributes.keys())
+        )
 
     def default_body(update_blacklist: Sequence[str] = []) -> str:
         body = '{resource} {verbed}'.format(
-            resource=linkified_id(object_['id']), verbed=event.replace('_', ' '))
+            resource=linkified_id(object_['id']), verbed=event.replace('_', ' ')
+        )
         if event == 'updated':
             return body + update_string(blacklist=update_blacklist)
         return body
@@ -90,13 +101,16 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
                 topic = 'charges'
             body = "{resource} for {amount} {verbed}".format(
                 resource=linkified_id(object_['id']),
-                amount=amount_string(object_['amount'], object_['currency']), verbed=event)
+                amount=amount_string(object_['amount'], object_['currency']),
+                verbed=event,
+            )
             if object_['failure_code']:  # nocoverage
                 body += '. Failure code: {}'.format(object_['failure_code'])
         if resource == 'dispute':
             topic = 'disputes'
             body = default_body() + '. Current status: {status}.'.format(
-                status=object_['status'].replace('_', ' '))
+                status=object_['status'].replace('_', ' ')
+            )
         if resource == 'refund':
             topic = 'refunds'
             body = 'A {resource} for a {charge} of {amount} was updated.'.format(
@@ -126,7 +140,9 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
             body = 'Discount {verbed} ([{coupon_name}]({coupon_url})).'.format(
                 verbed=event.replace('_', ' '),
                 coupon_name=object_['coupon']['name'],
-                coupon_url='https://dashboard.stripe.com/{}/{}'.format('coupons', object_['coupon']['id']),
+                coupon_url='https://dashboard.stripe.com/{}/{}'.format(
+                    'coupons', object_['coupon']['id']
+                ),
             )
         if resource == 'source':  # nocoverage
             body = default_body()
@@ -136,11 +152,13 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
                 DAY = 60 * 60 * 24  # seconds in a day
                 # Basically always three: https://stripe.com/docs/api/python#event_types
                 body += ' in {days} days'.format(
-                    days=int((object_["trial_end"] - time.time() + DAY//2) // DAY))
+                    days=int((object_["trial_end"] - time.time() + DAY // 2) // DAY)
+                )
             if event == 'created':
                 if object_['plan']:
                     body += '\nPlan: [{plan_nickname}](https://dashboard.stripe.com/plans/{plan_id})'.format(
-                        plan_nickname=object_['plan']['nickname'], plan_id=object_['plan']['id'])
+                        plan_nickname=object_['plan']['nickname'], plan_id=object_['plan']['id']
+                    )
                 if object_['quantity']:
                     body += '\nQuantity: {}'.format(object_['quantity'])
                 if 'billing' in object_:  # nocoverage
@@ -148,42 +166,68 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
     if category == 'file':  # nocoverage
         topic = 'files'
         body = default_body() + ' ({purpose}). \nTitle: {title}'.format(
-            purpose=object_['purpose'].replace('_', ' '), title=object_['title'])
+            purpose=object_['purpose'].replace('_', ' '), title=object_['title']
+        )
     if category == 'invoice':
         if event == 'upcoming':  # nocoverage
             body = 'Upcoming invoice created'
-        elif (event == 'updated' and
-              payload['data']['previous_attributes'].get('paid', None) is False and
-              object_['paid'] is True and
-              object_["amount_paid"] != 0 and
-              object_["amount_remaining"] == 0):
+        elif (
+            event == 'updated'
+            and payload['data']['previous_attributes'].get('paid', None) is False
+            and object_['paid'] is True
+            and object_["amount_paid"] != 0
+            and object_["amount_remaining"] == 0
+        ):
             # We are taking advantage of logical AND short circuiting here since we need the else
             # statement below.
             object_id = object_['id']
             invoice_link = f'https://dashboard.stripe.com/invoices/{object_id}'
             body = f'[Invoice]({invoice_link}) is now paid'
         else:
-            body = default_body(update_blacklist=['lines', 'description', 'number', 'finalized_at',
-                                                  'status_transitions', 'payment_intent'])
+            body = default_body(
+                update_blacklist=[
+                    'lines',
+                    'description',
+                    'number',
+                    'finalized_at',
+                    'status_transitions',
+                    'payment_intent',
+                ]
+            )
         if event == 'created':
             # Could potentially add link to invoice PDF here
             body += ' ({reason})\nTotal: {total}\nAmount due: {due}'.format(
                 reason=object_['billing_reason'].replace('_', ' '),
                 total=amount_string(object_['total'], object_['currency']),
-                due=amount_string(object_['amount_due'], object_['currency']))
+                due=amount_string(object_['amount_due'], object_['currency']),
+            )
     if category == 'invoiceitem':
         body = default_body(update_blacklist=['description', 'invoice'])
         if event == 'created':
-            body += ' for {amount}'.format(amount=amount_string(object_['amount'], object_['currency']))
+            body += ' for {amount}'.format(
+                amount=amount_string(object_['amount'], object_['currency'])
+            )
     if category.startswith('issuing'):  # nocoverage
         # Not implemented
         raise NotImplementedEventType()
     if category.startswith('order'):  # nocoverage
         # Not implemented
         raise NotImplementedEventType()
-    if category in ['payment_intent', 'payout', 'plan', 'product', 'recipient',
-                    'reporting', 'review', 'sigma', 'sku', 'source', 'subscription_schedule',
-                    'topup', 'transfer']:  # nocoverage
+    if category in [
+        'payment_intent',
+        'payout',
+        'plan',
+        'product',
+        'recipient',
+        'reporting',
+        'review',
+        'sigma',
+        'sku',
+        'source',
+        'subscription_schedule',
+        'topup',
+        'transfer',
+    ]:  # nocoverage
         # Not implemented. In theory doing something like
         #   body = default_body()
         # may not be hard for some of these
@@ -193,9 +237,25 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
         raise UnsupportedWebhookEventType(event_type)
     return (topic, body)
 
+
 def amount_string(amount: int, currency: str) -> str:
-    zero_decimal_currencies = ["bif", "djf", "jpy", "krw", "pyg", "vnd", "xaf",
-                               "xpf", "clp", "gnf", "kmf", "mga", "rwf", "vuv", "xof"]
+    zero_decimal_currencies = [
+        "bif",
+        "djf",
+        "jpy",
+        "krw",
+        "pyg",
+        "vnd",
+        "xaf",
+        "xpf",
+        "clp",
+        "gnf",
+        "kmf",
+        "mga",
+        "rwf",
+        "vuv",
+        "xof",
+    ]
     if currency in zero_decimal_currencies:
         decimal_amount = str(amount)  # nocoverage
     else:
@@ -205,7 +265,8 @@ def amount_string(amount: int, currency: str) -> str:
         return '$' + decimal_amount
     return decimal_amount + f' {currency.upper()}'
 
-def linkified_id(object_id: str, lower: bool=False) -> str:
+
+def linkified_id(object_id: str, lower: bool = False) -> str:
     names_and_urls: Dict[str, Tuple[str, Optional[str]]] = {
         # Core resources
         'ch': ('Charge', 'charges'),
@@ -219,13 +280,11 @@ def linkified_id(object_id: str, lower: bool=False) -> str:
         'prod': ('Product', 'products'),
         're': ('Refund', 'refunds'),
         'tok': ('Token', 'tokens'),
-
         # Payment methods
         # payment methods have URL prefixes like /customers/cus_id/sources
         'ba': ('Bank account', None),
         'card': ('Card', None),
         'src': ('Source', None),
-
         # Billing
         # coupons have a configurable id, but the URL prefix is /coupons
         # discounts don't have a URL, I think
@@ -238,11 +297,9 @@ def linkified_id(object_id: str, lower: bool=False) -> str:
         'si': ('Subscription item', 'subscription_items'),
         # I think usage records have URL prefixes like /subscription_items/si_id/usage_record_summaries
         'mbur': ('Usage record', None),
-
         # Undocumented :|
         'py': ('Payment', 'payments'),
         'pyr': ('Refund', 'refunds'),  # Pseudo refunds. Not fully tested.
-
         # Connect, Fraud, Orders, etc not implemented
     }
     name, url_prefix = names_and_urls[object_id.split('_')[0]]
@@ -252,6 +309,7 @@ def linkified_id(object_id: str, lower: bool=False) -> str:
         return name
     return f'[{name}](https://dashboard.stripe.com/{url_prefix}/{object_id})'
 
+
 def stringify(value: Any) -> str:
     if isinstance(value, int) and value > 1500000000 and value < 2000000000:
         return timestamp_to_datetime(value).strftime('%b %d, %Y, %H:%M:%S %Z')
diff --git a/zerver/webhooks/taiga/tests.py b/zerver/webhooks/taiga/tests.py
index ad487f908e..ca93017e22 100644
--- a/zerver/webhooks/taiga/tests.py
+++ b/zerver/webhooks/taiga/tests.py
@@ -80,8 +80,10 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("userstory_changed_comment_added", self.TOPIC, message)
 
     def test_taiga_userstory_changed_due_date(self) -> None:
-        message = ('[Aditya Verma](https://tree.taiga.io/profile/orientor) changed due date of user story ' +
-                   '[Nice Issue](https://tree.taiga.io/project/orientor-sd/us/54) from 2020-02-15 to 2020-02-22.')
+        message = (
+            '[Aditya Verma](https://tree.taiga.io/profile/orientor) changed due date of user story '
+            + '[Nice Issue](https://tree.taiga.io/project/orientor-sd/us/54) from 2020-02-15 to 2020-02-22.'
+        )
         self.check_webhook("userstory_changed_due_date", self.TOPIC, message)
 
     def test_taiga_userstory_changed_new_due_date(self) -> None:
@@ -109,7 +111,9 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("task_changed_blocked_link", self.TOPIC, message)
 
     def test_taiga_task_changed_unblocked(self) -> None:
-        message = '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) unblocked task **New Task**.'
+        message = (
+            '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) unblocked task **New Task**.'
+        )
         self.check_webhook("task_changed_unblocked", self.TOPIC, message)
 
     def test_taiga_task_changed_assigned(self) -> None:
@@ -133,12 +137,16 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("task_deleted", self.TOPIC, message)
 
     def test_taiga_task_changed_comment_added(self) -> None:
-        message = '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) commented on task **New Task**.'
+        message = (
+            '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) commented on task **New Task**.'
+        )
         self.check_webhook("task_changed_comment_added", self.TOPIC, message)
 
     def test_taiga_task_changed_due_date(self) -> None:
-        message = ('[Aditya Verma](https://tree.taiga.io/profile/orientor) changed due date of task' +
-                   ' [nice task](https://tree.taiga.io/project/orientor-sd/task/56) from 2020-02-22 to 2020-02-15.')
+        message = (
+            '[Aditya Verma](https://tree.taiga.io/profile/orientor) changed due date of task'
+            + ' [nice task](https://tree.taiga.io/project/orientor-sd/task/56) from 2020-02-22 to 2020-02-15.'
+        )
         self.check_webhook("task_changed_due_date", self.TOPIC, message)
 
     def test_taiga_task_changed_new_due_date(self) -> None:
@@ -146,11 +154,15 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("task_changed_new_due_date", self.TOPIC, message)
 
     def test_taiga_sprint_created(self) -> None:
-        message = '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) created sprint **New sprint**.'
+        message = (
+            '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) created sprint **New sprint**.'
+        )
         self.check_webhook("sprint_created", self.TOPIC, message)
 
     def test_taiga_sprint_deleted(self) -> None:
-        message = '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) deleted sprint **New name**.'
+        message = (
+            '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) deleted sprint **New name**.'
+        )
         self.check_webhook("sprint_deleted", self.TOPIC, message)
 
     def test_taiga_sprint_changed_time(self) -> None:
@@ -162,7 +174,9 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("sprint_changed_name", self.TOPIC, message)
 
     def test_taiga_issue_created(self) -> None:
-        message = '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) created issue **New issue**.'
+        message = (
+            '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) created issue **New issue**.'
+        )
         self.check_webhook("issue_created", self.TOPIC, message)
 
     def test_taiga_issue_created_link(self) -> None:
@@ -170,7 +184,9 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("issue_created_link", self.TOPIC, message)
 
     def test_taiga_issue_deleted(self) -> None:
-        message = '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) deleted issue **New issue**.'
+        message = (
+            '[TomaszKolek](https://tree.taiga.io/profile/kolaszek) deleted issue **New issue**.'
+        )
         self.check_webhook("issue_deleted", self.TOPIC, message)
 
     def test_taiga_issue_changed_assigned(self) -> None:
@@ -218,8 +234,10 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("issue_changed_unblocked", self.TOPIC, message)
 
     def test_taiga_issue_changed_due_date(self) -> None:
-        message = ('[Aditya Verma](https://tree.taiga.io/profile/orientor) changed due date of issue [Issues](https://tree.taiga.io/project/orientor-sd/issue/49) ' +
-                   'from 2020-03-08 to 2020-02-22.')
+        message = (
+            '[Aditya Verma](https://tree.taiga.io/profile/orientor) changed due date of issue [Issues](https://tree.taiga.io/project/orientor-sd/issue/49) '
+            + 'from 2020-03-08 to 2020-02-22.'
+        )
         self.check_webhook("issue_changed_due_date", self.TOPIC, message)
 
     def test_taiga_issue_changed_new_due_date(self) -> None:
@@ -283,8 +301,10 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("relateduserstory_created", self.TOPIC, message)
 
     def test_taiga_relateduserstory_created_link(self) -> None:
-        message = ('[Aditya Verma](https://tree.taiga.io/profile/orientor) added a related user story [Nice Issue](https://tree.taiga.io/project/orientor-sd/us/54) ' +
-                   'to the epic [ASAS](https://tree.taiga.io/project/orientor-sd/epic/42).')
+        message = (
+            '[Aditya Verma](https://tree.taiga.io/profile/orientor) added a related user story [Nice Issue](https://tree.taiga.io/project/orientor-sd/us/54) '
+            + 'to the epic [ASAS](https://tree.taiga.io/project/orientor-sd/epic/42).'
+        )
         self.check_webhook("relateduserstory_created_link", self.TOPIC, message)
 
     def test_taiga_relateduserstory_deleted(self) -> None:
@@ -292,5 +312,7 @@ class TaigaHookTests(WebhookTestCase):
         self.check_webhook("relateduserstory_deleted", self.TOPIC, message)
 
     def test_taiga_webhook_test(self) -> None:
-        message = '[Jan](https://tree.taiga.io/profile/kostek) triggered a test of the Taiga integration.'
+        message = (
+            '[Jan](https://tree.taiga.io/profile/kostek) triggered a test of the Taiga integration.'
+        )
         self.check_webhook("webhook_test", self.TOPIC, message)
diff --git a/zerver/webhooks/taiga/view.py b/zerver/webhooks/taiga/view.py
index 6eeddc51af..d5d574ed43 100644
--- a/zerver/webhooks/taiga/view.py
+++ b/zerver/webhooks/taiga/view.py
@@ -19,8 +19,11 @@ from zerver.models import UserProfile
 
 @webhook_view('Taiga')
 @has_request_variables
-def api_taiga_webhook(request: HttpRequest, user_profile: UserProfile,
-                      message: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_taiga_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     parsed_events = parse_message(message)
     content_lines = []
     for event in parsed_events:
@@ -34,6 +37,7 @@ def api_taiga_webhook(request: HttpRequest, user_profile: UserProfile,
 
     return json_success()
 
+
 templates = {
     'epic': {
         'create': '[{user}]({user_link}) created epic {subject}.',
@@ -51,10 +55,14 @@ templates = {
         'delete': '[{user}]({user_link}) deleted epic {subject}.',
     },
     'relateduserstory': {
-        'create': ('[{user}]({user_link}) added a related user story '
-                   '{userstory_subject} to the epic {epic_subject}.'),
-        'delete': ('[{user}]({user_link}) removed a related user story ' +
-                   '{userstory_subject} from the epic {epic_subject}.'),
+        'create': (
+            '[{user}]({user_link}) added a related user story '
+            '{userstory_subject} to the epic {epic_subject}.'
+        ),
+        'delete': (
+            '[{user}]({user_link}) removed a related user story '
+            + '{userstory_subject} from the epic {epic_subject}.'
+        ),
     },
     'userstory': {
         'create': '[{user}]({user_link}) created user story {subject}.',
@@ -79,8 +87,7 @@ templates = {
         'delete': '[{user}]({user_link}) deleted user story {subject}.',
         'due_date': '[{user}]({user_link}) changed due date of user story {subject}'
         ' from {old} to {new}.',
-        'set_due_date': '[{user}]({user_link}) set due date of user story {subject}'
-        ' to {new}.',
+        'set_due_date': '[{user}]({user_link}) set due date of user story {subject}' ' to {new}.',
     },
     'milestone': {
         'create': '[{user}]({user_link}) created sprint {subject}.',
@@ -113,8 +120,7 @@ templates = {
         'changed_us': '[{user}]({user_link}) moved task {subject} from user story {old} to {new}.',
         'due_date': '[{user}]({user_link}) changed due date of task {subject}'
         ' from {old} to {new}.',
-        'set_due_date': '[{user}]({user_link}) set due date of task {subject}'
-        ' to {new}.',
+        'set_due_date': '[{user}]({user_link}) set due date of task {subject}' ' to {new}.',
     },
     'issue': {
         'create': '[{user}]({user_link}) created issue {subject}.',
@@ -125,11 +131,11 @@ templates = {
         'set_milestone': '[{user}]({user_link}) added issue {subject} to sprint {new}.',
         'unset_milestone': '[{user}]({user_link}) detached issue {subject} from sprint {old}.',
         'changed_priority': '[{user}]({user_link}) changed priority of issue '
-                            '{subject} from {old} to {new}.',
+        '{subject} from {old} to {new}.',
         'changed_severity': '[{user}]({user_link}) changed severity of issue '
-                            '{subject} from {old} to {new}.',
+        '{subject} from {old} to {new}.',
         'changed_status': '[{user}]({user_link}) changed status of issue {subject}'
-                           ' from {old} to {new}.',
+        ' from {old} to {new}.',
         'changed_type': '[{user}]({user_link}) changed type of issue {subject} from {old} to {new}.',
         'renamed': '[{user}]({user_link}) renamed issue {old} to **{new}**.',
         'description_diff': '[{user}]({user_link}) updated description of issue {subject}.',
@@ -137,8 +143,7 @@ templates = {
         'delete': '[{user}]({user_link}) deleted issue {subject}.',
         'due_date': '[{user}]({user_link}) changed due date of issue {subject}'
         ' from {old} to {new}.',
-        'set_due_date': '[{user}]({user_link}) set due date of issue {subject}'
-        ' to {new}.',
+        'set_due_date': '[{user}]({user_link}) set due date of issue {subject}' ' to {new}.',
         'blocked': '[{user}]({user_link}) blocked issue {subject}.',
         'unblocked': '[{user}]({user_link}) unblocked issue {subject}.',
     },
@@ -149,8 +154,9 @@ templates = {
 
 
 return_type = Tuple[Optional[Dict[str, Any]], Optional[Dict[str, Any]]]
-def get_old_and_new_values(change_type: str,
-                           message: Mapping[str, Any]) -> return_type:
+
+
+def get_old_and_new_values(change_type: str, message: Mapping[str, Any]) -> return_type:
     """ Parses the payload and finds previous and current value of change_type."""
     old = message["change"]["diff"][change_type].get("from")
     new = message["change"]["diff"][change_type].get("to")
@@ -169,6 +175,7 @@ def parse_comment(message: Mapping[str, Any]) -> Dict[str, Any]:
         },
     }
 
+
 def parse_create_or_delete(message: Mapping[str, Any]) -> Dict[str, Any]:
     """ Parses create or delete event. """
     if message["type"] == 'relateduserstory':
@@ -264,6 +271,7 @@ def parse_change_event(change_type: str, message: Mapping[str, Any]) -> Optional
     evt.update(type=message["type"], event=event_type, values=values)
     return evt
 
+
 def parse_webhook_test(message: Mapping[str, Any]) -> Dict[str, Any]:
     return {
         "type": "webhook_test",
@@ -294,30 +302,42 @@ def parse_message(message: Mapping[str, Any]) -> List[Dict[str, Any]]:
 
     return events
 
+
 def generate_content(data: Mapping[str, Any]) -> str:
     """ Gets the template string and formats it with parsed data. """
     template = templates[data['type']][data['event']]
     content = template.format(**data['values'])
     return content
 
+
 def get_owner_name(message: Mapping[str, Any]) -> str:
     return message["by"]["full_name"]
 
+
 def get_owner_link(message: Mapping[str, Any]) -> str:
     return message['by']['permalink']
 
+
 def get_subject(message: Mapping[str, Any]) -> str:
     data = message["data"]
     if 'permalink' in data:
         return '[' + data.get('subject', data.get('name')) + ']' + '(' + data['permalink'] + ')'
     return '**' + data.get('subject', data.get('name')) + '**'
 
+
 def get_epic_subject(message: Mapping[str, Any]) -> str:
     if 'permalink' in message['data']['epic']:
-        return ('[' + message['data']['epic']['subject'] + ']' +
-                '(' + message['data']['epic']['permalink'] + ')')
+        return (
+            '['
+            + message['data']['epic']['subject']
+            + ']'
+            + '('
+            + message['data']['epic']['permalink']
+            + ')'
+        )
     return '**' + message['data']['epic']['subject'] + '**'
 
+
 def get_userstory_subject(message: Mapping[str, Any]) -> str:
     if 'permalink' in message['data']['user_story']:
         us_data = message['data']['user_story']
diff --git a/zerver/webhooks/teamcity/tests.py b/zerver/webhooks/teamcity/tests.py
index cf797eaaea..98859222df 100644
--- a/zerver/webhooks/teamcity/tests.py
+++ b/zerver/webhooks/teamcity/tests.py
@@ -35,7 +35,9 @@ class TeamcityHookTests(WebhookTestCase):
 
     def test_teamcity_personal(self) -> None:
         expected_message = "Your personal build for Project :: Compile build 5535 - CL 123456 is broken with status Exit code 1 (new)! :thumbs_down: See [changes](http://teamcity/viewLog.html?buildTypeId=Project_Compile&buildId=19952&tab=buildChangesDiv) and [build log](http://teamcity/viewLog.html?buildTypeId=Project_Compile&buildId=19952)."
-        payload = orjson.dumps(orjson.loads(self.webhook_fixture_data(self.FIXTURE_DIR_NAME, 'personal')))
+        payload = orjson.dumps(
+            orjson.loads(self.webhook_fixture_data(self.FIXTURE_DIR_NAME, 'personal'))
+        )
         self.client_post(self.url, payload, content_type="application/json")
         msg = self.get_last_message()
 
@@ -44,7 +46,9 @@ class TeamcityHookTests(WebhookTestCase):
 
     def test_non_generic_payload_ignore_pm_notification(self) -> None:
         expected_message = MISCONFIGURED_PAYLOAD_TYPE_ERROR_MESSAGE.format(
-            bot_name=get_user_by_delivery_email('webhook-bot@zulip.com', get_realm('zulip')).full_name,
+            bot_name=get_user_by_delivery_email(
+                'webhook-bot@zulip.com', get_realm('zulip')
+            ).full_name,
             support_email=FromAddress.SUPPORT,
         ).strip()
         payload = self.get_body('slack_non_generic_payload')
diff --git a/zerver/webhooks/teamcity/view.py b/zerver/webhooks/teamcity/view.py
index dbb201dda7..2d3e368f89 100644
--- a/zerver/webhooks/teamcity/view.py
+++ b/zerver/webhooks/teamcity/view.py
@@ -25,30 +25,36 @@ in your TeamCity webhook configuration. Contact {support_email} if you
 need further help!
 """
 
+
 def guess_zulip_user_from_teamcity(teamcity_username: str, realm: Realm) -> Optional[UserProfile]:
     try:
         # Try to find a matching user in Zulip
         # We search a user's full name, short name,
         # and beginning of email address
         user = UserProfile.objects.filter(
-            Q(full_name__iexact=teamcity_username) |
-            Q(email__istartswith=teamcity_username),
+            Q(full_name__iexact=teamcity_username) | Q(email__istartswith=teamcity_username),
             is_active=True,
-            realm=realm).order_by("id")[0]
+            realm=realm,
+        ).order_by("id")[0]
         return user
     except IndexError:
         return None
 
+
 def get_teamcity_property_value(property_list: List[Dict[str, str]], name: str) -> Optional[str]:
     for property in property_list:
         if property['name'] == name:
             return property['value']
     return None
 
+
 @webhook_view('Teamcity')
 @has_request_variables
-def api_teamcity_webhook(request: HttpRequest, user_profile: UserProfile,
-                         payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_teamcity_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     message = payload.get('build')
     if message is None:
         # Ignore third-party specific (e.g. Slack) payload formats
@@ -57,8 +63,7 @@ def api_teamcity_webhook(request: HttpRequest, user_profile: UserProfile,
             bot_name=user_profile.full_name,
             support_email=FromAddress.SUPPORT,
         ).strip()
-        send_rate_limited_pm_notification_to_bot_owner(
-            user_profile, user_profile.realm, message)
+        send_rate_limited_pm_notification_to_bot_owner(user_profile, user_profile.realm, message)
 
         return json_success()
 
@@ -102,7 +107,10 @@ def api_teamcity_webhook(request: HttpRequest, user_profile: UserProfile,
         topic = build_name
 
     # Check if this is a personal build, and if so try to private message the user who triggered it.
-    if get_teamcity_property_value(message['teamcityProperties'], 'env.BUILD_IS_PERSONAL') == 'true':
+    if (
+        get_teamcity_property_value(message['teamcityProperties'], 'env.BUILD_IS_PERSONAL')
+        == 'true'
+    ):
         # The triggeredBy field gives us the teamcity user full name, and the
         # "teamcity.build.triggeredBy.username" property gives us the teamcity username.
         # Let's try finding the user email from both.
@@ -110,15 +118,22 @@ def api_teamcity_webhook(request: HttpRequest, user_profile: UserProfile,
         teamcity_user = guess_zulip_user_from_teamcity(teamcity_fullname, user_profile.realm)
 
         if teamcity_user is None:
-            teamcity_shortname = get_teamcity_property_value(message['teamcityProperties'],
-                                                             'teamcity.build.triggeredBy.username')
+            teamcity_shortname = get_teamcity_property_value(
+                message['teamcityProperties'], 'teamcity.build.triggeredBy.username'
+            )
             if teamcity_shortname is not None:
-                teamcity_user = guess_zulip_user_from_teamcity(teamcity_shortname, user_profile.realm)
+                teamcity_user = guess_zulip_user_from_teamcity(
+                    teamcity_shortname, user_profile.realm
+                )
 
         if teamcity_user is None:
             # We can't figure out who started this build - there's nothing we can do here.
-            logging.info("Teamcity webhook couldn't find a matching Zulip user for "
-                         "Teamcity user '%s' or '%s'", teamcity_fullname, teamcity_shortname)
+            logging.info(
+                "Teamcity webhook couldn't find a matching Zulip user for "
+                "Teamcity user '%s' or '%s'",
+                teamcity_fullname,
+                teamcity_shortname,
+            )
             return json_success()
 
         body = f"Your personal build for {body}"
diff --git a/zerver/webhooks/thinkst/view.py b/zerver/webhooks/thinkst/view.py
index e205f84884..2c96da94cc 100644
--- a/zerver/webhooks/thinkst/view.py
+++ b/zerver/webhooks/thinkst/view.py
@@ -39,8 +39,7 @@ def canary_kind(message: Dict[str, Any]) -> str:
         return 'canary'
 
 
-def source_ip_and_reverse_dns(
-        message: Dict[str, Any]) -> Tuple[Optional[str], Optional[str]]:
+def source_ip_and_reverse_dns(message: Dict[str, Any]) -> Tuple[Optional[str], Optional[str]]:
     """
     Extract the source IP and reverse DNS information from a canary request.
     """
@@ -107,9 +106,10 @@ def body(message: Dict[str, Any]) -> str:
 @webhook_view('Thinkst')
 @has_request_variables
 def api_thinkst_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        message: Dict[str, Any] = REQ(argument_type='body'),
-        user_specified_topic: Optional[str] = REQ('topic', default=None)
+    request: HttpRequest,
+    user_profile: UserProfile,
+    message: Dict[str, Any] = REQ(argument_type='body'),
+    user_specified_topic: Optional[str] = REQ('topic', default=None),
 ) -> HttpResponse:
     """
     Construct a response to a webhook event from a Thinkst canary or canarytoken.
diff --git a/zerver/webhooks/travis/tests.py b/zerver/webhooks/travis/tests.py
index 95c5491790..cec751160a 100644
--- a/zerver/webhooks/travis/tests.py
+++ b/zerver/webhooks/travis/tests.py
@@ -16,13 +16,18 @@ class TravisHookTests(WebhookTestCase):
         The subject describes the repo and Stash "project". The
         content describes the commits pushed.
         """
-        expected_message = ("Author: josh_mandel\nBuild status: Passed :thumbs_up:\n"
-                            "Details: [changes](https://github.com/hl7-fhir/fhir-sv"
-                            "n/compare/6dccb98bcfd9...6c457d366a31), [build log](ht"
-                            "tps://travis-ci.org/hl7-fhir/fhir-svn/builds/92495257)")
+        expected_message = (
+            "Author: josh_mandel\nBuild status: Passed :thumbs_up:\n"
+            "Details: [changes](https://github.com/hl7-fhir/fhir-sv"
+            "n/compare/6dccb98bcfd9...6c457d366a31), [build log](ht"
+            "tps://travis-ci.org/hl7-fhir/fhir-svn/builds/92495257)"
+        )
 
         self.check_webhook(
-            "build", self.TOPIC, expected_message, content_type="application/x-www-form-urlencoded",
+            "build",
+            self.TOPIC,
+            expected_message,
+            content_type="application/x-www-form-urlencoded",
         )
 
     def test_ignore_travis_pull_request_by_default(self) -> None:
@@ -38,10 +43,12 @@ class TravisHookTests(WebhookTestCase):
 
     def test_travis_pull_requests_are_not_ignored_when_applicable(self) -> None:
         self.url = f"{self.build_webhook_url()}&ignore_pull_requests=false"
-        expected_message = ("Author: josh_mandel\nBuild status: Passed :thumbs_up:\n"
-                            "Details: [changes](https://github.com/hl7-fhir/fhir-sv"
-                            "n/compare/6dccb98bcfd9...6c457d366a31), [build log](ht"
-                            "tps://travis-ci.org/hl7-fhir/fhir-svn/builds/92495257)")
+        expected_message = (
+            "Author: josh_mandel\nBuild status: Passed :thumbs_up:\n"
+            "Details: [changes](https://github.com/hl7-fhir/fhir-sv"
+            "n/compare/6dccb98bcfd9...6c457d366a31), [build log](ht"
+            "tps://travis-ci.org/hl7-fhir/fhir-svn/builds/92495257)"
+        )
 
         self.check_webhook(
             "pull_request",
@@ -51,4 +58,6 @@ class TravisHookTests(WebhookTestCase):
         )
 
     def get_body(self, fixture_name: str) -> str:
-        return urllib.parse.urlencode({'payload': self.webhook_fixture_data("travis", fixture_name, file_type="json")})
+        return urllib.parse.urlencode(
+            {'payload': self.webhook_fixture_data("travis", fixture_name, file_type="json")}
+        )
diff --git a/zerver/webhooks/travis/view.py b/zerver/webhooks/travis/view.py
index 47bae289ea..611fc8871d 100644
--- a/zerver/webhooks/travis/view.py
+++ b/zerver/webhooks/travis/view.py
@@ -19,15 +19,24 @@ Author: {}
 Build status: {} {}
 Details: [changes]({}), [build log]({})"""
 
+
 @webhook_view('Travis')
 @has_request_variables
-def api_travis_webhook(request: HttpRequest, user_profile: UserProfile,
-                       ignore_pull_requests: bool = REQ(validator=check_bool, default=True),
-                       message: Dict[str, object]=REQ('payload', validator=check_dict([
-                           ('author_name', check_string),
-                           ('status_message', check_string),
-                           ('compare_url', check_string),
-                       ]))) -> HttpResponse:
+def api_travis_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    ignore_pull_requests: bool = REQ(validator=check_bool, default=True),
+    message: Dict[str, object] = REQ(
+        'payload',
+        validator=check_dict(
+            [
+                ('author_name', check_string),
+                ('status_message', check_string),
+                ('compare_url', check_string),
+            ]
+        ),
+    ),
+) -> HttpResponse:
 
     message_status = message['status_message']
     if ignore_pull_requests and message['type'] == 'pull_request':
diff --git a/zerver/webhooks/trello/tests.py b/zerver/webhooks/trello/tests.py
index da4062ae93..ff4474b50a 100644
--- a/zerver/webhooks/trello/tests.py
+++ b/zerver/webhooks/trello/tests.py
@@ -32,11 +32,15 @@ class TrelloHookTests(WebhookTestCase):
         self.check_webhook("removing_label_from_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_member_was_added_to_card(self) -> None:
-        expected_message = "TomaszKolek added TomaszKolek to [Card name](https://trello.com/c/9BduUcVQ)."
+        expected_message = (
+            "TomaszKolek added TomaszKolek to [Card name](https://trello.com/c/9BduUcVQ)."
+        )
         self.check_webhook("adding_member_to_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_member_was_removed_from_card(self) -> None:
-        expected_message = "TomaszKolek removed Trello from [Card name](https://trello.com/c/9BduUcVQ)."
+        expected_message = (
+            "TomaszKolek removed Trello from [Card name](https://trello.com/c/9BduUcVQ)."
+        )
         self.check_webhook("removing_member_from_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_due_date_was_set(self) -> None:
@@ -48,7 +52,9 @@ class TrelloHookTests(WebhookTestCase):
         self.check_webhook("changing_due_date_on_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_due_date_was_removed(self) -> None:
-        expected_message = "TomaszKolek removed the due date from [Card name](https://trello.com/c/9BduUcVQ)."
+        expected_message = (
+            "TomaszKolek removed the due date from [Card name](https://trello.com/c/9BduUcVQ)."
+        )
         self.check_webhook("removing_due_date_from_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_card_was_archived(self) -> None:
@@ -80,15 +86,21 @@ class TrelloHookTests(WebhookTestCase):
         self.check_webhook("uncheck_item_on_card_checklist", "Zulip", expected_message)
 
     def test_trello_webhook_when_member_was_removed_from_board(self) -> None:
-        expected_message = "TomaszKolek removed Trello from [Welcome Board](https://trello.com/b/iqXXzYEj)."
+        expected_message = (
+            "TomaszKolek removed Trello from [Welcome Board](https://trello.com/b/iqXXzYEj)."
+        )
         self.check_webhook("removing_member_from_board", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_member_was_added_to_board(self) -> None:
-        expected_message = "TomaszKolek added Trello to [Welcome Board](https://trello.com/b/iqXXzYEj)."
+        expected_message = (
+            "TomaszKolek added Trello to [Welcome Board](https://trello.com/b/iqXXzYEj)."
+        )
         self.check_webhook("adding_member_to_board", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_list_was_added_to_board(self) -> None:
-        expected_message = "TomaszKolek added New list list to [Welcome Board](https://trello.com/b/iqXXzYEj)."
+        expected_message = (
+            "TomaszKolek added New list list to [Welcome Board](https://trello.com/b/iqXXzYEj)."
+        )
         self.check_webhook("adding_new_list_to_board", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_comment_was_added_to_card(self) -> None:
@@ -150,10 +162,7 @@ class TrelloHookTests(WebhookTestCase):
                 model="whatever",
                 action=dict(
                     type="updateCard",
-                    data=dict(
-                        card=card,
-                        old=old
-                    ),
+                    data=dict(card=card, old=old),
                 ),
             )
             payload = orjson.dumps(data).decode()
@@ -164,7 +173,9 @@ class TrelloHookTests(WebhookTestCase):
         self.check_webhook("adding_description_to_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_description_was_removed_from_card(self) -> None:
-        expected_message = "Marco Matarazzo removed description from [New Card](https://trello.com/c/P2r0z66z)."
+        expected_message = (
+            "Marco Matarazzo removed description from [New Card](https://trello.com/c/P2r0z66z)."
+        )
         self.check_webhook("removing_description_from_card", "Welcome Board", expected_message)
 
     def test_trello_webhook_when_description_was_changed_on_card(self) -> None:
diff --git a/zerver/webhooks/trello/view/__init__.py b/zerver/webhooks/trello/view/__init__.py
index 19c6ccacd0..abbe89de2c 100644
--- a/zerver/webhooks/trello/view/__init__.py
+++ b/zerver/webhooks/trello/view/__init__.py
@@ -18,9 +18,11 @@ from .card_actions import IGNORED_CARD_ACTIONS, SUPPORTED_CARD_ACTIONS, process_
 @webhook_view('Trello')
 @return_success_on_head_request
 @has_request_variables
-def api_trello_webhook(request: HttpRequest,
-                       user_profile: UserProfile,
-                       payload: Mapping[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_trello_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Mapping[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     payload = orjson.loads(request.body)
     action_type = payload['action'].get('type')
     message = get_subject_and_body(payload, action_type)
@@ -32,6 +34,7 @@ def api_trello_webhook(request: HttpRequest,
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_subject_and_body(payload: Mapping[str, Any], action_type: str) -> Optional[Tuple[str, str]]:
     if action_type in SUPPORTED_CARD_ACTIONS:
         return process_card_action(payload, action_type)
diff --git a/zerver/webhooks/trello/view/board_actions.py b/zerver/webhooks/trello/view/board_actions.py
index 2941991f2e..1d45e1776d 100644
--- a/zerver/webhooks/trello/view/board_actions.py
+++ b/zerver/webhooks/trello/view/board_actions.py
@@ -23,13 +23,16 @@ ACTIONS_TO_MESSAGE_MAPPER = {
     CHANGE_NAME: 'renamed the board from {old_name} to {board_url_template}.',
 }
 
-def process_board_action(payload: Mapping[str, Any],
-                         action_type: Optional[str]) -> Optional[Tuple[str, str]]:
+
+def process_board_action(
+    payload: Mapping[str, Any], action_type: Optional[str]
+) -> Optional[Tuple[str, str]]:
     action_type = get_proper_action(payload, action_type)
     if action_type is not None:
         return get_subject(payload), get_body(payload, action_type)
     return None
 
+
 def get_proper_action(payload: Mapping[str, Any], action_type: Optional[str]) -> Optional[str]:
     if action_type == 'updateBoard':
         data = get_action_data(payload)
@@ -42,26 +45,31 @@ def get_proper_action(payload: Mapping[str, Any], action_type: Optional[str]) ->
         raise UnsupportedWebhookEventType(action_type)
     return action_type
 
+
 def get_subject(payload: Mapping[str, Any]) -> str:
     return get_action_data(payload)['board']['name']
 
+
 def get_body(payload: Mapping[str, Any], action_type: str) -> str:
     message_body = ACTIONS_TO_FILL_BODY_MAPPER[action_type](payload, action_type)
     creator = payload['action']['memberCreator']['fullName']
     return f'{creator} {message_body}'
 
+
 def get_managed_member_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'member_name': payload['action']['member']['fullName'],
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_create_list_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'list_name': get_action_data(payload)['list']['name'],
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_change_name_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'old_name': get_action_data(payload)['old']['name'],
@@ -69,31 +77,38 @@ def get_change_name_body(payload: Mapping[str, Any], action_type: str) -> str:
     return fill_appropriate_message_content(payload, action_type, data)
 
 
-def fill_appropriate_message_content(payload: Mapping[str, Any],
-                                     action_type: str,
-                                     data: Mapping[str, Any] = {}) -> str:
+def fill_appropriate_message_content(
+    payload: Mapping[str, Any], action_type: str, data: Mapping[str, Any] = {}
+) -> str:
     data = dict(data)
     if 'board_url_template' not in data:
         data['board_url_template'] = get_filled_board_url_template(payload)
     message_body = get_message_body(action_type)
     return message_body.format(**data)
 
+
 def get_filled_board_url_template(payload: Mapping[str, Any]) -> str:
-    return TRELLO_BOARD_URL_TEMPLATE.format(board_name=get_board_name(payload),
-                                            board_url=get_board_url(payload))
+    return TRELLO_BOARD_URL_TEMPLATE.format(
+        board_name=get_board_name(payload), board_url=get_board_url(payload)
+    )
+
 
 def get_board_name(payload: Mapping[str, Any]) -> str:
     return get_action_data(payload)['board']['name']
 
+
 def get_board_url(payload: Mapping[str, Any]) -> str:
     return 'https://trello.com/b/{}'.format(get_action_data(payload)['board']['shortLink'])
 
+
 def get_message_body(action_type: str) -> str:
     return ACTIONS_TO_MESSAGE_MAPPER[action_type]
 
+
 def get_action_data(payload: Mapping[str, Any]) -> Mapping[str, Any]:
     return payload['action']['data']
 
+
 ACTIONS_TO_FILL_BODY_MAPPER = {
     REMOVE_MEMBER: get_managed_member_body,
     ADD_MEMBER: get_managed_member_body,
diff --git a/zerver/webhooks/trello/view/card_actions.py b/zerver/webhooks/trello/view/card_actions.py
index bb5388a040..a2227b5ad5 100644
--- a/zerver/webhooks/trello/view/card_actions.py
+++ b/zerver/webhooks/trello/view/card_actions.py
@@ -49,8 +49,10 @@ ACTIONS_TO_MESSAGE_MAPPER = {
     CHANGE_LIST: 'moved {card_url_template} from {old_list} to {new_list}.',
     CHANGE_NAME: 'renamed the card from "{old_name}" to {card_url_template}.',
     SET_DESC: 'set description for {card_url_template} to:\n~~~ quote\n{desc}\n~~~\n',
-    CHANGE_DESC: ('changed description for {card_url_template} from\n' +
-                  '~~~ quote\n{old_desc}\n~~~\nto\n~~~ quote\n{desc}\n~~~\n'),
+    CHANGE_DESC: (
+        'changed description for {card_url_template} from\n'
+        + '~~~ quote\n{old_desc}\n~~~\nto\n~~~ quote\n{desc}\n~~~\n'
+    ),
     REMOVE_DESC: 'removed description from {card_url_template}.',
     ARCHIVE: 'archived {card_url_template}.',
     REOPEN: 'reopened {card_url_template}.',
@@ -67,15 +69,18 @@ ACTIONS_TO_MESSAGE_MAPPER = {
     UPDATE_CHECK_ITEM_STATE: '{action} **{item_name}** in **{checklist_name}** ({card_url_template}).',
 }
 
+
 def prettify_date(date_string: str) -> str:
     return date_string.replace('T', ' ').replace('.000', '').replace('Z', ' UTC')
 
+
 def process_card_action(payload: Mapping[str, Any], action_type: str) -> Optional[Tuple[str, str]]:
     proper_action = get_proper_action(payload, action_type)
     if proper_action is not None:
         return get_subject(payload), get_body(payload, proper_action)
     return None
 
+
 def get_proper_action(payload: Mapping[str, Any], action_type: str) -> Optional[str]:
     if action_type == 'updateCard':
         data = get_action_data(payload)
@@ -119,20 +124,24 @@ def get_proper_action(payload: Mapping[str, Any], action_type: str) -> Optional[
 
     return action_type
 
+
 def get_subject(payload: Mapping[str, Any]) -> str:
     return get_action_data(payload)['board'].get('name')
 
+
 def get_body(payload: Mapping[str, Any], action_type: str) -> str:
     message_body = ACTIONS_TO_FILL_BODY_MAPPER[action_type](payload, action_type)
     creator = payload['action']['memberCreator'].get('fullName')
     return f'{creator} {message_body}'
 
+
 def get_added_checklist_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'checklist_name': get_action_data(payload)['checklist'].get('name'),
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_update_check_item_body(payload: Mapping[str, Any], action_type: str) -> str:
     action = get_action_data(payload)
     state = action['checkItem']['state']
@@ -143,6 +152,7 @@ def get_update_check_item_body(payload: Mapping[str, Any], action_type: str) ->
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_added_attachment_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'attachment_url': get_action_data(payload)['attachment'].get('url'),
@@ -150,6 +160,7 @@ def get_added_attachment_body(payload: Mapping[str, Any], action_type: str) -> s
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_updated_card_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'card_name': get_card_name(payload),
@@ -158,6 +169,7 @@ def get_updated_card_body(payload: Mapping[str, Any], action_type: str) -> str:
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_renamed_card_body(payload: Mapping[str, Any], action_type: str) -> str:
 
     data = {
@@ -166,6 +178,7 @@ def get_renamed_card_body(payload: Mapping[str, Any], action_type: str) -> str:
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_added_label_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'color': get_action_data(payload).get('value'),
@@ -173,24 +186,28 @@ def get_added_label_body(payload: Mapping[str, Any], action_type: str) -> str:
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_managed_member_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'member_name': payload['action']['member'].get('fullName'),
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_comment_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'text': get_action_data(payload)['text'],
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_managed_due_date_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'due_date': prettify_date(get_action_data(payload)['card'].get('due')),
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_changed_due_date_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'due_date': prettify_date(get_action_data(payload)['card'].get('due')),
@@ -198,12 +215,14 @@ def get_changed_due_date_body(payload: Mapping[str, Any], action_type: str) -> s
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_managed_desc_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'desc': get_action_data(payload)['card']['desc'],
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_changed_desc_body(payload: Mapping[str, Any], action_type: str) -> str:
     data = {
         'desc': get_action_data(payload)['card']['desc'],
@@ -211,33 +230,43 @@ def get_changed_desc_body(payload: Mapping[str, Any], action_type: str) -> str:
     }
     return fill_appropriate_message_content(payload, action_type, data)
 
+
 def get_body_by_action_type_without_data(payload: Mapping[str, Any], action_type: str) -> str:
     return fill_appropriate_message_content(payload, action_type)
 
-def fill_appropriate_message_content(payload: Mapping[str, Any],
-                                     action_type: str,
-                                     data: Mapping[str, Any] = {}) -> str:
+
+def fill_appropriate_message_content(
+    payload: Mapping[str, Any], action_type: str, data: Mapping[str, Any] = {}
+) -> str:
     data = dict(data)
     if 'card_url_template' not in data:
         data['card_url_template'] = get_filled_card_url_template(payload)
     message_body = get_message_body(action_type)
     return message_body.format(**data)
 
+
 def get_filled_card_url_template(payload: Mapping[str, Any]) -> str:
-    return TRELLO_CARD_URL_TEMPLATE.format(card_name=get_card_name(payload), card_url=get_card_url(payload))
+    return TRELLO_CARD_URL_TEMPLATE.format(
+        card_name=get_card_name(payload), card_url=get_card_url(payload)
+    )
+
 
 def get_card_url(payload: Mapping[str, Any]) -> str:
     return 'https://trello.com/c/{}'.format(get_action_data(payload)['card'].get('shortLink'))
 
+
 def get_message_body(action_type: str) -> str:
     return ACTIONS_TO_MESSAGE_MAPPER[action_type]
 
+
 def get_card_name(payload: Mapping[str, Any]) -> str:
     return get_action_data(payload)['card'].get('name')
 
+
 def get_action_data(payload: Mapping[str, Any]) -> Mapping[str, Any]:
     return payload['action'].get('data')
 
+
 ACTIONS_TO_FILL_BODY_MAPPER = {
     CREATE: get_body_by_action_type_without_data,
     CHANGE_LIST: get_updated_card_body,
diff --git a/zerver/webhooks/updown/view.py b/zerver/webhooks/updown/view.py
index 360151387e..88c9782540 100644
--- a/zerver/webhooks/updown/view.py
+++ b/zerver/webhooks/updown/view.py
@@ -13,13 +13,16 @@ from zerver.models import UserProfile
 
 TOPIC_TEMPLATE = "{service_url}"
 
-def send_message_for_event(request: HttpRequest, user_profile: UserProfile,
-                           event: Dict[str, Any]) -> None:
+
+def send_message_for_event(
+    request: HttpRequest, user_profile: UserProfile, event: Dict[str, Any]
+) -> None:
     event_type = get_event_type(event)
     subject = TOPIC_TEMPLATE.format(service_url=event['check']['url'])
     body = EVENT_TYPE_BODY_MAPPER[event_type](event)
     check_send_webhook_message(request, user_profile, subject, body)
 
+
 def get_body_for_up_event(event: Dict[str, Any]) -> str:
     body = "Service is `up`"
     event_downtime = event['downtime']
@@ -30,6 +33,7 @@ def get_body_for_up_event(event: Dict[str, Any]) -> str:
             body = f"{body} after {string_date}"
     return f"{body}."
 
+
 def get_time_string_based_on_duration(duration: int) -> str:
     days, reminder = divmod(duration, 86400)
     hours, reminder = divmod(reminder, 3600)
@@ -42,6 +46,7 @@ def get_time_string_based_on_duration(duration: int) -> str:
     string_date += add_time_part_to_string_date_if_needed(seconds, 'second')
     return string_date.rstrip()
 
+
 def add_time_part_to_string_date_if_needed(value: int, text_name: str) -> str:
     if value == 1:
         return f"1 {text_name} "
@@ -49,26 +54,32 @@ def add_time_part_to_string_date_if_needed(value: int, text_name: str) -> str:
         return f"{value} {text_name}s "
     return ''
 
+
 def get_body_for_down_event(event: Dict[str, Any]) -> str:
     return "Service is `down`. It returned a {} error at {}.".format(
         event['downtime']['error'],
-        event['downtime']['started_at'].replace('T', ' ').replace('Z', ' UTC'))
+        event['downtime']['started_at'].replace('T', ' ').replace('Z', ' UTC'),
+    )
+
 
 @webhook_view('Updown')
 @has_request_variables
 def api_updown_webhook(
-        request: HttpRequest, user_profile: UserProfile,
-        payload: List[Dict[str, Any]]=REQ(argument_type='body'),
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: List[Dict[str, Any]] = REQ(argument_type='body'),
 ) -> HttpResponse:
     for event in payload:
         send_message_for_event(request, user_profile, event)
     return json_success()
 
+
 EVENT_TYPE_BODY_MAPPER = {
     'up': get_body_for_up_event,
     'down': get_body_for_down_event,
 }
 
+
 def get_event_type(event: Dict[str, Any]) -> str:
     event_type_match = re.match('check.(.*)', event['event'])
     if event_type_match:
diff --git a/zerver/webhooks/wordpress/tests.py b/zerver/webhooks/wordpress/tests.py
index 54cf2080d0..da4f16a89f 100644
--- a/zerver/webhooks/wordpress/tests.py
+++ b/zerver/webhooks/wordpress/tests.py
@@ -58,7 +58,9 @@ class WordPressHookTests(WebhookTestCase):
     def test_user_register(self) -> None:
 
         expected_topic = "New Blog Users"
-        expected_message = "New blog user registered:\n* **Name**: test_user\n* **Email**: test_user@example.com"
+        expected_message = (
+            "New blog user registered:\n* **Name**: test_user\n* **Email**: test_user@example.com"
+        )
 
         self.check_webhook(
             "user_register",
@@ -90,8 +92,10 @@ class WordPressHookTests(WebhookTestCase):
         self.subscribe(self.test_user, self.STREAM_NAME)
 
         # post to the webhook url
-        post_params = {'stream_name': self.STREAM_NAME,
-                       'content_type': 'application/x-www-form-urlencoded'}
+        post_params = {
+            'stream_name': self.STREAM_NAME,
+            'content_type': 'application/x-www-form-urlencoded',
+        }
         result = self.client_post(self.url, 'unknown_action', **post_params)
 
         # check that we got the expected error message
@@ -103,8 +107,10 @@ class WordPressHookTests(WebhookTestCase):
         # params but without the hook parameter. This should also return an error.
 
         self.subscribe(self.test_user, self.STREAM_NAME)
-        post_params = {'stream_name': self.STREAM_NAME,
-                       'content_type': 'application/x-www-form-urlencoded'}
+        post_params = {
+            'stream_name': self.STREAM_NAME,
+            'content_type': 'application/x-www-form-urlencoded',
+        }
         result = self.client_post(self.url, 'unknown_action', **post_params)
 
         self.assert_json_error(result, "Unknown WordPress webhook action: WordPress Action")
diff --git a/zerver/webhooks/wordpress/view.py b/zerver/webhooks/wordpress/view.py
index af9eaa19e4..d34e203736 100644
--- a/zerver/webhooks/wordpress/view.py
+++ b/zerver/webhooks/wordpress/view.py
@@ -19,16 +19,20 @@ New blog user registered:
 """.strip()
 WP_LOGIN_TEMPLATE = 'User {name} logged in.'
 
+
 @webhook_view("WordPress", notify_bot_owner_on_invalid_json=False)
 @has_request_variables
-def api_wordpress_webhook(request: HttpRequest, user_profile: UserProfile,
-                          hook: str=REQ(default="WordPress Action"),
-                          post_title: str=REQ(default="New WordPress Post"),
-                          post_type: str=REQ(default="post"),
-                          post_url: str=REQ(default="WordPress Post URL"),
-                          display_name: str=REQ(default="New User Name"),
-                          user_email: str=REQ(default="New User Email"),
-                          user_login: str=REQ(default="Logged in User")) -> HttpResponse:
+def api_wordpress_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    hook: str = REQ(default="WordPress Action"),
+    post_title: str = REQ(default="New WordPress Post"),
+    post_type: str = REQ(default="post"),
+    post_url: str = REQ(default="WordPress Post URL"),
+    display_name: str = REQ(default="New User Name"),
+    user_email: str = REQ(default="New User Email"),
+    user_login: str = REQ(default="Logged in User"),
+) -> HttpResponse:
     # remove trailing whitespace (issue for some test fixtures)
     hook = hook.rstrip()
 
diff --git a/zerver/webhooks/yo/tests.py b/zerver/webhooks/yo/tests.py
index 3fcebf5c78..e6af2a77fc 100644
--- a/zerver/webhooks/yo/tests.py
+++ b/zerver/webhooks/yo/tests.py
@@ -19,8 +19,9 @@ class YoHookTests(WebhookTestCase):
             user_ip="127.0.0.1",
         )
         expected_message = "Yo from IAGO"
-        self.send_and_test_private_message('', expected_message=expected_message,
-                                           content_type="application/x-www-form-urlencoded")
+        self.send_and_test_private_message(
+            '', expected_message=expected_message, content_type="application/x-www-form-urlencoded"
+        )
 
     def get_payload(self, fixture_name: str) -> Dict[str, str]:
         return {}
diff --git a/zerver/webhooks/yo/view.py b/zerver/webhooks/yo/view.py
index 728e256305..2bb08d7b9b 100644
--- a/zerver/webhooks/yo/view.py
+++ b/zerver/webhooks/yo/view.py
@@ -12,11 +12,14 @@ from zerver.models import UserProfile, get_user
 
 @webhook_view('Yo', notify_bot_owner_on_invalid_json=False)
 @has_request_variables
-def api_yo_app_webhook(request: HttpRequest, user_profile: UserProfile,
-                       email: str = REQ(default=""),
-                       username: str = REQ(default='Yo Bot'),
-                       topic: Optional[str] = REQ(default=None),
-                       user_ip: Optional[str] = REQ(default=None)) -> HttpResponse:
+def api_yo_app_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    email: str = REQ(default=""),
+    username: str = REQ(default='Yo Bot'),
+    topic: Optional[str] = REQ(default=None),
+    user_ip: Optional[str] = REQ(default=None),
+) -> HttpResponse:
     body = f'Yo from {username}'
     receiving_user = get_user(email, user_profile.realm)
     check_send_private_message(user_profile, request.client, receiving_user, body)
diff --git a/zerver/webhooks/zabbix/view.py b/zerver/webhooks/zabbix/view.py
index 7ff1b56003..413238fdde 100644
--- a/zerver/webhooks/zabbix/view.py
+++ b/zerver/webhooks/zabbix/view.py
@@ -26,10 +26,14 @@ ZABBIX_MESSAGE_TEMPLATE = """
 * {item}
 """.strip()
 
+
 @webhook_view('Zabbix')
 @has_request_variables
-def api_zabbix_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_zabbix_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
 
     try:
         body = get_body_for_http_request(payload)
@@ -39,17 +43,18 @@ def api_zabbix_webhook(request: HttpRequest, user_profile: UserProfile,
             bot_name=user_profile.full_name,
             support_email=FromAddress.SUPPORT,
         ).strip()
-        send_rate_limited_pm_notification_to_bot_owner(
-            user_profile, user_profile.realm, message)
+        send_rate_limited_pm_notification_to_bot_owner(user_profile, user_profile.realm, message)
 
         return json_error(_("Invalid payload"))
 
     check_send_webhook_message(request, user_profile, subject, body)
     return json_success()
 
+
 def get_subject_for_http_request(payload: Dict[str, Any]) -> str:
     return ZABBIX_TOPIC_TEMPLATE.format(hostname=payload['hostname'])
 
+
 def get_body_for_http_request(payload: Dict[str, Any]) -> str:
     hostname = payload['hostname']
     severity = payload['severity']
diff --git a/zerver/webhooks/zapier/tests.py b/zerver/webhooks/zapier/tests.py
index 9c03fb9e3f..8190aaeed3 100644
--- a/zerver/webhooks/zapier/tests.py
+++ b/zerver/webhooks/zapier/tests.py
@@ -18,9 +18,12 @@ class ZapierHookTests(WebhookTestCase):
 
     def test_zapier_weather_update(self) -> None:
         expected_topic = "Here is your weather update for the day:"
-        expected_message = "Foggy in the morning.\nMaximum temperature to be 24.\nMinimum temperature to be 12"
+        expected_message = (
+            "Foggy in the morning.\nMaximum temperature to be 24.\nMinimum temperature to be 12"
+        )
         self.check_webhook("weather_update", expected_topic, expected_message)
 
+
 class ZapierZulipAppTests(WebhookTestCase):
     STREAM_NAME = 'zapier'
     URL_TEMPLATE = "/api/v1/external/zapier?api_key={api_key}&stream={stream}"
@@ -28,8 +31,7 @@ class ZapierZulipAppTests(WebhookTestCase):
 
     def test_auth(self) -> None:
         payload = self.get_body('zapier_zulip_app_auth')
-        result = self.client_post(self.url, payload,
-                                  content_type='application/json')
+        result = self.client_post(self.url, payload, content_type='application/json')
         json_result = self.assert_json_success(result)
         self.assertEqual(json_result['full_name'], 'Zulip Webhook Bot')
         self.assertEqual(json_result['email'], 'webhook-bot@zulip.com')
diff --git a/zerver/webhooks/zapier/view.py b/zerver/webhooks/zapier/view.py
index b400827de0..61204c5428 100644
--- a/zerver/webhooks/zapier/view.py
+++ b/zerver/webhooks/zapier/view.py
@@ -12,17 +12,22 @@ from zerver.models import UserProfile
 
 @webhook_view('Zapier', notify_bot_owner_on_invalid_json=False)
 @has_request_variables
-def api_zapier_webhook(request: HttpRequest, user_profile: UserProfile,
-                       payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def api_zapier_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     if payload.get('type') == 'auth':
         # The bot's details are used by our Zapier app to format a connection
         # label for users to be able to distinguish between different Zulip
         # bots and API keys in their UI
-        return json_success({
-            'full_name': user_profile.full_name,
-            'email': user_profile.email,
-            'id': user_profile.id,
-        })
+        return json_success(
+            {
+                'full_name': user_profile.full_name,
+                'email': user_profile.email,
+                'id': user_profile.id,
+            }
+        )
 
     topic = payload.get('topic')
     content = payload.get('content')
diff --git a/zerver/webhooks/zendesk/view.py b/zerver/webhooks/zendesk/view.py
index 4292ba150d..06db17c865 100644
--- a/zerver/webhooks/zendesk/view.py
+++ b/zerver/webhooks/zendesk/view.py
@@ -10,14 +10,19 @@ from zerver.models import UserProfile
 
 def truncate(string: str, length: int) -> str:
     if len(string) > length:
-        string = string[:length-3] + '...'
+        string = string[: length - 3] + '...'
     return string
 
+
 @authenticated_rest_api_view(webhook_client_name="Zendesk")
 @has_request_variables
-def api_zendesk_webhook(request: HttpRequest, user_profile: UserProfile,
-                        ticket_title: str=REQ(), ticket_id: str=REQ(),
-                        message: str=REQ()) -> HttpResponse:
+def api_zendesk_webhook(
+    request: HttpRequest,
+    user_profile: UserProfile,
+    ticket_title: str = REQ(),
+    ticket_id: str = REQ(),
+    message: str = REQ(),
+) -> HttpResponse:
     """
     Zendesk uses triggers with message templates. This webhook uses the
     ticket_id and ticket_title to create a subject. And passes with zendesk
diff --git a/zerver/worker/queue_processors.py b/zerver/worker/queue_processors.py
index 6e608261c3..0e93c9951d 100644
--- a/zerver/worker/queue_processors.py
+++ b/zerver/worker/queue_processors.py
@@ -104,6 +104,7 @@ from zerver.models import (
 
 logger = logging.getLogger(__name__)
 
+
 class WorkerTimeoutException(Exception):
     def __init__(self, limit: int, event_count: int) -> None:
         self.limit = limit
@@ -112,35 +113,52 @@ class WorkerTimeoutException(Exception):
     def __str__(self) -> str:
         return f"Timed out after {self.limit * self.event_count} seconds processing {self.event_count} events"
 
+
 class WorkerDeclarationException(Exception):
     pass
 
+
 ConcreteQueueWorker = TypeVar('ConcreteQueueWorker', bound='QueueProcessingWorker')
 
+
 def assign_queue(
-        queue_name: str, enabled: bool=True, is_test_queue: bool=False,
+    queue_name: str,
+    enabled: bool = True,
+    is_test_queue: bool = False,
 ) -> Callable[[Type[ConcreteQueueWorker]], Type[ConcreteQueueWorker]]:
     def decorate(clazz: Type[ConcreteQueueWorker]) -> Type[ConcreteQueueWorker]:
         clazz.queue_name = queue_name
         if enabled:
             register_worker(queue_name, clazz, is_test_queue)
         return clazz
+
     return decorate
 
+
 worker_classes: Dict[str, Type["QueueProcessingWorker"]] = {}
 test_queues: Set[str] = set()
-def register_worker(queue_name: str, clazz: Type['QueueProcessingWorker'], is_test_queue: bool=False) -> None:
+
+
+def register_worker(
+    queue_name: str, clazz: Type['QueueProcessingWorker'], is_test_queue: bool = False
+) -> None:
     worker_classes[queue_name] = clazz
     if is_test_queue:
         test_queues.add(queue_name)
 
+
 def get_worker(queue_name: str) -> 'QueueProcessingWorker':
     return worker_classes[queue_name]()
 
-def get_active_worker_queues(only_test_queues: bool=False) -> List[str]:
+
+def get_active_worker_queues(only_test_queues: bool = False) -> List[str]:
     """Returns all (either test, or real) worker queues."""
-    return [queue_name for queue_name in worker_classes.keys()
-            if bool(queue_name in test_queues) == only_test_queues]
+    return [
+        queue_name
+        for queue_name in worker_classes.keys()
+        if bool(queue_name in test_queues) == only_test_queues
+    ]
+
 
 def check_and_send_restart_signal() -> None:
     try:
@@ -150,28 +168,36 @@ def check_and_send_restart_signal() -> None:
     except Exception:
         pass
 
-def retry_send_email_failures(
-        func: Callable[[ConcreteQueueWorker, Dict[str, Any]], None],
-) -> Callable[[ConcreteQueueWorker, Dict[str, Any]], None]:
 
+def retry_send_email_failures(
+    func: Callable[[ConcreteQueueWorker, Dict[str, Any]], None],
+) -> Callable[[ConcreteQueueWorker, Dict[str, Any]], None]:
     @wraps(func)
     def wrapper(worker: ConcreteQueueWorker, data: Dict[str, Any]) -> None:
         try:
             func(worker, data)
-        except (smtplib.SMTPServerDisconnected, socket.gaierror, socket.timeout,
-                EmailNotDeliveredException) as e:
+        except (
+            smtplib.SMTPServerDisconnected,
+            socket.gaierror,
+            socket.timeout,
+            EmailNotDeliveredException,
+        ) as e:
             error_class_name = e.__class__.__name__
 
             def on_failure(event: Dict[str, Any]) -> None:
-                logging.exception("Event %r failed due to exception %s", event, error_class_name, stack_info=True)
+                logging.exception(
+                    "Event %r failed due to exception %s", event, error_class_name, stack_info=True
+                )
 
             retry_event(worker.queue_name, data, on_failure)
 
     return wrapper
 
+
 def timer_expired(limit: int, event_count: int, signal: int, frame: FrameType) -> None:
     raise WorkerTimeoutException(limit, event_count)
 
+
 class QueueProcessingWorker(ABC):
     queue_name: str
     MAX_CONSUME_SECONDS: Optional[int] = 30
@@ -237,8 +263,9 @@ class QueueProcessingWorker(ABC):
     def consume(self, data: Dict[str, Any]) -> None:
         pass
 
-    def do_consume(self, consume_func: Callable[[List[Dict[str, Any]]], None],
-                   events: List[Dict[str, Any]]) -> None:
+    def do_consume(
+        self, consume_func: Callable[[List[Dict[str, Any]]], None], events: List[Dict[str, Any]]
+    ) -> None:
         consume_time_seconds: Optional[float] = None
         with configure_scope() as scope:
             scope.clear_breadcrumbs()
@@ -297,8 +324,11 @@ class QueueProcessingWorker(ABC):
                 return
 
             self.consume_iteration_counter += 1
-            if (self.consume_iteration_counter >= self.CONSUME_ITERATIONS_BEFORE_UPDATE_STATS_NUM
-                    or time.time() - self.last_statistics_update_time >= self.MAX_SECONDS_BEFORE_UPDATE_STATS):
+            if (
+                self.consume_iteration_counter >= self.CONSUME_ITERATIONS_BEFORE_UPDATE_STATS_NUM
+                or time.time() - self.last_statistics_update_time
+                >= self.MAX_SECONDS_BEFORE_UPDATE_STATS
+            ):
                 self.consume_iteration_counter = 0
                 self.update_statistics(remaining_local_queue_size)
 
@@ -308,17 +338,23 @@ class QueueProcessingWorker(ABC):
 
     def _handle_consume_exception(self, events: List[Dict[str, Any]], exception: Exception) -> None:
         with configure_scope() as scope:
-            scope.set_context("events", {
-                "data": events,
-                "queue_name": self.queue_name,
-            })
+            scope.set_context(
+                "events",
+                {
+                    "data": events,
+                    "queue_name": self.queue_name,
+                },
+            )
             if isinstance(exception, WorkerTimeoutException):
                 with sentry_sdk.push_scope() as scope:
                     scope.fingerprint = ['worker-timeout', self.queue_name]
-                    logging.exception("%s in queue %s",
-                                      str(exception), self.queue_name, stack_info=True)
+                    logging.exception(
+                        "%s in queue %s", str(exception), self.queue_name, stack_info=True
+                    )
             else:
-                logging.exception("Problem handling data on queue %s", self.queue_name, stack_info=True)
+                logging.exception(
+                    "Problem handling data on queue %s", self.queue_name, stack_info=True
+                )
         if not os.path.exists(settings.QUEUE_ERROR_DIR):
             os.mkdir(settings.QUEUE_ERROR_DIR)  # nocoverage
         # Use 'mark_sanitized' to prevent Pysa from detecting this false positive
@@ -347,6 +383,7 @@ class QueueProcessingWorker(ABC):
         assert self.q is not None
         self.q.stop_consuming()
 
+
 class LoopQueueProcessingWorker(QueueProcessingWorker):
     sleep_delay = 1
     batch_size = 100
@@ -369,6 +406,7 @@ class LoopQueueProcessingWorker(QueueProcessingWorker):
         """In LoopQueueProcessingWorker, consume is used just for automated tests"""
         self.consume_batch([event])
 
+
 @assign_queue('invites')
 class ConfirmationEmailWorker(QueueProcessingWorker):
     def consume(self, data: Mapping[str, Any]) -> None:
@@ -387,7 +425,9 @@ class ConfirmationEmailWorker(QueueProcessingWorker):
                 return
 
         referrer = get_user_profile_by_id(data["referrer_id"])
-        logger.info("Sending invitation for realm %s to %s", referrer.realm.string_id, invitee.email)
+        logger.info(
+            "Sending invitation for realm %s to %s", referrer.realm.string_id, invitee.email
+        )
         activate_url = do_send_confirmation_email(invitee, referrer)
 
         # queue invitation reminder
@@ -406,7 +446,9 @@ class ConfirmationEmailWorker(QueueProcessingWorker):
                 from_address=FromAddress.tokenized_no_reply_placeholder,
                 language=referrer.realm.default_language,
                 context=context,
-                delay=datetime.timedelta(days=settings.INVITATION_LINK_VALIDITY_DAYS - 2))
+                delay=datetime.timedelta(days=settings.INVITATION_LINK_VALIDITY_DAYS - 2),
+            )
+
 
 @assign_queue('user_activity')
 class UserActivityWorker(LoopQueueProcessingWorker):
@@ -427,6 +469,7 @@ class UserActivityWorker(LoopQueueProcessingWorker):
       common events from doing an action multiple times.
 
     """
+
     client_id_map: Dict[str, int] = {}
 
     def start(self) -> None:
@@ -472,6 +515,7 @@ class UserActivityWorker(LoopQueueProcessingWorker):
             log_time = timestamp_to_datetime(time)
             do_update_user_activity(user_profile_id, client_id, query, count, log_time)
 
+
 @assign_queue('user_activity_interval')
 class UserActivityIntervalWorker(QueueProcessingWorker):
     def consume(self, event: Mapping[str, Any]) -> None:
@@ -479,6 +523,7 @@ class UserActivityIntervalWorker(QueueProcessingWorker):
         log_time = timestamp_to_datetime(event["time"])
         do_update_user_activity_interval(user_profile, log_time)
 
+
 @assign_queue('user_presence')
 class UserPresenceWorker(QueueProcessingWorker):
     def consume(self, event: Mapping[str, Any]) -> None:
@@ -489,6 +534,7 @@ class UserPresenceWorker(QueueProcessingWorker):
         status = event["status"]
         do_update_user_presence(user_profile, client, log_time, status)
 
+
 @assign_queue('missedmessage_emails')
 class MissedMessageWorker(QueueProcessingWorker):
     # Aggregate all messages received over the last BATCH_DURATION
@@ -532,8 +578,9 @@ class MissedMessageWorker(QueueProcessingWorker):
         if self.timer_event is not None:
             return
 
-        self.timer_event = Timer(self.TIMER_FREQUENCY, MissedMessageWorker.maybe_send_batched_emails,
-                                 [self])
+        self.timer_event = Timer(
+            self.TIMER_FREQUENCY, MissedMessageWorker.maybe_send_batched_emails, [self]
+        )
         self.timer_event.start()
 
     def maybe_send_batched_emails(self) -> None:
@@ -549,8 +596,11 @@ class MissedMessageWorker(QueueProcessingWorker):
                 if current_time - timestamp < self.BATCH_DURATION:
                     continue
                 events = self.events_by_recipient[user_profile_id]
-                logging.info("Batch-processing %s missedmessage_emails events for user %s",
-                             len(events), user_profile_id)
+                logging.info(
+                    "Batch-processing %s missedmessage_emails events for user %s",
+                    len(events),
+                    user_profile_id,
+                )
                 handle_missedmessage_emails(user_profile_id, events)
                 del self.events_by_recipient[user_profile_id]
                 del self.batch_start_by_recipient[user_profile_id]
@@ -562,6 +612,7 @@ class MissedMessageWorker(QueueProcessingWorker):
             if len(self.batch_start_by_recipient) > 0:
                 self.ensure_timer()
 
+
 @assign_queue('email_senders')
 class EmailSendingWorker(QueueProcessingWorker):
     @retry_send_email_failures
@@ -575,6 +626,7 @@ class EmailSendingWorker(QueueProcessingWorker):
         handle_send_email_format_changes(copied_event)
         send_email_from_dict(copied_event)
 
+
 @assign_queue('missedmessage_mobile_notifications')
 class PushNotificationsWorker(QueueProcessingWorker):  # nocoverage
     def start(self) -> None:
@@ -594,19 +646,26 @@ class PushNotificationsWorker(QueueProcessingWorker):  # nocoverage
             else:
                 handle_push_notification(event['user_profile_id'], event)
         except PushNotificationBouncerRetryLaterError:
+
             def failure_processor(event: Dict[str, Any]) -> None:
                 logger.warning(
                     "Maximum retries exceeded for trigger:%s event:push_notification",
-                    event['user_profile_id'])
+                    event['user_profile_id'],
+                )
+
             retry_event(self.queue_name, event, failure_processor)
 
+
 @assign_queue('error_reports')
 class ErrorReporter(QueueProcessingWorker):
     def consume(self, event: Mapping[str, Any]) -> None:
-        logging.info("Processing traceback with type %s for %s", event['type'], event.get('user_email'))
+        logging.info(
+            "Processing traceback with type %s for %s", event['type'], event.get('user_email')
+        )
         if settings.ERROR_REPORTING:
             do_report_error(event['type'], event['report'])
 
+
 @assign_queue('digest_emails')
 class DigestWorker(QueueProcessingWorker):  # nocoverage
     # Who gets a digest is entirely determined by the enqueue_digest_emails
@@ -619,6 +678,7 @@ class DigestWorker(QueueProcessingWorker):  # nocoverage
             user_ids = [event["user_profile_id"]]
         bulk_handle_digest_email(user_ids, event["cutoff"])
 
+
 @assign_queue('email_mirror')
 class MirrorWorker(QueueProcessingWorker):
     def consume(self, event: Mapping[str, Any]) -> None:
@@ -635,12 +695,16 @@ class MirrorWorker(QueueProcessingWorker):
             try:
                 rate_limit_mirror_by_realm(recipient_realm)
             except RateLimited:
-                logger.warning("MirrorWorker: Rejecting an email from: %s to realm: %s - rate limited.",
-                               msg['From'], recipient_realm.name)
+                logger.warning(
+                    "MirrorWorker: Rejecting an email from: %s to realm: %s - rate limited.",
+                    msg['From'],
+                    recipient_realm.name,
+                )
                 return
 
         mirror_email(msg, rcpt_to=rcpt_to)
 
+
 @assign_queue('embed_links')
 class FetchLinksEmbedData(QueueProcessingWorker):
     # This is a slow queue with network requests, so a disk write is negligible.
@@ -651,7 +715,9 @@ class FetchLinksEmbedData(QueueProcessingWorker):
         for url in event['urls']:
             start_time = time.time()
             url_preview.get_link_embed_data(url)
-            logging.info("Time spent on get_link_embed_data for %s: %s", url, time.time() - start_time)
+            logging.info(
+                "Time spent on get_link_embed_data for %s: %s", url, time.time() - start_time
+            )
 
         message = Message.objects.get(id=event['message_id'])
         # If the message changed, we will run this task after updating the message
@@ -669,12 +735,10 @@ class FetchLinksEmbedData(QueueProcessingWorker):
 
             # If rendering fails, the called code will raise a JsonableError.
             rendered_content = render_incoming_message(
-                message,
-                message.content,
-                message_user_ids,
-                realm)
-            do_update_embedded_data(
-                message.sender, message, message.content, rendered_content)
+                message, message.content, message_user_ids, realm
+            )
+            do_update_embedded_data(message.sender, message, message.content, rendered_content)
+
 
 @assign_queue('outgoing_webhooks')
 class OutgoingWebhookWorker(QueueProcessingWorker):
@@ -688,14 +752,11 @@ class OutgoingWebhookWorker(QueueProcessingWorker):
             service_handler = get_outgoing_webhook_service_handler(service)
             request_data = service_handler.build_bot_request(event)
             if request_data:
-                do_rest_call(service.base_url,
-                             request_data,
-                             event,
-                             service_handler)
+                do_rest_call(service.base_url, request_data, event, service_handler)
+
 
 @assign_queue('embedded_bots')
 class EmbeddedBotWorker(QueueProcessingWorker):
-
     def get_bot_api_client(self, user_profile: UserProfile) -> EmbeddedBotHandler:
         return EmbeddedBotHandler(user_profile)
 
@@ -712,7 +773,8 @@ class EmbeddedBotWorker(QueueProcessingWorker):
             if bot_handler is None:
                 logging.error(
                     "Error: User %s has bot with invalid embedded bot service %s",
-                    user_profile_id, service.name,
+                    user_profile_id,
+                    service.name,
                 )
                 continue
             try:
@@ -731,6 +793,7 @@ class EmbeddedBotWorker(QueueProcessingWorker):
             except EmbeddedBotQuitException as e:
                 logging.warning(str(e))
 
+
 @assign_queue('deferred_work')
 class DeferredWorker(QueueProcessingWorker):
     """This queue processor is intended for cases where we want to trigger a
@@ -739,6 +802,7 @@ class DeferredWorker(QueueProcessingWorker):
     can provide a low-latency HTTP response or avoid risk of request
     timeouts for an operation that could in rare cases take minutes).
     """
+
     # Because these operations have no SLO, and can take minutes,
     # remove any processing timeouts
     MAX_CONSUME_SECONDS = None
@@ -755,10 +819,12 @@ class DeferredWorker(QueueProcessingWorker):
             batch_size = 100
             offset = 0
             while True:
-                messages = Message.objects.filter(recipient_id=event["stream_recipient_id"]) \
-                    .order_by("id")[offset:offset + batch_size]
-                UserMessage.objects.filter(message__in=messages).extra(where=[UserMessage.where_unread()]) \
-                    .update(flags=F('flags').bitor(UserMessage.flags.read))
+                messages = Message.objects.filter(
+                    recipient_id=event["stream_recipient_id"]
+                ).order_by("id")[offset : offset + batch_size]
+                UserMessage.objects.filter(message__in=messages).extra(
+                    where=[UserMessage.where_unread()]
+                ).update(flags=F('flags').bitor(UserMessage.flags.read))
                 offset += len(messages)
                 if len(messages) < batch_size:
                     break
@@ -766,10 +832,13 @@ class DeferredWorker(QueueProcessingWorker):
             try:
                 clear_push_device_tokens(event["user_profile_id"])
             except PushNotificationBouncerRetryLaterError:
+
                 def failure_processor(event: Dict[str, Any]) -> None:
                     logger.warning(
                         "Maximum retries exceeded for trigger:%s event:clear_push_device_tokens",
-                        event['user_profile_id'])
+                        event['user_profile_id'],
+                    )
+
                 retry_event(self.queue_name, event, failure_processor)
         elif event['type'] == 'realm_export':
             realm = Realm.objects.get(id=event['realm_id'])
@@ -778,17 +847,25 @@ class DeferredWorker(QueueProcessingWorker):
             user_profile = get_user_profile_by_id(event['user_profile_id'])
 
             try:
-                public_url = export_realm_wrapper(realm=realm, output_dir=output_dir,
-                                                  threads=6, upload=True, public_only=True,
-                                                  delete_after_upload=True)
+                public_url = export_realm_wrapper(
+                    realm=realm,
+                    output_dir=output_dir,
+                    threads=6,
+                    upload=True,
+                    public_only=True,
+                    delete_after_upload=True,
+                )
             except Exception:
-                export_event.extra_data = orjson.dumps(dict(
-                    failed_timestamp=timezone_now().timestamp(),
-                )).decode()
+                export_event.extra_data = orjson.dumps(
+                    dict(
+                        failed_timestamp=timezone_now().timestamp(),
+                    )
+                ).decode()
                 export_event.save(update_fields=['extra_data'])
                 logging.error(
                     "Data export for %s failed after %s",
-                    user_profile.realm.string_id, time.time() - start,
+                    user_profile.realm.string_id,
+                    time.time() - start,
                 )
                 notify_realm_export(user_profile)
                 return
@@ -796,15 +873,19 @@ class DeferredWorker(QueueProcessingWorker):
             assert public_url is not None
 
             # Update the extra_data field now that the export is complete.
-            export_event.extra_data = orjson.dumps(dict(
-                export_path=urllib.parse.urlparse(public_url).path,
-            )).decode()
+            export_event.extra_data = orjson.dumps(
+                dict(
+                    export_path=urllib.parse.urlparse(public_url).path,
+                )
+            ).decode()
             export_event.save(update_fields=['extra_data'])
 
             # Send a private message notification letting the user who
             # triggered the export know the export finished.
             with override_language(user_profile.default_language):
-                content = _("Your data export is complete and has been uploaded here:\n\n{public_url}").format(public_url=public_url)
+                content = _(
+                    "Your data export is complete and has been uploaded here:\n\n{public_url}"
+                ).format(public_url=public_url)
             internal_send_private_message(
                 realm=user_profile.realm,
                 sender=get_system_bot(settings.NOTIFICATION_BOT),
@@ -817,12 +898,13 @@ class DeferredWorker(QueueProcessingWorker):
             notify_realm_export(user_profile)
             logging.info(
                 "Completed data export for %s in %s",
-                user_profile.realm.string_id, time.time() - start,
+                user_profile.realm.string_id,
+                time.time() - start,
             )
 
         end = time.time()
-        logger.info("deferred_work processed %s event (%dms)", event['type'],
-                    (end-start)*1000)
+        logger.info("deferred_work processed %s event (%dms)", event['type'], (end - start) * 1000)
+
 
 @assign_queue('test', is_test_queue=True)
 class TestWorker(QueueProcessingWorker):
@@ -837,11 +919,12 @@ class TestWorker(QueueProcessingWorker):
         with open(fn, 'ab') as f:
             f.write(message + b'\n')
 
+
 @assign_queue('noop', is_test_queue=True)
 class NoopWorker(QueueProcessingWorker):
     """Used to profile the queue processing framework, in zilencer's queue_rate."""
 
-    def __init__(self, max_consume: int=1000, slow_queries: Optional[List[int]]=None) -> None:
+    def __init__(self, max_consume: int = 1000, slow_queries: Optional[List[int]] = None) -> None:
         self.consumed = 0
         self.max_consume = max_consume
         self.slow_queries: Set[int] = set(slow_queries or [])
@@ -855,12 +938,14 @@ class NoopWorker(QueueProcessingWorker):
         if self.consumed >= self.max_consume:
             self.stop()
 
+
 @assign_queue('noop_batch', is_test_queue=True)
 class BatchNoopWorker(LoopQueueProcessingWorker):
     """Used to profile the queue processing framework, in zilencer's queue_rate."""
+
     batch_size = 500
 
-    def __init__(self, max_consume: int=1000, slow_queries: Optional[List[int]]=None) -> None:
+    def __init__(self, max_consume: int = 1000, slow_queries: Optional[List[int]] = None) -> None:
         self.consumed = 0
         self.max_consume = max_consume
         self.slow_queries: Set[int] = set(slow_queries or [])
diff --git a/zilencer/management/commands/add_mock_conversation.py b/zilencer/management/commands/add_mock_conversation.py
index 19eb9c169e..3f66ad5c0a 100644
--- a/zilencer/management/commands/add_mock_conversation.py
+++ b/zilencer/management/commands/add_mock_conversation.py
@@ -46,52 +46,84 @@ From image editing program:
         stream = ensure_stream(realm, 'zulip features', acting_user=None)
 
         UserProfile.objects.filter(email__contains='stage').delete()
-        starr = do_create_user('1@stage.example.com', 'password', realm, 'Ada Starr', acting_user=None)
+        starr = do_create_user(
+            '1@stage.example.com', 'password', realm, 'Ada Starr', acting_user=None
+        )
         self.set_avatar(starr, 'static/images/characters/starr.png')
-        fisher = do_create_user('2@stage.example.com', 'password', realm, 'Bel Fisher', acting_user=None)
+        fisher = do_create_user(
+            '2@stage.example.com', 'password', realm, 'Bel Fisher', acting_user=None
+        )
         self.set_avatar(fisher, 'static/images/characters/fisher.png')
-        twitter_bot = do_create_user('3@stage.example.com', 'password', realm, 'Twitter Bot',
-                                     bot_type=UserProfile.DEFAULT_BOT, acting_user=None)
+        twitter_bot = do_create_user(
+            '3@stage.example.com',
+            'password',
+            realm,
+            'Twitter Bot',
+            bot_type=UserProfile.DEFAULT_BOT,
+            acting_user=None,
+        )
         self.set_avatar(twitter_bot, 'static/images/features/twitter.png')
 
         bulk_add_subscriptions(realm, [stream], list(UserProfile.objects.filter(realm=realm)))
 
         staged_messages: List[Dict[str, Any]] = [
-            {'sender': starr,
-             'content': "Hey @**Bel Fisher**, check out Zulip's Markdown formatting! "
-             "You can have:\n* bulleted lists\n  * with sub-bullets too\n"
-             "* **bold**, *italic*, and ~~strikethrough~~ text\n"
-             "* LaTeX for mathematical formulas, both inline -- $$O(n^2)$$ -- and displayed:\n"
-             "```math\n\\int_a^b f(t)\\, dt=F(b)-F(a)\n```"},
-            {'sender': fisher,
-             'content': "My favorite is the syntax highlighting for code blocks\n"
-             "```python\ndef fib(n: int) -> int:\n    # returns the n-th Fibonacci number\n"
-             "    return fib(n-1) + fib(n-2)\n```"},
-            {'sender': starr,
-             'content': "I think you forgot your base case there, Bel :laughing:\n"
-             "```quote\n```python\ndef fib(n: int) -> int:\n    # returns the n-th Fibonacci number\n"
-             "    return fib(n-1) + fib(n-2)\n```\n```"},
-            {'sender': fisher,
-             'content': "I'm also a big fan of inline link, tweet, video, and image previews. "
-             "Check out this picture of Çet Whalin[](/static/images/features/whale.png)!"},
-            {'sender': starr,
-             'content': "I just set up a custom linkifier, "
-                        "so `#1234` becomes [#1234](github.com/zulip/zulip/1234), "
-             "a link to the corresponding GitHub issue."},
-            {'sender': twitter_bot,
-             'content': 'https://twitter.com/gvanrossum/status/786661035637772288'},
-            {'sender': fisher,
-             'content': "Oops, the Twitter bot I set up shouldn't be posting here. Let me go fix that."},
+            {
+                'sender': starr,
+                'content': "Hey @**Bel Fisher**, check out Zulip's Markdown formatting! "
+                "You can have:\n* bulleted lists\n  * with sub-bullets too\n"
+                "* **bold**, *italic*, and ~~strikethrough~~ text\n"
+                "* LaTeX for mathematical formulas, both inline -- $$O(n^2)$$ -- and displayed:\n"
+                "```math\n\\int_a^b f(t)\\, dt=F(b)-F(a)\n```",
+            },
+            {
+                'sender': fisher,
+                'content': "My favorite is the syntax highlighting for code blocks\n"
+                "```python\ndef fib(n: int) -> int:\n    # returns the n-th Fibonacci number\n"
+                "    return fib(n-1) + fib(n-2)\n```",
+            },
+            {
+                'sender': starr,
+                'content': "I think you forgot your base case there, Bel :laughing:\n"
+                "```quote\n```python\ndef fib(n: int) -> int:\n    # returns the n-th Fibonacci number\n"
+                "    return fib(n-1) + fib(n-2)\n```\n```",
+            },
+            {
+                'sender': fisher,
+                'content': "I'm also a big fan of inline link, tweet, video, and image previews. "
+                "Check out this picture of Çet Whalin[](/static/images/features/whale.png)!",
+            },
+            {
+                'sender': starr,
+                'content': "I just set up a custom linkifier, "
+                "so `#1234` becomes [#1234](github.com/zulip/zulip/1234), "
+                "a link to the corresponding GitHub issue.",
+            },
+            {
+                'sender': twitter_bot,
+                'content': 'https://twitter.com/gvanrossum/status/786661035637772288',
+            },
+            {
+                'sender': fisher,
+                'content': "Oops, the Twitter bot I set up shouldn't be posting here. Let me go fix that.",
+            },
         ]
 
-        messages = [internal_prep_stream_message(
-            realm, message['sender'], stream,
-            'message formatting', message['content'],
-        ) for message in staged_messages]
+        messages = [
+            internal_prep_stream_message(
+                realm,
+                message['sender'],
+                stream,
+                'message formatting',
+                message['content'],
+            )
+            for message in staged_messages
+        ]
 
         message_ids = do_send_messages(messages)
 
-        preview_message = Message.objects.get(id__in=message_ids, content__icontains='image previews')
+        preview_message = Message.objects.get(
+            id__in=message_ids, content__icontains='image previews'
+        )
         (emoji_code, reaction_type) = emoji_name_to_emoji_code(realm, 'whale')
         do_add_reaction(starr, preview_message, 'whale', emoji_code, reaction_type)
 
@@ -106,7 +138,8 @@ From image editing program:
             'src="https://pbs.twimg.com/profile_images/424495004/GuidoAvatar_bigger.jpg"></a>'
             '<p>Great blog post about Zulip\'s use of mypy: '
             '<a>http://blog.zulip.org/2016/10/13/static-types-in-python-oh-mypy/</a></p>'
-            '<span>- Guido van Rossum (@gvanrossum)</span></div></div>')
+            '<span>- Guido van Rossum (@gvanrossum)</span></div></div>'
+        )
         twitter_message.save(update_fields=['rendered_content'])
 
         # Put a short pause between the whale reaction and this, so that the
diff --git a/zilencer/management/commands/add_new_realm.py b/zilencer/management/commands/add_new_realm.py
index 8a21252eac..4e509e56a8 100644
--- a/zilencer/management/commands/add_new_realm.py
+++ b/zilencer/management/commands/add_new_realm.py
@@ -10,12 +10,10 @@ class Command(ZulipBaseCommand):
     help = """Add a new realm and initial user for manual testing of the onboarding process."""
 
     def handle(self, **options: Any) -> None:
-        string_id = 'realm{:02}'.format(
-            Realm.objects.filter(string_id__startswith='realm').count())
+        string_id = 'realm{:02}'.format(Realm.objects.filter(string_id__startswith='realm').count())
         realm = do_create_realm(string_id, string_id)
 
-        name = '{:02}-user'.format(
-            UserProfile.objects.filter(email__contains='user@').count())
+        name = '{:02}-user'.format(UserProfile.objects.filter(email__contains='user@').count())
         user = do_create_user(
             f'{name}@{string_id}.zulip.com',
             'password',
diff --git a/zilencer/management/commands/add_new_user.py b/zilencer/management/commands/add_new_user.py
index 22eed000f6..ccb60c6b8c 100644
--- a/zilencer/management/commands/add_new_user.py
+++ b/zilencer/management/commands/add_new_user.py
@@ -18,11 +18,14 @@ and will otherwise fall back to the zulip realm."""
     def handle(self, **options: Any) -> None:
         realm = self.get_realm(options)
         if realm is None:
-            realm = Realm.objects.filter(string_id__startswith='realm') \
-                                 .order_by('-string_id').first()
+            realm = (
+                Realm.objects.filter(string_id__startswith='realm').order_by('-string_id').first()
+            )
         if realm is None:
-            print('Warning: Using default zulip realm, which has an unusual configuration.\n'
-                  'Try running `manage.py add_new_realm`, and then running this again.')
+            print(
+                'Warning: Using default zulip realm, which has an unusual configuration.\n'
+                'Try running `manage.py add_new_realm`, and then running this again.'
+            )
             valid_realm = Realm.objects.get(string_id='zulip')
             domain = 'zulip.com'
         else:
diff --git a/zilencer/management/commands/add_remote_server.py b/zilencer/management/commands/add_remote_server.py
index cace945c10..344eeba1dd 100644
--- a/zilencer/management/commands/add_remote_server.py
+++ b/zilencer/management/commands/add_remote_server.py
@@ -12,14 +12,12 @@ class Command(ZulipBaseCommand):
         group = parser.add_argument_group("command-specific arguments")
         group.add_argument('uuid', help="the user's `zulip_org_id`")
         group.add_argument('key', help="the user's `zulip_org_key`")
-        group.add_argument('--hostname', '-n', required=True,
-                           help="the hostname, for human identification")
-        group.add_argument('--email', '-e', required=True,
-                           help="a contact email address")
+        group.add_argument(
+            '--hostname', '-n', required=True, help="the hostname, for human identification"
+        )
+        group.add_argument('--email', '-e', required=True, help="a contact email address")
 
-    def handle(self, uuid: str, key: str, hostname: str, email: str,
-               **options: Any) -> None:
-        RemoteZulipServer.objects.create(uuid=uuid,
-                                         api_key=key,
-                                         hostname=hostname,
-                                         contact_email=email)
+    def handle(self, uuid: str, key: str, hostname: str, email: str, **options: Any) -> None:
+        RemoteZulipServer.objects.create(
+            uuid=uuid, api_key=key, hostname=hostname, contact_email=email
+        )
diff --git a/zilencer/management/commands/calculate_first_visible_message_id.py b/zilencer/management/commands/calculate_first_visible_message_id.py
index 3df4332dce..dc08827567 100644
--- a/zilencer/management/commands/calculate_first_visible_message_id.py
+++ b/zilencer/management/commands/calculate_first_visible_message_id.py
@@ -16,7 +16,7 @@ class Command(ZulipBaseCommand):
             '--lookback-hours',
             type=int,
             help="Period a bit larger than that of the cron job that runs "
-                 "this command so that the lookback periods are sure to overlap.",
+            "this command so that the lookback periods are sure to overlap.",
             required=True,
         )
 
diff --git a/zilencer/management/commands/invoice_plans.py b/zilencer/management/commands/invoice_plans.py
index ade071ec29..52757e7bf3 100644
--- a/zilencer/management/commands/invoice_plans.py
+++ b/zilencer/management/commands/invoice_plans.py
@@ -7,6 +7,7 @@ from zerver.lib.management import ZulipBaseCommand
 if settings.BILLING_ENABLED:
     from corporate.lib.stripe import invoice_plans_as_needed
 
+
 class Command(ZulipBaseCommand):
     help = """Generates invoices for customers if needed."""
 
diff --git a/zilencer/management/commands/migrate_stream_notifications.py b/zilencer/management/commands/migrate_stream_notifications.py
index d462394c04..31b845e4c3 100644
--- a/zilencer/management/commands/migrate_stream_notifications.py
+++ b/zilencer/management/commands/migrate_stream_notifications.py
@@ -12,5 +12,4 @@ class Command(BaseCommand):
         for subscription in Subscription.objects.all():
             subscription.desktop_notifications = subscription.notifications
             subscription.audible_notifications = subscription.notifications
-            subscription.save(update_fields=["desktop_notifications",
-                                             "audible_notifications"])
+            subscription.save(update_fields=["desktop_notifications", "audible_notifications"])
diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py
index b2c9660bbd..1f62e16e4e 100644
--- a/zilencer/management/commands/populate_db.py
+++ b/zilencer/management/commands/populate_db.py
@@ -85,6 +85,7 @@ DEFAULT_EMOJIS = [
     ('hundred_points', '1f4af'),
 ]
 
+
 def clear_database() -> None:
     # Hacky function only for use inside populate_db.  Designed to
     # allow running populate_db repeatedly in series to work without
@@ -95,19 +96,31 @@ def clear_database() -> None:
     # database that would be used with it (i.e. zproject.dev_settings).
     if default_cache['BACKEND'] == 'django_bmemcached.memcached.BMemcached':
         bmemcached.Client(
-            (default_cache['LOCATION'],), **default_cache['OPTIONS'],
+            (default_cache['LOCATION'],),
+            **default_cache['OPTIONS'],
         ).flush_all()
 
     model: Any = None  # Hack because mypy doesn't know these are model classes
-    for model in [Message, Stream, UserProfile, Recipient,
-                  Realm, Subscription, Huddle, UserMessage, Client,
-                  DefaultStream]:
+    for model in [
+        Message,
+        Stream,
+        UserProfile,
+        Recipient,
+        Realm,
+        Subscription,
+        Huddle,
+        UserMessage,
+        Client,
+        DefaultStream,
+    ]:
         model.objects.all().delete()
     Session.objects.all().delete()
 
+
 # Suppress spammy output from the push notifications logger
 push_notifications_logger.disabled = True
 
+
 def subscribe_users_to_streams(realm: Realm, stream_dict: Dict[str, Dict[str, Any]]) -> None:
     subscriptions_to_add = []
     event_time = timezone_now()
@@ -121,19 +134,23 @@ def subscribe_users_to_streams(realm: Realm, stream_dict: Dict[str, Dict[str, An
             s = Subscription(
                 recipient=recipient,
                 user_profile=profile,
-                color=STREAM_ASSIGNMENT_COLORS[i % len(STREAM_ASSIGNMENT_COLORS)])
+                color=STREAM_ASSIGNMENT_COLORS[i % len(STREAM_ASSIGNMENT_COLORS)],
+            )
             subscriptions_to_add.append(s)
 
-            log = RealmAuditLog(realm=profile.realm,
-                                modified_user=profile,
-                                modified_stream=stream,
-                                event_last_message_id=0,
-                                event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
-                                event_time=event_time)
+            log = RealmAuditLog(
+                realm=profile.realm,
+                modified_user=profile,
+                modified_stream=stream,
+                event_last_message_id=0,
+                event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
+                event_time=event_time,
+            )
             all_subscription_logs.append(log)
     Subscription.objects.bulk_create(subscriptions_to_add)
     RealmAuditLog.objects.bulk_create(all_subscription_logs)
 
+
 def create_alert_words(realm_id: int) -> None:
     user_ids = UserProfile.objects.filter(
         realm_id=realm_id,
@@ -163,86 +180,95 @@ def create_alert_words(realm_id: int) -> None:
                 AlertWord(
                     realm_id=realm_id,
                     user_profile_id=user_id,
-                    word = alert_words[i],
+                    word=alert_words[i],
                 )
             )
 
     AlertWord.objects.bulk_create(recs)
 
+
 class Command(BaseCommand):
     help = "Populate a test database"
 
     def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument('-n', '--num-messages',
-                            type=int,
-                            default=500,
-                            help='The number of messages to create.')
+        parser.add_argument(
+            '-n', '--num-messages', type=int, default=500, help='The number of messages to create.'
+        )
 
-        parser.add_argument('-b', '--batch-size',
-                            type=int,
-                            default=1000,
-                            help='How many messages to process in a single batch')
+        parser.add_argument(
+            '-b',
+            '--batch-size',
+            type=int,
+            default=1000,
+            help='How many messages to process in a single batch',
+        )
 
-        parser.add_argument('--extra-users',
-                            type=int,
-                            default=0,
-                            help='The number of extra users to create')
+        parser.add_argument(
+            '--extra-users', type=int, default=0, help='The number of extra users to create'
+        )
 
-        parser.add_argument('--extra-bots',
-                            type=int,
-                            default=0,
-                            help='The number of extra bots to create')
+        parser.add_argument(
+            '--extra-bots', type=int, default=0, help='The number of extra bots to create'
+        )
 
-        parser.add_argument('--extra-streams',
-                            type=int,
-                            default=0,
-                            help='The number of extra streams to create')
+        parser.add_argument(
+            '--extra-streams', type=int, default=0, help='The number of extra streams to create'
+        )
 
-        parser.add_argument('--max-topics',
-                            type=int,
-                            help='The number of maximum topics to create')
+        parser.add_argument('--max-topics', type=int, help='The number of maximum topics to create')
 
-        parser.add_argument('--huddles',
-                            dest='num_huddles',
-                            type=int,
-                            default=3,
-                            help='The number of huddles to create.')
+        parser.add_argument(
+            '--huddles',
+            dest='num_huddles',
+            type=int,
+            default=3,
+            help='The number of huddles to create.',
+        )
 
-        parser.add_argument('--personals',
-                            dest='num_personals',
-                            type=int,
-                            default=6,
-                            help='The number of personal pairs to create.')
+        parser.add_argument(
+            '--personals',
+            dest='num_personals',
+            type=int,
+            default=6,
+            help='The number of personal pairs to create.',
+        )
 
-        parser.add_argument('--threads',
-                            type=int,
-                            default=1,
-                            help='The number of threads to use.')
+        parser.add_argument('--threads', type=int, default=1, help='The number of threads to use.')
 
-        parser.add_argument('--percent-huddles',
-                            type=float,
-                            default=15,
-                            help='The percent of messages to be huddles.')
+        parser.add_argument(
+            '--percent-huddles',
+            type=float,
+            default=15,
+            help='The percent of messages to be huddles.',
+        )
 
-        parser.add_argument('--percent-personals',
-                            type=float,
-                            default=15,
-                            help='The percent of messages to be personals.')
+        parser.add_argument(
+            '--percent-personals',
+            type=float,
+            default=15,
+            help='The percent of messages to be personals.',
+        )
 
-        parser.add_argument('--stickyness',
-                            type=float,
-                            default=20,
-                            help='The percent of messages to repeat recent folks.')
+        parser.add_argument(
+            '--stickyness',
+            type=float,
+            default=20,
+            help='The percent of messages to repeat recent folks.',
+        )
 
-        parser.add_argument('--nodelete',
-                            action="store_false",
-                            dest='delete',
-                            help='Whether to delete all the existing messages.')
+        parser.add_argument(
+            '--nodelete',
+            action="store_false",
+            dest='delete',
+            help='Whether to delete all the existing messages.',
+        )
 
-        parser.add_argument('--test-suite',
-                            action="store_true",
-                            help='Configures populate_db to create a deterministic '
-                            'data set for the backend tests.')
+        parser.add_argument(
+            '--test-suite',
+            action="store_true",
+            help='Configures populate_db to create a deterministic '
+            'data set for the backend tests.',
+        )
 
     def handle(self, **options: Any) -> None:
         if options["percent_huddles"] + options["percent_personals"] > 100:
@@ -276,21 +302,33 @@ class Command(BaseCommand):
             # welcome-bot (needed for do_create_realm) hasn't been created yet
             create_internal_realm()
             zulip_realm = Realm.objects.create(
-                string_id="zulip", name="Zulip Dev", emails_restricted_to_domains=False,
+                string_id="zulip",
+                name="Zulip Dev",
+                emails_restricted_to_domains=False,
                 email_address_visibility=Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS,
                 description="The Zulip development environment default organization."
-                            "  It's great for testing!",
-                invite_required=False, org_type=Realm.CORPORATE)
+                "  It's great for testing!",
+                invite_required=False,
+                org_type=Realm.CORPORATE,
+            )
             RealmDomain.objects.create(realm=zulip_realm, domain="zulip.com")
             if options["test_suite"]:
                 mit_realm = Realm.objects.create(
-                    string_id="zephyr", name="MIT", emails_restricted_to_domains=True,
-                    invite_required=False, org_type=Realm.CORPORATE)
+                    string_id="zephyr",
+                    name="MIT",
+                    emails_restricted_to_domains=True,
+                    invite_required=False,
+                    org_type=Realm.CORPORATE,
+                )
                 RealmDomain.objects.create(realm=mit_realm, domain="mit.edu")
 
                 lear_realm = Realm.objects.create(
-                    string_id="lear", name="Lear & Co.", emails_restricted_to_domains=False,
-                    invite_required=False, org_type=Realm.CORPORATE)
+                    string_id="lear",
+                    name="Lear & Co.",
+                    emails_restricted_to_domains=False,
+                    invite_required=False,
+                    org_type=Realm.CORPORATE,
+                )
 
                 # Default to allowing all members to send mentions in
                 # large streams for the test suite to keep
@@ -324,17 +362,67 @@ class Command(BaseCommand):
                 names.append((full_name, f'extrauser{i}@zulip.com'))
 
             if num_names > num_boring_names:
-                fnames = ['Amber', 'Arpita', 'Bob', 'Cindy', 'Daniela', 'Dan', 'Dinesh',
-                          'Faye', 'François', 'George', 'Hank', 'Irene',
-                          'James', 'Janice', 'Jenny', 'Jill', 'John',
-                          'Kate', 'Katelyn', 'Kobe', 'Lexi', 'Manish', 'Mark', 'Matt', 'Mayna',
-                          'Michael', 'Pete', 'Peter', 'Phil', 'Phillipa', 'Preston',
-                          'Sally', 'Scott', 'Sandra', 'Steve', 'Stephanie',
-                          'Vera']
+                fnames = [
+                    'Amber',
+                    'Arpita',
+                    'Bob',
+                    'Cindy',
+                    'Daniela',
+                    'Dan',
+                    'Dinesh',
+                    'Faye',
+                    'François',
+                    'George',
+                    'Hank',
+                    'Irene',
+                    'James',
+                    'Janice',
+                    'Jenny',
+                    'Jill',
+                    'John',
+                    'Kate',
+                    'Katelyn',
+                    'Kobe',
+                    'Lexi',
+                    'Manish',
+                    'Mark',
+                    'Matt',
+                    'Mayna',
+                    'Michael',
+                    'Pete',
+                    'Peter',
+                    'Phil',
+                    'Phillipa',
+                    'Preston',
+                    'Sally',
+                    'Scott',
+                    'Sandra',
+                    'Steve',
+                    'Stephanie',
+                    'Vera',
+                ]
                 mnames = ['de', 'van', 'von', 'Shaw', 'T.']
-                lnames = ['Adams', 'Agarwal', 'Beal', 'Benson', 'Bonita', 'Davis',
-                          'George', 'Harden', 'James', 'Jones', 'Johnson', 'Jordan',
-                          'Lee', 'Leonard', 'Singh', 'Smith', 'Patel', 'Towns', 'Wall']
+                lnames = [
+                    'Adams',
+                    'Agarwal',
+                    'Beal',
+                    'Benson',
+                    'Bonita',
+                    'Davis',
+                    'George',
+                    'Harden',
+                    'James',
+                    'Jones',
+                    'Johnson',
+                    'Jordan',
+                    'Lee',
+                    'Leonard',
+                    'Singh',
+                    'Smith',
+                    'Patel',
+                    'Towns',
+                    'Wall',
+                ]
 
             for i in range(num_boring_names, num_names):
                 fname = random.choice(fnames) + str(i)
@@ -378,18 +466,31 @@ class Command(BaseCommand):
             # If a stream is not supplied in the webhook URL, the webhook
             # will (in some cases) send the notification as a PM to the
             # owner of the webhook bot, so bot_owner can't be None
-            create_users(zulip_realm, zulip_webhook_bots,
-                         bot_type=UserProfile.INCOMING_WEBHOOK_BOT, bot_owner=zoe)
+            create_users(
+                zulip_realm,
+                zulip_webhook_bots,
+                bot_type=UserProfile.INCOMING_WEBHOOK_BOT,
+                bot_owner=zoe,
+            )
             aaron = get_user_by_delivery_email("AARON@zulip.com", zulip_realm)
 
             zulip_outgoing_bots = [
                 ("Outgoing Webhook", "outgoing-webhook@zulip.com"),
             ]
-            create_users(zulip_realm, zulip_outgoing_bots,
-                         bot_type=UserProfile.OUTGOING_WEBHOOK_BOT, bot_owner=aaron)
+            create_users(
+                zulip_realm,
+                zulip_outgoing_bots,
+                bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
+                bot_owner=aaron,
+            )
             outgoing_webhook = get_user("outgoing-webhook@zulip.com", zulip_realm)
-            add_service("outgoing-webhook", user_profile=outgoing_webhook, interface=Service.GENERIC,
-                        base_url="http://127.0.0.1:5002", token=generate_api_key())
+            add_service(
+                "outgoing-webhook",
+                user_profile=outgoing_webhook,
+                interface=Service.GENERIC,
+                base_url="http://127.0.0.1:5002",
+                token=generate_api_key(),
+            )
 
             # Add the realm internal bots to each realm.
             create_if_missing_realm_internal_bots()
@@ -406,8 +507,7 @@ class Command(BaseCommand):
 
             bulk_create_streams(zulip_realm, stream_dict)
             recipient_streams: List[int] = [
-                Stream.objects.get(name=name, realm=zulip_realm).id
-                for name in stream_list
+                Stream.objects.get(name=name, realm=zulip_realm).id for name in stream_list
             ]
 
             # Create subscriptions to streams.  The following
@@ -418,8 +518,9 @@ class Command(BaseCommand):
             # across platforms.
 
             subscriptions_list: List[Tuple[UserProfile, Recipient]] = []
-            profiles: Sequence[UserProfile] = UserProfile.objects.select_related().filter(
-                is_bot=False).order_by("email")
+            profiles: Sequence[UserProfile] = (
+                UserProfile.objects.select_related().filter(is_bot=False).order_by("email")
+            )
 
             if options["test_suite"]:
                 subscriptions_map = {
@@ -463,80 +564,96 @@ class Command(BaseCommand):
             for profile, recipient in subscriptions_list:
                 i += 1
                 color = STREAM_ASSIGNMENT_COLORS[i % len(STREAM_ASSIGNMENT_COLORS)]
-                s = Subscription(
-                    recipient=recipient,
-                    user_profile=profile,
-                    color=color)
+                s = Subscription(recipient=recipient, user_profile=profile, color=color)
 
                 subscriptions_to_add.append(s)
 
-                log = RealmAuditLog(realm=profile.realm,
-                                    modified_user=profile,
-                                    modified_stream_id=recipient.type_id,
-                                    event_last_message_id=0,
-                                    event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
-                                    event_time=event_time)
+                log = RealmAuditLog(
+                    realm=profile.realm,
+                    modified_user=profile,
+                    modified_stream_id=recipient.type_id,
+                    event_last_message_id=0,
+                    event_type=RealmAuditLog.SUBSCRIPTION_CREATED,
+                    event_time=event_time,
+                )
                 all_subscription_logs.append(log)
 
             Subscription.objects.bulk_create(subscriptions_to_add)
             RealmAuditLog.objects.bulk_create(all_subscription_logs)
 
             # Create custom profile field data
-            phone_number = try_add_realm_custom_profile_field(zulip_realm, "Phone number",
-                                                              CustomProfileField.SHORT_TEXT,
-                                                              hint='')
-            biography = try_add_realm_custom_profile_field(zulip_realm, "Biography",
-                                                           CustomProfileField.LONG_TEXT,
-                                                           hint='What are you known for?')
-            favorite_food = try_add_realm_custom_profile_field(zulip_realm, "Favorite food",
-                                                               CustomProfileField.SHORT_TEXT,
-                                                               hint="Or drink, if you'd prefer")
+            phone_number = try_add_realm_custom_profile_field(
+                zulip_realm, "Phone number", CustomProfileField.SHORT_TEXT, hint=''
+            )
+            biography = try_add_realm_custom_profile_field(
+                zulip_realm,
+                "Biography",
+                CustomProfileField.LONG_TEXT,
+                hint='What are you known for?',
+            )
+            favorite_food = try_add_realm_custom_profile_field(
+                zulip_realm,
+                "Favorite food",
+                CustomProfileField.SHORT_TEXT,
+                hint="Or drink, if you'd prefer",
+            )
             field_data: ProfileFieldData = {
                 'vim': {'text': 'Vim', 'order': '1'},
                 'emacs': {'text': 'Emacs', 'order': '2'},
             }
-            favorite_editor = try_add_realm_custom_profile_field(zulip_realm,
-                                                                 "Favorite editor",
-                                                                 CustomProfileField.CHOICE,
-                                                                 field_data=field_data)
-            birthday = try_add_realm_custom_profile_field(zulip_realm, "Birthday",
-                                                          CustomProfileField.DATE)
-            favorite_website = try_add_realm_custom_profile_field(zulip_realm, "Favorite website",
-                                                                  CustomProfileField.URL,
-                                                                  hint="Or your personal blog's URL")
-            mentor = try_add_realm_custom_profile_field(zulip_realm, "Mentor",
-                                                        CustomProfileField.USER)
+            favorite_editor = try_add_realm_custom_profile_field(
+                zulip_realm, "Favorite editor", CustomProfileField.CHOICE, field_data=field_data
+            )
+            birthday = try_add_realm_custom_profile_field(
+                zulip_realm, "Birthday", CustomProfileField.DATE
+            )
+            favorite_website = try_add_realm_custom_profile_field(
+                zulip_realm,
+                "Favorite website",
+                CustomProfileField.URL,
+                hint="Or your personal blog's URL",
+            )
+            mentor = try_add_realm_custom_profile_field(
+                zulip_realm, "Mentor", CustomProfileField.USER
+            )
             github_profile = try_add_realm_default_custom_profile_field(zulip_realm, "github")
 
             # Fill in values for Iago and Hamlet
             hamlet = get_user_by_delivery_email("hamlet@zulip.com", zulip_realm)
-            do_update_user_custom_profile_data_if_changed(iago, [
-                {"id": phone_number.id, "value": "+1-234-567-8901"},
-                {"id": biography.id, "value": "Betrayer of Othello."},
-                {"id": favorite_food.id, "value": "Apples"},
-                {"id": favorite_editor.id, "value": "emacs"},
-                {"id": birthday.id, "value": "2000-01-01"},
-                {"id": favorite_website.id, "value": "https://zulip.readthedocs.io/en/latest/"},
-                {"id": mentor.id, "value": [hamlet.id]},
-                {"id": github_profile.id, "value": 'zulip'},
-            ])
-            do_update_user_custom_profile_data_if_changed(hamlet, [
-                {"id": phone_number.id, "value": "+0-11-23-456-7890"},
-                {
-                    "id": biography.id,
-                    "value": "I am:\n* The prince of Denmark\n* Nephew to the usurping Claudius",
-                },
-                {"id": favorite_food.id, "value": "Dark chocolate"},
-                {"id": favorite_editor.id, "value": "vim"},
-                {"id": birthday.id, "value": "1900-01-01"},
-                {"id": favorite_website.id, "value": "https://blog.zulig.org"},
-                {"id": mentor.id, "value": [iago.id]},
-                {"id": github_profile.id, "value": 'zulipbot'},
-            ])
+            do_update_user_custom_profile_data_if_changed(
+                iago,
+                [
+                    {"id": phone_number.id, "value": "+1-234-567-8901"},
+                    {"id": biography.id, "value": "Betrayer of Othello."},
+                    {"id": favorite_food.id, "value": "Apples"},
+                    {"id": favorite_editor.id, "value": "emacs"},
+                    {"id": birthday.id, "value": "2000-01-01"},
+                    {"id": favorite_website.id, "value": "https://zulip.readthedocs.io/en/latest/"},
+                    {"id": mentor.id, "value": [hamlet.id]},
+                    {"id": github_profile.id, "value": 'zulip'},
+                ],
+            )
+            do_update_user_custom_profile_data_if_changed(
+                hamlet,
+                [
+                    {"id": phone_number.id, "value": "+0-11-23-456-7890"},
+                    {
+                        "id": biography.id,
+                        "value": "I am:\n* The prince of Denmark\n* Nephew to the usurping Claudius",
+                    },
+                    {"id": favorite_food.id, "value": "Dark chocolate"},
+                    {"id": favorite_editor.id, "value": "vim"},
+                    {"id": birthday.id, "value": "1900-01-01"},
+                    {"id": favorite_website.id, "value": "https://blog.zulig.org"},
+                    {"id": mentor.id, "value": [iago.id]},
+                    {"id": github_profile.id, "value": 'zulipbot'},
+                ],
+            )
         else:
             zulip_realm = get_realm("zulip")
-            recipient_streams = [klass.type_id for klass in
-                                 Recipient.objects.filter(type=Recipient.STREAM)]
+            recipient_streams = [
+                klass.type_id for klass in Recipient.objects.filter(type=Recipient.STREAM)
+            ]
 
         # Extract a list of all users
         user_profiles: List[UserProfile] = list(UserProfile.objects.filter(is_bot=False))
@@ -554,11 +671,13 @@ class Command(BaseCommand):
                 client = get_client("website")
                 if user.full_name[0] <= 'H':
                     client = get_client("ZulipAndroid")
-                UserPresence.objects.get_or_create(user_profile=user,
-                                                   realm_id=user.realm_id,
-                                                   client=client,
-                                                   timestamp=date,
-                                                   status=status)
+                UserPresence.objects.get_or_create(
+                    user_profile=user,
+                    realm_id=user.realm_id,
+                    client=client,
+                    timestamp=date,
+                    status=status,
+                )
 
         user_profiles_ids = [user_profile.id for user_profile in user_profiles]
 
@@ -567,8 +686,9 @@ class Command(BaseCommand):
             get_huddle(random.sample(user_profiles_ids, random.randint(3, 4)))
 
         # Create several initial pairs for personals
-        personals_pairs = [random.sample(user_profiles_ids, 2)
-                           for i in range(options["num_personals"])]
+        personals_pairs = [
+            random.sample(user_profiles_ids, 2) for i in range(options["num_personals"])
+        ]
 
         create_alert_words(zulip_realm.id)
 
@@ -609,8 +729,10 @@ class Command(BaseCommand):
                 zulip_stream_dict: Dict[str, Dict[str, Any]] = {
                     "devel": {"description": "For developing"},
                     "all": {"description": "For **everything**"},
-                    "announce": {"description": "For announcements",
-                                 'stream_post_policy': Stream.STREAM_POST_POLICY_ADMINS},
+                    "announce": {
+                        "description": "For announcements",
+                        'stream_post_policy': Stream.STREAM_POST_POLICY_ADMINS,
+                    },
                     "design": {"description": "For design"},
                     "support": {"description": "For support"},
                     "social": {"description": "For socializing"},
@@ -642,8 +764,9 @@ class Command(BaseCommand):
 
                 # Add a few default streams
                 for default_stream_name in ["design", "devel", "social", "support"]:
-                    DefaultStream.objects.create(realm=zulip_realm,
-                                                 stream=get_stream(default_stream_name, zulip_realm))
+                    DefaultStream.objects.create(
+                        realm=zulip_realm, stream=get_stream(default_stream_name, zulip_realm)
+                    )
 
                 # Now subscribe everyone to these streams
                 subscribe_users_to_streams(zulip_realm, zulip_stream_dict)
@@ -651,12 +774,15 @@ class Command(BaseCommand):
             if not options["test_suite"]:
                 # Update pointer of each user to point to the last message in their
                 # UserMessage rows with sender_id=user_profile_id.
-                users = list(UserMessage.objects.filter(
-                    message__sender_id=F('user_profile_id')).values(
-                    'user_profile_id').annotate(pointer=Max('message_id')))
+                users = list(
+                    UserMessage.objects.filter(message__sender_id=F('user_profile_id'))
+                    .values('user_profile_id')
+                    .annotate(pointer=Max('message_id'))
+                )
                 for user in users:
                     UserProfile.objects.filter(id=user['user_profile_id']).update(
-                        pointer=user['pointer'])
+                        pointer=user['pointer']
+                    )
 
             create_user_groups()
 
@@ -671,7 +797,9 @@ class Command(BaseCommand):
             count = options["num_messages"] // threads
             if i < options["num_messages"] % threads:
                 count += 1
-            jobs.append((count, personals_pairs, options, self.stdout.write, random.randint(0, 10**10)))
+            jobs.append(
+                (count, personals_pairs, options, self.stdout.write, random.randint(0, 10 ** 10))
+            )
 
         for job in jobs:
             generate_and_send_messages(job)
@@ -686,13 +814,16 @@ class Command(BaseCommand):
                     ("Zulip Trac Bot", "trac-bot@zulip.com"),
                     ("Zulip Nagios Bot", "nagios-bot@zulip.com"),
                 ]
-                create_users(zulip_realm, internal_zulip_users_nosubs, bot_type=UserProfile.DEFAULT_BOT)
+                create_users(
+                    zulip_realm, internal_zulip_users_nosubs, bot_type=UserProfile.DEFAULT_BOT
+                )
 
             mark_all_messages_as_read()
             self.stdout.write("Successfully populated test database.\n")
 
+
 def mark_all_messages_as_read() -> None:
-    '''
+    """
     We want to keep these two flags intact after we
     create messages:
 
@@ -700,18 +831,22 @@ def mark_all_messages_as_read() -> None:
         is_private
 
     But we will mark all messages as read to save a step for users.
-    '''
+    """
     # Mark all messages as read
     UserMessage.objects.all().update(
         flags=F('flags').bitor(UserMessage.flags.read),
     )
 
+
 recipient_hash: Dict[int, Recipient] = {}
+
+
 def get_recipient_by_id(rid: int) -> Recipient:
     if rid in recipient_hash:
         return recipient_hash[rid]
     return Recipient.objects.get(id=rid)
 
+
 # Create some test messages, including:
 # - multiple streams
 # - multiple subjects per stream
@@ -719,13 +854,15 @@ def get_recipient_by_id(rid: int) -> Recipient:
 # - multiple personals converastions
 # - multiple messages per subject
 # - both single and multi-line content
-def generate_and_send_messages(data: Tuple[int, Sequence[Sequence[int]], Mapping[str, Any],
-                                           Callable[[str], Any], int]) -> int:
+def generate_and_send_messages(
+    data: Tuple[int, Sequence[Sequence[int]], Mapping[str, Any], Callable[[str], Any], int]
+) -> int:
     (tot_messages, personals_pairs, options, output, random_seed) = data
     random.seed(random_seed)
 
-    with open(os.path.join(get_or_create_dev_uuid_var_path('test-backend'),
-                           "test_messages.json"), "rb") as infile:
+    with open(
+        os.path.join(get_or_create_dev_uuid_var_path('test-backend'), "test_messages.json"), "rb"
+    ) as infile:
         dialog = orjson.loads(infile.read())
     random.shuffle(dialog)
     texts = itertools.cycle(dialog)
@@ -737,8 +874,7 @@ def generate_and_send_messages(data: Tuple[int, Sequence[Sequence[int]], Mapping
 
     huddle_members: Dict[int, List[int]] = {}
     for h in recipient_huddles:
-        huddle_members[h] = [s.user_profile.id for s in
-                             Subscription.objects.filter(recipient_id=h)]
+        huddle_members[h] = [s.user_profile.id for s in Subscription.objects.filter(recipient_id=h)]
 
     # Generate different topics for each stream
     possible_topics = {}
@@ -758,8 +894,10 @@ def generate_and_send_messages(data: Tuple[int, Sequence[Sequence[int]], Mapping
         message.content = next(texts)
 
         randkey = random.randint(1, random_max)
-        if (num_messages > 0 and
-                random.randint(1, random_max) * 100. / random_max < options["stickyness"]):
+        if (
+            num_messages > 0
+            and random.randint(1, random_max) * 100.0 / random_max < options["stickyness"]
+        ):
             # Use an old recipient
             message_type, recipient_id, saved_data = recipients[num_messages - 1]
             if message_type == Recipient.PERSONAL:
@@ -770,14 +908,17 @@ def generate_and_send_messages(data: Tuple[int, Sequence[Sequence[int]], Mapping
                 message.recipient = get_recipient_by_id(recipient_id)
             elif message_type == Recipient.HUDDLE:
                 message.recipient = get_recipient_by_id(recipient_id)
-        elif (randkey <= random_max * options["percent_huddles"] / 100.):
+        elif randkey <= random_max * options["percent_huddles"] / 100.0:
             message_type = Recipient.HUDDLE
             message.recipient = get_recipient_by_id(random.choice(recipient_huddles))
-        elif (randkey <= random_max * (options["percent_huddles"] + options["percent_personals"]) / 100.):
+        elif (
+            randkey
+            <= random_max * (options["percent_huddles"] + options["percent_personals"]) / 100.0
+        ):
             message_type = Recipient.PERSONAL
             personals_pair = random.choice(personals_pairs)
             random.shuffle(personals_pair)
-        elif (randkey <= random_max * 1.0):
+        elif randkey <= random_max * 1.0:
             message_type = Recipient.STREAM
             message.recipient = get_recipient_by_id(random.choice(recipient_streams))
 
@@ -785,14 +926,16 @@ def generate_and_send_messages(data: Tuple[int, Sequence[Sequence[int]], Mapping
             sender_id = random.choice(huddle_members[message.recipient.id])
             message.sender = get_user_profile_by_id(sender_id)
         elif message_type == Recipient.PERSONAL:
-            message.recipient = Recipient.objects.get(type=Recipient.PERSONAL,
-                                                      type_id=personals_pair[0])
+            message.recipient = Recipient.objects.get(
+                type=Recipient.PERSONAL, type_id=personals_pair[0]
+            )
             message.sender = get_user_profile_by_id(personals_pair[1])
             saved_data['personals_pair'] = personals_pair
         elif message_type == Recipient.STREAM:
             # Pick a random subscriber to the stream
-            message.sender = random.choice(Subscription.objects.filter(
-                recipient=message.recipient)).user_profile
+            message.sender = random.choice(
+                Subscription.objects.filter(recipient=message.recipient)
+            ).user_profile
             message.subject = random.choice(possible_topics[message.recipient.id])
             saved_data['subject'] = message.subject
 
@@ -813,6 +956,7 @@ def generate_and_send_messages(data: Tuple[int, Sequence[Sequence[int]], Mapping
 
     return tot_messages
 
+
 def send_messages(messages: List[Message]) -> None:
     # We disable USING_RABBITMQ here, so that deferred work is
     # executed in do_send_message_messages, rather than being
@@ -829,6 +973,7 @@ def send_messages(messages: List[Message]) -> None:
     bulk_create_reactions(messages)
     settings.USING_RABBITMQ = True
 
+
 def get_message_to_users(message_ids: List[int]) -> Dict[int, List[int]]:
     rows = UserMessage.objects.filter(
         message_id__in=message_ids,
@@ -841,6 +986,7 @@ def get_message_to_users(message_ids: List[int]) -> Dict[int, List[int]]:
 
     return result
 
+
 def bulk_create_reactions(all_messages: List[Message]) -> None:
     reactions: List[Reaction] = []
 
@@ -873,11 +1019,13 @@ def bulk_create_reactions(all_messages: List[Message]) -> None:
                         message_id=message_id,
                         emoji_name=emoji_name,
                         emoji_code=emoji_code,
-                        reaction_type=Reaction.UNICODE_EMOJI
+                        reaction_type=Reaction.UNICODE_EMOJI,
                     )
                     reactions.append(reaction)
 
     Reaction.objects.bulk_create(reactions)
+
+
 def choose_date_sent(num_messages: int, tot_messages: int, threads: int) -> datetime:
     # Spoofing time not supported with threading
     if threads != 1:
@@ -887,17 +1035,17 @@ def choose_date_sent(num_messages: int, tot_messages: int, threads: int) -> date
     # of 3 days. Then, distributes remaining messages over past 24 hours.
     amount_in_first_chunk = int(tot_messages * 0.8)
     amount_in_second_chunk = tot_messages - amount_in_first_chunk
-    if (num_messages < amount_in_first_chunk):
+    if num_messages < amount_in_first_chunk:
         # Distribute starting from 5 days ago, over a period
         # of 3 days:
-        spoofed_date = timezone_now() - timezone_timedelta(days = 5)
+        spoofed_date = timezone_now() - timezone_timedelta(days=5)
         interval_size = 3 * 24 * 60 * 60 / amount_in_first_chunk
         lower_bound = interval_size * num_messages
         upper_bound = interval_size * (num_messages + 1)
 
     else:
         # We're in the last 20% of messages, distribute them over the last 24 hours:
-        spoofed_date = timezone_now() - timezone_timedelta(days = 1)
+        spoofed_date = timezone_now() - timezone_timedelta(days=1)
         interval_size = 24 * 60 * 60 / amount_in_second_chunk
         lower_bound = interval_size * (num_messages - amount_in_first_chunk)
         upper_bound = interval_size * (num_messages - amount_in_first_chunk + 1)
@@ -907,9 +1055,11 @@ def choose_date_sent(num_messages: int, tot_messages: int, threads: int) -> date
 
     return spoofed_date
 
+
 def create_user_groups() -> None:
     zulip = get_realm('zulip')
-    members = [get_user_by_delivery_email('cordelia@zulip.com', zulip),
-               get_user_by_delivery_email('hamlet@zulip.com', zulip)]
-    create_user_group("hamletcharacters", members, zulip,
-                      description="Characters of Hamlet")
+    members = [
+        get_user_by_delivery_email('cordelia@zulip.com', zulip),
+        get_user_by_delivery_email('hamlet@zulip.com', zulip),
+    ]
+    create_user_group("hamletcharacters", members, zulip, description="Characters of Hamlet")
diff --git a/zilencer/management/commands/print_initial_password.py b/zilencer/management/commands/print_initial_password.py
index 06c1c6afe3..9d41300751 100644
--- a/zilencer/management/commands/print_initial_password.py
+++ b/zilencer/management/commands/print_initial_password.py
@@ -12,8 +12,12 @@ class Command(ZulipBaseCommand):
     fmt = '%-30s %-16s  %-32s'
 
     def add_arguments(self, parser: ArgumentParser) -> None:
-        parser.add_argument('emails', metavar='<email>', nargs='*',
-                            help="email of user to show password and API key for")
+        parser.add_argument(
+            'emails',
+            metavar='<email>',
+            nargs='*',
+            help="email of user to show password and API key for",
+        )
         self.add_realm_args(parser)
 
     def handle(self, *args: Any, **options: str) -> None:
diff --git a/zilencer/management/commands/profile_request.py b/zilencer/management/commands/profile_request.py
index 7c2ad80d62..7d07f7a8ec 100644
--- a/zilencer/management/commands/profile_request.py
+++ b/zilencer/management/commands/profile_request.py
@@ -13,17 +13,21 @@ from zerver.views.message_fetch import get_messages_backend
 
 request_logger = LogRequests()
 
+
 class MockSession:
     def __init__(self) -> None:
         self.modified = False
 
+
 class MockRequest(HttpRequest):
     def __init__(self, user: UserProfile) -> None:
         self.user = user
         self.path = '/'
         self.method = "POST"
         self.META = {"REMOTE_ADDR": "127.0.0.1"}
-        anchor = UserMessage.objects.filter(user_profile=self.user).order_by("-message")[200].message_id
+        anchor = (
+            UserMessage.objects.filter(user_profile=self.user).order_by("-message")[200].message_id
+        )
         self.REQUEST = {
             "anchor": anchor,
             "num_before": 1200,
@@ -35,12 +39,12 @@ class MockRequest(HttpRequest):
     def get_full_path(self) -> str:
         return self.path
 
+
 def profile_request(request: HttpRequest) -> HttpResponse:
     request_logger.process_request(request)
     prof = cProfile.Profile()
     prof.enable()
-    ret = get_messages_backend(request, request.user,
-                               apply_markdown=True)
+    ret = get_messages_backend(request, request.user, apply_markdown=True)
     prof.disable()
     with tempfile.NamedTemporaryFile(prefix='profile.data.', delete=False) as stats_file:
         prof.dump_stats(stats_file.name)
@@ -48,6 +52,7 @@ def profile_request(request: HttpRequest) -> HttpResponse:
         logging.info("Profiling data written to %s", stats_file.name)
     return ret
 
+
 class Command(ZulipBaseCommand):
     def add_arguments(self, parser: CommandParser) -> None:
         parser.add_argument("email", metavar="<email>", help="Email address of the user")
diff --git a/zilencer/management/commands/queue_rate.py b/zilencer/management/commands/queue_rate.py
index 260300f097..c40bcce843 100644
--- a/zilencer/management/commands/queue_rate.py
+++ b/zilencer/management/commands/queue_rate.py
@@ -14,12 +14,8 @@ class Command(BaseCommand):
         parser.add_argument(
             "--count", help="Number of messages to enqueue", default=10000, type=int
         )
-        parser.add_argument(
-            "--reps", help="Iterations of enqueue/dequeue", default=1, type=int
-        )
-        parser.add_argument(
-            "--batch", help="Enables batch dequeuing", action="store_true"
-        )
+        parser.add_argument("--reps", help="Iterations of enqueue/dequeue", default=1, type=int)
+        parser.add_argument("--batch", help="Enables batch dequeuing", action="store_true")
         parser.add_argument(
             "--prefetch",
             help="Limits the prefetch size; RabbitMQ defaults to unbounded (0)",
@@ -66,7 +62,7 @@ class Command(BaseCommand):
                 number=1,
             )
 
-        rate = lambda time, iterations: int(iterations/time)
+        rate = lambda time, iterations: int(iterations / time)
 
         total_reps_time = timeit(one_rep, number=reps)
         if reps > 1:
diff --git a/zilencer/management/commands/render_messages.py b/zilencer/management/commands/render_messages.py
index 67a7249e4a..3063ef1e3b 100644
--- a/zilencer/management/commands/render_messages.py
+++ b/zilencer/management/commands/render_messages.py
@@ -9,7 +9,7 @@ from zerver.lib.message import render_markdown
 from zerver.models import Message
 
 
-def queryset_iterator(queryset: QuerySet, chunksize: int=5000) -> Iterator[Any]:
+def queryset_iterator(queryset: QuerySet, chunksize: int = 5000) -> Iterator[Any]:
     queryset = queryset.order_by('id')
     while queryset.exists():
         for row in queryset[:chunksize]:
@@ -54,10 +54,14 @@ class Command(BaseCommand):
                         if 'prev_content' in entry:
                             content = entry['prev_content']
                             break
-                result.write(orjson.dumps({
-                    'id': message.id,
-                    'content': render_markdown(message, content),
-                }))
+                result.write(
+                    orjson.dumps(
+                        {
+                            'id': message.id,
+                            'content': render_markdown(message, content),
+                        }
+                    )
+                )
                 if message.id != latest:
                     result.write(b',')
             result.write(b']')
diff --git a/zilencer/management/commands/rundjangoserver.py b/zilencer/management/commands/rundjangoserver.py
index d7d67261e4..1ae74ecf3d 100644
--- a/zilencer/management/commands/rundjangoserver.py
+++ b/zilencer/management/commands/rundjangoserver.py
@@ -27,21 +27,28 @@ class Command(DjangoCommand):
         # Need to check migrations here, so can't use the
         # requires_migrations_check attribute.
         self.check_migrations()
-        self.stdout.write((
-            "Django process (re)started. Quit the server with %(quit_command)s.\n"
-        ) % {
-            "version": self.get_version(),
-            "settings": settings.SETTINGS_MODULE,
-            "protocol": self.protocol,
-            "addr": '[%s]' % self.addr if self._raw_ipv6 else self.addr,
-            "port": self.port,
-            "quit_command": quit_command,
-        })
+        self.stdout.write(
+            ("Django process (re)started. Quit the server with %(quit_command)s.\n")
+            % {
+                "version": self.get_version(),
+                "settings": settings.SETTINGS_MODULE,
+                "protocol": self.protocol,
+                "addr": '[%s]' % self.addr if self._raw_ipv6 else self.addr,
+                "port": self.port,
+                "quit_command": quit_command,
+            }
+        )
 
         try:
             handler = self.get_handler(*args, **options)
-            run(self.addr, int(self.port), handler,
-                ipv6=self.use_ipv6, threading=threading, server_cls=self.server_cls)
+            run(
+                self.addr,
+                int(self.port),
+                handler,
+                ipv6=self.use_ipv6,
+                threading=threading,
+                server_cls=self.server_cls,
+            )
         except socket.error as e:
             # Use helpful error messages instead of ugly tracebacks.
             ERRORS = {
@@ -60,5 +67,3 @@ class Command(DjangoCommand):
             if shutdown_message:
                 self.stdout.write(shutdown_message)
             sys.exit(0)
-
-
diff --git a/zilencer/migrations/0001_initial.py b/zilencer/migrations/0001_initial.py
index 82c915365e..b996406697 100644
--- a/zilencer/migrations/0001_initial.py
+++ b/zilencer/migrations/0001_initial.py
@@ -11,15 +11,19 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Deployment',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        verbose_name='ID', serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
                 ('is_active', models.BooleanField(default=True)),
                 ('api_key', models.CharField(max_length=32, null=True)),
                 ('base_api_url', models.CharField(max_length=128)),
                 ('base_site_url', models.CharField(max_length=128)),
                 ('realms', models.ManyToManyField(related_name='_deployments', to='zerver.Realm')),
             ],
-            options={
-            },
+            options={},
             bases=(models.Model,),
         ),
     ]
diff --git a/zilencer/migrations/0002_remote_zulip_server.py b/zilencer/migrations/0002_remote_zulip_server.py
index 9d47bbebb6..dd29af0014 100644
--- a/zilencer/migrations/0002_remote_zulip_server.py
+++ b/zilencer/migrations/0002_remote_zulip_server.py
@@ -12,7 +12,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RemotePushDeviceToken',
             fields=[
-                ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        serialize=False, auto_created=True, verbose_name='ID', primary_key=True
+                    ),
+                ),
                 ('user_id', models.BigIntegerField()),
                 ('kind', models.PositiveSmallIntegerField(choices=[(1, 'apns'), (2, 'gcm')])),
                 ('token', models.CharField(unique=True, max_length=4096)),
@@ -23,7 +28,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RemoteZulipServer',
             fields=[
-                ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(
+                        serialize=False, auto_created=True, verbose_name='ID', primary_key=True
+                    ),
+                ),
                 ('uuid', models.CharField(unique=True, max_length=36)),
                 ('api_key', models.CharField(max_length=64)),
                 ('hostname', models.CharField(unique=True, max_length=128)),
@@ -34,6 +44,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='remotepushdevicetoken',
             name='server',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer'
+            ),
         ),
     ]
diff --git a/zilencer/migrations/0006_customer.py b/zilencer/migrations/0006_customer.py
index 88ec1d3b6b..4a323488c1 100644
--- a/zilencer/migrations/0006_customer.py
+++ b/zilencer/migrations/0006_customer.py
@@ -15,9 +15,19 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Customer',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('stripe_customer_id', models.CharField(max_length=255, unique=True)),
-                ('realm', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'realm',
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zilencer/migrations/0008_customer_billing_user.py b/zilencer/migrations/0008_customer_billing_user.py
index 40f978e9a9..9996962d18 100644
--- a/zilencer/migrations/0008_customer_billing_user.py
+++ b/zilencer/migrations/0008_customer_billing_user.py
@@ -16,6 +16,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='customer',
             name='billing_user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL
+            ),
         ),
     ]
diff --git a/zilencer/migrations/0009_plan.py b/zilencer/migrations/0009_plan.py
index 05c7356745..4e3e5ce630 100644
--- a/zilencer/migrations/0009_plan.py
+++ b/zilencer/migrations/0009_plan.py
@@ -13,7 +13,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Plan',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('nickname', models.CharField(max_length=40, unique=True)),
                 ('stripe_plan_id', models.CharField(max_length=255, unique=True)),
             ],
diff --git a/zilencer/migrations/0010_billingprocessor.py b/zilencer/migrations/0010_billingprocessor.py
index 94090640ef..91cf7edf29 100644
--- a/zilencer/migrations/0010_billingprocessor.py
+++ b/zilencer/migrations/0010_billingprocessor.py
@@ -15,11 +15,26 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='BillingProcessor',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('state', models.CharField(max_length=20)),
                 ('last_modified', models.DateTimeField(auto_now=True)),
-                ('log_row', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.RealmAuditLog')),
-                ('realm', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm')),
+                (
+                    'log_row',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zerver.RealmAuditLog'
+                    ),
+                ),
+                (
+                    'realm',
+                    models.OneToOneField(
+                        null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zilencer/migrations/0012_coupon.py b/zilencer/migrations/0012_coupon.py
index ab19661f81..109d9399fe 100644
--- a/zilencer/migrations/0012_coupon.py
+++ b/zilencer/migrations/0012_coupon.py
@@ -13,7 +13,12 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Coupon',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('percent_off', models.SmallIntegerField(unique=True)),
                 ('stripe_coupon_id', models.CharField(max_length=255, unique=True)),
             ],
diff --git a/zilencer/migrations/0016_remote_counts.py b/zilencer/migrations/0016_remote_counts.py
index 207ce088c7..7d5d39bb91 100644
--- a/zilencer/migrations/0016_remote_counts.py
+++ b/zilencer/migrations/0016_remote_counts.py
@@ -14,26 +14,46 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RemoteInstallationCount',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('property', models.CharField(max_length=32)),
                 ('subgroup', models.CharField(max_length=16, null=True)),
                 ('end_time', models.DateTimeField()),
                 ('value', models.BigIntegerField()),
                 ('remote_id', models.IntegerField(db_index=True)),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer')),
+                (
+                    'server',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer'
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
             name='RemoteRealmCount',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('property', models.CharField(max_length=32)),
                 ('subgroup', models.CharField(max_length=16, null=True)),
                 ('end_time', models.DateTimeField()),
                 ('value', models.BigIntegerField()),
                 ('realm_id', models.IntegerField(db_index=True)),
                 ('remote_id', models.IntegerField(db_index=True)),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer')),
+                (
+                    'server',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer'
+                    ),
+                ),
             ],
         ),
         migrations.AlterUniqueTogether(
diff --git a/zilencer/migrations/0018_remoterealmauditlog.py b/zilencer/migrations/0018_remoterealmauditlog.py
index 7e24e25097..21faf9cb9e 100644
--- a/zilencer/migrations/0018_remoterealmauditlog.py
+++ b/zilencer/migrations/0018_remoterealmauditlog.py
@@ -14,14 +14,24 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RemoteRealmAuditLog',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+                    ),
+                ),
                 ('realm_id', models.IntegerField(db_index=True)),
                 ('remote_id', models.IntegerField(db_index=True)),
                 ('event_time', models.DateTimeField(db_index=True)),
                 ('backfilled', models.BooleanField(default=False)),
                 ('extra_data', models.TextField(null=True)),
                 ('event_type', models.PositiveSmallIntegerField()),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer')),
+                (
+                    'server',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to='zilencer.RemoteZulipServer'
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/zilencer/models.py b/zilencer/models.py
index 34481bbeb5..42cc4e1e03 100644
--- a/zilencer/models.py
+++ b/zilencer/models.py
@@ -9,6 +9,7 @@ from zerver.models import AbstractPushDeviceToken, AbstractRealmAuditLog
 def get_remote_server_by_uuid(uuid: str) -> 'RemoteZulipServer':
     return RemoteZulipServer.objects.get(uuid=uuid)
 
+
 class RemoteZulipServer(models.Model):
     UUID_LENGTH = 36
     API_KEY_LENGTH = 64
@@ -27,6 +28,7 @@ class RemoteZulipServer(models.Model):
     def format_requestor_for_logs(self) -> str:
         return "zulip-server:" + self.uuid
 
+
 # Variant of PushDeviceToken for a remote server.
 class RemotePushDeviceToken(AbstractPushDeviceToken):
     server: RemoteZulipServer = models.ForeignKey(RemoteZulipServer, on_delete=models.CASCADE)
@@ -39,10 +41,12 @@ class RemotePushDeviceToken(AbstractPushDeviceToken):
     def __str__(self) -> str:
         return f"<RemotePushDeviceToken {self.server} {self.user_id}>"
 
+
 class RemoteRealmAuditLog(AbstractRealmAuditLog):
     """Synced audit data from a remote Zulip server, used primarily for
     billing.  See RealmAuditLog and AbstractRealmAuditLog for details.
     """
+
     server: RemoteZulipServer = models.ForeignKey(RemoteZulipServer, on_delete=models.CASCADE)
     realm_id: int = models.IntegerField(db_index=True)
     # The remote_id field lets us deduplicate data from the remote server
@@ -51,6 +55,7 @@ class RemoteRealmAuditLog(AbstractRealmAuditLog):
     def __str__(self) -> str:
         return f"<RemoteRealmAuditLog: {self.server} {self.event_type} {self.event_time} {self.id}>"
 
+
 class RemoteInstallationCount(BaseCount):
     server: RemoteZulipServer = models.ForeignKey(RemoteZulipServer, on_delete=models.CASCADE)
     # The remote_id field lets us deduplicate data from the remote server
@@ -65,6 +70,7 @@ class RemoteInstallationCount(BaseCount):
     def __str__(self) -> str:
         return f"<InstallationCount: {self.property} {self.subgroup} {self.value}>"
 
+
 # We can't subclass RealmCount because we only have a realm_id here, not a foreign key.
 class RemoteRealmCount(BaseCount):
     server: RemoteZulipServer = models.ForeignKey(RemoteZulipServer, on_delete=models.CASCADE)
diff --git a/zilencer/urls.py b/zilencer/urls.py
index 47855e749b..b17466d386 100644
--- a/zilencer/urls.py
+++ b/zilencer/urls.py
@@ -18,23 +18,15 @@ i18n_urlpatterns: Any = []
 
 # Zilencer views following the REST API style
 v1_api_and_json_patterns = [
-    rest_path('remotes/push/register',
-              POST=register_remote_push_device),
-    rest_path('remotes/push/unregister',
-              POST=unregister_remote_push_device),
-    rest_path('remotes/push/unregister/all',
-              POST=unregister_all_remote_push_devices),
-    rest_path('remotes/push/notify',
-              POST=remote_server_notify_push),
-
+    rest_path('remotes/push/register', POST=register_remote_push_device),
+    rest_path('remotes/push/unregister', POST=unregister_remote_push_device),
+    rest_path('remotes/push/unregister/all', POST=unregister_all_remote_push_devices),
+    rest_path('remotes/push/notify', POST=remote_server_notify_push),
     # Push signup doesn't use the REST API, since there's no auth.
     path('remotes/server/register', register_remote_server),
-
     # For receiving table data used in analytics and billing
-    rest_path('remotes/server/analytics',
-              POST=remote_server_post_analytics),
-    rest_path('remotes/server/analytics/status',
-              GET=remote_server_check_analytics),
+    rest_path('remotes/server/analytics', POST=remote_server_post_analytics),
+    rest_path('remotes/server/analytics/status', GET=remote_server_check_analytics),
 ]
 
 urlpatterns = [
diff --git a/zilencer/views.py b/zilencer/views.py
index 0f6abf1109..bf4f93219e 100644
--- a/zilencer/views.py
+++ b/zilencer/views.py
@@ -47,25 +47,31 @@ def validate_entity(entity: Union[UserProfile, RemoteZulipServer]) -> RemoteZuli
         raise JsonableError(err_("Must validate with valid Zulip server API key"))
     return entity
 
-def validate_bouncer_token_request(entity: Union[UserProfile, RemoteZulipServer],
-                                   token: str, kind: int) -> RemoteZulipServer:
+
+def validate_bouncer_token_request(
+    entity: Union[UserProfile, RemoteZulipServer], token: str, kind: int
+) -> RemoteZulipServer:
     if kind not in [RemotePushDeviceToken.APNS, RemotePushDeviceToken.GCM]:
         raise JsonableError(err_("Invalid token type"))
     server = validate_entity(entity)
     validate_token(token, kind)
     return server
 
+
 @csrf_exempt
 @require_post
 @has_request_variables
 def register_remote_server(
-        request: HttpRequest,
-        zulip_org_id: str=REQ(str_validator=check_string_fixed_length(RemoteZulipServer.UUID_LENGTH)),
-        zulip_org_key: str=REQ(str_validator=check_string_fixed_length(RemoteZulipServer.API_KEY_LENGTH)),
-        hostname: str=REQ(str_validator=check_capped_string(RemoteZulipServer.HOSTNAME_MAX_LENGTH)),
-        contact_email: str=REQ(str_validator=check_string),
-        new_org_key: Optional[str]=REQ(str_validator=check_string_fixed_length(
-            RemoteZulipServer.API_KEY_LENGTH), default=None),
+    request: HttpRequest,
+    zulip_org_id: str = REQ(str_validator=check_string_fixed_length(RemoteZulipServer.UUID_LENGTH)),
+    zulip_org_key: str = REQ(
+        str_validator=check_string_fixed_length(RemoteZulipServer.API_KEY_LENGTH)
+    ),
+    hostname: str = REQ(str_validator=check_capped_string(RemoteZulipServer.HOSTNAME_MAX_LENGTH)),
+    contact_email: str = REQ(str_validator=check_string),
+    new_org_key: Optional[str] = REQ(
+        str_validator=check_string_fixed_length(RemoteZulipServer.API_KEY_LENGTH), default=None
+    ),
 ) -> HttpResponse:
     # REQ validated the the field lengths, but we still need to
     # validate the format of these fields.
@@ -83,8 +89,8 @@ def register_remote_server(
 
     remote_server, created = RemoteZulipServer.objects.get_or_create(
         uuid=zulip_org_id,
-        defaults={'hostname': hostname, 'contact_email': contact_email,
-                  'api_key': zulip_org_key})
+        defaults={'hostname': hostname, 'contact_email': contact_email, 'api_key': zulip_org_key},
+    )
 
     if not created:
         if remote_server.api_key != zulip_org_key:
@@ -98,11 +104,16 @@ def register_remote_server(
 
     return json_success({'created': created})
 
+
 @has_request_variables
-def register_remote_push_device(request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer],
-                                user_id: int=REQ(validator=check_int), token: str=REQ(),
-                                token_kind: int=REQ(validator=check_int),
-                                ios_app_id: Optional[str]=None) -> HttpResponse:
+def register_remote_push_device(
+    request: HttpRequest,
+    entity: Union[UserProfile, RemoteZulipServer],
+    user_id: int = REQ(validator=check_int),
+    token: str = REQ(),
+    token_kind: int = REQ(validator=check_int),
+    ios_app_id: Optional[str] = None,
+) -> HttpResponse:
     server = validate_bouncer_token_request(entity, token, token_kind)
 
     try:
@@ -114,39 +125,50 @@ def register_remote_push_device(request: HttpRequest, entity: Union[UserProfile,
                 token=token,
                 ios_app_id=ios_app_id,
                 # last_updated is to be renamed to date_created.
-                last_updated=timezone.now())
+                last_updated=timezone.now(),
+            )
     except IntegrityError:
         pass
 
     return json_success()
 
+
 @has_request_variables
-def unregister_remote_push_device(request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer],
-                                  token: str=REQ(),
-                                  token_kind: int=REQ(validator=check_int),
-                                  user_id: int=REQ(validator=check_int),
-                                  ios_app_id: Optional[str]=None) -> HttpResponse:
+def unregister_remote_push_device(
+    request: HttpRequest,
+    entity: Union[UserProfile, RemoteZulipServer],
+    token: str = REQ(),
+    token_kind: int = REQ(validator=check_int),
+    user_id: int = REQ(validator=check_int),
+    ios_app_id: Optional[str] = None,
+) -> HttpResponse:
     server = validate_bouncer_token_request(entity, token, token_kind)
-    deleted = RemotePushDeviceToken.objects.filter(token=token,
-                                                   kind=token_kind,
-                                                   user_id=user_id,
-                                                   server=server).delete()
+    deleted = RemotePushDeviceToken.objects.filter(
+        token=token, kind=token_kind, user_id=user_id, server=server
+    ).delete()
     if deleted[0] == 0:
         return json_error(err_("Token does not exist"))
 
     return json_success()
 
-@has_request_variables
-def unregister_all_remote_push_devices(request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer],
-                                       user_id: int=REQ(validator=check_int)) -> HttpResponse:
-    server = validate_entity(entity)
-    RemotePushDeviceToken.objects.filter(user_id=user_id,
-                                         server=server).delete()
-    return json_success()
 
 @has_request_variables
-def remote_server_notify_push(request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer],
-                              payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
+def unregister_all_remote_push_devices(
+    request: HttpRequest,
+    entity: Union[UserProfile, RemoteZulipServer],
+    user_id: int = REQ(validator=check_int),
+) -> HttpResponse:
+    server = validate_entity(entity)
+    RemotePushDeviceToken.objects.filter(user_id=user_id, server=server).delete()
+    return json_success()
+
+
+@has_request_variables
+def remote_server_notify_push(
+    request: HttpRequest,
+    entity: Union[UserProfile, RemoteZulipServer],
+    payload: Dict[str, Any] = REQ(argument_type='body'),
+) -> HttpResponse:
     server = validate_entity(entity)
 
     user_id = payload['user_id']
@@ -154,17 +176,21 @@ def remote_server_notify_push(request: HttpRequest, entity: Union[UserProfile, R
     apns_payload = payload['apns_payload']
     gcm_options = payload.get('gcm_options', {})
 
-    android_devices = list(RemotePushDeviceToken.objects.filter(
-        user_id=user_id,
-        kind=RemotePushDeviceToken.GCM,
-        server=server,
-    ))
+    android_devices = list(
+        RemotePushDeviceToken.objects.filter(
+            user_id=user_id,
+            kind=RemotePushDeviceToken.GCM,
+            server=server,
+        )
+    )
 
-    apple_devices = list(RemotePushDeviceToken.objects.filter(
-        user_id=user_id,
-        kind=RemotePushDeviceToken.APNS,
-        server=server,
-    ))
+    apple_devices = list(
+        RemotePushDeviceToken.objects.filter(
+            user_id=user_id,
+            kind=RemotePushDeviceToken.APNS,
+            server=server,
+        )
+    )
 
     send_android_push_notification(android_devices, gcm_payload, gcm_options, remote=True)
 
@@ -172,8 +198,10 @@ def remote_server_notify_push(request: HttpRequest, entity: Union[UserProfile, R
 
     return json_success()
 
-def validate_incoming_table_data(server: RemoteZulipServer, model: Any,
-                                 rows: List[Dict[str, Any]], is_count_stat: bool=False) -> None:
+
+def validate_incoming_table_data(
+    server: RemoteZulipServer, model: Any, rows: List[Dict[str, Any]], is_count_stat: bool = False
+) -> None:
     last_id = get_last_id_from_server(server, model)
     for row in rows:
         if is_count_stat and row['property'] not in COUNT_STATS:
@@ -182,9 +210,12 @@ def validate_incoming_table_data(server: RemoteZulipServer, model: Any,
             raise JsonableError(_("Data is out of order."))
         last_id = row['id']
 
-def batch_create_table_data(server: RemoteZulipServer, model: Any,
-                            row_objects: Union[List[RemoteRealmCount],
-                                               List[RemoteInstallationCount]]) -> None:
+
+def batch_create_table_data(
+    server: RemoteZulipServer,
+    model: Any,
+    row_objects: Union[List[RemoteRealmCount], List[RemoteInstallationCount]],
+) -> None:
     BATCH_SIZE = 1000
     while len(row_objects) > 0:
         try:
@@ -192,40 +223,61 @@ def batch_create_table_data(server: RemoteZulipServer, model: Any,
         except IntegrityError:
             logging.warning(
                 "Invalid data saving %s for server %s/%s",
-                model._meta.db_table, server.hostname, server.uuid,
+                model._meta.db_table,
+                server.hostname,
+                server.uuid,
             )
             raise JsonableError(_("Invalid data."))
         row_objects = row_objects[BATCH_SIZE:]
 
+
 @has_request_variables
-def remote_server_post_analytics(request: HttpRequest,
-                                 entity: Union[UserProfile, RemoteZulipServer],
-                                 realm_counts: List[Dict[str, Any]]=REQ(
-                                     validator=check_list(check_dict_only([
-                                         ('property', check_string),
-                                         ('realm', check_int),
-                                         ('id', check_int),
-                                         ('end_time', check_float),
-                                         ('subgroup', check_none_or(check_string)),
-                                         ('value', check_int),
-                                     ]))),
-                                 installation_counts: List[Dict[str, Any]]=REQ(
-                                     validator=check_list(check_dict_only([
-                                         ('property', check_string),
-                                         ('id', check_int),
-                                         ('end_time', check_float),
-                                         ('subgroup', check_none_or(check_string)),
-                                         ('value', check_int),
-                                     ]))),
-                                 realmauditlog_rows: Optional[List[Dict[str, Any]]]=REQ(
-                                     validator=check_list(check_dict_only([
-                                         ('id', check_int),
-                                         ('realm', check_int),
-                                         ('event_time', check_float),
-                                         ('backfilled', check_bool),
-                                         ('extra_data', check_none_or(check_string)),
-                                         ('event_type', check_int),
-                                     ])), default=None)) -> HttpResponse:
+def remote_server_post_analytics(
+    request: HttpRequest,
+    entity: Union[UserProfile, RemoteZulipServer],
+    realm_counts: List[Dict[str, Any]] = REQ(
+        validator=check_list(
+            check_dict_only(
+                [
+                    ('property', check_string),
+                    ('realm', check_int),
+                    ('id', check_int),
+                    ('end_time', check_float),
+                    ('subgroup', check_none_or(check_string)),
+                    ('value', check_int),
+                ]
+            )
+        )
+    ),
+    installation_counts: List[Dict[str, Any]] = REQ(
+        validator=check_list(
+            check_dict_only(
+                [
+                    ('property', check_string),
+                    ('id', check_int),
+                    ('end_time', check_float),
+                    ('subgroup', check_none_or(check_string)),
+                    ('value', check_int),
+                ]
+            )
+        )
+    ),
+    realmauditlog_rows: Optional[List[Dict[str, Any]]] = REQ(
+        validator=check_list(
+            check_dict_only(
+                [
+                    ('id', check_int),
+                    ('realm', check_int),
+                    ('event_time', check_float),
+                    ('backfilled', check_bool),
+                    ('extra_data', check_none_or(check_string)),
+                    ('event_type', check_int),
+                ]
+            )
+        ),
+        default=None,
+    ),
+) -> HttpResponse:
     server = validate_entity(entity)
 
     validate_incoming_table_data(server, RemoteRealmCount, realm_counts, True)
@@ -233,54 +285,69 @@ def remote_server_post_analytics(request: HttpRequest,
     if realmauditlog_rows is not None:
         validate_incoming_table_data(server, RemoteRealmAuditLog, realmauditlog_rows)
 
-    row_objects = [RemoteRealmCount(
-        property=row['property'],
-        realm_id=row['realm'],
-        remote_id=row['id'],
-        server=server,
-        end_time=datetime.datetime.fromtimestamp(row['end_time'], tz=datetime.timezone.utc),
-        subgroup=row['subgroup'],
-        value=row['value']) for row in realm_counts]
-    batch_create_table_data(server, RemoteRealmCount, row_objects)
-
-    row_objects = [RemoteInstallationCount(
-        property=row['property'],
-        remote_id=row['id'],
-        server=server,
-        end_time=datetime.datetime.fromtimestamp(row['end_time'], tz=datetime.timezone.utc),
-        subgroup=row['subgroup'],
-        value=row['value']) for row in installation_counts]
-    batch_create_table_data(server, RemoteInstallationCount, row_objects)
-
-    if realmauditlog_rows is not None:
-        row_objects = [RemoteRealmAuditLog(
+    row_objects = [
+        RemoteRealmCount(
+            property=row['property'],
             realm_id=row['realm'],
             remote_id=row['id'],
             server=server,
-            event_time=datetime.datetime.fromtimestamp(row['event_time'], tz=datetime.timezone.utc),
-            backfilled=row['backfilled'],
-            extra_data=row['extra_data'],
-            event_type=row['event_type']) for row in realmauditlog_rows]
+            end_time=datetime.datetime.fromtimestamp(row['end_time'], tz=datetime.timezone.utc),
+            subgroup=row['subgroup'],
+            value=row['value'],
+        )
+        for row in realm_counts
+    ]
+    batch_create_table_data(server, RemoteRealmCount, row_objects)
+
+    row_objects = [
+        RemoteInstallationCount(
+            property=row['property'],
+            remote_id=row['id'],
+            server=server,
+            end_time=datetime.datetime.fromtimestamp(row['end_time'], tz=datetime.timezone.utc),
+            subgroup=row['subgroup'],
+            value=row['value'],
+        )
+        for row in installation_counts
+    ]
+    batch_create_table_data(server, RemoteInstallationCount, row_objects)
+
+    if realmauditlog_rows is not None:
+        row_objects = [
+            RemoteRealmAuditLog(
+                realm_id=row['realm'],
+                remote_id=row['id'],
+                server=server,
+                event_time=datetime.datetime.fromtimestamp(
+                    row['event_time'], tz=datetime.timezone.utc
+                ),
+                backfilled=row['backfilled'],
+                extra_data=row['extra_data'],
+                event_type=row['event_type'],
+            )
+            for row in realmauditlog_rows
+        ]
         batch_create_table_data(server, RemoteRealmAuditLog, row_objects)
 
     return json_success()
 
+
 def get_last_id_from_server(server: RemoteZulipServer, model: Any) -> int:
     last_count = model.objects.filter(server=server).order_by("remote_id").last()
     if last_count is not None:
         return last_count.remote_id
     return 0
 
+
 @has_request_variables
-def remote_server_check_analytics(request: HttpRequest,
-                                  entity: Union[UserProfile, RemoteZulipServer]) -> HttpResponse:
+def remote_server_check_analytics(
+    request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer]
+) -> HttpResponse:
     server = validate_entity(entity)
 
     result = {
         'last_realm_count_id': get_last_id_from_server(server, RemoteRealmCount),
-        'last_installation_count_id': get_last_id_from_server(
-            server, RemoteInstallationCount),
-        'last_realmauditlog_id': get_last_id_from_server(
-            server, RemoteRealmAuditLog),
+        'last_installation_count_id': get_last_id_from_server(server, RemoteInstallationCount),
+        'last_realmauditlog_id': get_last_id_from_server(server, RemoteRealmAuditLog),
     }
     return json_success(result)
diff --git a/zproject/backends.py b/zproject/backends.py
index e83bc6b210..814a42a328 100644
--- a/zproject/backends.py
+++ b/zproject/backends.py
@@ -107,6 +107,7 @@ def pad_method_dict(method_dict: Dict[str, bool]) -> Dict[str, bool]:
             method_dict[key] = False
     return method_dict
 
+
 def auth_enabled_helper(backends_to_check: List[str], realm: Optional[Realm]) -> bool:
     if realm is not None:
         enabled_method_dict = realm.authentication_methods_dict()
@@ -121,47 +122,60 @@ def auth_enabled_helper(backends_to_check: List[str], realm: Optional[Realm]) ->
                 return True
     return False
 
-def ldap_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def ldap_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['LDAP'], realm)
 
-def email_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def email_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['Email'], realm)
 
-def password_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def password_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return ldap_auth_enabled(realm) or email_auth_enabled(realm)
 
-def dev_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def dev_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['Dev'], realm)
 
-def google_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def google_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['Google'], realm)
 
-def github_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def github_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['GitHub'], realm)
 
-def gitlab_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def gitlab_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['GitLab'], realm)
 
-def apple_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def apple_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['Apple'], realm)
 
-def saml_auth_enabled(realm: Optional[Realm]=None) -> bool:
+
+def saml_auth_enabled(realm: Optional[Realm] = None) -> bool:
     return auth_enabled_helper(['SAML'], realm)
 
-def any_social_backend_enabled(realm: Optional[Realm]=None) -> bool:
+
+def any_social_backend_enabled(realm: Optional[Realm] = None) -> bool:
     """Used by the login page process to determine whether to show the
     'OR' for login with Google"""
-    social_backend_names = [social_auth_subclass.auth_backend_name
-                            for social_auth_subclass in EXTERNAL_AUTH_METHODS]
+    social_backend_names = [
+        social_auth_subclass.auth_backend_name for social_auth_subclass in EXTERNAL_AUTH_METHODS
+    ]
     return auth_enabled_helper(social_backend_names, realm)
 
-def require_email_format_usernames(realm: Optional[Realm]=None) -> bool:
+
+def require_email_format_usernames(realm: Optional[Realm] = None) -> bool:
     if ldap_auth_enabled(realm):
         if settings.LDAP_EMAIL_ATTR or settings.LDAP_APPEND_DOMAIN:
             return False
     return True
 
-def is_user_active(user_profile: UserProfile, return_data: Optional[Dict[str, Any]]=None) -> bool:
+
+def is_user_active(user_profile: UserProfile, return_data: Optional[Dict[str, Any]] = None) -> bool:
     if not user_profile.is_active:
         if return_data is not None:
             if user_profile.is_mirror_dummy:
@@ -177,8 +191,10 @@ def is_user_active(user_profile: UserProfile, return_data: Optional[Dict[str, An
 
     return True
 
-def common_get_active_user(email: str, realm: Realm,
-                           return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+
+def common_get_active_user(
+    email: str, realm: Realm, return_data: Optional[Dict[str, Any]] = None
+) -> Optional[UserProfile]:
     """This is the core common function used by essentially all
     authentication backends to check if there's an active user account
     with a given email address in the organization, handling both
@@ -201,6 +217,7 @@ def common_get_active_user(email: str, realm: Realm,
 
     return user_profile
 
+
 def is_subdomain_in_allowed_subdomains_list(subdomain: str, allowed_subdomains: List[str]) -> bool:
     if subdomain in allowed_subdomains:
         return True
@@ -210,16 +227,20 @@ def is_subdomain_in_allowed_subdomains_list(subdomain: str, allowed_subdomains:
     # not be viable. So, any of the ROOT_SUBDOMAIN_ALIASES can
     # be used to signify the user is authorized for the root
     # subdomain.
-    if (subdomain == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
-            and not settings.ROOT_DOMAIN_LANDING_PAGE
-            and any(alias in allowed_subdomains for alias in settings.ROOT_SUBDOMAIN_ALIASES)):
+    if (
+        subdomain == Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
+        and not settings.ROOT_DOMAIN_LANDING_PAGE
+        and any(alias in allowed_subdomains for alias in settings.ROOT_SUBDOMAIN_ALIASES)
+    ):
         return True
 
     return False
 
+
 AuthFuncT = TypeVar('AuthFuncT', bound=Callable[..., Optional[UserProfile]])
 rate_limiting_rules = settings.RATE_LIMITING_RULES['authenticate_by_username']
 
+
 class RateLimitedAuthenticationByUsername(RateLimitedObject):
     def __init__(self, username: str) -> None:
         self.username = username
@@ -231,15 +252,20 @@ class RateLimitedAuthenticationByUsername(RateLimitedObject):
     def rules(self) -> List[Tuple[int, int]]:
         return rate_limiting_rules
 
+
 def rate_limit_authentication_by_username(request: HttpRequest, username: str) -> None:
     RateLimitedAuthenticationByUsername(username).rate_limit_request(request)
 
+
 def auth_rate_limiting_already_applied(request: HttpRequest) -> bool:
     if not hasattr(request, '_ratelimits_applied'):
         return False
 
-    return any(isinstance(r.entity, RateLimitedAuthenticationByUsername)
-               for r in request._ratelimits_applied)
+    return any(
+        isinstance(r.entity, RateLimitedAuthenticationByUsername)
+        for r in request._ratelimits_applied
+    )
+
 
 # Django's authentication mechanism uses introspection on the various authenticate() functions
 # defined by backends, so we need a decorator that doesn't break function signatures.
@@ -272,12 +298,14 @@ def rate_limit_auth(auth_func: AuthFuncT, *args: Any, **kwargs: Any) -> Optional
 
     return result
 
+
 class ZulipAuthMixin:
     """This common mixin is used to override Django's default behavior for
     looking up a logged-in user by ID to use a version that fetches
     from memcached before checking the database (avoiding a database
     query in most cases).
     """
+
     name = "undefined"
     _logger = None
 
@@ -295,6 +323,7 @@ class ZulipAuthMixin:
         except UserProfile.DoesNotExist:
             return None
 
+
 class ZulipDummyBackend(ZulipAuthMixin):
     """Used when we want to log you in without checking any
     authentication (i.e. new user registration or when otherwise
@@ -304,14 +333,20 @@ class ZulipDummyBackend(ZulipAuthMixin):
     when explicitly requested by including the use_dummy_backend kwarg.
     """
 
-    def authenticate(self, request: Optional[HttpRequest]=None, *,
-                     username: str, realm: Realm,
-                     use_dummy_backend: bool=False,
-                     return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+    def authenticate(
+        self,
+        request: Optional[HttpRequest] = None,
+        *,
+        username: str,
+        realm: Realm,
+        use_dummy_backend: bool = False,
+        return_data: Optional[Dict[str, Any]] = None,
+    ) -> Optional[UserProfile]:
         if use_dummy_backend:
             return common_get_active_user(username, realm, return_data)
         return None
 
+
 def check_password_strength(password: str) -> bool:
     """
     Returns True if the password is strong enough,
@@ -330,6 +365,7 @@ def check_password_strength(password: str) -> bool:
 
     return True
 
+
 class EmailAuthBackend(ZulipAuthMixin):
     """
     Email+Password authentication backend (the default).
@@ -340,10 +376,15 @@ class EmailAuthBackend(ZulipAuthMixin):
     name = 'email'
 
     @rate_limit_auth
-    def authenticate(self, request: Optional[HttpRequest]=None, *,
-                     username: str, password: str,
-                     realm: Realm,
-                     return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+    def authenticate(
+        self,
+        request: Optional[HttpRequest] = None,
+        *,
+        username: str,
+        password: str,
+        realm: Realm,
+        return_data: Optional[Dict[str, Any]] = None,
+    ) -> Optional[UserProfile]:
         """ Authenticate a user based on email address as the user name. """
         if not password_auth_enabled(realm):
             if return_data is not None:
@@ -366,6 +407,7 @@ class EmailAuthBackend(ZulipAuthMixin):
             return user_profile
         return None
 
+
 def is_valid_email(email: str) -> bool:
     try:
         validate_email(email)
@@ -373,11 +415,13 @@ def is_valid_email(email: str) -> bool:
         return False
     return True
 
+
 def check_ldap_config() -> None:
     if not settings.LDAP_APPEND_DOMAIN:
         # Email search needs to be configured in this case.
         assert settings.AUTH_LDAP_USERNAME_ATTR and settings.AUTH_LDAP_REVERSE_EMAIL_SEARCH
 
+
 def find_ldap_users_by_email(email: str) -> Optional[List[_LDAPUser]]:
     """
     Returns list of _LDAPUsers matching the email search,
@@ -386,6 +430,7 @@ def find_ldap_users_by_email(email: str) -> Optional[List[_LDAPUser]]:
     email_search = LDAPReverseEmailSearch(LDAPBackend(), email)
     return email_search.search_for_users(should_populate=False)
 
+
 def email_belongs_to_ldap(realm: Realm, email: str) -> bool:
     """Used to make determinations on whether a user's email address is
     managed by LDAP.  For environments using both LDAP and
@@ -408,22 +453,30 @@ def email_belongs_to_ldap(realm: Realm, email: str) -> bool:
     else:
         return False
 
+
 ldap_logger = logging.getLogger("zulip.ldap")
+
+
 class ZulipLDAPException(_LDAPUser.AuthenticationFailed):
     """Since this inherits from _LDAPUser.AuthenticationFailed, these will
     be caught and logged at debug level inside django-auth-ldap's authenticate()"""
 
+
 class ZulipLDAPExceptionNoMatchingLDAPUser(ZulipLDAPException):
     pass
 
+
 class ZulipLDAPExceptionOutsideDomain(ZulipLDAPExceptionNoMatchingLDAPUser):
     pass
 
+
 class ZulipLDAPConfigurationError(Exception):
     pass
 
+
 LDAP_USER_ACCOUNT_CONTROL_DISABLED_MASK = 2
 
+
 class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
     """Common code between LDAP authentication (ZulipLDAPAuthBackend) and
     using LDAP just to sync user data (ZulipLDAPUserPopulator).
@@ -448,16 +501,16 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
     # Disable django-auth-ldap's permissions functions -- we don't use
     # the standard Django user/group permissions system because they
     # are prone to performance issues.
-    def has_perm(self, user: Optional[UserProfile], perm: Any, obj: Any=None) -> bool:
+    def has_perm(self, user: Optional[UserProfile], perm: Any, obj: Any = None) -> bool:
         return False
 
     def has_module_perms(self, user: Optional[UserProfile], app_label: Optional[str]) -> bool:
         return False
 
-    def get_all_permissions(self, user: Optional[UserProfile], obj: Any=None) -> Set[Any]:
+    def get_all_permissions(self, user: Optional[UserProfile], obj: Any = None) -> Set[Any]:
         return set()
 
-    def get_group_permissions(self, user: Optional[UserProfile], obj: Any=None) -> Set[Any]:
+    def get_group_permissions(self, user: Optional[UserProfile], obj: Any = None) -> Set[Any]:
         return set()
 
     def django_to_ldap_username(self, username: str) -> str:
@@ -471,7 +524,9 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
         if settings.LDAP_APPEND_DOMAIN:
             if is_valid_email(username):
                 if not username.endswith("@" + settings.LDAP_APPEND_DOMAIN):
-                    raise ZulipLDAPExceptionOutsideDomain(f"Email {username} does not match LDAP domain {settings.LDAP_APPEND_DOMAIN}.")
+                    raise ZulipLDAPExceptionOutsideDomain(
+                        f"Email {username} does not match LDAP domain {settings.LDAP_APPEND_DOMAIN}."
+                    )
                 result = email_to_username(username)
         else:
             # We can use find_ldap_users_by_email
@@ -491,7 +546,9 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
         if _LDAPUser(self, result).attrs is None:
             # Check that there actually is an LDAP entry matching the result username
             # we want to return. Otherwise, raise an exception.
-            error_message = "No LDAP user matching django_to_ldap_username result: {}. Input username: {}"
+            error_message = (
+                "No LDAP user matching django_to_ldap_username result: {}. Input username: {}"
+            )
             raise ZulipLDAPExceptionNoMatchingLDAPUser(
                 error_message.format(result, username),
             )
@@ -510,7 +567,9 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
         if settings.LDAP_EMAIL_ATTR is not None:
             # Get email from LDAP attributes.
             if settings.LDAP_EMAIL_ATTR not in ldap_user.attrs:
-                raise ZulipLDAPException(f"LDAP user doesn't have the needed {settings.LDAP_EMAIL_ATTR} attribute")
+                raise ZulipLDAPException(
+                    f"LDAP user doesn't have the needed {settings.LDAP_EMAIL_ATTR} attribute"
+                )
             else:
                 return ldap_user.attrs[settings.LDAP_EMAIL_ATTR][0]
 
@@ -560,14 +619,15 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
                 user.avatar_hash = user_avatar_content_hash(ldap_avatar)
                 user.save(update_fields=["avatar_hash"])
             else:
-                logging.warning("Could not parse %s field for user %s",
-                                avatar_attr_name, user.id)
+                logging.warning("Could not parse %s field for user %s", avatar_attr_name, user.id)
 
     def is_account_control_disabled_user(self, ldap_user: _LDAPUser) -> bool:
         """Implements the userAccountControl check for whether a user has been
         disabled in an Active Directory server being integrated with
         Zulip via LDAP."""
-        account_control_value = ldap_user.attrs[settings.AUTH_LDAP_USER_ATTR_MAP['userAccountControl']][0]
+        account_control_value = ldap_user.attrs[
+            settings.AUTH_LDAP_USER_ATTR_MAP['userAccountControl']
+        ][0]
         ldap_disabled = bool(int(account_control_value) & LDAP_USER_ACCOUNT_CONTROL_DISABLED_MASK)
         return ldap_disabled
 
@@ -588,9 +648,9 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
 
         return full_name
 
-    def sync_full_name_from_ldap(self, user_profile: UserProfile,
-                                 ldap_user: _LDAPUser) -> None:
+    def sync_full_name_from_ldap(self, user_profile: UserProfile, ldap_user: _LDAPUser) -> None:
         from zerver.lib.actions import do_change_full_name
+
         full_name = self.get_mapped_name(ldap_user)
         if full_name != user_profile.full_name:
             try:
@@ -599,8 +659,9 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
                 raise ZulipLDAPException(e.msg)
             do_change_full_name(user_profile, full_name, None)
 
-    def sync_custom_profile_fields_from_ldap(self, user_profile: UserProfile,
-                                             ldap_user: _LDAPUser) -> None:
+    def sync_custom_profile_fields_from_ldap(
+        self, user_profile: UserProfile, ldap_user: _LDAPUser
+    ) -> None:
         values_by_var_name: Dict[str, Union[int, str, List[int]]] = {}
         for attr, ldap_attr in settings.AUTH_LDAP_USER_ATTR_MAP.items():
             if not attr.startswith('custom_profile_field__'):
@@ -638,20 +699,29 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
                 validate_user_custom_profile_field(user_profile.realm.id, field, value)
             except ValidationError as error:
                 raise ZulipLDAPException(f'Invalid data for {var_name} field: {error.message}')
-            profile_data.append({
-                'id': field.id,
-                'value': value,
-            })
+            profile_data.append(
+                {
+                    'id': field.id,
+                    'value': value,
+                }
+            )
         do_update_user_custom_profile_data_if_changed(user_profile, profile_data)
 
+
 class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
     REALM_IS_NONE_ERROR = 1
 
     @rate_limit_auth
-    def authenticate(self, request: Optional[HttpRequest]=None, *,
-                     username: str, password: str, realm: Realm,
-                     prereg_user: Optional[PreregistrationUser]=None,
-                     return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+    def authenticate(
+        self,
+        request: Optional[HttpRequest] = None,
+        *,
+        username: str,
+        password: str,
+        realm: Realm,
+        prereg_user: Optional[PreregistrationUser] = None,
+        return_data: Optional[Dict[str, Any]] = None,
+    ) -> Optional[UserProfile]:
         self._realm = realm
         self._prereg_user = prereg_user
         if not ldap_auth_enabled(realm):
@@ -755,12 +825,15 @@ class ZulipLDAPAuthBackend(ZulipLDAPAuthBackendBase):
             # the LDAP flow.
             opts['default_stream_groups'] = []
 
-        user_profile = do_create_user(username, None, self._realm, full_name, acting_user=None, **opts)
+        user_profile = do_create_user(
+            username, None, self._realm, full_name, acting_user=None, **opts
+        )
         self.sync_avatar_from_ldap(user_profile, ldap_user)
         self.sync_custom_profile_fields_from_ldap(user_profile, ldap_user)
 
         return user_profile, True
 
+
 class ZulipLDAPUser(_LDAPUser):
     """
     This is an extension of the _LDAPUser class, with a realm attribute
@@ -776,6 +849,7 @@ class ZulipLDAPUser(_LDAPUser):
 
         super().__init__(*args, **kwargs)
 
+
 class ZulipLDAPUserPopulator(ZulipLDAPAuthBackendBase):
     """Just like ZulipLDAPAuthBackend, but doesn't let you log in.  Used
     for syncing data like names, avatars, and custom profile fields
@@ -784,15 +858,22 @@ class ZulipLDAPUserPopulator(ZulipLDAPAuthBackendBase):
     for managing login (often via RemoteUserBackend).
     """
 
-    def authenticate(self, request: Optional[HttpRequest]=None, *,
-                     username: str, password: str, realm: Realm,
-                     return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+    def authenticate(
+        self,
+        request: Optional[HttpRequest] = None,
+        *,
+        username: str,
+        password: str,
+        realm: Realm,
+        return_data: Optional[Dict[str, Any]] = None,
+    ) -> Optional[UserProfile]:
         return None
 
-    def get_or_build_user(self, username: str,
-                          ldap_user: ZulipLDAPUser) -> Tuple[UserProfile, bool]:
+    def get_or_build_user(
+        self, username: str, ldap_user: ZulipLDAPUser
+    ) -> Tuple[UserProfile, bool]:
         """This is used only in non-authentication contexts such as:
-             ./manage.py sync_ldap_user_data
+        ./manage.py sync_ldap_user_data
         """
         # Obtain the django username from the ldap_user object:
         username = self.user_email_from_ldapuser(username, ldap_user)
@@ -807,14 +888,18 @@ class ZulipLDAPUserPopulator(ZulipLDAPAuthBackendBase):
             user_disabled_in_ldap = self.is_account_control_disabled_user(ldap_user)
             if user_disabled_in_ldap:
                 if user.is_active:
-                    ldap_logger.info("Deactivating user %s because they are disabled in LDAP.",
-                                     user.delivery_email)
+                    ldap_logger.info(
+                        "Deactivating user %s because they are disabled in LDAP.",
+                        user.delivery_email,
+                    )
                     do_deactivate_user(user)
                 # Do an early return to avoid trying to sync additional data.
                 return (user, built)
             elif not user.is_active:
-                ldap_logger.info("Reactivating user %s because they are not disabled in LDAP.",
-                                 user.delivery_email)
+                ldap_logger.info(
+                    "Reactivating user %s because they are not disabled in LDAP.",
+                    user.delivery_email,
+                )
                 do_reactivate_user(user)
 
         self.sync_avatar_from_ldap(user, ldap_user)
@@ -822,9 +907,11 @@ class ZulipLDAPUserPopulator(ZulipLDAPAuthBackendBase):
         self.sync_custom_profile_fields_from_ldap(user, ldap_user)
         return (user, built)
 
+
 class PopulateUserLDAPError(ZulipLDAPException):
     pass
 
+
 @receiver(ldap_error, sender=ZulipLDAPUserPopulator)
 def catch_ldap_error(signal: Signal, **kwargs: Any) -> None:
     """
@@ -840,6 +927,7 @@ def catch_ldap_error(signal: Signal, **kwargs: Any) -> None:
         # so it seems better not to log that, and only use the original exception's name here.
         raise PopulateUserLDAPError(kwargs['exception'].__class__.__name__)
 
+
 def sync_user_from_ldap(user_profile: UserProfile, logger: logging.Logger) -> bool:
     backend = ZulipLDAPUserPopulator()
     try:
@@ -879,10 +967,13 @@ def sync_user_from_ldap(user_profile: UserProfile, logger: logging.Logger) -> bo
 
     raise PopulateUserLDAPError(f"populate_user unexpectedly returned {updated_user}")
 
+
 # Quick tool to test whether you're correctly authenticating to LDAP
 def query_ldap(email: str) -> List[str]:
     values = []
-    backend = next((backend for backend in get_backends() if isinstance(backend, LDAPBackend)), None)
+    backend = next(
+        (backend for backend in get_backends() if isinstance(backend, LDAPBackend)), None
+    )
     if backend is not None:
         try:
             ldap_username = backend.django_to_ldap_username(email)
@@ -904,19 +995,26 @@ def query_ldap(email: str) -> List[str]:
         values.append("LDAP backend not configured on this server.")
     return values
 
+
 class DevAuthBackend(ZulipAuthMixin):
     """Allow logging in as any user without a password.  This is used for
     convenience when developing Zulip, and is disabled in production."""
 
     name = 'dev'
 
-    def authenticate(self, request: Optional[HttpRequest]=None, *,
-                     dev_auth_username: str, realm: Realm,
-                     return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+    def authenticate(
+        self,
+        request: Optional[HttpRequest] = None,
+        *,
+        dev_auth_username: str,
+        realm: Realm,
+        return_data: Optional[Dict[str, Any]] = None,
+    ) -> Optional[UserProfile]:
         if not dev_auth_enabled(realm):
             return None
         return common_get_active_user(dev_auth_username, realm, return_data=return_data)
 
+
 class ExternalAuthMethodDictT(TypedDict):
     name: str
     display_name: str
@@ -924,6 +1022,7 @@ class ExternalAuthMethodDictT(TypedDict):
     login_url: str
     signup_url: str
 
+
 class ExternalAuthMethod(ABC):
     """
     To register a backend as an external_authentication_method, it should
@@ -931,6 +1030,7 @@ class ExternalAuthMethod(ABC):
     classmethod, and finally use the external_auth_method class decorator to
     get added to the EXTERNAL_AUTH_METHODS list.
     """
+
     auth_backend_name = "undeclared"
     name = "undeclared"
     display_icon: Optional[str] = None
@@ -941,7 +1041,7 @@ class ExternalAuthMethod(ABC):
 
     @classmethod
     @abstractmethod
-    def dict_representation(cls, realm: Optional[Realm]=None) -> List[ExternalAuthMethodDictT]:
+    def dict_representation(cls, realm: Optional[Realm] = None) -> List[ExternalAuthMethodDictT]:
         """
         Method returning dictionaries representing the authentication methods
         corresponding to the backend that subclasses this. The documentation
@@ -951,14 +1051,17 @@ class ExternalAuthMethod(ABC):
         that are all serviced by that backend - our SAML backend is an example of that.
         """
 
+
 EXTERNAL_AUTH_METHODS: List[Type[ExternalAuthMethod]] = []
 
+
 def external_auth_method(cls: Type[ExternalAuthMethod]) -> Type[ExternalAuthMethod]:
     assert issubclass(cls, ExternalAuthMethod)
 
     EXTERNAL_AUTH_METHODS.append(cls)
     return cls
 
+
 # We want to be able to store this data in Redis, so it has to be easy to serialize.
 # That's why we avoid having fields that could pose a problem for that.
 class ExternalAuthDataDict(TypedDict, total=False):
@@ -973,21 +1076,28 @@ class ExternalAuthDataDict(TypedDict, total=False):
     multiuse_object_key: str
     full_name_validated: bool
 
+
 class ExternalAuthResult:
     LOGIN_KEY_PREFIX = "login_key_"
     LOGIN_KEY_FORMAT = LOGIN_KEY_PREFIX + "{token}"
     LOGIN_KEY_EXPIRATION_SECONDS = 15
     LOGIN_TOKEN_LENGTH = UserProfile.API_KEY_LENGTH
 
-    def __init__(self, *, user_profile: Optional[UserProfile]=None,
-                 data_dict: Optional[ExternalAuthDataDict]=None,
-                 login_token: Optional[str]=None,
-                 delete_stored_data: bool=True) -> None:
+    def __init__(
+        self,
+        *,
+        user_profile: Optional[UserProfile] = None,
+        data_dict: Optional[ExternalAuthDataDict] = None,
+        login_token: Optional[str] = None,
+        delete_stored_data: bool = True,
+    ) -> None:
         if data_dict is None:
             data_dict = {}
 
         if login_token is not None:
-            assert (not data_dict) and (user_profile is None), "Passing in data_dict or user_profile with login_token is disallowed."
+            assert (not data_dict) and (
+                user_profile is None
+            ), "Passing in data_dict or user_profile with login_token is disallowed."
             self.instantiate_with_token(login_token, delete_stored_data)
         else:
             self.data_dict = data_dict.copy()
@@ -995,8 +1105,14 @@ class ExternalAuthResult:
 
         if self.user_profile is not None:
             # Ensure data inconsistent with the user_profile wasn't passed in inside the data_dict argument.
-            assert 'full_name' not in data_dict or data_dict['full_name'] == self.user_profile.full_name
-            assert 'email' not in data_dict or data_dict['email'].lower() == self.user_profile.delivery_email.lower()
+            assert (
+                'full_name' not in data_dict
+                or data_dict['full_name'] == self.user_profile.full_name
+            )
+            assert (
+                'email' not in data_dict
+                or data_dict['email'].lower() == self.user_profile.delivery_email.lower()
+            )
             # Update these data_dict fields to ensure consistency with self.user_profile. This is mostly
             # defensive code, but is useful in these scenarios:
             # 1. user_profile argument was passed in, and no full_name or email_data in the data_dict arg.
@@ -1011,13 +1127,17 @@ class ExternalAuthResult:
                 self.data_dict['is_signup'] = False
 
     def store_data(self) -> str:
-        key = put_dict_in_redis(redis_client, self.LOGIN_KEY_FORMAT, self.data_dict,
-                                expiration_seconds=self.LOGIN_KEY_EXPIRATION_SECONDS,
-                                token_length=self.LOGIN_TOKEN_LENGTH)
+        key = put_dict_in_redis(
+            redis_client,
+            self.LOGIN_KEY_FORMAT,
+            self.data_dict,
+            expiration_seconds=self.LOGIN_KEY_EXPIRATION_SECONDS,
+            token_length=self.LOGIN_TOKEN_LENGTH,
+        )
         token = key.split(self.LOGIN_KEY_PREFIX, 1)[1]  # remove the prefix
         return token
 
-    def instantiate_with_token(self, token: str, delete_stored_data: bool=True) -> None:
+    def instantiate_with_token(self, token: str, delete_stored_data: bool = True) -> None:
         key = self.LOGIN_KEY_FORMAT.format(token=token)
         data = get_dict_from_redis(redis_client, self.LOGIN_KEY_FORMAT, key)
         if data is None or None in [data.get("email"), data.get("subdomain")]:
@@ -1037,12 +1157,14 @@ class ExternalAuthResult:
         # more customized error messages for those unlikely races, but
         # it's likely not worth implementing.
         realm = get_realm(data['subdomain'])
-        self.user_profile = authenticate(username=data['email'], realm=realm,
-                                         use_dummy_backend=True)
+        self.user_profile = authenticate(
+            username=data['email'], realm=realm, use_dummy_backend=True
+        )
 
     class InvalidTokenError(Exception):
         pass
 
+
 @external_auth_method
 class ZulipRemoteUserBackend(RemoteUserBackend, ExternalAuthMethod):
     """Authentication backend that reads the Apache REMOTE_USER variable.
@@ -1053,6 +1175,7 @@ class ZulipRemoteUserBackend(RemoteUserBackend, ExternalAuthMethod):
 
     See also remote_user_sso in zerver/views/auth.py.
     """
+
     auth_backend_name = "RemoteUser"
     name = "remoteuser"
     display_icon = None
@@ -1061,9 +1184,14 @@ class ZulipRemoteUserBackend(RemoteUserBackend, ExternalAuthMethod):
 
     create_unknown_user = False
 
-    def authenticate(self, request: Optional[HttpRequest]=None, *,
-                     remote_user: str, realm: Realm,
-                     return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
+    def authenticate(
+        self,
+        request: Optional[HttpRequest] = None,
+        *,
+        remote_user: str,
+        realm: Realm,
+        return_data: Optional[Dict[str, Any]] = None,
+    ) -> Optional[UserProfile]:
         if not auth_enabled_helper(["RemoteUser"], realm):
             return None
 
@@ -1071,25 +1199,30 @@ class ZulipRemoteUserBackend(RemoteUserBackend, ExternalAuthMethod):
         return common_get_active_user(email, realm, return_data=return_data)
 
     @classmethod
-    def dict_representation(cls, realm: Optional[Realm]=None) -> List[ExternalAuthMethodDictT]:
-        return [dict(
-            name=cls.name,
-            display_name="SSO",
-            display_icon=cls.display_icon,
-            # The user goes to the same URL for both login and signup:
-            login_url=reverse('start-login-sso'),
-            signup_url=reverse('start-login-sso'),
-        )]
+    def dict_representation(cls, realm: Optional[Realm] = None) -> List[ExternalAuthMethodDictT]:
+        return [
+            dict(
+                name=cls.name,
+                display_name="SSO",
+                display_icon=cls.display_icon,
+                # The user goes to the same URL for both login and signup:
+                login_url=reverse('start-login-sso'),
+                signup_url=reverse('start-login-sso'),
+            )
+        ]
+
 
 def redirect_deactivated_user_to_login() -> HttpResponseRedirect:
     # Specifying the template name makes sure that the user is not redirected to dev_login in case of
     # a deactivated account on a test server.
-    login_url = reverse('login_page', kwargs = {'template_name': 'zerver/login.html'})
+    login_url = reverse('login_page', kwargs={'template_name': 'zerver/login.html'})
     redirect_url = login_url + '?is_deactivated=true'
     return HttpResponseRedirect(redirect_url)
 
-def social_associate_user_helper(backend: BaseAuth, return_data: Dict[str, Any],
-                                 *args: Any, **kwargs: Any) -> Union[HttpResponse, Optional[UserProfile]]:
+
+def social_associate_user_helper(
+    backend: BaseAuth, return_data: Dict[str, Any], *args: Any, **kwargs: Any
+) -> Union[HttpResponse, Optional[UserProfile]]:
     """Responsible for doing the Zulip account lookup and validation parts
     of the Zulip social auth pipeline (similar to the authenticate()
     methods in most other auth backends in this file).
@@ -1124,8 +1257,10 @@ def social_associate_user_helper(backend: BaseAuth, return_data: Dict[str, Any],
         if verified_emails_length == 0:
             # TODO: Provide a nice error message screen to the user
             # for this case, rather than just logging a warning.
-            backend.logger.warning("Social auth (%s) failed because user has no verified emails",
-                                   backend.auth_backend_name)
+            backend.logger.warning(
+                "Social auth (%s) failed because user has no verified emails",
+                backend.auth_backend_name,
+            )
             return_data["email_not_verified"] = True
             return None
 
@@ -1143,17 +1278,24 @@ def social_associate_user_helper(backend: BaseAuth, return_data: Dict[str, Any],
                     existing_account_emails.append(email)
                     avatars[email] = avatar_url(existing_account)
 
-            if (len(existing_account_emails) != 1 or backend.strategy.session_get('is_signup') == '1'):
+            if (
+                len(existing_account_emails) != 1
+                or backend.strategy.session_get('is_signup') == '1'
+            ):
                 unverified_emails = []
                 if hasattr(backend, 'get_unverified_emails'):
                     unverified_emails = backend.get_unverified_emails(realm, *args, **kwargs)
-                return render(backend.strategy.request, 'zerver/social_auth_select_email.html', context = {
-                    'primary_email': verified_emails[0],
-                    'verified_non_primary_emails': verified_emails[1:],
-                    'unverified_emails': unverified_emails,
-                    'backend': 'github',
-                    'avatar_urls': avatars,
-                })
+                return render(
+                    backend.strategy.request,
+                    'zerver/social_auth_select_email.html',
+                    context={
+                        'primary_email': verified_emails[0],
+                        'verified_non_primary_emails': verified_emails[1:],
+                        'unverified_emails': unverified_emails,
+                        'backend': 'github',
+                        'avatar_urls': avatars,
+                    },
+                )
             else:
                 chosen_email = existing_account_emails[0]
 
@@ -1167,9 +1309,11 @@ def social_associate_user_helper(backend: BaseAuth, return_data: Dict[str, Any],
             # If a user edits the submit value for the choose email form, we might
             # end up with a wrong email associated with the account. The below code
             # takes care of that.
-            backend.logger.warning("Social auth (%s) failed because user has no verified"
-                                   " emails associated with the account",
-                                   backend.auth_backend_name)
+            backend.logger.warning(
+                "Social auth (%s) failed because user has no verified"
+                " emails associated with the account",
+                backend.auth_backend_name,
+            )
             return_data["email_not_associated"] = True
             return None
 
@@ -1216,11 +1360,11 @@ def social_associate_user_helper(backend: BaseAuth, return_data: Dict[str, Any],
 
     return user_profile
 
+
 @partial
 def social_auth_associate_user(
-        backend: BaseAuth,
-        *args: Any,
-        **kwargs: Any) -> Union[HttpResponse, Dict[str, Any]]:
+    backend: BaseAuth, *args: Any, **kwargs: Any
+) -> Union[HttpResponse, Dict[str, Any]]:
     """A simple wrapper function to reformat the return data from
     social_associate_user_helper as a dictionary.  The
     python-social-auth infrastructure will then pass those values into
@@ -1229,22 +1373,22 @@ def social_auth_associate_user(
     """
     partial_token = backend.strategy.request_data().get('partial_token')
     return_data: Dict[str, Any] = {}
-    user_profile = social_associate_user_helper(
-        backend, return_data, *args, **kwargs)
+    user_profile = social_associate_user_helper(backend, return_data, *args, **kwargs)
 
     if isinstance(user_profile, HttpResponse):
         return user_profile
     else:
-        return {'user_profile': user_profile,
-                'return_data': return_data,
-                'partial_token': partial_token,
-                'partial_backend_name': backend}
+        return {
+            'user_profile': user_profile,
+            'return_data': return_data,
+            'partial_token': partial_token,
+            'partial_backend_name': backend,
+        }
 
-def social_auth_finish(backend: Any,
-                       details: Dict[str, Any],
-                       response: HttpResponse,
-                       *args: Any,
-                       **kwargs: Any) -> Optional[HttpResponse]:
+
+def social_auth_finish(
+    backend: Any, details: Dict[str, Any], response: HttpResponse, *args: Any, **kwargs: Any
+) -> Optional[HttpResponse]:
     """Given the determination in social_auth_associate_user for whether
     the user should be authenticated, this takes care of actually
     logging in the user (if appropriate) and redirecting the browser
@@ -1274,8 +1418,11 @@ def social_auth_finish(backend: Any,
         return HttpResponseRedirect(reverse('find_account'))
 
     if inactive_user:
-        backend.logger.info("Failed login attempt for deactivated account: %s@%s",
-                            return_data['inactive_user_id'], return_data['realm_string_id'])
+        backend.logger.info(
+            "Failed login attempt for deactivated account: %s@%s",
+            return_data['inactive_user_id'],
+            return_data['realm_string_id'],
+        )
         return redirect_deactivated_user_to_login()
 
     if auth_backend_disabled or inactive_realm or no_verified_email or email_not_associated:
@@ -1287,7 +1434,8 @@ def social_auth_finish(backend: Any,
         # In case of invalid email, we will end up on registration page.
         # This seems better than redirecting to login page.
         backend.logger.warning(
-            "%s got invalid email argument.", backend.auth_backend_name,
+            "%s got invalid email argument.",
+            backend.auth_backend_name,
         )
         return None
 
@@ -1367,6 +1515,7 @@ def social_auth_finish(backend: Any,
     # then call login_or_register_remote_user.
     return redirect_and_log_into_subdomain(result)
 
+
 class SocialAuthMixin(ZulipAuthMixin, ExternalAuthMethod, BaseAuth):
     # Whether we expect that the full_name value obtained by the
     # social backend is definitely how the user should be referred to
@@ -1407,14 +1556,17 @@ class SocialAuthMixin(ZulipAuthMixin, ExternalAuthMethod, BaseAuth):
             return None
 
     @classmethod
-    def dict_representation(cls, realm: Optional[Realm]=None) -> List[ExternalAuthMethodDictT]:
-        return [dict(
-            name=cls.name,
-            display_name=cls.auth_backend_name,
-            display_icon=cls.display_icon,
-            login_url=reverse('login-social', args=(cls.name,)),
-            signup_url=reverse('signup-social', args=(cls.name,)),
-        )]
+    def dict_representation(cls, realm: Optional[Realm] = None) -> List[ExternalAuthMethodDictT]:
+        return [
+            dict(
+                name=cls.name,
+                display_name=cls.auth_backend_name,
+                display_icon=cls.display_icon,
+                login_url=reverse('login-social', args=(cls.name,)),
+                signup_url=reverse('signup-social', args=(cls.name,)),
+            )
+        ]
+
 
 @external_auth_method
 class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
@@ -1436,7 +1588,8 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
 
     def get_unverified_emails(self, realm: Realm, *args: Any, **kwargs: Any) -> List[str]:
         return [
-            email_obj['email'] for email_obj in self.get_usable_email_objects(realm, *args, **kwargs)
+            email_obj['email']
+            for email_obj in self.get_usable_email_objects(realm, *args, **kwargs)
             if not email_obj.get('verified')
         ]
 
@@ -1445,8 +1598,11 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
         # verified by GitHub, because the whole point is for the user
         # to demonstrate that they control the target email address.
         verified_emails: List[str] = []
-        for email_obj in [obj for obj in self.get_usable_email_objects(realm, *args, **kwargs)
-                          if obj.get('verified')]:
+        for email_obj in [
+            obj
+            for obj in self.get_usable_email_objects(realm, *args, **kwargs)
+            if obj.get('verified')
+        ]:
             # social_associate_user_helper assumes that the first email in
             # verified_emails is primary.
             if email_obj.get("primary"):
@@ -1456,7 +1612,9 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
 
         return verified_emails
 
-    def get_usable_email_objects(self, realm: Realm, *args: Any, **kwargs: Any) -> List[Dict[str, Any]]:
+    def get_usable_email_objects(
+        self, realm: Realm, *args: Any, **kwargs: Any
+    ) -> List[Dict[str, Any]]:
         # We disallow creation of new accounts with
         # @noreply.github.com/@users.noreply.github.com email
         # addresses, because structurally, we only want to allow email
@@ -1468,9 +1626,12 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
         # it.
         email_objs = self.get_all_associated_email_objects(*args, **kwargs)
         return [
-            email for email in email_objs
-            if (not email["email"].endswith("@users.noreply.github.com")
-                or common_get_active_user(email["email"], realm) is not None)
+            email
+            for email in email_objs
+            if (
+                not email["email"].endswith("@users.noreply.github.com")
+                or common_get_active_user(email["email"], realm) is not None
+            )
         ]
 
     def user_data(self, access_token: str, *args: Any, **kwargs: Any) -> Dict[str, str]:
@@ -1482,7 +1643,9 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
         if team_id is None and org_name is None:
             # I believe this can't raise AuthFailed, so we don't try to catch it here.
             return super().user_data(
-                access_token, *args, **kwargs,
+                access_token,
+                *args,
+                **kwargs,
             )
         elif team_id is not None:
             backend = GithubTeamOAuth2(self.strategy, self.redirect_uri)
@@ -1499,6 +1662,7 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
 
         raise AssertionError("Invalid configuration")
 
+
 @external_auth_method
 class AzureADAuthBackend(SocialAuthMixin, AzureADOAuth2):
     sort_order = 50
@@ -1506,6 +1670,7 @@ class AzureADAuthBackend(SocialAuthMixin, AzureADOAuth2):
     auth_backend_name = "AzureAD"
     display_icon = "/static/images/landing-page/logos/azuread-icon.png"
 
+
 @external_auth_method
 class GitLabAuthBackend(SocialAuthMixin, GitLabOAuth2):
     sort_order = 75
@@ -1521,6 +1686,7 @@ class GitLabAuthBackend(SocialAuthMixin, GitLabOAuth2):
     # we just use the primary email address, which is always verified.
     # (No code is required to do so, as that's the default behavior).
 
+
 @external_auth_method
 class GoogleAuthBackend(SocialAuthMixin, GoogleOAuth2):
     sort_order = 150
@@ -1536,6 +1702,7 @@ class GoogleAuthBackend(SocialAuthMixin, GoogleOAuth2):
             verified_emails.append(details["email"])
         return verified_emails
 
+
 @external_auth_method
 class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
     """
@@ -1552,6 +1719,7 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
        /complete/apple/ endpoint, together with native_flow=true and any other
        appropriate params, such as mobile_flow_otp.
     """
+
     sort_order = 10
     name = "apple"
     auth_backend_name = "Apple"
@@ -1562,7 +1730,7 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
     # But if Apple does send us the user's name, it will be validated,
     # so it's appropriate to set full_name_validated here.
     full_name_validated = True
-    REDIS_EXPIRATION_SECONDS = 60*10
+    REDIS_EXPIRATION_SECONDS = 60 * 10
 
     SCOPE_SEPARATOR = "%20"  # https://github.com/python-social-auth/social-core/issues/470
 
@@ -1585,7 +1753,7 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
     # This method replaces a method from python-social-auth; it is adapted to store
     # the state_token data in Redis.
     def get_or_create_state(self) -> str:
-        '''Creates the Oauth2 state parameter in first step of the flow,
+        """Creates the Oauth2 state parameter in first step of the flow,
         before redirecting the user to the IdP (aka Apple).
 
         Apple will send the user back to us with a POST
@@ -1602,18 +1770,21 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
         us to validate the state and retrieve the params after the
         redirect - by querying Redis for the key derived from the
         state sent in the POST redirect.
-        '''
+        """
         request_data = self.strategy.request_data().dict()
         data_to_store = {
-            key: request_data[key] for key in self.standard_relay_params
-            if key in request_data
+            key: request_data[key] for key in self.standard_relay_params if key in request_data
         }
 
         # Generate a random string of 32 alphanumeric characters.
         state = self.state_token()
-        put_dict_in_redis(redis_client, 'apple_auth_{token}',
-                          data_to_store, self.REDIS_EXPIRATION_SECONDS,
-                          token=state)
+        put_dict_in_redis(
+            redis_client,
+            'apple_auth_{token}',
+            data_to_store,
+            self.REDIS_EXPIRATION_SECONDS,
+            token=state,
+        )
         return state
 
     def validate_state(self) -> Optional[str]:
@@ -1629,8 +1800,9 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
             raise AuthMissingParameter(self, 'state')
 
         formatted_request_state = "apple_auth_" + request_state
-        redis_data = get_dict_from_redis(redis_client, "apple_auth_{token}",
-                                         formatted_request_state)
+        redis_data = get_dict_from_redis(
+            redis_client, "apple_auth_{token}", formatted_request_state
+        )
         if redis_data is None:
             self.logger.info("Sign in with Apple failed: bad state token.")
             raise AuthStateForbidden(self)
@@ -1651,9 +1823,7 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
         name = response.get('name') or {}
         name = json.loads(self.data.get('user', '{}')).get('name', {})
         fullname, first_name, last_name = self.get_user_names(
-            fullname='',
-            first_name=name.get('firstName', ''),
-            last_name=name.get('lastName', '')
+            fullname='', first_name=name.get('firstName', ''), last_name=name.get('lastName', '')
         )
         email = response.get('email', '')
         # prevent updating User with empty strings
@@ -1714,6 +1884,7 @@ class AppleAuthBackend(SocialAuthMixin, AppleIdAuth):
             self.logger.info("/complete/apple/: %s", str(e))
             return None
 
+
 @external_auth_method
 class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
     auth_backend_name = "SAML"
@@ -1736,13 +1907,16 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         if settings.SAML_REQUIRE_LIMIT_TO_SUBDOMAINS:
             idps_without_limit_to_subdomains = [
-                idp_name for idp_name, idp_dict in settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.items()
+                idp_name
+                for idp_name, idp_dict in settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.items()
                 if 'limit_to_subdomains' not in idp_dict
             ]
             if idps_without_limit_to_subdomains:
-                self.logger.error("SAML_REQUIRE_LIMIT_TO_SUBDOMAINS is enabled and the following " +
-                                  "IdPs don't have limit_to_subdomains specified and will be ignored: " +
-                                  f"{idps_without_limit_to_subdomains}")
+                self.logger.error(
+                    "SAML_REQUIRE_LIMIT_TO_SUBDOMAINS is enabled and the following "
+                    + "IdPs don't have limit_to_subdomains specified and will be ignored: "
+                    + f"{idps_without_limit_to_subdomains}"
+                )
                 for idp_name in idps_without_limit_to_subdomains:
                     del settings.SOCIAL_AUTH_SAML_ENABLED_IDPS[idp_name]
         super().__init__(*args, **kwargs)
@@ -1758,8 +1932,7 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
             # If the above raise KeyError, it means invalid or no idp was specified,
             # we should log that and redirect to the login page.
             self.logger.info("/login/saml/ : Bad idp param: KeyError: %s.", str(e))
-            return reverse('login_page',
-                           kwargs = {'template_name': 'zerver/login.html'})
+            return reverse('login_page', kwargs={'template_name': 'zerver/login.html'})
 
         # This where we change things.  We need to pass some params
         # (`mobile_flow_otp`, `next`, etc.) through RelayState, which
@@ -1774,18 +1947,19 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
         # returned a successful authentication.
         params_to_relay = self.standard_relay_params
         request_data = self.strategy.request_data().dict()
-        data_to_relay = {
-            key: request_data[key] for key in params_to_relay if key in request_data
-        }
+        data_to_relay = {key: request_data[key] for key in params_to_relay if key in request_data}
         relay_state = orjson.dumps({"state_token": self.put_data_in_redis(data_to_relay)}).decode()
 
         return auth.login(return_to=relay_state)
 
     @classmethod
     def put_data_in_redis(cls, data_to_relay: Dict[str, Any]) -> str:
-        return put_dict_in_redis(redis_client, "saml_token_{token}",
-                                 data_to_store=data_to_relay,
-                                 expiration_seconds=cls.REDIS_EXPIRATION_SECONDS)
+        return put_dict_in_redis(
+            redis_client,
+            "saml_token_{token}",
+            data_to_store=data_to_relay,
+            expiration_seconds=cls.REDIS_EXPIRATION_SECONDS,
+        )
 
     @classmethod
     def get_data_from_redis(cls, key: str) -> Optional[Dict[str, Any]]:
@@ -1861,7 +2035,9 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
         else:
             return request_subdomain
 
-    def _check_entitlements(self, idp: SAMLIdentityProvider, attributes: Dict[str, List[str]]) -> None:
+    def _check_entitlements(
+        self, idp: SAMLIdentityProvider, attributes: Dict[str, List[str]]
+    ) -> None:
         """
         Below is the docstring from the social_core SAML backend.
 
@@ -1885,14 +2061,18 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
         if isinstance(entitlements, str):  # nocoverage
             # This shouldn't happen as we'd always expect a list from this attribute even
             # if it only has one element, but it's safer to have this defensive code.
-            entitlements = [entitlements, ]
+            entitlements = [
+                entitlements,
+            ]
         assert isinstance(entitlements, list)
 
         if is_subdomain_in_allowed_subdomains_list(subdomain, entitlements):
             return
 
-        error_msg = f"SAML user from IdP {idp.name} rejected due to missing entitlement " + \
-                    f"for subdomain '{subdomain}'. User entitlements: {entitlements}."
+        error_msg = (
+            f"SAML user from IdP {idp.name} rejected due to missing entitlement "
+            + f"for subdomain '{subdomain}'. User entitlements: {entitlements}."
+        )
         raise AuthFailed(self, error_msg)
 
     def auth_complete(self, *args: Any, **kwargs: Any) -> Optional[HttpResponse]:
@@ -1918,8 +2098,10 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
 
         subdomain = self.choose_subdomain(relayed_params)
         if subdomain is None:
-            error_msg = "/complete/saml/: Can't figure out subdomain for this authentication request. " + \
-                "relayed_params: %s"
+            error_msg = (
+                "/complete/saml/: Can't figure out subdomain for this authentication request. "
+                + "relayed_params: %s"
+            )
             self.logger.info(error_msg, relayed_params)
             return None
 
@@ -1930,8 +2112,10 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
 
         idp_valid = self.validate_idp_for_subdomain(idp_name, subdomain)
         if not idp_valid:
-            error_msg = "/complete/saml/: Authentication request with IdP %s but this provider is not " + \
-                        "enabled for this subdomain %s."
+            error_msg = (
+                "/complete/saml/: Authentication request with IdP %s but this provider is not "
+                + "enabled for this subdomain %s."
+            )
             self.logger.info(error_msg, idp_name, subdomain)
             return None
 
@@ -1991,7 +2175,7 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
         return True
 
     @classmethod
-    def dict_representation(cls, realm: Optional[Realm]=None) -> List[ExternalAuthMethodDictT]:
+    def dict_representation(cls, realm: Optional[Realm] = None) -> List[ExternalAuthMethodDictT]:
         result: List[ExternalAuthMethodDictT] = []
         for idp_name, idp_dict in settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.items():
             if realm and not cls.validate_idp_for_subdomain(idp_name, realm.subdomain):
@@ -2011,8 +2195,10 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
 
         return result
 
-def validate_otp_params(mobile_flow_otp: Optional[str]=None,
-                        desktop_flow_otp: Optional[str]=None) -> None:
+
+def validate_otp_params(
+    mobile_flow_otp: Optional[str] = None, desktop_flow_otp: Optional[str] = None
+) -> None:
     for otp in [mobile_flow_otp, desktop_flow_otp]:
         if otp is not None and not is_valid_otp(otp):
             raise JsonableError(_("Invalid OTP"))
@@ -2020,7 +2206,8 @@ def validate_otp_params(mobile_flow_otp: Optional[str]=None,
     if mobile_flow_otp and desktop_flow_otp:
         raise JsonableError(_("Can't use both mobile_flow_otp and desktop_flow_otp together."))
 
-def get_external_method_dicts(realm: Optional[Realm]=None) -> List[ExternalAuthMethodDictT]:
+
+def get_external_method_dicts(realm: Optional[Realm] = None) -> List[ExternalAuthMethodDictT]:
     """
     Returns a list of dictionaries that represent social backends, sorted
     in the order in which they should be displayed.
@@ -2034,6 +2221,7 @@ def get_external_method_dicts(realm: Optional[Realm]=None) -> List[ExternalAuthM
 
     return result
 
+
 AUTH_BACKEND_NAME_MAP: Dict[str, Any] = {
     'Dev': DevAuthBackend,
     'Email': EmailAuthBackend,
diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py
index a94ea421b9..5676c574ea 100644
--- a/zproject/computed_settings.py
+++ b/zproject/computed_settings.py
@@ -114,14 +114,15 @@ BAN_CONSOLE_OUTPUT = False
 # These are the settings that we will check that the user has filled in for
 # production deployments before starting the app.  It consists of a series
 # of pairs of (setting name, default value that it must be changed from)
-REQUIRED_SETTINGS = [("EXTERNAL_HOST", "zulip.example.com"),
-                     ("ZULIP_ADMINISTRATOR", "zulip-admin@example.com"),
-                     # SECRET_KEY doesn't really need to be here, in
-                     # that we set it automatically, but just in
-                     # case, it seems worth having in this list
-                     ("SECRET_KEY", ""),
-                     ("AUTHENTICATION_BACKENDS", ()),
-                     ]
+REQUIRED_SETTINGS = [
+    ("EXTERNAL_HOST", "zulip.example.com"),
+    ("ZULIP_ADMINISTRATOR", "zulip-admin@example.com"),
+    # SECRET_KEY doesn't really need to be here, in
+    # that we set it automatically, but just in
+    # case, it seems worth having in this list
+    ("SECRET_KEY", ""),
+    ("AUTHENTICATION_BACKENDS", ()),
+]
 
 MANAGERS = ADMINS
 
@@ -168,6 +169,7 @@ class TwoFactorLoader(app_directories.Loader):
         dirs = super().get_dirs()
         return [d for d in dirs if d.match("two_factor/*")]
 
+
 MIDDLEWARE = (
     # With the exception of it's dependencies,
     # our logging middleware should be the top middleware item.
@@ -274,20 +276,22 @@ SILENCED_SYSTEM_CHECKS = [
 # We implement these options with a default DATABASES configuration
 # supporting peer authentication, with logic to override it as
 # appropriate if DEVELOPMENT or REMOTE_POSTGRES_HOST is set.
-DATABASES: Dict[str, Dict[str, Any]] = {"default": {
-    'ENGINE': 'django.db.backends.postgresql',
-    'NAME': 'zulip',
-    'USER': 'zulip',
-    # Password = '' => peer/certificate authentication (no password)
-    'PASSWORD': '',
-    # Host = '' => connect to localhost by default
-    'HOST': '',
-    'SCHEMA': 'zulip',
-    'CONN_MAX_AGE': 600,
-    'OPTIONS': {
-        'connection_factory': TimeTrackingConnection,
-    },
-}}
+DATABASES: Dict[str, Dict[str, Any]] = {
+    "default": {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'zulip',
+        'USER': 'zulip',
+        # Password = '' => peer/certificate authentication (no password)
+        'PASSWORD': '',
+        # Host = '' => connect to localhost by default
+        'HOST': '',
+        'SCHEMA': 'zulip',
+        'CONN_MAX_AGE': 600,
+        'OPTIONS': {
+            'connection_factory': TimeTrackingConnection,
+        },
+    }
+}
 
 if DEVELOPMENT:
     LOCAL_DATABASE_PASSWORD = get_secret("local_database_password")
@@ -422,8 +426,10 @@ if DEVELOPMENT:
 else:
     # For production, use the best password hashing algorithm: Argon2
     # Zulip was originally on PBKDF2 so we need it for compatibility
-    PASSWORD_HASHERS = ('django.contrib.auth.hashers.Argon2PasswordHasher',
-                        'django.contrib.auth.hashers.PBKDF2PasswordHasher')
+    PASSWORD_HASHERS = (
+        'django.contrib.auth.hashers.Argon2PasswordHasher',
+        'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+    )
 
 ########################################################################
 # API/BOT SETTINGS
@@ -458,48 +464,58 @@ TWITTER_ACCESS_TOKEN_KEY = get_secret("twitter_access_token_key")
 TWITTER_ACCESS_TOKEN_SECRET = get_secret("twitter_access_token_secret")
 
 # These are the bots that Zulip sends automated messages as.
-INTERNAL_BOTS = [{'var_name': 'NOTIFICATION_BOT',
-                  'email_template': 'notification-bot@%s',
-                  'name': 'Notification Bot',
-                  },
-                 {'var_name': 'EMAIL_GATEWAY_BOT',
-                  'email_template': 'emailgateway@%s',
-                  'name': 'Email Gateway',
-                  },
-                 {'var_name': 'NAGIOS_SEND_BOT',
-                  'email_template': 'nagios-send-bot@%s',
-                  'name': 'Nagios Send Bot',
-                  },
-                 {'var_name': 'NAGIOS_RECEIVE_BOT',
-                  'email_template': 'nagios-receive-bot@%s',
-                  'name': 'Nagios Receive Bot',
-                  },
-                 {'var_name': 'WELCOME_BOT',
-                  'email_template': 'welcome-bot@%s',
-                  'name': 'Welcome Bot',
-                  }]
+INTERNAL_BOTS = [
+    {
+        'var_name': 'NOTIFICATION_BOT',
+        'email_template': 'notification-bot@%s',
+        'name': 'Notification Bot',
+    },
+    {
+        'var_name': 'EMAIL_GATEWAY_BOT',
+        'email_template': 'emailgateway@%s',
+        'name': 'Email Gateway',
+    },
+    {
+        'var_name': 'NAGIOS_SEND_BOT',
+        'email_template': 'nagios-send-bot@%s',
+        'name': 'Nagios Send Bot',
+    },
+    {
+        'var_name': 'NAGIOS_RECEIVE_BOT',
+        'email_template': 'nagios-receive-bot@%s',
+        'name': 'Nagios Receive Bot',
+    },
+    {
+        'var_name': 'WELCOME_BOT',
+        'email_template': 'welcome-bot@%s',
+        'name': 'Welcome Bot',
+    },
+]
 
 # Bots that are created for each realm like the reminder-bot goes here.
 REALM_INTERNAL_BOTS: List[Dict[str, str]] = []
 # These are realm-internal bots that may exist in some organizations,
 # so configure power the setting, but should not be auto-created at this time.
 DISABLED_REALM_INTERNAL_BOTS = [
-    {'var_name': 'REMINDER_BOT',
-     'email_template': 'reminder-bot@%s',
-     'name': 'Reminder Bot',
-     },
+    {
+        'var_name': 'REMINDER_BOT',
+        'email_template': 'reminder-bot@%s',
+        'name': 'Reminder Bot',
+    },
 ]
 
 if PRODUCTION:
     INTERNAL_BOTS += [
-        {'var_name': 'NAGIOS_STAGING_SEND_BOT',
-         'email_template': 'nagios-staging-send-bot@%s',
-         'name': 'Nagios Staging Send Bot',
-         },
-        {'var_name': 'NAGIOS_STAGING_RECEIVE_BOT',
-         'email_template': 'nagios-staging-receive-bot@%s',
-         'name': 'Nagios Staging Receive Bot',
-         },
+        {
+            'var_name': 'NAGIOS_STAGING_SEND_BOT',
+            'email_template': 'nagios-staging-send-bot@%s',
+            'name': 'Nagios Staging Send Bot',
+        },
+        {
+            'var_name': 'NAGIOS_STAGING_RECEIVE_BOT',
+            'email_template': 'nagios-staging-receive-bot@%s',
+            'name': 'Nagios Staging Receive Bot',
+        },
     ]
 
 INTERNAL_BOT_DOMAIN = "zulip.com"
@@ -649,6 +665,7 @@ TEMPLATES = [
 # LOGGING SETTINGS
 ########################################################################
 
+
 def zulip_path(path: str) -> str:
     if DEVELOPMENT:
         # if DEVELOPMENT, store these files in the Zulip checkout
@@ -658,6 +675,7 @@ def zulip_path(path: str) -> str:
             path = os.path.join(os.path.join(DEPLOY_ROOT, 'var'), os.path.basename(path))
     return path
 
+
 SERVER_LOG_PATH = zulip_path("/var/log/zulip/server.log")
 ERROR_FILE_LOG_PATH = zulip_path("/var/log/zulip/errors.log")
 MANAGEMENT_LOG_PATH = zulip_path("/var/log/zulip/manage.log")
@@ -696,7 +714,9 @@ LOGGING_ENABLED = True
 
 DEFAULT_ZULIP_HANDLERS = [
     *(['zulip_admins'] if ERROR_REPORTING else []),
-    'console', 'file', 'errors_file',
+    'console',
+    'file',
+    'errors_file',
 ]
 
 LOGGING: Dict[str, Any] = {
@@ -745,8 +765,11 @@ LOGGING: Dict[str, Any] = {
         'zulip_admins': {
             'level': 'ERROR',
             'class': 'zerver.logging_handlers.AdminNotifyHandler',
-            'filters': (['ZulipLimiter', 'require_debug_false', 'require_really_deployed']
-                        if not DEBUG_ERROR_REPORTING else []),
+            'filters': (
+                ['ZulipLimiter', 'require_debug_false', 'require_really_deployed']
+                if not DEBUG_ERROR_REPORTING
+                else []
+            ),
             'formatter': 'default',
         },
         'auth_file': {
@@ -820,14 +843,12 @@ LOGGING: Dict[str, Any] = {
         #  * Setting `level` equal to the parent is redundant; don't.
         #  * Setting `handlers` equal to the parent is redundant; don't.
         #  * Always write in order: level, filters, handlers, propagate.
-
         # root logger
         '': {
             'level': 'INFO',
             'filters': ['require_logging_enabled'],
             'handlers': DEFAULT_ZULIP_HANDLERS,
         },
-
         # Django, alphabetized
         'django': {
             # Django's default logging config has already set some
@@ -864,14 +885,12 @@ LOGGING: Dict[str, Any] = {
             'handlers': ['console'],
             'propagate': False,
         },
-
         ## Uncomment the following to get all database queries logged to the console
         # 'django.db': {
         #     'level': 'DEBUG',
         #     'handlers': ['console'],
         #     'propagate': False,
         # },
-
         # other libraries, alphabetized
         'django_auth_ldap': {
             'level': 'DEBUG',
@@ -890,7 +909,6 @@ LOGGING: Dict[str, Any] = {
         'requests': {
             'level': 'WARNING',
         },
-
         # our own loggers, alphabetized
         'zerver.lib.digest': {
             'level': 'DEBUG',
@@ -973,7 +991,7 @@ POLL_TIMEOUT = 90 * 1000
 
 USING_LDAP = "zproject.backends.ZulipLDAPAuthBackend" in AUTHENTICATION_BACKENDS
 ONLY_LDAP = AUTHENTICATION_BACKENDS == ("zproject.backends.ZulipLDAPAuthBackend",)
-USING_APACHE_SSO = ('zproject.backends.ZulipRemoteUserBackend' in AUTHENTICATION_BACKENDS)
+USING_APACHE_SSO = 'zproject.backends.ZulipRemoteUserBackend' in AUTHENTICATION_BACKENDS
 ONLY_SSO = AUTHENTICATION_BACKENDS == ("zproject.backends.ZulipRemoteUserBackend",)
 
 if ONLY_SSO:
@@ -997,7 +1015,8 @@ else:
 
 if POPULATE_PROFILE_VIA_LDAP:
     import ldap
-    if (AUTH_LDAP_BIND_DN and ldap.OPT_REFERRALS not in AUTH_LDAP_CONNECTION_OPTIONS):
+
+    if AUTH_LDAP_BIND_DN and ldap.OPT_REFERRALS not in AUTH_LDAP_CONNECTION_OPTIONS:
         # The default behavior of python-ldap (without setting option
         # `ldap.OPT_REFERRALS`) is to follow referrals, but anonymously.
         # If our original query was non-anonymous, that's unlikely to
@@ -1019,15 +1038,22 @@ if REGISTER_LINK_DISABLED is None:
 # SOCIAL AUTHENTICATION SETTINGS
 ########################################################################
 
-SOCIAL_AUTH_FIELDS_STORED_IN_SESSION = ['subdomain', 'is_signup', 'mobile_flow_otp', 'desktop_flow_otp',
-                                        'multiuse_object_key']
+SOCIAL_AUTH_FIELDS_STORED_IN_SESSION = [
+    'subdomain',
+    'is_signup',
+    'mobile_flow_otp',
+    'desktop_flow_otp',
+    'multiuse_object_key',
+]
 SOCIAL_AUTH_LOGIN_ERROR_URL = '/login/'
 
 # CLIENT is required by PSA's internal implementation. We name it
 # SERVICES_ID to make things more readable in the configuration
 # and our own custom backend code.
 SOCIAL_AUTH_APPLE_CLIENT = SOCIAL_AUTH_APPLE_SERVICES_ID
-SOCIAL_AUTH_APPLE_AUDIENCE = [id for id in [SOCIAL_AUTH_APPLE_CLIENT, SOCIAL_AUTH_APPLE_APP_ID] if id is not None]
+SOCIAL_AUTH_APPLE_AUDIENCE = [
+    id for id in [SOCIAL_AUTH_APPLE_CLIENT, SOCIAL_AUTH_APPLE_APP_ID] if id is not None
+]
 
 if PRODUCTION:
     SOCIAL_AUTH_APPLE_SECRET = get_from_file_if_exists("/etc/zulip/apple-auth-key.p8")
@@ -1054,7 +1080,9 @@ SOCIAL_AUTH_GOOGLE_SECRET = SOCIAL_AUTH_GOOGLE_SECRET or GOOGLE_OAUTH2_CLIENT_SE
 
 if PRODUCTION:
     SOCIAL_AUTH_SAML_SP_PUBLIC_CERT = get_from_file_if_exists("/etc/zulip/saml/zulip-cert.crt")
-    SOCIAL_AUTH_SAML_SP_PRIVATE_KEY = get_from_file_if_exists("/etc/zulip/saml/zulip-private-key.key")
+    SOCIAL_AUTH_SAML_SP_PRIVATE_KEY = get_from_file_if_exists(
+        "/etc/zulip/saml/zulip-private-key.key"
+    )
 
 if "signatureAlgorithm" not in SOCIAL_AUTH_SAML_SECURITY_CONFIG:
     # If the configuration doesn't explicitly specify the algorithm,
@@ -1142,4 +1170,5 @@ TWO_FACTOR_PATCH_ADMIN = False
 SENTRY_DSN = os.environ.get("SENTRY_DSN", SENTRY_DSN)
 if SENTRY_DSN:
     from .sentry import setup_sentry
+
     setup_sentry(SENTRY_DSN)
diff --git a/zproject/config.py b/zproject/config.py
index 1a10b7f1f8..55b7a3c689 100644
--- a/zproject/config.py
+++ b/zproject/config.py
@@ -17,28 +17,41 @@ if PRODUCTION:
 else:
     secrets_file.read(os.path.join(DEPLOY_ROOT, "zproject/dev-secrets.conf"))
 
+
 @overload
-def get_secret(key: str, default_value: str, development_only: bool=False) -> str:
+def get_secret(key: str, default_value: str, development_only: bool = False) -> str:
     ...
+
+
 @overload
-def get_secret(key: str, default_value: Optional[str]=None,
-               development_only: bool=False) -> Optional[str]:
+def get_secret(
+    key: str, default_value: Optional[str] = None, development_only: bool = False
+) -> Optional[str]:
     ...
-def get_secret(key: str, default_value: Optional[str]=None,
-               development_only: bool=False) -> Optional[str]:
+
+
+def get_secret(
+    key: str, default_value: Optional[str] = None, development_only: bool = False
+) -> Optional[str]:
     if development_only and PRODUCTION:
         return default_value
     return secrets_file.get('secrets', key, fallback=default_value)
 
+
 @overload
 def get_config(section: str, key: str, default_value: str) -> str:
     ...
+
+
 @overload
-def get_config(section: str, key: str, default_value: Optional[str]=None) -> Optional[str]:
+def get_config(section: str, key: str, default_value: Optional[str] = None) -> Optional[str]:
     ...
-def get_config(section: str, key: str, default_value: Optional[str]=None) -> Optional[str]:
+
+
+def get_config(section: str, key: str, default_value: Optional[str] = None) -> Optional[str]:
     return config_file.get(section, key, fallback=default_value)
 
+
 def get_from_file_if_exists(path: str) -> str:
     if os.path.exists(path):
         with open(path) as f:
diff --git a/zproject/default_settings.py b/zproject/default_settings.py
index 1523da4870..ddc7726fcf 100644
--- a/zproject/default_settings.py
+++ b/zproject/default_settings.py
@@ -356,12 +356,14 @@ STATSD_HOST = ''
 
 # Configuration for JWT auth.
 if TYPE_CHECKING:
+
     class JwtAuthKey(TypedDict):
         key: str
         # See https://pyjwt.readthedocs.io/en/latest/algorithms.html for a list
         # of supported algorithms.
         algorithms: List[str]
 
+
 JWT_AUTH_KEYS: Dict[str, "JwtAuthKey"] = {}
 
 # https://docs.djangoproject.com/en/2.2/ref/settings/#std:setting-SERVER_EMAIL
diff --git a/zproject/dev_settings.py b/zproject/dev_settings.py
index d32c10104d..f19b96d24c 100644
--- a/zproject/dev_settings.py
+++ b/zproject/dev_settings.py
@@ -120,14 +120,17 @@ if FAKE_LDAP_MODE:
     # To understand these parameters, read the docs in
     # prod_settings_template.py and on ReadTheDocs.
     LDAP_APPEND_DOMAIN = None
-    AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                       ldap.SCOPE_ONELEVEL, "(uid=%(user)s)")
-    AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                                ldap.SCOPE_ONELEVEL, "(email=%(email)s)")
+    AUTH_LDAP_USER_SEARCH = LDAPSearch(
+        "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(uid=%(user)s)"
+    )
+    AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch(
+        "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(email=%(email)s)"
+    )
 
     if FAKE_LDAP_MODE == 'a':
-        AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                                    ldap.SCOPE_ONELEVEL, "(uid=%(email)s)")
+        AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch(
+            "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(uid=%(email)s)"
+        )
         AUTH_LDAP_USERNAME_ATTR = "uid"
         AUTH_LDAP_USER_ATTR_MAP = {
             "full_name": "cn",
diff --git a/zproject/dev_urls.py b/zproject/dev_urls.py
index cb4648474d..791481fadd 100644
--- a/zproject/dev_urls.py
+++ b/zproject/dev_urls.py
@@ -29,54 +29,50 @@ use_prod_static = not settings.DEBUG
 
 urls = [
     # Serve useful development environment resources (docs, coverage reports, etc.)
-    path('coverage/<path:path>',
-         serve, {'document_root':
-                 os.path.join(settings.DEPLOY_ROOT, 'var/coverage'),
-                 'show_indexes': True}),
-    path('node-coverage/<path:path>',
-         serve, {'document_root':
-                 os.path.join(settings.DEPLOY_ROOT, 'var/node-coverage/lcov-report'),
-                 'show_indexes': True}),
-    path('docs/<path:path>',
-         serve, {'document_root':
-                 os.path.join(settings.DEPLOY_ROOT, 'docs/_build/html')}),
-
+    path(
+        'coverage/<path:path>',
+        serve,
+        {'document_root': os.path.join(settings.DEPLOY_ROOT, 'var/coverage'), 'show_indexes': True},
+    ),
+    path(
+        'node-coverage/<path:path>',
+        serve,
+        {
+            'document_root': os.path.join(settings.DEPLOY_ROOT, 'var/node-coverage/lcov-report'),
+            'show_indexes': True,
+        },
+    ),
+    path(
+        'docs/<path:path>',
+        serve,
+        {'document_root': os.path.join(settings.DEPLOY_ROOT, 'docs/_build/html')},
+    ),
     # The special no-password login endpoint for development
-    path('devlogin/', login_page,
-         {'template_name': 'zerver/dev_login.html'}, name='login_page'),
-
+    path('devlogin/', login_page, {'template_name': 'zerver/dev_login.html'}, name='login_page'),
     # Page for testing email templates
     path('emails/', email_page),
     path('emails/generate/', generate_all_emails),
     path('emails/clear/', clear_emails),
-
     # Listing of useful URLs and various tools for development
     path('devtools/', TemplateView.as_view(template_name='zerver/dev_tools.html')),
     # Register New User and Realm
-    path('devtools/register_user/',
-         register_development_user,
-         name='register_dev_user'),
-    path('devtools/register_realm/',
-         register_development_realm,
-         name='register_dev_realm'),
-
+    path('devtools/register_user/', register_development_user, name='register_dev_user'),
+    path('devtools/register_realm/', register_development_realm, name='register_dev_realm'),
     # Have easy access for error pages
     path('errors/404/', TemplateView.as_view(template_name='404.html')),
     path('errors/5xx/', TemplateView.as_view(template_name='500.html')),
-
     # Add a convenient way to generate webhook messages from fixtures.
     path('devtools/integrations/', dev_panel),
-    path('devtools/integrations/check_send_webhook_fixture_message',
-         check_send_webhook_fixture_message),
-    path('devtools/integrations/send_all_webhook_fixture_messages',
-         send_all_webhook_fixture_messages),
-    path('devtools/integrations/<integration_name>/fixtures',
-         get_fixtures),
-
-    path('config-error/<error_category_name>', config_error,
-         name='config_error'),
-    path('config-error/remoteuser/<error_category_name>',
-         config_error),
+    path(
+        'devtools/integrations/check_send_webhook_fixture_message',
+        check_send_webhook_fixture_message,
+    ),
+    path(
+        'devtools/integrations/send_all_webhook_fixture_messages', send_all_webhook_fixture_messages
+    ),
+    path('devtools/integrations/<integration_name>/fixtures', get_fixtures),
+    path('config-error/<error_category_name>', config_error, name='config_error'),
+    path('config-error/remoteuser/<error_category_name>', config_error),
 ]
 
 # Serve static assets via the Django server
@@ -85,6 +81,7 @@ if use_prod_static:
         path('static/<path:path>', serve, {'document_root': settings.STATIC_ROOT}),
     ]
 else:
+
     def serve_static(request: HttpRequest, path: str) -> HttpResponse:
         response = staticfiles_serve(request, path)
         response["Access-Control-Allow-Origin"] = "*"
diff --git a/zproject/email_backends.py b/zproject/email_backends.py
index fc19ed412a..e03baa49e5 100644
--- a/zproject/email_backends.py
+++ b/zproject/email_backends.py
@@ -16,6 +16,7 @@ def get_forward_address() -> str:
     except (configparser.NoSectionError, configparser.NoOptionError):
         return ""
 
+
 def set_forward_address(forward_address: str) -> None:
     config = configparser.ConfigParser()
     config.read(settings.FORWARD_ADDRESS_CONFIG_FILE)
@@ -27,6 +28,7 @@ def set_forward_address(forward_address: str) -> None:
     with open(settings.FORWARD_ADDRESS_CONFIG_FILE, "w") as cfgfile:
         config.write(cfgfile)
 
+
 class EmailLogBackEnd(EmailBackend):
     @staticmethod
     def log_email(email: EmailMultiAlternatives) -> None:
@@ -67,7 +69,9 @@ class EmailLogBackEnd(EmailBackend):
             # Here, we replace the email addresses used in development
             # with chat.zulip.org, so that web email providers like Gmail
             # will be able to fetch the illustrations used in the emails.
-            html_alternative[0] = html_alternative[0].replace(localhost_email_images_base_uri, czo_email_images_base_uri)
+            html_alternative[0] = html_alternative[0].replace(
+                localhost_email_images_base_uri, czo_email_images_base_uri
+            )
             email_message.alternatives[0] = tuple(html_alternative)
 
             email_message.to = [get_forward_address()]
diff --git a/zproject/legacy_urls.py b/zproject/legacy_urls.py
index 1ad5f18b83..7b62612572 100644
--- a/zproject/legacy_urls.py
+++ b/zproject/legacy_urls.py
@@ -10,7 +10,6 @@ import zerver.views.tutorial
 
 legacy_urls = [
     # These are json format views used by the web client.  They require a logged in browser.
-
     # We should remove this endpoint and all code related to it.
     # It returns a 404 if the stream doesn't exist, which is confusing
     # for devs, and I don't think we need to go to the server
diff --git a/zproject/prod_settings_template.py b/zproject/prod_settings_template.py
index 3bf5f7db93..bb57b3a3f4 100644
--- a/zproject/prod_settings_template.py
+++ b/zproject/prod_settings_template.py
@@ -166,8 +166,9 @@ from django_auth_ldap.config import LDAPSearch
 ## name they type into the Zulip login form.
 ##
 ## For more details and alternatives, see the documentation linked above.
-AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=example,dc=com",
-                                   ldap.SCOPE_SUBTREE, "(uid=%(user)s)")
+AUTH_LDAP_USER_SEARCH = LDAPSearch(
+    "ou=users,dc=example,dc=com", ldap.SCOPE_SUBTREE, "(uid=%(user)s)"
+)
 
 ## Configuration to lookup a user's LDAP data given their email address
 ## (For Zulip reverse mapping).  If users log in as e.g. "sam" when
diff --git a/zproject/sentry.py b/zproject/sentry.py
index d8cc52ed8e..b0bab9c117 100644
--- a/zproject/sentry.py
+++ b/zproject/sentry.py
@@ -16,6 +16,7 @@ from .config import PRODUCTION
 if TYPE_CHECKING:
     from sentry_sdk._types import Event, Hint
 
+
 def add_context(event: 'Event', hint: 'Hint') -> Optional['Event']:
     if "exc_info" in hint:
         _, exc_value, _ = hint["exc_info"]
@@ -26,6 +27,7 @@ def add_context(event: 'Event', hint: 'Hint') -> Optional['Event']:
 
     from zerver.lib.request import get_current_request
     from zerver.models import get_user_profile_by_id
+
     with capture_internal_exceptions():
         # event.user is the user context, from Sentry, which is
         # pre-populated with some keys via its Django integration:
@@ -54,6 +56,7 @@ def add_context(event: 'Event', hint: 'Hint') -> Optional['Event']:
                 event['tags'].setdefault('realm', request.realm.string_id)
     return event
 
+
 def setup_sentry(dsn: Optional[str], *integrations: Integration) -> None:
     if not dsn:
         return
diff --git a/zproject/test_extra_settings.py b/zproject/test_extra_settings.py
index 647734a5c7..40b76a32e5 100644
--- a/zproject/test_extra_settings.py
+++ b/zproject/test_extra_settings.py
@@ -77,12 +77,13 @@ GOOGLE_OAUTH2_CLIENT_ID = "test_client_id"
 
 # Makes testing LDAP backend require less mocking
 AUTH_LDAP_ALWAYS_UPDATE_USER = False
-AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                   ldap.SCOPE_ONELEVEL, "(uid=%(user)s)")
+AUTH_LDAP_USER_SEARCH = LDAPSearch(
+    "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(uid=%(user)s)"
+)
 AUTH_LDAP_USERNAME_ATTR = "uid"
-AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
-                                            ldap.SCOPE_ONELEVEL,
-                                            "(mail=%(email)s)")
+AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch(
+    "ou=users,dc=zulip,dc=com", ldap.SCOPE_ONELEVEL, "(mail=%(email)s)"
+)
 
 TEST_SUITE = True
 RATE_LIMITING = False
@@ -136,6 +137,7 @@ if not PUPPETEER_TESTS:
     # Here we set various loggers to be less noisy for unit tests.
     def set_loglevel(logger_name: str, level: str) -> None:
         LOGGING['loggers'].setdefault(logger_name, {})['level'] = level
+
     set_loglevel('zulip.requests', 'CRITICAL')
     set_loglevel('zulip.management', 'CRITICAL')
     set_loglevel('django.request', 'ERROR')
@@ -192,7 +194,9 @@ SOCIAL_AUTH_APPLE_TEAM = 'TEAMSTRING'
 SOCIAL_AUTH_APPLE_SECRET = get_from_file_if_exists("zerver/tests/fixtures/apple/private_key.pem")
 
 APPLE_JWK = get_from_file_if_exists("zerver/tests/fixtures/apple/jwk")
-APPLE_ID_TOKEN_GENERATION_KEY = get_from_file_if_exists("zerver/tests/fixtures/apple/token_gen_private_key")
+APPLE_ID_TOKEN_GENERATION_KEY = get_from_file_if_exists(
+    "zerver/tests/fixtures/apple/token_gen_private_key"
+)
 
 VIDEO_ZOOM_CLIENT_ID = "client_id"
 VIDEO_ZOOM_CLIENT_SECRET = "client_secret"
@@ -214,7 +218,7 @@ THUMBOR_SERVES_CAMO = True
 DEVELOPMENT_LOG_EMAILS = False
 
 SOCIAL_AUTH_SAML_SP_ENTITY_ID = 'http://' + EXTERNAL_HOST
-SOCIAL_AUTH_SAML_SP_PUBLIC_CERT  = get_from_file_if_exists("zerver/tests/fixtures/saml/zulip.crt")
+SOCIAL_AUTH_SAML_SP_PUBLIC_CERT = get_from_file_if_exists("zerver/tests/fixtures/saml/zulip.crt")
 SOCIAL_AUTH_SAML_SP_PRIVATE_KEY = get_from_file_if_exists("zerver/tests/fixtures/saml/zulip.key")
 
 SOCIAL_AUTH_SAML_ORG_INFO = {
diff --git a/zproject/urls.py b/zproject/urls.py
index bbb5679f86..3486fbbe64 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -245,348 +245,251 @@ if settings.TWO_FACTOR_AUTHENTICATION_ENABLED:
 # e.g. `PATCH /json/realm` or `PATCH /api/v1/realm`.
 v1_api_and_json_patterns = [
     # realm-level calls
-    rest_path('realm',
-              PATCH=update_realm),
-
+    rest_path('realm', PATCH=update_realm),
     # Returns a 204, used by desktop app to verify connectivity status
     path('generate_204', generate_204),
-
     path('realm/subdomain/<subdomain>', check_subdomain_available),
-
     # realm/domains -> zerver.views.realm_domains
-    rest_path('realm/domains',
-              GET=list_realm_domains,
-              POST=create_realm_domain),
-    rest_path('realm/domains/<domain>',
-              PATCH=patch_realm_domain,
-              DELETE=delete_realm_domain),
-
+    rest_path('realm/domains', GET=list_realm_domains, POST=create_realm_domain),
+    rest_path('realm/domains/<domain>', PATCH=patch_realm_domain, DELETE=delete_realm_domain),
     # realm/emoji -> zerver.views.realm_emoji
-    rest_path('realm/emoji',
-              GET=list_emoji),
-    rest_path('realm/emoji/<emoji_name>',
-              POST=upload_emoji,
-              DELETE=(delete_emoji, {"intentionally_undocumented"})),
+    rest_path('realm/emoji', GET=list_emoji),
+    rest_path(
+        'realm/emoji/<emoji_name>',
+        POST=upload_emoji,
+        DELETE=(delete_emoji, {"intentionally_undocumented"}),
+    ),
     # this endpoint throws a status code 400 JsonableError when it should be a 404.
-
     # realm/icon -> zerver.views.realm_icon
-    rest_path('realm/icon',
-              POST=upload_icon,
-              DELETE=delete_icon_backend,
-              GET=get_icon_backend),
-
+    rest_path('realm/icon', POST=upload_icon, DELETE=delete_icon_backend, GET=get_icon_backend),
     # realm/logo -> zerver.views.realm_logo
-    rest_path('realm/logo',
-              POST=upload_logo,
-              DELETE=delete_logo_backend,
-              GET=get_logo_backend),
-
+    rest_path('realm/logo', POST=upload_logo, DELETE=delete_logo_backend, GET=get_logo_backend),
     # realm/filters -> zerver.views.realm_filters
-    rest_path('realm/filters',
-              GET=list_filters,
-              POST=create_filter),
-    rest_path('realm/filters/<int:filter_id>',
-              DELETE=delete_filter),
-
+    rest_path('realm/filters', GET=list_filters, POST=create_filter),
+    rest_path('realm/filters/<int:filter_id>', DELETE=delete_filter),
     # realm/profile_fields -> zerver.views.custom_profile_fields
-    rest_path('realm/profile_fields',
-              GET=list_realm_custom_profile_fields,
-              PATCH=reorder_realm_custom_profile_fields,
-              POST=create_realm_custom_profile_field),
-    rest_path('realm/profile_fields/<int:field_id>',
-              PATCH=update_realm_custom_profile_field,
-              DELETE=delete_realm_custom_profile_field),
-
+    rest_path(
+        'realm/profile_fields',
+        GET=list_realm_custom_profile_fields,
+        PATCH=reorder_realm_custom_profile_fields,
+        POST=create_realm_custom_profile_field,
+    ),
+    rest_path(
+        'realm/profile_fields/<int:field_id>',
+        PATCH=update_realm_custom_profile_field,
+        DELETE=delete_realm_custom_profile_field,
+    ),
     # realm/deactivate -> zerver.views.deactivate_realm
-    rest_path('realm/deactivate',
-              POST=deactivate_realm),
-
+    rest_path('realm/deactivate', POST=deactivate_realm),
     # users -> zerver.views.users
-    rest_path('users',
-              GET=get_members_backend,
-              POST=create_user_backend),
-    rest_path('users/me',
-              GET=get_profile_backend,
-              DELETE=deactivate_user_own_backend),
-    rest_path('users/<int:user_id>/reactivate',
-              POST=reactivate_user_backend),
-    rest_path('users/<int:user_id>',
-              GET=get_members_backend,
-              PATCH=update_user_backend,
-              DELETE=deactivate_user_backend),
-    rest_path('users/<int:user_id>/subscriptions/<int:stream_id>',
-              GET=get_subscription_backend),
-    rest_path('bots',
-              GET=get_bots_backend,
-              POST=add_bot_backend),
-    rest_path('bots/<int:bot_id>/api_key/regenerate',
-              POST=regenerate_bot_api_key),
-    rest_path('bots/<int:bot_id>',
-              PATCH=patch_bot_backend,
-              DELETE=deactivate_bot_backend),
-
+    rest_path('users', GET=get_members_backend, POST=create_user_backend),
+    rest_path('users/me', GET=get_profile_backend, DELETE=deactivate_user_own_backend),
+    rest_path('users/<int:user_id>/reactivate', POST=reactivate_user_backend),
+    rest_path(
+        'users/<int:user_id>',
+        GET=get_members_backend,
+        PATCH=update_user_backend,
+        DELETE=deactivate_user_backend,
+    ),
+    rest_path('users/<int:user_id>/subscriptions/<int:stream_id>', GET=get_subscription_backend),
+    rest_path('bots', GET=get_bots_backend, POST=add_bot_backend),
+    rest_path('bots/<int:bot_id>/api_key/regenerate', POST=regenerate_bot_api_key),
+    rest_path('bots/<int:bot_id>', PATCH=patch_bot_backend, DELETE=deactivate_bot_backend),
     # invites -> zerver.views.invite
-    rest_path('invites',
-              GET=get_user_invites,
-              POST=invite_users_backend),
-    rest_path('invites/<int:prereg_id>',
-              DELETE=revoke_user_invite),
-    rest_path('invites/<int:prereg_id>/resend',
-              POST=resend_user_invite_email),
-
+    rest_path('invites', GET=get_user_invites, POST=invite_users_backend),
+    rest_path('invites/<int:prereg_id>', DELETE=revoke_user_invite),
+    rest_path('invites/<int:prereg_id>/resend', POST=resend_user_invite_email),
     # invites/multiuse -> zerver.views.invite
-    rest_path('invites/multiuse',
-              POST=generate_multiuse_invite_backend),
+    rest_path('invites/multiuse', POST=generate_multiuse_invite_backend),
     # invites/multiuse -> zerver.views.invite
-    rest_path('invites/multiuse/<int:invite_id>',
-              DELETE=revoke_multiuse_invite),
-
+    rest_path('invites/multiuse/<int:invite_id>', DELETE=revoke_multiuse_invite),
     # mark messages as read (in bulk)
-    rest_path('mark_all_as_read',
-              POST=mark_all_as_read),
-    rest_path('mark_stream_as_read',
-              POST=mark_stream_as_read),
-    rest_path('mark_topic_as_read',
-              POST=mark_topic_as_read),
-
-    rest_path('zcommand',
-              POST=zcommand_backend),
-
+    rest_path('mark_all_as_read', POST=mark_all_as_read),
+    rest_path('mark_stream_as_read', POST=mark_stream_as_read),
+    rest_path('mark_topic_as_read', POST=mark_topic_as_read),
+    rest_path('zcommand', POST=zcommand_backend),
     # Endpoints for syncing drafts.
-    rest_path('drafts',
-              GET=(fetch_drafts,
-                   {'intentionally_undocumented'}),
-              POST=(create_drafts,
-                    {'intentionally_undocumented'})),
-    rest_path('drafts/<int:draft_id>',
-              PATCH=(edit_draft,
-                     {'intentionally_undocumented'}),
-              DELETE=(delete_draft,
-                      {'intentionally_undocumented'})),
-
+    rest_path(
+        'drafts',
+        GET=(fetch_drafts, {'intentionally_undocumented'}),
+        POST=(create_drafts, {'intentionally_undocumented'}),
+    ),
+    rest_path(
+        'drafts/<int:draft_id>',
+        PATCH=(edit_draft, {'intentionally_undocumented'}),
+        DELETE=(delete_draft, {'intentionally_undocumented'}),
+    ),
     # messages -> zerver.views.message*
     # GET returns messages, possibly filtered, POST sends a message
-    rest_path('messages',
-              GET=(get_messages_backend,
-                   {'allow_anonymous_user_web'}),
-              POST=(send_message_backend,
-                    {'allow_incoming_webhooks'})),
-    rest_path('messages/<int:message_id>',
-              GET=json_fetch_raw_message,
-              PATCH=update_message_backend,
-              DELETE=delete_message_backend),
-    rest_path('messages/render',
-              POST=render_message_backend),
-    rest_path('messages/flags',
-              POST=update_message_flags),
-    rest_path('messages/<int:message_id>/history',
-              GET=get_message_edit_history),
-    rest_path('messages/matches_narrow',
-              GET=messages_in_narrow_backend),
-
-    rest_path('users/me/subscriptions/properties',
-              POST=update_subscription_properties_backend),
-
-    rest_path('users/me/subscriptions/<int:stream_id>',
-              PATCH=update_subscriptions_property),
-
-    rest_path('submessage',
-              POST=process_submessage),
-
+    rest_path(
+        'messages',
+        GET=(get_messages_backend, {'allow_anonymous_user_web'}),
+        POST=(send_message_backend, {'allow_incoming_webhooks'}),
+    ),
+    rest_path(
+        'messages/<int:message_id>',
+        GET=json_fetch_raw_message,
+        PATCH=update_message_backend,
+        DELETE=delete_message_backend,
+    ),
+    rest_path('messages/render', POST=render_message_backend),
+    rest_path('messages/flags', POST=update_message_flags),
+    rest_path('messages/<int:message_id>/history', GET=get_message_edit_history),
+    rest_path('messages/matches_narrow', GET=messages_in_narrow_backend),
+    rest_path('users/me/subscriptions/properties', POST=update_subscription_properties_backend),
+    rest_path('users/me/subscriptions/<int:stream_id>', PATCH=update_subscriptions_property),
+    rest_path('submessage', POST=process_submessage),
     # New endpoint for handling reactions.
     # reactions -> zerver.view.reactions
     # POST adds a reaction to a message
     # DELETE removes a reaction from a message
-    rest_path('messages/<int:message_id>/reactions',
-              POST=add_reaction,
-              DELETE=remove_reaction),
-
+    rest_path('messages/<int:message_id>/reactions', POST=add_reaction, DELETE=remove_reaction),
     # attachments -> zerver.views.attachments
-    rest_path('attachments',
-              GET=list_by_user),
-    rest_path('attachments/<int:attachment_id>',
-              DELETE=remove),
-
+    rest_path('attachments', GET=list_by_user),
+    rest_path('attachments/<int:attachment_id>', DELETE=remove),
     # typing -> zerver.views.typing
     # POST sends a typing notification event to recipients
-    rest_path('typing',
-              POST=send_notification_backend),
-
+    rest_path('typing', POST=send_notification_backend),
     # user_uploads -> zerver.views.upload
-    rest_path('user_uploads',
-              POST=upload_file_backend),
-    rest_path('user_uploads/<realm_id_str>/<path:filename>',
-              GET=(serve_file_url_backend,
-                   {'override_api_url_scheme'})),
-
+    rest_path('user_uploads', POST=upload_file_backend),
+    rest_path(
+        'user_uploads/<realm_id_str>/<path:filename>',
+        GET=(serve_file_url_backend, {'override_api_url_scheme'}),
+    ),
     # bot_storage -> zerver.views.storage
-    rest_path('bot_storage',
-              PUT=update_storage,
-              GET=get_storage,
-              DELETE=remove_storage),
-
+    rest_path('bot_storage', PUT=update_storage, GET=get_storage, DELETE=remove_storage),
     # Endpoint used by mobile devices to register their push
     # notification credentials
-    rest_path('users/me/apns_device_token',
-              POST=add_apns_device_token,
-              DELETE=remove_apns_device_token),
-    rest_path('users/me/android_gcm_reg_id',
-              POST=add_android_reg_id,
-              DELETE=remove_android_reg_id),
-
+    rest_path(
+        'users/me/apns_device_token', POST=add_apns_device_token, DELETE=remove_apns_device_token
+    ),
+    rest_path('users/me/android_gcm_reg_id', POST=add_android_reg_id, DELETE=remove_android_reg_id),
     # users/*/presnece => zerver.views.presence.
-    rest_path('users/me/presence',
-              POST=update_active_status_backend),
+    rest_path('users/me/presence', POST=update_active_status_backend),
     # It's important that this sit after users/me/presence so that
     # Django's URL resolution order doesn't break the
     # /users/me/presence endpoint.
-    rest_path('users/<email>/presence',
-              GET=get_presence_backend),
-    rest_path('realm/presence',
-              GET=get_statuses_for_realm),
-    rest_path('users/me/status',
-              POST=update_user_status_backend),
-
+    rest_path('users/<email>/presence', GET=get_presence_backend),
+    rest_path('realm/presence', GET=get_statuses_for_realm),
+    rest_path('users/me/status', POST=update_user_status_backend),
     # user_groups -> zerver.views.user_groups
-    rest_path('user_groups',
-              GET=get_user_group),
-    rest_path('user_groups/create',
-              POST=add_user_group),
-    rest_path('user_groups/<int:user_group_id>',
-              PATCH=edit_user_group,
-              DELETE=delete_user_group),
-    rest_path('user_groups/<int:user_group_id>/members',
-              POST=update_user_group_backend),
-
+    rest_path('user_groups', GET=get_user_group),
+    rest_path('user_groups/create', POST=add_user_group),
+    rest_path('user_groups/<int:user_group_id>', PATCH=edit_user_group, DELETE=delete_user_group),
+    rest_path('user_groups/<int:user_group_id>/members', POST=update_user_group_backend),
     # users/me -> zerver.views.user_settings
-    rest_path('users/me/api_key/regenerate',
-              POST=regenerate_api_key),
-    rest_path('users/me/enter-sends',
-              POST=(change_enter_sends,
-                    # This endpoint should be folded into user settings
-                    {'intentionally_undocumented'})),
-    rest_path('users/me/avatar',
-              POST=set_avatar_backend,
-              DELETE=delete_avatar_backend),
-
+    rest_path('users/me/api_key/regenerate', POST=regenerate_api_key),
+    rest_path(
+        'users/me/enter-sends',
+        POST=(
+            change_enter_sends,
+            # This endpoint should be folded into user settings
+            {'intentionally_undocumented'},
+        ),
+    ),
+    rest_path('users/me/avatar', POST=set_avatar_backend, DELETE=delete_avatar_backend),
     # users/me/hotspots -> zerver.views.hotspots
-    rest_path('users/me/hotspots',
-              POST=(mark_hotspot_as_read,
-                    # This endpoint is low priority for documentation as
-                    # it is part of the webapp-specific tutorial.
-                    {'intentionally_undocumented'})),
-
+    rest_path(
+        'users/me/hotspots',
+        POST=(
+            mark_hotspot_as_read,
+            # This endpoint is low priority for documentation as
+            # it is part of the webapp-specific tutorial.
+            {'intentionally_undocumented'},
+        ),
+    ),
     # users/me/tutorial_status -> zerver.views.tutorial
-    rest_path('users/me/tutorial_status',
-              POST=(set_tutorial_status,
-                    # This is a relic of an old Zulip tutorial model and
-                    # should be deleted.
-                    {'intentionally_undocumented'})),
-
+    rest_path(
+        'users/me/tutorial_status',
+        POST=(
+            set_tutorial_status,
+            # This is a relic of an old Zulip tutorial model and
+            # should be deleted.
+            {'intentionally_undocumented'},
+        ),
+    ),
     # settings -> zerver.views.user_settings
-    rest_path('settings',
-              PATCH=json_change_settings),
-    rest_path('settings/display',
-              PATCH=update_display_settings_backend),
-    rest_path('settings/notifications',
-              PATCH=json_change_notify_settings),
-
+    rest_path('settings', PATCH=json_change_settings),
+    rest_path('settings/display', PATCH=update_display_settings_backend),
+    rest_path('settings/notifications', PATCH=json_change_notify_settings),
     # users/me/alert_words -> zerver.views.alert_words
-    rest_path('users/me/alert_words',
-              GET=list_alert_words,
-              POST=add_alert_words,
-              DELETE=remove_alert_words),
-
+    rest_path(
+        'users/me/alert_words',
+        GET=list_alert_words,
+        POST=add_alert_words,
+        DELETE=remove_alert_words,
+    ),
     # users/me/custom_profile_data -> zerver.views.custom_profile_data
-    rest_path('users/me/profile_data',
-              PATCH=update_user_custom_profile_data,
-              DELETE=remove_user_custom_profile_data),
-
-    rest_path('users/me/<int:stream_id>/topics',
-              GET=(get_topics_backend,
-                   {'allow_anonymous_user_web'})),
-
-
+    rest_path(
+        'users/me/profile_data',
+        PATCH=update_user_custom_profile_data,
+        DELETE=remove_user_custom_profile_data,
+    ),
+    rest_path(
+        'users/me/<int:stream_id>/topics', GET=(get_topics_backend, {'allow_anonymous_user_web'})
+    ),
     # streams -> zerver.views.streams
     # (this API is only used externally)
-    rest_path('streams',
-              GET=get_streams_backend),
-
+    rest_path('streams', GET=get_streams_backend),
     # GET returns `stream_id`, stream name should be encoded in the URL query (in `stream` param)
-    rest_path('get_stream_id',
-              GET=json_get_stream_id),
-
+    rest_path('get_stream_id', GET=json_get_stream_id),
     # GET returns "stream info" (undefined currently?), HEAD returns whether stream exists (200 or 404)
-    rest_path('streams/<int:stream_id>/members',
-              GET=get_subscribers_backend),
-    rest_path('streams/<int:stream_id>',
-              PATCH=update_stream_backend,
-              DELETE=deactivate_stream_backend),
-
+    rest_path('streams/<int:stream_id>/members', GET=get_subscribers_backend),
+    rest_path(
+        'streams/<int:stream_id>', PATCH=update_stream_backend, DELETE=deactivate_stream_backend
+    ),
     # Delete topic in stream
-    rest_path('streams/<int:stream_id>/delete_topic',
-              POST=delete_in_topic),
-
-    rest_path('default_streams',
-              POST=add_default_stream,
-              DELETE=remove_default_stream),
-    rest_path('default_stream_groups/create',
-              POST=create_default_stream_group),
-    rest_path('default_stream_groups/<int:group_id>',
-              PATCH=update_default_stream_group_info,
-              DELETE=remove_default_stream_group),
-    rest_path('default_stream_groups/<int:group_id>/streams',
-              PATCH=update_default_stream_group_streams),
+    rest_path('streams/<int:stream_id>/delete_topic', POST=delete_in_topic),
+    rest_path('default_streams', POST=add_default_stream, DELETE=remove_default_stream),
+    rest_path('default_stream_groups/create', POST=create_default_stream_group),
+    rest_path(
+        'default_stream_groups/<int:group_id>',
+        PATCH=update_default_stream_group_info,
+        DELETE=remove_default_stream_group,
+    ),
+    rest_path(
+        'default_stream_groups/<int:group_id>/streams', PATCH=update_default_stream_group_streams
+    ),
     # GET lists your streams, POST bulk adds, PATCH bulk modifies/removes
-    rest_path('users/me/subscriptions',
-              GET=list_subscriptions_backend,
-              POST=add_subscriptions_backend,
-              PATCH=update_subscriptions_backend,
-              DELETE=remove_subscriptions_backend),
+    rest_path(
+        'users/me/subscriptions',
+        GET=list_subscriptions_backend,
+        POST=add_subscriptions_backend,
+        PATCH=update_subscriptions_backend,
+        DELETE=remove_subscriptions_backend,
+    ),
     # muting -> zerver.views.muting
-    rest_path('users/me/subscriptions/muted_topics',
-              PATCH=update_muted_topic),
-
+    rest_path('users/me/subscriptions/muted_topics', PATCH=update_muted_topic),
     # used to register for an event queue in tornado
-    rest_path('register',
-              POST=events_register_backend),
-
+    rest_path('register', POST=events_register_backend),
     # events -> zerver.tornado.views
-    rest_path('events',
-              GET=get_events,
-              DELETE=cleanup_event_queue),
-
+    rest_path('events', GET=get_events, DELETE=cleanup_event_queue),
     # report -> zerver.views.report
     #
     # These endpoints are for internal error/performance reporting
     # from the browser to the webapp, and we don't expect to ever
     # include in our API documentation.
-    rest_path('report/error',
-              # Logged-out browsers can hit this endpoint, for portico page JS exceptions.
-              POST=(report_error, {'allow_anonymous_user_web',
-                                   'intentionally_undocumented'})),
-    rest_path('report/send_times',
-              POST=(report_send_times, {'intentionally_undocumented'})),
-    rest_path('report/narrow_times',
-              POST=(report_narrow_times, {'allow_anonymous_user_web',
-                                          'intentionally_undocumented'})),
-    rest_path('report/unnarrow_times',
-              POST=(report_unnarrow_times, {'allow_anonymous_user_web',
-                                            'intentionally_undocumented'})),
-
+    rest_path(
+        'report/error',
+        # Logged-out browsers can hit this endpoint, for portico page JS exceptions.
+        POST=(report_error, {'allow_anonymous_user_web', 'intentionally_undocumented'}),
+    ),
+    rest_path('report/send_times', POST=(report_send_times, {'intentionally_undocumented'})),
+    rest_path(
+        'report/narrow_times',
+        POST=(report_narrow_times, {'allow_anonymous_user_web', 'intentionally_undocumented'}),
+    ),
+    rest_path(
+        'report/unnarrow_times',
+        POST=(report_unnarrow_times, {'allow_anonymous_user_web', 'intentionally_undocumented'}),
+    ),
     # Used to generate a Zoom video call URL
-    rest_path('calls/zoom/create',
-              POST=make_zoom_video_call),
+    rest_path('calls/zoom/create', POST=make_zoom_video_call),
     # Used to generate a Big Blue Button video call URL
-    rest_path('calls/bigbluebutton/create',
-              GET=get_bigbluebutton_url),
-
+    rest_path('calls/bigbluebutton/create', GET=get_bigbluebutton_url),
     # export/realm -> zerver.views.realm_export
-    rest_path('export/realm',
-              POST=export_realm,
-              GET=get_realm_exports),
-    rest_path('export/realm/<int:export_id>',
-              DELETE=delete_realm_export),
+    rest_path('export/realm', POST=export_realm, GET=get_realm_exports),
+    rest_path('export/realm/<int:export_id>', DELETE=delete_realm_export),
 ]
 
 integrations_view = IntegrationView.as_view()
@@ -602,127 +505,110 @@ i18n_urls = [
     # to not log in in the future. We don't want to require a new
     # desktop app build for everyone in that case
     path('desktop_home/', desktop_home),
-
     # Backwards-compatibility (legacy) Google auth URL for the mobile
     # apps; see https://github.com/zulip/zulip/issues/13081 for
     # background.  We can remove this once older versions of the
     # mobile app are no longer present in the wild.
     path('accounts/login/google/', start_social_login, {"backend": "google"}),
-
     path('accounts/login/start/sso/', start_remote_user_sso, name='start-login-sso'),
     path('accounts/login/sso/', remote_user_sso, name='login-sso'),
     path('accounts/login/jwt/', remote_user_jwt),
-    path('accounts/login/social/<backend>', start_social_login,
-         name='login-social'),
-    path('accounts/login/social/<backend>/<extra_arg>', start_social_login,
-         name='login-social'),
-    path('accounts/register/social/<backend>',
-         start_social_signup,
-         name='signup-social'),
-    path('accounts/register/social/<backend>/<extra_arg>',
-         start_social_signup,
-         name='signup-social'),
+    path('accounts/login/social/<backend>', start_social_login, name='login-social'),
+    path('accounts/login/social/<backend>/<extra_arg>', start_social_login, name='login-social'),
+    path('accounts/register/social/<backend>', start_social_signup, name='signup-social'),
+    path(
+        'accounts/register/social/<backend>/<extra_arg>', start_social_signup, name='signup-social'
+    ),
     path('accounts/login/subdomain/<token>', log_into_subdomain),
     path('accounts/login/local/', dev_direct_login, name='login-local'),
     # We have two entries for accounts/login; only the first one is
     # used for URL resolution.  The second here is to allow
     # reverse("login") in templates to
     # return `/accounts/login/`.
-    path('accounts/login/', login_page,
-         {'template_name': 'zerver/login.html'}, name='login_page'),
-    path('accounts/login/', LoginView.as_view(template_name='zerver/login.html'),
-         name='login'),
+    path('accounts/login/', login_page, {'template_name': 'zerver/login.html'}, name='login_page'),
+    path('accounts/login/', LoginView.as_view(template_name='zerver/login.html'), name='login'),
     path('accounts/logout/', logout_then_login),
-
-    path('accounts/webathena_kerberos_login/',
-         webathena_kerberos_login),
-
+    path('accounts/webathena_kerberos_login/', webathena_kerberos_login),
     path('accounts/password/reset/', password_reset, name='password_reset'),
-    path('accounts/password/reset/done/',
-         PasswordResetDoneView.as_view(template_name='zerver/reset_emailed.html')),
-    path('accounts/password/reset/<uidb64>/<token>/',
-         PasswordResetConfirmView.as_view(success_url='/accounts/password/done/',
-                                          template_name='zerver/reset_confirm.html',
-                                          form_class=LoggingSetPasswordForm),
-         name='password_reset_confirm'),
-    path('accounts/password/done/',
-         PasswordResetCompleteView.as_view(template_name='zerver/reset_done.html')),
-    path('accounts/deactivated/',
-         show_deactivation_notice),
-
+    path(
+        'accounts/password/reset/done/',
+        PasswordResetDoneView.as_view(template_name='zerver/reset_emailed.html'),
+    ),
+    path(
+        'accounts/password/reset/<uidb64>/<token>/',
+        PasswordResetConfirmView.as_view(
+            success_url='/accounts/password/done/',
+            template_name='zerver/reset_confirm.html',
+            form_class=LoggingSetPasswordForm,
+        ),
+        name='password_reset_confirm',
+    ),
+    path(
+        'accounts/password/done/',
+        PasswordResetCompleteView.as_view(template_name='zerver/reset_done.html'),
+    ),
+    path('accounts/deactivated/', show_deactivation_notice),
     # Displays digest email content in browser.
     path('digest/', digest_page),
-
     # Registration views, require a confirmation ID.
     path('accounts/home/', accounts_home),
-    path('accounts/send_confirm/<email>',
-         TemplateView.as_view(
-             template_name='zerver/accounts_send_confirm.html'),
-         name='signup_send_confirm'),
-    path('accounts/new/send_confirm/<email>',
-         TemplateView.as_view(
-             template_name='zerver/accounts_send_confirm.html'),
-         {'realm_creation': True}, name='new_realm_send_confirm'),
+    path(
+        'accounts/send_confirm/<email>',
+        TemplateView.as_view(template_name='zerver/accounts_send_confirm.html'),
+        name='signup_send_confirm',
+    ),
+    path(
+        'accounts/new/send_confirm/<email>',
+        TemplateView.as_view(template_name='zerver/accounts_send_confirm.html'),
+        {'realm_creation': True},
+        name='new_realm_send_confirm',
+    ),
     path('accounts/register/', accounts_register, name='accounts_register'),
-    path('accounts/do_confirm/<confirmation_key>',
-         check_prereg_key_and_redirect,
-         name='check_prereg_key_and_redirect'),
-
-    path('accounts/confirm_new_email/<confirmation_key>',
-         confirm_email_change,
-         name='confirm_email_change'),
-
+    path(
+        'accounts/do_confirm/<confirmation_key>',
+        check_prereg_key_and_redirect,
+        name='check_prereg_key_and_redirect',
+    ),
+    path(
+        'accounts/confirm_new_email/<confirmation_key>',
+        confirm_email_change,
+        name='confirm_email_change',
+    ),
     # Email unsubscription endpoint. Allows for unsubscribing from various types of emails,
     # including the welcome emails (day 1 & 2), missed PMs, etc.
-    path('accounts/unsubscribe/<email_type>/<confirmation_key>',
-         email_unsubscribe, name='unsubscribe'),
-
+    path(
+        'accounts/unsubscribe/<email_type>/<confirmation_key>',
+        email_unsubscribe,
+        name='unsubscribe',
+    ),
     # Portico-styled page used to provide email confirmation of terms acceptance.
     path('accounts/accept_terms/', accounts_accept_terms, name='accept_terms'),
-
     # Find your account
     path('accounts/find/', find_account, name='find_account'),
-
     # Go to organization subdomain
     path('accounts/go/', realm_redirect, name='realm_redirect'),
-
     # Realm creation
     path('new/', create_realm),
-    path('new/<creation_key>',
-         create_realm, name='create_realm'),
-
+    path('new/<creation_key>', create_realm, name='create_realm'),
     # Realm reactivation
-    path('reactivate/<confirmation_key>', realm_reactivation,
-         name='realm_reactivation'),
-
+    path('reactivate/<confirmation_key>', realm_reactivation, name='realm_reactivation'),
     # Global public streams (Zulip's way of doing archives)
-    path('archive/streams/<int:stream_id>/topics/<topic_name>',
-         archive),
-    path('archive/streams/<int:stream_id>/topics',
-         get_web_public_topics_backend),
-
+    path('archive/streams/<int:stream_id>/topics/<topic_name>', archive),
+    path('archive/streams/<int:stream_id>/topics', get_web_public_topics_backend),
     # Login/registration
     path('register/', accounts_home, name='register'),
-    path('login/', login_page, {'template_name': 'zerver/login.html'},
-         name='login_page'),
-
-    path('join/<confirmation_key>/',
-         accounts_home_from_multiuse_invite, name='join'),
-
+    path('login/', login_page, {'template_name': 'zerver/login.html'}, name='login_page'),
+    path('join/<confirmation_key>/', accounts_home_from_multiuse_invite, name='join'),
     # Used to generate a Zoom video call URL
     path('calls/zoom/register', register_zoom_user),
     path('calls/zoom/complete', complete_zoom_user),
     path('calls/zoom/deauthorize', deauthorize_zoom_user),
-
     # Used to join a Big Blue Button video call
     path('calls/bigbluebutton/join', join_bigbluebutton),
-
     # API and integrations documentation
-    path('integrations/doc-html/<integration_name>',
-         integration_doc),
+    path('integrations/doc-html/<integration_name>', integration_doc),
     path('integrations/', integrations_view),
     path('integrations/<path:path>', integrations_view),
-
     # Landing page, features pages, signup form, etc.
     path('hello/', hello_view),
     path('new-user/', RedirectView.as_view(url='/hello', permanent=True)),
@@ -734,16 +620,15 @@ i18n_urls = [
     path('team/', team_view),
     path('history/', landing_view, {'template_name': 'zerver/history.html'}),
     path('why-zulip/', landing_view, {'template_name': 'zerver/why-zulip.html'}),
-    path('for/open-source/', landing_view,
-         {'template_name': 'zerver/for-open-source.html'}),
-    path('for/research/', landing_view,
-         {'template_name': 'zerver/for-research.html'}),
-    path('for/companies/', landing_view,
-         {'template_name': 'zerver/for-companies.html'}),
-    path('for/working-groups-and-communities/', landing_view,
-         {'template_name': 'zerver/for-working-groups-and-communities.html'}),
+    path('for/open-source/', landing_view, {'template_name': 'zerver/for-open-source.html'}),
+    path('for/research/', landing_view, {'template_name': 'zerver/for-research.html'}),
+    path('for/companies/', landing_view, {'template_name': 'zerver/for-companies.html'}),
+    path(
+        'for/working-groups-and-communities/',
+        landing_view,
+        {'template_name': 'zerver/for-working-groups-and-communities.html'},
+    ),
     path('security/', landing_view, {'template_name': 'zerver/security.html'}),
-
     # Terms of Service and privacy pages.
     path('terms/', terms_view),
     path('privacy/', privacy_view),
@@ -767,26 +652,24 @@ urls += [
 # having to rewrite URLs, and is implemented using the
 # 'override_api_url_scheme' flag passed to rest_dispatch
 urls += [
-    path('user_uploads/temporary/<token>/<filename>',
-         serve_local_file_unauthed,
-         name='local_file_unauthed'),
-    rest_path('user_uploads/<realm_id_str>/<path:filename>',
-              GET=(serve_file_backend,
-                   {'override_api_url_scheme'})),
+    path(
+        'user_uploads/temporary/<token>/<filename>',
+        serve_local_file_unauthed,
+        name='local_file_unauthed',
+    ),
+    rest_path(
+        'user_uploads/<realm_id_str>/<path:filename>',
+        GET=(serve_file_backend, {'override_api_url_scheme'}),
+    ),
     # This endpoint serves thumbnailed versions of images using thumbor;
     # it requires an exception for the same reason.
-    rest_path('thumbnail',
-              GET=(backend_serve_thumbnail,
-                   {'override_api_url_scheme'})),
+    rest_path('thumbnail', GET=(backend_serve_thumbnail, {'override_api_url_scheme'})),
     # Avatars have the same constraint because their URLs are included
     # in API data structures used by both the mobile and web clients.
-    rest_path('avatar/<email_or_id>',
-              GET=(avatar,
-                   {'override_api_url_scheme'})),
-    rest_path('avatar/<email_or_id>/medium',
-              {'medium': True},
-              GET=(avatar,
-                   {'override_api_url_scheme'})),
+    rest_path('avatar/<email_or_id>', GET=(avatar, {'override_api_url_scheme'})),
+    rest_path(
+        'avatar/<email_or_id>/medium', {'medium': True}, GET=(avatar, {'override_api_url_scheme'})
+    ),
 ]
 
 # This URL serves as a way to receive CSP violation reports from the users.
@@ -800,8 +683,7 @@ urls += [
 # such links with images previews. Now thumbor can be used for serving such
 # images.
 urls += [
-    path('external_content/<digest>/<received_url>',
-         handle_camo_url),
+    path('external_content/<digest>/<received_url>', handle_camo_url),
 ]
 
 # Incoming webhook URLs
@@ -813,8 +695,7 @@ for incoming_webhook in WEBHOOK_INTEGRATIONS:
 
 # Desktop-specific authentication URLs
 urls += [
-    rest_path('json/fetch_api_key',
-              POST=json_fetch_api_key),
+    rest_path('json/fetch_api_key', POST=json_fetch_api_key),
 ]
 
 # Mobile-specific authentication URLs
@@ -831,19 +712,15 @@ v1_api_mobile_patterns = [
     # like the requested subdomains'd realm icon (if known) and
     # server-specific compatibility.
     path('server_settings', api_get_server_settings),
-
     # This json format view used by the mobile apps accepts a username
     # password/pair and returns an API key.
     path('fetch_api_key', api_fetch_api_key),
-
     # This is for the signing in through the devAuthBackEnd on mobile apps.
     path('dev_fetch_api_key', api_dev_fetch_api_key),
     # This is for fetching the emails of the admins and the users.
     path('dev_list_users', api_dev_list_users),
-
     # Used to present the GOOGLE_CLIENT_ID to mobile apps
-    path('fetch_google_client_id',
-         api_fetch_google_client_id),
+    path('fetch_google_client_id', api_fetch_google_client_id),
 ]
 urls += [
     path('api/v1/', include(v1_api_mobile_patterns)),
@@ -893,8 +770,7 @@ urls += [
 
 # Two-factor URLs
 if settings.TWO_FACTOR_AUTHENTICATION_ENABLED:
-    urls += [path('', include(tf_urls)),
-             path('', include(tf_twilio_urls))]
+    urls += [path('', include(tf_urls)), path('', include(tf_twilio_urls))]
 
 if settings.DEVELOPMENT:
     urls += dev_urls.urls
diff --git a/zproject/wsgi.py b/zproject/wsgi.py
index 7c1f82c0f2..aea4ba8ace 100644
--- a/zproject/wsgi.py
+++ b/zproject/wsgi.py
@@ -40,8 +40,12 @@ except Exception:
     # debugging process for a Zulip 500 error to always be "check
     # /var/log/zulip/errors.log", we log to that file directly here.
     import logging
-    logging.basicConfig(filename='/var/log/zulip/errors.log', level=logging.INFO,
-                        format='%(asctime)s %(levelname)s %(name)s %(message)s')
+
+    logging.basicConfig(
+        filename='/var/log/zulip/errors.log',
+        level=logging.INFO,
+        format='%(asctime)s %(levelname)s %(name)s %(message)s',
+    )
     logger = logging.getLogger(__name__)
     logger.exception("get_wsgi_application() failed:")
     raise
diff --git a/zthumbor/loaders/helpers.py b/zthumbor/loaders/helpers.py
index cb19c0a9cd..f9759c8a6d 100644
--- a/zthumbor/loaders/helpers.py
+++ b/zthumbor/loaders/helpers.py
@@ -5,6 +5,7 @@ THUMBOR_EXTERNAL_TYPE = 'external'
 THUMBOR_S3_TYPE = 's3'
 THUMBOR_LOCAL_FILE_TYPE = 'local_file'
 
+
 def separate_url_and_source_type(url: str) -> Tuple[str, str]:
     THUMBNAIL_URL_PATT = re.compile('^(?P<actual_url>.+)/source_type/(?P<source_type>.+)')
     matches = THUMBNAIL_URL_PATT.match(url)
diff --git a/zthumbor/loaders/zloader.py b/zthumbor/loaders/zloader.py
index 3b713ff477..e0eb14b706 100644
--- a/zthumbor/loaders/zloader.py
+++ b/zthumbor/loaders/zloader.py
@@ -22,20 +22,21 @@ def get_not_found_result() -> LoaderResult:
     result.successful = False
     return result
 
+
 async def load(context: Context, url: str) -> LoaderResult:
     source_type, encoded_url = separate_url_and_source_type(url)
     actual_url = base64.urlsafe_b64decode(urllib.parse.unquote(encoded_url)).decode('utf-8')
 
     if source_type == THUMBOR_S3_TYPE:
         if actual_url.startswith('/user_uploads/'):
-            actual_url = actual_url[len('/user_uploads/'):]
+            actual_url = actual_url[len('/user_uploads/') :]
         else:
             raise AssertionError("Unexpected s3 file.")
 
         return await s3_loader.load(context, actual_url)
     elif source_type == THUMBOR_LOCAL_FILE_TYPE:
         if actual_url.startswith('/user_uploads/'):
-            actual_url = actual_url[len('/user_uploads/'):]
+            actual_url = actual_url[len('/user_uploads/') :]
             local_file_path_prefix = 'files/'
         else:
             raise AssertionError("Unexpected local file.")
diff --git a/zthumbor/thumbor_settings.py b/zthumbor/thumbor_settings.py
index d5a310c7e8..d81573cce8 100644
--- a/zthumbor/thumbor_settings.py
+++ b/zthumbor/thumbor_settings.py
@@ -38,15 +38,15 @@ if IS_LOCAL_STORAGE:
 
 ## Logging configuration as json
 ## Defaults to: None
-#THUMBOR_LOG_CONFIG = None
+# THUMBOR_LOG_CONFIG = None
 
 ## Log Format to be used by thumbor when writing log messages.
 ## Defaults to: '%(asctime)s %(name)s:%(levelname)s %(message)s'
-#THUMBOR_LOG_FORMAT = '%(asctime)s %(name)s:%(levelname)s %(message)s'
+# THUMBOR_LOG_FORMAT = '%(asctime)s %(name)s:%(levelname)s %(message)s'
 
 ## Date Format to be used by thumbor when writing log messages.
 ## Defaults to: '%Y-%m-%d %H:%M:%S'
-#THUMBOR_LOG_DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
+# THUMBOR_LOG_DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
 
 ################################################################################
 
@@ -55,40 +55,40 @@ if IS_LOCAL_STORAGE:
 
 ## Max width in pixels for images read or generated by thumbor
 ## Defaults to: 0
-#MAX_WIDTH = 0
+# MAX_WIDTH = 0
 
 ## Max height in pixels for images read or generated by thumbor
 ## Defaults to: 0
-#MAX_HEIGHT = 0
+# MAX_HEIGHT = 0
 
 ## Max pixel count for images read by thumbor
 ## Defaults to: 75000000.0
-#MAX_PIXELS = 75000000.0
+# MAX_PIXELS = 75000000.0
 
 ## Min width in pixels for images read or generated by thumbor
 ## Defaults to: 1
-#MIN_WIDTH = 1
+# MIN_WIDTH = 1
 
 ## Min width in pixels for images read or generated by thumbor
 ## Defaults to: 1
-#MIN_HEIGHT = 1
+# MIN_HEIGHT = 1
 
 ## Allowed domains for the http loader to download. These are regular
 ## expressions.
 ## Defaults to: #    [
 #    ]
 
-#ALLOWED_SOURCES = #    [
+# ALLOWED_SOURCES = #    [
 #    ]
 
 
 ## Quality index used for generated JPEG images
 ## Defaults to: 80
-#QUALITY = 80
+# QUALITY = 80
 
 ## Exports JPEG images with the `progressive` flag set.
 ## Defaults to: True
-#PROGRESSIVE_JPEG = True
+# PROGRESSIVE_JPEG = True
 
 ## Specify subsampling behavior for Pillow (see `subsampling`               in
 ## http://pillow.readthedocs.org/en/latest/handbook/image-file-
@@ -96,63 +96,63 @@ if IS_LOCAL_STORAGE:
 ## notation. Will ignore `quality`. Using `keep` will copy the original file's
 ## subsampling.
 ## Defaults to: None
-#PILLOW_JPEG_SUBSAMPLING = None
+# PILLOW_JPEG_SUBSAMPLING = None
 
 ## Specify quantization tables for Pillow (see `qtables`               in
 ## http://pillow.readthedocs.org/en/latest/handbook/image-file-
 ## formats.html#jpeg). Will ignore `quality`. Using `keep` will copy the
 ## original file's qtables.
 ## Defaults to: None
-#PILLOW_JPEG_QTABLES = None
+# PILLOW_JPEG_QTABLES = None
 
 ## Quality index used for generated WebP images. If not set (None) the same level
 ## of JPEG quality will be used.
 ## Defaults to: None
-#WEBP_QUALITY = None
+# WEBP_QUALITY = None
 
 ## Specifies whether WebP format should be used automatically if the request
 ## accepts it (via Accept header)
 ## Defaults to: False
-#AUTO_WEBP = False
+# AUTO_WEBP = False
 
 ## Specify the ratio between 1in and 1px for SVG images. This is only used
 ## whenrasterizing SVG images having their size units in cm or inches.
 ## Defaults to: 150
-#SVG_DPI = 150
+# SVG_DPI = 150
 
 ## Max AGE sent as a header for the image served by thumbor in seconds
 ## Defaults to: 86400
-#MAX_AGE = 86400
+# MAX_AGE = 86400
 
 ## Indicates the Max AGE header in seconds for temporary images (images with
 ## failed smart detection)
 ## Defaults to: 0
-#MAX_AGE_TEMP_IMAGE = 0
+# MAX_AGE_TEMP_IMAGE = 0
 
 ## Indicates whether thumbor should rotate images that have an Orientation EXIF
 ## header
 ## Defaults to: False
-#RESPECT_ORIENTATION = False
+# RESPECT_ORIENTATION = False
 
 ## Ignore errors during smart detections and return image as a temp image (not
 ## saved in result storage and with MAX_AGE_TEMP_IMAGE age)
 ## Defaults to: False
-#IGNORE_SMART_ERRORS = False
+# IGNORE_SMART_ERRORS = False
 
 ## Sends If-Modified-Since & Last-Modified headers; requires support from result
 ## storage
 ## Defaults to: False
-#SEND_IF_MODIFIED_LAST_MODIFIED_HEADERS = False
+# SEND_IF_MODIFIED_LAST_MODIFIED_HEADERS = False
 
 ## Preserves exif information in generated images. Increases image size in
 ## kbytes, use with caution.
 ## Defaults to: False
-#PRESERVE_EXIF_INFO = False
+# PRESERVE_EXIF_INFO = False
 
 ## Indicates whether thumbor should enable the EXPERIMENTAL support for animated
 ## gifs.
 ## Defaults to: True
-#ALLOW_ANIMATED_GIFS = True
+# ALLOW_ANIMATED_GIFS = True
 
 ## Indicates whether thumbor should use gifsicle engine. Please note that smart
 ## cropping and filters are not supported for gifs using gifsicle (but won't
@@ -163,13 +163,13 @@ USE_GIFSICLE_ENGINE = True
 ## Indicates whether thumbor should enable blacklist functionality to prevent
 ## processing certain images.
 ## Defaults to: False
-#USE_BLACKLIST = False
+# USE_BLACKLIST = False
 
 ## Size of the thread pool used for image transformations.  The default value is
 ## 0 (don't use a threadpoool. Increase this if you are seeing your IOLoop
 ## getting blocked (often indicated by your upstream HTTP requests timing out)
 ## Defaults to: 0
-#ENGINE_THREADPOOL_SIZE = 0
+# ENGINE_THREADPOOL_SIZE = 0
 
 ################################################################################
 
@@ -179,7 +179,7 @@ USE_GIFSICLE_ENGINE = True
 ## The metrics backend thumbor should use to measure internal actions. This must
 ## be the full name of a python module (python must be able to import it)
 ## Defaults to: 'thumbor.metrics.logger_metrics'
-#METRICS = 'thumbor.metrics.logger_metrics'
+# METRICS = 'thumbor.metrics.logger_metrics'
 
 ## The loader thumbor should use to load the original image. This must be the
 ## full name of a python module (python must be able to import it)
@@ -205,17 +205,17 @@ else:
 ## The imaging engine thumbor should use to perform image operations. This must
 ## be the full name of a python module (python must be able to import it)
 ## Defaults to: 'thumbor.engines.pil'
-#ENGINE = 'thumbor.engines.pil'
+# ENGINE = 'thumbor.engines.pil'
 
 ## The gif engine thumbor should use to perform image operations. This must be
 ## the full name of a python module (python must be able to import it)
 ## Defaults to: 'thumbor.engines.gif'
-#GIF_ENGINE = 'thumbor.engines.gif'
+# GIF_ENGINE = 'thumbor.engines.gif'
 
 ## The url signer thumbor should use to verify url signatures.This must be the
 ## full name of a python module (python must be able to import it)
 ## Defaults to: 'thumbor.url_signers.base64_hmac_sha1'
-#URL_SIGNER = 'thumbor.url_signers.base64_hmac_sha1'
+# URL_SIGNER = 'thumbor.url_signers.base64_hmac_sha1'
 
 ################################################################################
 
@@ -241,7 +241,7 @@ ALLOW_OLD_URLS = False
 
 ## Enables automatically generated etags
 ## Defaults to: True
-#ENABLE_ETAGS = True
+# ENABLE_ETAGS = True
 
 ################################################################################
 
@@ -250,7 +250,7 @@ ALLOW_OLD_URLS = False
 
 ## Set maximum id length for images when stored
 ## Defaults to: 32
-#MAX_ID_LENGTH = 32
+# MAX_ID_LENGTH = 32
 
 ################################################################################
 
@@ -259,15 +259,15 @@ ALLOW_OLD_URLS = False
 
 ## Host to send statsd instrumentation to
 ## Defaults to: None
-#STATSD_HOST = None
+# STATSD_HOST = None
 
 ## Port to send statsd instrumentation to
 ## Defaults to: 8125
-#STATSD_PORT = 8125
+# STATSD_PORT = 8125
 
 ## Prefix for statsd
 ## Defaults to: None
-#STATSD_PREFIX = None
+# STATSD_PREFIX = None
 
 ################################################################################
 
@@ -276,33 +276,33 @@ ALLOW_OLD_URLS = False
 ## The maximum number of seconds libcurl can take to connect to an image being
 ## loaded
 ## Defaults to: 5
-#HTTP_LOADER_CONNECT_TIMEOUT = 5
+# HTTP_LOADER_CONNECT_TIMEOUT = 5
 
 ## The maximum number of seconds libcurl can take to download an image
 ## Defaults to: 20
-#HTTP_LOADER_REQUEST_TIMEOUT = 20
+# HTTP_LOADER_REQUEST_TIMEOUT = 20
 
 ## Indicates whether libcurl should follow redirects when downloading an image
 ## Defaults to: True
-#HTTP_LOADER_FOLLOW_REDIRECTS = True
+# HTTP_LOADER_FOLLOW_REDIRECTS = True
 
 ## Indicates the number of redirects libcurl should follow when downloading an
 ## image
 ## Defaults to: 5
-#HTTP_LOADER_MAX_REDIRECTS = 5
+# HTTP_LOADER_MAX_REDIRECTS = 5
 
 ## The maximum number of simultaneous HTTP connections the loader can make before
 ## queuing
 ## Defaults to: 10
-#HTTP_LOADER_MAX_CLIENTS = 10
+# HTTP_LOADER_MAX_CLIENTS = 10
 
 ## Indicates whether thumbor should forward the user agent of the requesting user
 ## Defaults to: False
-#HTTP_LOADER_FORWARD_USER_AGENT = False
+# HTTP_LOADER_FORWARD_USER_AGENT = False
 
 ## Default user agent for thumbor http loader requests
 ## Defaults to: 'Thumbor/6.1.5'
-#HTTP_LOADER_DEFAULT_USER_AGENT = 'Thumbor/6.1.5'
+# HTTP_LOADER_DEFAULT_USER_AGENT = 'Thumbor/6.1.5'
 
 
 if config_file.has_option("http_proxy", "host") and config_file.has_option("http_proxy", "port"):
@@ -316,27 +316,27 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 
 ## The proxy username for the proxy host
 ## Defaults to: None
-#HTTP_LOADER_PROXY_USERNAME = None
+# HTTP_LOADER_PROXY_USERNAME = None
 
 ## The proxy password for the proxy host
 ## Defaults to: None
-#HTTP_LOADER_PROXY_PASSWORD = None
+# HTTP_LOADER_PROXY_PASSWORD = None
 
 ## The filename of CA certificates in PEM format
 ## Defaults to: None
-#HTTP_LOADER_CA_CERTS = None
+# HTTP_LOADER_CA_CERTS = None
 
 ## The filename for client SSL key
 ## Defaults to: None
-#HTTP_LOADER_CLIENT_KEY = None
+# HTTP_LOADER_CLIENT_KEY = None
 
 ## The filename for client SSL certificate
 ## Defaults to: None
-#HTTP_LOADER_CLIENT_CERT = None
+# HTTP_LOADER_CLIENT_CERT = None
 
 ## If the CurlAsyncHTTPClient should be used
 ## Defaults to: False
-#HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT = False
+# HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT = False
 
 ################################################################################
 
@@ -346,17 +346,17 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 ## Expiration in seconds for the images in the File Storage. Defaults to one
 ## month
 ## Defaults to: 2592000
-#STORAGE_EXPIRATION_SECONDS = 2592000
+# STORAGE_EXPIRATION_SECONDS = 2592000
 
 ## Indicates whether thumbor should store the signing key for each image in the
 ## file storage. This allows the key to be changed and old images to still be
 ## properly found
 ## Defaults to: False
-#STORES_CRYPTO_KEY_FOR_EACH_IMAGE = False
+# STORES_CRYPTO_KEY_FOR_EACH_IMAGE = False
 
 ## The root path where the File Storage will try to find images
 ## Defaults to: '/tmp/thumbor/storage'
-#FILE_STORAGE_ROOT_PATH = '/tmp/thumbor/storage'
+# FILE_STORAGE_ROOT_PATH = '/tmp/thumbor/storage'
 
 ################################################################################
 
@@ -366,31 +366,31 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 ## Max size in Kb for images uploaded to thumbor
 ## Aliases: MAX_SIZE
 ## Defaults to: 0
-#UPLOAD_MAX_SIZE = 0
+# UPLOAD_MAX_SIZE = 0
 
 ## Indicates whether thumbor should enable File uploads
 ## Aliases: ENABLE_ORIGINAL_PHOTO_UPLOAD
 ## Defaults to: False
-#UPLOAD_ENABLED = False
+# UPLOAD_ENABLED = False
 
 ## The type of storage to store uploaded images with
 ## Aliases: ORIGINAL_PHOTO_STORAGE
 ## Defaults to: 'thumbor.storages.file_storage'
-#UPLOAD_PHOTO_STORAGE = 'thumbor.storages.file_storage'
+# UPLOAD_PHOTO_STORAGE = 'thumbor.storages.file_storage'
 
 ## Indicates whether image deletion should be allowed
 ## Aliases: ALLOW_ORIGINAL_PHOTO_DELETION
 ## Defaults to: False
-#UPLOAD_DELETE_ALLOWED = False
+# UPLOAD_DELETE_ALLOWED = False
 
 ## Indicates whether image overwrite should be allowed
 ## Aliases: ALLOW_ORIGINAL_PHOTO_PUTTING
 ## Defaults to: False
-#UPLOAD_PUT_ALLOWED = False
+# UPLOAD_PUT_ALLOWED = False
 
 ## Default filename for image uploaded
 ## Defaults to: 'image'
-#UPLOAD_DEFAULT_FILENAME = 'image'
+# UPLOAD_DEFAULT_FILENAME = 'image'
 
 ################################################################################
 
@@ -402,7 +402,7 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 #        'localhost:11211',
 #    ]
 
-#MEMCACHE_STORAGE_SERVERS = #    [
+# MEMCACHE_STORAGE_SERVERS = #    [
 #        'localhost:11211',
 #    ]
 
@@ -415,17 +415,17 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 ## Mixed Storage file storage. This must be the full name of a python module
 ## (python must be able to import it)
 ## Defaults to: 'thumbor.storages.no_storage'
-#MIXED_STORAGE_FILE_STORAGE = 'thumbor.storages.no_storage'
+# MIXED_STORAGE_FILE_STORAGE = 'thumbor.storages.no_storage'
 
 ## Mixed Storage signing key storage. This must be the full name of a python
 ## module (python must be able to import it)
 ## Defaults to: 'thumbor.storages.no_storage'
-#MIXED_STORAGE_CRYPTO_STORAGE = 'thumbor.storages.no_storage'
+# MIXED_STORAGE_CRYPTO_STORAGE = 'thumbor.storages.no_storage'
 
 ## Mixed Storage detector information storage. This must be the full name of a
 ## python module (python must be able to import it)
 ## Defaults to: 'thumbor.storages.no_storage'
-#MIXED_STORAGE_DETECTOR_STORAGE = 'thumbor.storages.no_storage'
+# MIXED_STORAGE_DETECTOR_STORAGE = 'thumbor.storages.no_storage'
 
 ################################################################################
 
@@ -435,7 +435,7 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 ## The callback function name that should be used by the META route for JSONP
 ## access
 ## Defaults to: None
-#META_CALLBACK_NAME = None
+# META_CALLBACK_NAME = None
 
 ################################################################################
 
@@ -448,21 +448,21 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 ## Defaults to: #    [
 #    ]
 
-#DETECTORS = #    [
+# DETECTORS = #    [
 #    ]
 
 
 ## The cascade file that opencv will use to detect faces.
 ## Defaults to: 'haarcascade_frontalface_alt.xml'
-#FACE_DETECTOR_CASCADE_FILE = 'haarcascade_frontalface_alt.xml'
+# FACE_DETECTOR_CASCADE_FILE = 'haarcascade_frontalface_alt.xml'
 
 ## The cascade file that opencv will use to detect glasses.
 ## Defaults to: 'haarcascade_eye_tree_eyeglasses.xml'
-#GLASSES_DETECTOR_CASCADE_FILE = 'haarcascade_eye_tree_eyeglasses.xml'
+# GLASSES_DETECTOR_CASCADE_FILE = 'haarcascade_eye_tree_eyeglasses.xml'
 
 ## The cascade file that opencv will use to detect profile faces.
 ## Defaults to: 'haarcascade_profileface.xml'
-#PROFILE_DETECTOR_CASCADE_FILE = 'haarcascade_profileface.xml'
+# PROFILE_DETECTOR_CASCADE_FILE = 'haarcascade_profileface.xml'
 
 ################################################################################
 
@@ -473,17 +473,17 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 ## Defaults to: #    [
 #    ]
 
-#OPTIMIZERS = #    [
+# OPTIMIZERS = #    [
 #    ]
 
 
 ## Path for the jpegtran binary
 ## Defaults to: '/usr/bin/jpegtran'
-#JPEGTRAN_PATH = '/usr/bin/jpegtran'
+# JPEGTRAN_PATH = '/usr/bin/jpegtran'
 
 ## Path for the ffmpeg binary used to generate gifv(h.264)
 ## Defaults to: '/usr/local/bin/ffmpeg'
-#FFMPEG_PATH = '/usr/local/bin/ffmpeg'
+# FFMPEG_PATH = '/usr/local/bin/ffmpeg'
 
 ################################################################################
 
@@ -521,7 +521,7 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 #        'thumbor.filters.curve',
 #    ]
 
-#FILTERS = #    [
+# FILTERS = #    [
 #        'thumbor.filters.brightness',
 #        'thumbor.filters.colorize',
 #        'thumbor.filters.contrast',
@@ -557,7 +557,7 @@ if config_file.has_option("http_proxy", "host") and config_file.has_option("http
 
 ## Expiration in seconds of generated images in the result storage
 ## Defaults to: 0
-#RESULT_STORAGE_EXPIRATION_SECONDS = 0
+# RESULT_STORAGE_EXPIRATION_SECONDS = 0
 
 ## Path where the Result storage will store generated images
 ## Defaults to: '/tmp/thumbor/result_storage'
@@ -575,19 +575,19 @@ RESULT_STORAGE_STORES_UNSAFE = True
 
 ## Server host for the queued redis detector
 ## Defaults to: 'localhost'
-#REDIS_QUEUE_SERVER_HOST = 'localhost'
+# REDIS_QUEUE_SERVER_HOST = 'localhost'
 
 ## Server port for the queued redis detector
 ## Defaults to: 6379
-#REDIS_QUEUE_SERVER_PORT = 6379
+# REDIS_QUEUE_SERVER_PORT = 6379
 
 ## Server database index for the queued redis detector
 ## Defaults to: 0
-#REDIS_QUEUE_SERVER_DB = 0
+# REDIS_QUEUE_SERVER_DB = 0
 
 ## Server password for the queued redis detector
 ## Defaults to: None
-#REDIS_QUEUE_SERVER_PASSWORD = None
+# REDIS_QUEUE_SERVER_PASSWORD = None
 
 ################################################################################
 
@@ -596,15 +596,15 @@ RESULT_STORAGE_STORES_UNSAFE = True
 
 ## AWS key id
 ## Defaults to: None
-#SQS_QUEUE_KEY_ID = None
+# SQS_QUEUE_KEY_ID = None
 
 ## AWS key secret
 ## Defaults to: None
-#SQS_QUEUE_KEY_SECRET = None
+# SQS_QUEUE_KEY_SECRET = None
 
 ## AWS SQS region
 ## Defaults to: 'us-east-1'
-#SQS_QUEUE_REGION = 'us-east-1'
+# SQS_QUEUE_REGION = 'us-east-1'
 
 ################################################################################
 
@@ -614,20 +614,20 @@ RESULT_STORAGE_STORES_UNSAFE = True
 ## This configuration indicates whether thumbor should use a custom error
 ## handler.
 ## Defaults to: False
-#USE_CUSTOM_ERROR_HANDLING = False
+# USE_CUSTOM_ERROR_HANDLING = False
 
 ## Error reporting module. Needs to contain a class called ErrorHandler with a
 ## handle_error(context, handler, exception) method.
 ## Defaults to: 'thumbor.error_handlers.sentry'
-#ERROR_HANDLER_MODULE = 'thumbor.error_handlers.sentry'
+# ERROR_HANDLER_MODULE = 'thumbor.error_handlers.sentry'
 
 ## File of error log as json
 ## Defaults to: None
-#ERROR_FILE_LOGGER = None
+# ERROR_FILE_LOGGER = None
 
 ## File of error log name is parametrized with context attribute
 ## Defaults to: False
-#ERROR_FILE_NAME_USE_CONTEXT = False
+# ERROR_FILE_NAME_USE_CONTEXT = False
 
 ################################################################################
 
@@ -637,7 +637,7 @@ RESULT_STORAGE_STORES_UNSAFE = True
 ## Sentry thumbor project dsn. i.e.: http://5a63d58ae7b94f1dab3dee740b301d6a:73ee
 ## a45d3e8649239a973087e8f21f98@localhost:9000/2
 ## Defaults to: ''
-#SENTRY_DSN_URL = ''
+# SENTRY_DSN_URL = ''
 
 ################################################################################
 
@@ -647,7 +647,7 @@ RESULT_STORAGE_STORES_UNSAFE = True
 ## Custom app class to override ThumborServiceApp. This config value is
 ## overridden by the -a command-line parameter.
 ## Defaults to: 'thumbor.app.ThumborServiceApp'
-#APP_CLASS = 'thumbor.app.ThumborServiceApp'
+# APP_CLASS = 'thumbor.app.ThumborServiceApp'
 
 ################################################################################